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 a38cae67..767c31e6 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -39,11 +39,9 @@ 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://192.168.34.148:6023/' //张志鹏本地
+ 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://139.9.66.234:40001/'; //南昌二期
+ // 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/';
@@ -78,9 +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://192.168.34.148:6023/
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
}
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;
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index 6c2f043c..eec13cea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1455,76 +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') }}
+中建四局数字建造管控平台
+科创大厦项目
+