diff --git a/dist.zip b/dist.zip new file mode 100644 index 00000000..262079b4 Binary files /dev/null and b/dist.zip differ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 136f8686..ea340b8a 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,8 +40,10 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // 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.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 + 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/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-ihover.png b/src/views/projectAdmin/zjsj/assets/images/common/bg-ihover.png new file mode 100644 index 00000000..916eba0a Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/bg-ihover.png differ diff --git a/src/views/projectAdmin/zjsj/assets/images/common/bg-intro.png b/src/views/projectAdmin/zjsj/assets/images/common/bg-intro.png new file mode 100644 index 00000000..3fc5f972 Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/bg-intro.png differ 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/assets/images/common/bgc_bluechart.png b/src/views/projectAdmin/zjsj/assets/images/common/bgc_bluechart.png new file mode 100644 index 00000000..6f3041f6 Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/bgc_bluechart.png differ diff --git a/src/views/projectAdmin/zjsj/assets/images/common/bgc_other.png b/src/views/projectAdmin/zjsj/assets/images/common/bgc_other.png new file mode 100644 index 00000000..d53e5819 Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/bgc_other.png differ diff --git a/src/views/projectAdmin/zjsj/assets/images/common/icon_hs.png b/src/views/projectAdmin/zjsj/assets/images/common/icon_hs.png new file mode 100644 index 00000000..bbf4246b Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/icon_hs.png differ diff --git a/src/views/projectAdmin/zjsj/assets/images/common/icon_jt.png b/src/views/projectAdmin/zjsj/assets/images/common/icon_jt.png new file mode 100644 index 00000000..a65297b0 Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/icon_jt.png differ diff --git a/src/views/projectAdmin/zjsj/assets/images/common/icon_zg.png b/src/views/projectAdmin/zjsj/assets/images/common/icon_zg.png new file mode 100644 index 00000000..d9ca655d Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/icon_zg.png differ diff --git a/src/views/projectAdmin/zjsj/assets/images/common/labor_yellow.png b/src/views/projectAdmin/zjsj/assets/images/common/labor_yellow.png new file mode 100644 index 00000000..5918ba15 Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/labor_yellow.png differ diff --git a/src/views/projectAdmin/zjsj/assets/images/common/num_bg.png b/src/views/projectAdmin/zjsj/assets/images/common/num_bg.png new file mode 100644 index 00000000..faa68f5c Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/num_bg.png differ diff --git a/src/views/projectAdmin/zjsj/assets/images/common/num_skyblue.png b/src/views/projectAdmin/zjsj/assets/images/common/num_skyblue.png new file mode 100644 index 00000000..a1bc1807 Binary files /dev/null and b/src/views/projectAdmin/zjsj/assets/images/common/num_skyblue.png differ diff --git a/src/views/projectAdmin/zjsj/govComp/Col2.vue b/src/views/projectAdmin/zjsj/govComp/Col2.vue index a51176ee..56047dae 100644 --- a/src/views/projectAdmin/zjsj/govComp/Col2.vue +++ b/src/views/projectAdmin/zjsj/govComp/Col2.vue @@ -1,14 +1,165 @@ - + diff --git a/src/views/projectAdmin/zjsj/govComp/Col3.vue b/src/views/projectAdmin/zjsj/govComp/Col3.vue index 9364044a..fabf9049 100644 --- a/src/views/projectAdmin/zjsj/govComp/Col3.vue +++ b/src/views/projectAdmin/zjsj/govComp/Col3.vue @@ -1,14 +1,222 @@ - + 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 @@ - + diff --git a/src/views/projectAdmin/zjsj/govComp/index.vue b/src/views/projectAdmin/zjsj/govComp/index.vue index 35789dbd..107ce776 100644 --- a/src/views/projectAdmin/zjsj/govComp/index.vue +++ b/src/views/projectAdmin/zjsj/govComp/index.vue @@ -38,10 +38,10 @@ export default { height: 33%; } .middle { - height: 30%; + height: 45%; } .bottom { - height: 37%; + height: 22%; } } } diff --git a/src/views/projectAdmin/zjsj/govComp/leftBottom.vue b/src/views/projectAdmin/zjsj/govComp/leftBottom.vue index d4466023..9b102cdf 100644 --- a/src/views/projectAdmin/zjsj/govComp/leftBottom.vue +++ b/src/views/projectAdmin/zjsj/govComp/leftBottom.vue @@ -1,14 +1,100 @@ - + diff --git a/src/views/projectAdmin/zjsj/govComp/leftMiddle.vue b/src/views/projectAdmin/zjsj/govComp/leftMiddle.vue index 03d8c933..2b140be4 100644 --- a/src/views/projectAdmin/zjsj/govComp/leftMiddle.vue +++ b/src/views/projectAdmin/zjsj/govComp/leftMiddle.vue @@ -1,14 +1,253 @@ - + diff --git a/src/views/projectAdmin/zjsj/govComp/leftTop.vue b/src/views/projectAdmin/zjsj/govComp/leftTop.vue index 8f09f426..d29b0581 100644 --- a/src/views/projectAdmin/zjsj/govComp/leftTop.vue +++ b/src/views/projectAdmin/zjsj/govComp/leftTop.vue @@ -1,6 +1,33 @@ @@ -11,4 +38,49 @@ export default { } - +