From 9e83537290ae8c18730917d7e453a0b42965ad71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Fri, 21 Oct 2022 14:21:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80(=E6=94=BF?= =?UTF-8?q?=E4=BC=81=E8=81=94=E5=90=88):=E9=A1=B5=E9=9D=A2=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 2 +- src/assets/js/http.js | 5 +- .../projectAdmin/fourEngin/cim/leftTop.vue | 4 +- .../fourEngin/command/leftThree.vue | 2 +- .../projectAdmin/fourEngin/govComp/Col2.vue | 37 +++++----- .../projectAdmin/fourEngin/govComp/Col3.vue | 16 +++-- .../projectAdmin/fourEngin/govComp/Col4.vue | 8 +-- .../projectAdmin/fourEngin/govComp/index.vue | 4 +- .../fourEngin/govComp/leftBottom.vue | 6 +- .../fourEngin/govComp/leftMiddle.vue | 68 ++++++++++++++---- .../fourEngin/govComp/leftTop.vue | 72 ++++++------------- 11 files changed, 120 insertions(+), 104 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index 9210af6b..93f5448a 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,7 +18,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.local_test +var PROJECT_TYPE = PROJECT.online_zjsj var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/http.js b/src/assets/js/http.js index b82c02a4..1777e2aa 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,18 +40,17 @@ 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.216:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.216:6024/' // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 - // axios.defaults.baseURL = 'http://192.168.34.216:18070/' // 邱平毅本地 // 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/'; // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 - axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 + // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 // axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲 // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; // diff --git a/src/views/projectAdmin/fourEngin/cim/leftTop.vue b/src/views/projectAdmin/fourEngin/cim/leftTop.vue index 27763af9..772681ca 100644 --- a/src/views/projectAdmin/fourEngin/cim/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/cim/leftTop.vue @@ -44,13 +44,13 @@ export default { display: flex; .td { color: #fff; - opacity: 0.5; + // opacity: 0.5; flex: 1; text-align: center; } #tr{ color: #66D4D9 ; - opacity: 0.5; + // opacity: 0.5; } &:nth-child(1) { font-size: 14px; diff --git a/src/views/projectAdmin/fourEngin/command/leftThree.vue b/src/views/projectAdmin/fourEngin/command/leftThree.vue index 74a2cd47..1b3f11ee 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree.vue @@ -57,7 +57,7 @@ export default { windSpeed: { label: '风速', value: 60, - unit: 'km/h', + unit: 'm/s', image: require('../assets/images/command-center/icon-windSpeed.png'), color: '#f66629', valueBackgroundImage: require('../assets/images/command-center/block3.png') diff --git a/src/views/projectAdmin/fourEngin/govComp/Col2.vue b/src/views/projectAdmin/fourEngin/govComp/Col2.vue index 66b1ad8d..ffb6f4ae 100644 --- a/src/views/projectAdmin/fourEngin/govComp/Col2.vue +++ b/src/views/projectAdmin/fourEngin/govComp/Col2.vue @@ -7,11 +7,11 @@

是否发现问题 - {{item.question == 1 ? '是' : '否' }} + {{item.question == 1 ? '是' : '否' }}

巡检单位 - {{item.utils}} + {{item.utils}}

监督员 @@ -19,15 +19,15 @@

抽查类型 - {{item.type}} + {{item.type}}

检查部位 - {{item.position}} + {{item.position}}

是否下发整改 - {{item.change}} + {{item.change}}

@@ -45,7 +45,7 @@ export default { contentList: [ { time: "2022-06-14", - question: 1, + question: 2, utils: "中国建筑第四工程局有限公司", safe: "张三、李四", type: "安全", @@ -54,7 +54,7 @@ export default { }, { time: "2022-07-28", - question: 1, + question: 2, utils: "中国建筑第四工程局有限公司", safe: "张三、李四", type: "安全", @@ -63,7 +63,7 @@ export default { }, { time: "2022-08-11", - question: 1, + question: 2, utils: "中国建筑第四工程局有限公司", safe: "张三、李四", type: "安全", @@ -72,7 +72,7 @@ export default { }, { time: "2022-08-14", - question: 1, + question: 2, utils: "中国建筑第四工程局有限公司", safe: "张三、李四", type: "安全", @@ -81,7 +81,7 @@ export default { }, { time: "2022-08-14", - question: 1, + question: 2, utils: "中国建筑第四工程局有限公司", safe: "张三、李四", type: "安全", @@ -116,7 +116,7 @@ export default { .timeline { box-sizing: border-box; padding-top: 3%; - height: 100%; + height: 97%; width: 97%; overflow: auto; @@ -124,15 +124,15 @@ export default { width: 6px; height: 6px; margin-right: 5px; - background-color: #e2e4e6; + background-color: #fff; border-radius: 50%; display: inline-block; } .mintit{ display: inline-block; margin-bottom: 10px; - font-size: 18px; - color: #c4c7cc; + font-size: 16px; + color: #fff; } .contentBox { // background-color: rosybrown; @@ -148,8 +148,8 @@ export default { } } ::v-deep .el-timeline { - margin: 5px !important; - font-size: 16px; + margin: 8px !important; + font-size: 14px; } ::v-deep .el-timeline-item__tail { position: absolute; @@ -158,7 +158,7 @@ export default { border-left: 3px solid #274b5f; } ::v-deep .el-timeline-item__content { - color: #888e98; + color: #fff; } ::v-deep .el-timeline { margin: 3px; @@ -170,4 +170,7 @@ export default { ::v-deep .el-timeline-item__node{ box-shadow: 0px 0px 6px 2px #bddade; } +::v-deep .el-timeline-item__timestamp{ + color: #fff; +} diff --git a/src/views/projectAdmin/fourEngin/govComp/Col3.vue b/src/views/projectAdmin/fourEngin/govComp/Col3.vue index a608e72f..99adf59c 100644 --- a/src/views/projectAdmin/fourEngin/govComp/Col3.vue +++ b/src/views/projectAdmin/fourEngin/govComp/Col3.vue @@ -5,7 +5,7 @@
- 监测报告统计 + 检测报告统计
总分数 252份 @@ -36,7 +36,12 @@