From 9091e6b007dabf51ad6b16ac47d3838351193075 Mon Sep 17 00:00:00 2001 From: Luck-Xiaomi <1569717859@qq.com> Date: Wed, 6 Jul 2022 10:14:24 +0800 Subject: [PATCH 1/3] . --- public/js/config.js | 2 +- src/assets/js/http.js | 4 +- src/components/account.vue | 10 +- src/router/index.js | 138 +++++++++--------- src/store/index.js | 1 + .../projectAdmin/dataBoard/dataBoard.vue | 9 +- 6 files changed, 84 insertions(+), 80 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index 081a2924..5128235d 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -5,7 +5,7 @@ var COMPANY = ''; //通用 // var COMPANY='longguang'; //龙光地产 // var COMPANY='zhengwu' // var COMPANY='shenbai'; //沈白高铁 -// COMPANY = 'henan' +// COMPANY = 'henan' // 河南 // COMPANY = 'xingxuan' var headerShow = true; // 是否显示头部 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 493f4143..717241b7 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // tag: 本地 - axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 - // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 + // axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 + axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // axios.defaults.baseURL = 'http://139.9.66.234:8/'; // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 diff --git a/src/components/account.vue b/src/components/account.vue index 44a9e82f..eebcba3b 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -139,11 +139,11 @@ export default { mounted() { this.seeEquipment = this.$store.state.userInfo.seeEquipment; this.loginData = JSON.parse(localStorage.getItem('systemInfo')) - this.headerConfiguration = this.loginData.headerConfiguration - this.projectBackground = this.loginData.projectBackground - this.enterpriseBackground = this.loginData.enterpriseBackground - this.dataCenter1 = this.loginData.dataCenter - this.equipmentChina = this.loginData.equipmentChina + this.headerConfiguration = this.loginData.headerConfiguration + this.projectBackground = this.loginData.projectBackground + this.enterpriseBackground = this.loginData.enterpriseBackground + this.dataCenter1 = this.loginData.dataCenter + this.equipmentChina = this.loginData.equipmentChina // console.log('项目后台',this.projectBackground) // console.log('企业后台',this.enterpriseBackground) }, diff --git a/src/router/index.js b/src/router/index.js index ec22b765..eec13cea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1455,75 +1455,75 @@ const routes2 = [ component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'), } ] - // 中建四局的看板 - // children: [{ - // path: 'index', - // name: '数据看板-首页概览', - // component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'), - // }, { - // path: 'digitalSite', - // name: '数据看板-数字工地', - // component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'), - // }, { - // path: 'laborManage', - // name: '数据看板-劳务管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'), - // }, { - // path: 'environment', - // name: '数据看板-环境监测', - // component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'), - // }, - // { - // path: 'material', - // name: '数据看板-材料管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'), - // }, - // { - // path: 'plan', - // name: '数据看板-进度计划', - // component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'), - // }, - // { - // path: 'secure', - // name: '数据看板-安全管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'), - // }, - // { - // path: 'quality', - // name: '数据看板-质量管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'), - // }, - // { - // path: 'SixHundred', - // name: '数据看板-六个百分百', - // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'), - // }, - // { - // path: 'AiAnalysis', - // name: '数据看板-AI数据分析', - // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'), - // }, - // { - // path: 'contractManage', - // name: '数据看板-合约管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'), - // }, - // { - // path: 'doublecManage', - // name: '数据看板-双碳管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'), - // }, - // { - // path: 'bigScreen', - // name: '数据看板-监控大屏', - // component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'), - // }, - // { - // path: 'cimManage', - // name: '数据看板-CIM+', - // component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'), - // } - // ] + // 中建四局的看板 + // children: [{ + // path: 'index', + // name: '数据看板-首页概览', + // component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'), + // }, { + // path: 'digitalSite', + // name: '数据看板-数字工地', + // component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'), + // }, { + // path: 'laborManage', + // name: '数据看板-劳务管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'), + // }, { + // path: 'environment', + // name: '数据看板-环境监测', + // component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'), + // }, + // { + // path: 'material', + // name: '数据看板-材料管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'), + // }, + // { + // path: 'plan', + // name: '数据看板-进度计划', + // component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'), + // }, + // { + // path: 'secure', + // name: '数据看板-安全管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'), + // }, + // { + // path: 'quality', + // name: '数据看板-质量管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'), + // }, + // { + // path: 'SixHundred', + // name: '数据看板-六个百分百', + // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'), + // }, + // { + // path: 'AiAnalysis', + // name: '数据看板-AI数据分析', + // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'), + // }, + // { + // path: 'contractManage', + // name: '数据看板-合约管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'), + // }, + // { + // path: 'doublecManage', + // name: '数据看板-双碳管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'), + // }, + // { + // path: 'bigScreen', + // name: '数据看板-监控大屏', + // component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'), + // }, + // { + // path: 'cimManage', + // name: '数据看板-CIM+', + // component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'), + // } + // ] }, { path: '/equipmentCenter/', diff --git a/src/store/index.js b/src/store/index.js index d5f8659b..151aa154 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -51,6 +51,7 @@ export default new Vuex.Store({ // tag: 部署河南项目时，需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', // FILEURL: 'http://124.71.178.44:100/image/', + /* 2022-06-06 */ // tag: 本地测试接口 // UPLOADURL: 'http://192.168.34.125:6023/upload/image', // FILEURL: 'http://192.168.34.125:6023/image/', diff --git a/src/views/projectAdmin/dataBoard/dataBoard.vue b/src/views/projectAdmin/dataBoard/dataBoard.vue index 469f3437..4afe17e2 100644 --- a/src/views/projectAdmin/dataBoard/dataBoard.vue +++ b/src/views/projectAdmin/dataBoard/dataBoard.vue @@ -9,6 +9,7 @@ >
- -

中建四局数字建造管控平台

-

科创大厦项目

+

{{ $t('message.dataBoard.headerTitle') }}

+
+

中建四局数字建造管控平台

+

科创大厦项目

+
From 2655aab2050c406ff5918b0ec754616cdea7a6e1 Mon Sep 17 00:00:00 2001 From: Luck-Xiaomi <1569717859@qq.com> Date: Wed, 6 Jul 2022 13:56:34 +0800 Subject: [PATCH 2/3] . --- src/assets/js/http.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 717241b7..767c31e6 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -39,10 +39,10 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789 - // axios.defaults.baseURL = 'http://124.71.178.44:100/' + axios.defaults.baseURL = 'http://124.71.178.44:100/' // tag: 本地 - // axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 - axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 + // axios.defaults.baseURL = 'http://192.168.88.220:6023/'; //本地 http/1.1 + // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // axios.defaults.baseURL = 'http://139.9.66.234:8/'; // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 @@ -76,8 +76,6 @@ else if (process.env.NODE_ENV == 'debug') { let host = window.location.host; axios.defaults.baseURL = window.location.protocol + "//" + host + "/" // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/" - // axios.defaults.baseURL = 'http://192.168.34.125:6023/'; - // axios.defaults.baseURL = 'http://139.9.66.234:8/' // axios.defaults.baseURL = 'http://zhgd.loganwy.com/' } From 37d9a2de004d6a669da3ba4e6b6cf66c87672fff Mon Sep 17 00:00:00 2001 From: Luck-Xiaomi <1569717859@qq.com> Date: Wed, 6 Jul 2022 18:05:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/closePage.vue | 89 +++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/src/components/closePage.vue b/src/components/closePage.vue index cf00504e..558d459d 100644 --- a/src/components/closePage.vue +++ b/src/components/closePage.vue @@ -1,52 +1,57 @@ + + \ No newline at end of file +.closeBtn { + width: 16px; + height: 16px; + position: absolute; + right: 6px; + top: 6px; + z-index: 9999; + cursor: pointer; +} + +a { + outline: none; +} +