diff --git a/public/config.js b/public/config.js index 7e8615c..dcb3150 100644 --- a/public/config.js +++ b/public/config.js @@ -4,4 +4,5 @@ config = { LOGIN_URL: 'http://www.fatoaniic.com/#/login', APP_URL:'http://nmsj.org.cn/', SHOW_URL: "http://121.36.65.171:8787/file/", + UPLOAD_URL: "http://www.fatoaniic.com/api/api-ftp/ftp/upload", } diff --git a/public/template/001/img/login/bg.png b/public/template/001/img/login/bg.png index 80f851c..0ffb171 100644 Binary files a/public/template/001/img/login/bg.png and b/public/template/001/img/login/bg.png differ diff --git a/public/template/001/img/login/refresh.png b/public/template/001/img/login/refresh.png index dc9f56b..bd2758c 100644 Binary files a/public/template/001/img/login/refresh.png and b/public/template/001/img/login/refresh.png differ diff --git a/public/template/001/login/login/index.scss b/public/template/001/login/login/index.scss index 27a994a..d1f7086 100644 --- a/public/template/001/login/login/index.scss +++ b/public/template/001/login/login/index.scss @@ -53,7 +53,7 @@ .el-form-item { // width:407px; max-width: 100%; - height:34px; + // height:34px; background:rgba(255,255,255,1); border:1px solid rgba(220,220,220,1); border-radius:4px; @@ -74,7 +74,7 @@ } a.click_link { font-size: 14px; - color: #2788CC; + color: #01496E; cursor: pointer; } } @@ -99,7 +99,7 @@ position: absolute; width: 450px; left: 50%; - top:calc(15vh + 130px); + top:130px; z-index: 100; padding: 50px 70px; transform: translateX(-50%); @@ -225,4 +225,10 @@ text-align: center; color:#000; background-color: rgba(255, 255, 255, 0.2); + } + .is-error .el-form-item__content { + border: 1px solid #e60012; + } + .el-form-item__content:focus-within { + border: 1px solid #01496e; } \ No newline at end of file diff --git a/public/template/001/styles/element-ui.scss b/public/template/001/styles/element-ui.scss index 930d0e2..2ead4b4 100644 --- a/public/template/001/styles/element-ui.scss +++ b/public/template/001/styles/element-ui.scss @@ -12,7 +12,15 @@ .el-table tr { background-color: transparent; } - +.el-button--primary { + color: #FFF; + background: linear-gradient(180deg, rgba(1, 73, 110, 1),rgba(27, 92, 125, 1)); + border-radius: 2px; + border-color: rgba(1, 73, 110, 1); + &:hover,&:active,&:focus { + background: linear-gradient(180deg, rgba(1, 73, 110, 0.8),rgba(27, 92, 125, 0.8)); + } +} //分页器reset css .el-pagination { padding: 30px 5px; @@ -36,16 +44,19 @@ // border-color: #df3434; // } .el-select .el-input.is-focus .el-input__inner { - border-color: #df3434; + border-color: #01496e; } .el-select-dropdown__item.selected { - color: #df3434; + color: #01496e; } .el-input.is-active .el-input__inner, .el-input__inner:focus { - border-color: #df3434; + border-color: #01496e; +} +.el-select .el-input .el-select__caret { + color: #01496e; + font-size: 16px; } - .el-dialog__header { background-color:rgba(248,248,248,1); } diff --git a/public/template/001/styles/index.scss b/public/template/001/styles/index.scss index 4135622..17553d9 100644 --- a/public/template/001/styles/index.scss +++ b/public/template/001/styles/index.scss @@ -142,7 +142,9 @@ a:hover { align-items: center; flex-direction: column-reverse; } - +.font-size-24 { + font-size: 24px; +} .font-size-21 { font-size: 21px; } @@ -212,6 +214,8 @@ a:hover { .app-container { padding: 20px; + margin: 0 auto; + width: 1200px; background-color: #fff; .input-suffix { line-height: 60px; diff --git a/public/template/001/styles/sidebar.scss b/public/template/001/styles/sidebar.scss index 593506b..1b456a9 100644 --- a/public/template/001/styles/sidebar.scss +++ b/public/template/001/styles/sidebar.scss @@ -32,7 +32,7 @@ left: 0; font-size: 18px; z-index: 1001; - overflow: hidden; + // overflow: hidden; .svg-icon { color: #000; margin-right: 16px; diff --git a/src/views/about/index.vue b/src/views/about/index.vue new file mode 100644 index 0000000..a752d83 --- /dev/null +++ b/src/views/about/index.vue @@ -0,0 +1,19 @@ + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 748e8c4..8844010 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -38,34 +38,46 @@
- +
-
+
联盟动态
NEWS
-
+
行业资讯
INFORMATION
-
-
-

{{item.title}}

-

{{item.content.replace(/<[^>]+>/g,"")}}

-
-
-

{{item.title}}

-
- {{item.sendtime}} -
-
-
-
- 2020年互联网大会 -
-
- 2020年转型升级论坛 -
+ + +
+
+

{{item.title}}

+

{{item.content.replace(/<[^>]+>/g,"")}}

+
+
+

{{item.title}}

+
+ {{item.sendtime}} +
+ + +
+
+

{{item.title}}

+
+ {{item.sendtime}} +
+ + +
+ + +
+ 2020年互联网大会 +
+
+ 2020年转型升级论坛
@@ -178,8 +190,23 @@ export default { {sendtime:'2020-05-07',title:'江门市工业和信息化局转发关于组织推进 “5G+工业”',content:'各市（含定州、辛集市）工业和信息化局、通信发展管理办公室，中国联通 河北分公司、中国电信河北分公司、中国移动河北分公司、河北广电网络。'}, {sendtime:'2020-05-08',title:'关于进一步加快工业互联网发展的通知',content:'各省、自治区、直辖市及计划单列市工业和信息化主管部门，各省、自治区 、直辖市通信管理局，各有关单位。'}, {sendtime:'2020-05-07',title:'关于天津市钢铁、水泥企业 2018年度工序单位产品',content:'按照工业和信息化部《2019年工业节能监察重点工作计划》（工信部节函 〔2019〕77号）和《关于下达2019年国家重大工业节能监察任务及经费。'}, + {sendtime:'2020-06-07',title:'ssssssssssssssss 2018年度工序单位产品',content:'按照工业和信息化部《2019年工业节能监察重点工作计划》（工信部节函 〔2019〕77号）和《关于下达2019年国家重大工业节能监察任务及经费。'}, ], } + }, + mounted(){ + + }, + methods:{ + changeTitleBox(e){ + let aDoc = document.getElementsByName("title-box") + for (let i = 0; i < aDoc.length; i++) { + const element = aDoc[i]; + element.className = "title-box" + } + e.currentTarget.className = "title-box is-active" + // e.target.className = "title-box is-active" + } } } @@ -270,17 +297,17 @@ export default { position: relative; vertical-align: top; display: inline-block; - width: 550px; + width: 1000px; height: 400px; background: #fff; z-index: 5; } .right-box { position: relative; - float: right; - vertical-align: top; + // float: right; + // vertical-align: top; display: inline-block; - width: 430px; + width: 1200px; height: 400px; } .title-box { @@ -318,12 +345,13 @@ export default { } .meeting { position: relative; - width: 100%; - height: 190px; + display: inline-block; + width: calc(50% - 15px); + height: 220px; color: #fff; - padding: 0 15px; + padding: 0 30px; &:first-child { - margin-bottom: 20px; + margin-right: 30px; } &:after { content: " "; @@ -528,7 +556,7 @@ export default { position: relative; display: inline-block; width: calc(100% - 90px); - height: 48px; + height: 46px; padding: 0 15px; &::before { content: " "; @@ -545,7 +573,7 @@ export default { position: relative; display: inline-block; width: calc(100% - 90px); - height: 94px; + height: 103px; padding: 0 15px; } .text-date { diff --git a/src/views/layout/components/header.vue b/src/views/layout/components/header.vue index e226b54..b4516e8 100644 --- a/src/views/layout/components/header.vue +++ b/src/views/layout/components/header.vue @@ -4,7 +4,7 @@ 欢迎访问中国食品工业互联网产业联盟 返回首页 加入联盟登录
- +
@@ -14,7 +14,7 @@
- + -
- +
+
+ + + +
+
@@ -69,7 +74,9 @@ export default { return { routes: [], variables:"", - top:true + top:true, + searchFlag:false, + sSearch:'' }; }, created(){ @@ -77,6 +84,15 @@ export default { }, mounted() { this.routes = this.$router.options.routes[0].children; + }, + methods:{ + search(){ + + }, + closeSearch() { + this.searchFlag = false, + this.sSearch = '' + } } }; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index bbc789e..1d64f81 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,9 +1,9 @@ @@ -178,16 +174,16 @@ export default { password:this.$md5(this.loginForm.password), vercode:this.loginForm.vercode } - this.$store - .dispatch("Login", params) - .then(data => { - this.loading = false; - this.$router.push({path: "/"}); - }) - .catch(() => { - this.loading = false; - this.refreshCode(); - }); + // this.$store + // .dispatch("Login", params) + // .then(data => { + // this.loading = false; + // this.$router.push({path: "/"}); + // }) + // .catch(() => { + // this.loading = false; + // this.refreshCode(); + // }); } else { console.log("error submit!!"); return false; @@ -195,12 +191,12 @@ export default { }); }, getKeysList() { - this.$store - .dispatch("keyWords") - .then(data => { - }) - .catch(() => { - }); + // this.$store + // .dispatch("keyWords") + // .then(data => { + // }) + // .catch(() => { + // }); }, //刷新验证码 refreshCode: function () { diff --git a/src/views/login/register.vue b/src/views/login/register.vue index 86e4fec..e1c086b 100644 --- a/src/views/login/register.vue +++ b/src/views/login/register.vue @@ -1,154 +1,148 @@