diff --git a/public/js/config.js b/public/js/config.js index 615f9cd6..047a789e 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -16,7 +16,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.online_hq +var PROJECT_TYPE = PROJECT.local_test var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 74dd0c14..dc276cf9 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') { // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.216:6025/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; // axios.defaults.baseURL = 'http://139.9.66.234:8/'; diff --git a/src/components/account.vue b/src/components/account.vue index 7a2f2cd6..0cc01e6b 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -15,7 +15,7 @@

{{ $store.state.userInfo.companyName }}

- +

客服电话：{{$store.state.userInfo.customerServicePhone}}

入场码：{{$store.state.currentProDetail.placeCode}}

diff --git a/src/store/index.js b/src/store/index.js index 0f8baa6f..5cafa864 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,8 +45,8 @@ export default new Vuex.Store({ // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // - UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // - FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 + // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时，需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', @@ -56,8 +56,8 @@ export default new Vuex.Store({ // UPLOADURL: 'http://192.168.34.125:6023/upload/image', // FILEURL: 'http://192.168.34.125:6023/image/', // 邱平毅的 - // UPLOADURL: 'http://192.168.34.216:6023/upload/image', - // FILEURL: 'http://192.168.34.216:6023/image/', + UPLOADURL: 'http://192.168.34.216:6023/upload/image', + FILEURL: 'http://192.168.34.216:6023/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 diff --git a/src/views/projectAdmin/zjsj/assets/images/common/bg_time.png b/src/views/projectAdmin/zjsj/assets/images/common/bg_time.png new file mode 100644 index 00000000..11ce0e37 Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/bg_time.png differ diff --git a/src/views/projectAdmin/zjsj/govComp/Col2.vue b/src/views/projectAdmin/zjsj/govComp/Col2.vue index 5b7668f0..56047dae 100644 --- a/src/views/projectAdmin/zjsj/govComp/Col2.vue +++ b/src/views/projectAdmin/zjsj/govComp/Col2.vue @@ -150,7 +150,7 @@ export default { position: absolute; left: 4px; height: 100%; - border-left: 3px solid #2ac9e2; + border-left: 3px solid #274b5f; } ::v-deep .el-timeline-item__content { color: #888e98; diff --git a/src/views/projectAdmin/zjsj/govComp/Col3.vue b/src/views/projectAdmin/zjsj/govComp/Col3.vue index d6f9d0b2..d94bd0b9 100644 --- a/src/views/projectAdmin/zjsj/govComp/Col3.vue +++ b/src/views/projectAdmin/zjsj/govComp/Col3.vue @@ -39,7 +39,12 @@ - + + +
@@ -179,6 +184,11 @@ export default { color: white; } } +.raleRow{ + color: #5ec2c8 !important; + font-weight:bold; + +} ::v-deep .el-table { color: #7f8691; } diff --git a/src/views/projectAdmin/zjsj/govComp/Col4.vue b/src/views/projectAdmin/zjsj/govComp/Col4.vue index 255c3de5..e8d062c3 100644 --- a/src/views/projectAdmin/zjsj/govComp/Col4.vue +++ b/src/views/projectAdmin/zjsj/govComp/Col4.vue @@ -1,14 +1,186 @@ - +