From cfc10ada9d35e7f5c3e2cb6944372ab8489b275f Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 29 Jan 2024 14:12:10 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E8=AF=9D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9b7b066e9a3638b0d0c4a428f1740a1a211ef9c7. --- src/views/BI/index.vue | 14 +- .../hotwork/hotwork_list/components/list.vue | 2 +- .../components/hotwork/hotwork_list/index.vue | 18 +- src/views/firefighting/fireReport/index.vue | 7 +- .../components/hidden_list.vue | 2 +- .../outsourced/components/edit.vue | 4 +- .../keyprojects/personnelmanagement/index.vue | 1 + .../keyprojects/platformelectronic/index.vue | 60 +- src/views/keyprojects/platformvideo/index.vue | 2 +- src/views/map/components/caofeidian_index.vue | 2 +- src/views/map/components/menjin.vue | 16 +- src/views/map/components/menjinCfd.vue | 14 +- src/views/map/components/qixiang.vue | 4 +- src/views/map/dialog/blindboardCfdD.vue | 124 +- src/views/map/dialog/hoistingCfdD.vue | 8 +- src/views/map/dialog/hotwork.vue | 12 +- src/views/map/dialog/humiditystation.vue | 161 +- src/views/map/dialog/index.vue | 2 +- src/views/map/dialog/peoplePositionCfdD.vue | 26 +- src/views/map/dialog/peoplePositionOne.vue | 4 +- src/views/map/dialog/temperaturestation.vue | 161 +- src/views/map/dialog/video_play_cfd.vue | 2 +- src/views/map/dialog/weatherstation.vue | 11 +- src/views/map/dialog/windspeedstation.vue | 161 +- src/views/map/dialog/xfControl.vue | 8 +- src/views/map/js/mapbox.js | 4352 +++++++++-------- .../inspection/components/add.vue | 8 +- src/views/system/appment/index.vue | 584 +-- src/views/system/group/user/index.vue | 3 +- 29 files changed, 2905 insertions(+), 2868 deletions(-) diff --git a/src/views/BI/index.vue b/src/views/BI/index.vue index f2fa049..9f1872d 100644 --- a/src/views/BI/index.vue +++ b/src/views/BI/index.vue @@ -212,11 +212,11 @@
{{ - item.INSPECTION_PLACE.length > 6 ? item.INSPECTION_PLACE.substr(0, 6) + '...' : item.INSPECTION_PLACE - }} + item.INSPECTION_PLACE.length > 6 ? item.INSPECTION_PLACE.substr(0, 6) + '...' : item.INSPECTION_PLACE + }} {{ - item.INSPECTION_TIME_START.length > 10 ? item.INSPECTION_TIME_START.substr(0, 10) + '...' : item.INSPECTION_TIME_START - }} + item.INSPECTION_TIME_START.length > 10 ? item.INSPECTION_TIME_START.substr(0, 10) + '...' : item.INSPECTION_TIME_START + }}
@@ -507,7 +507,7 @@ export default { count3 = item.count } }) - this.safetyEnvironmentalInspectionList = data.insList.length > 4 ? data.insList.splice(0, 4) : data.insList + this.safetyEnvironmentalInspectionList = data.insList.length > 4 ? data.insList.splice(0,4) : data.insList this.initEcharts4(count1, count2, count3) }) }, @@ -553,9 +553,9 @@ export default { // } if (item.HIDDENLEVEL == 'hiddenLevel1004') { // 轻微隐患 yinhuanCount[0] = item.count - } else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患 + }else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患 yinhuanCount[1] = item.count - } else if (item.HIDDENLEVEL == 'jdyh001') { // 较大隐患 + } else if (item.HIDDENLEVEL == 'jdyh001') { // 较大隐患 yinhuanCount[2] = item.count } else if (item.HIDDENLEVEL == 'hiddenLevel2002') { // 重大隐患 yinhuanCount[3] = item.count diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue index e5a93c3..91eb85a 100644 --- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue +++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue @@ -84,7 +84,7 @@ -
+
diff --git a/src/views/map/dialog/hoistingCfdD.vue b/src/views/map/dialog/hoistingCfdD.vue index ff8736f..2545ff3 100644 --- a/src/views/map/dialog/hoistingCfdD.vue +++ b/src/views/map/dialog/hoistingCfdD.vue @@ -43,10 +43,10 @@ {{ pd.PART_WEIGHT }}t - {{ pd.WORK_LEVEL == '1' ? '一级作业级别' : '' }} - {{ pd.WORK_LEVEL == '2' ? '二级作业级别' : '' }} - {{ pd.WORK_LEVEL == '3' ? '三级作业级别' : '' }} - + {{ pd.WORK_LEVEL == '1' ? '一级作业级别' : '' }} + {{ pd.WORK_LEVEL == '2' ? '二级作业级别' : '' }} + {{ pd.WORK_LEVEL == '3' ? '三级作业级别' : '' }} + diff --git a/src/views/map/dialog/hotwork.vue b/src/views/map/dialog/hotwork.vue index 81b04b9..2adb22a 100644 --- a/src/views/map/dialog/hotwork.vue +++ b/src/views/map/dialog/hotwork.vue @@ -72,31 +72,31 @@ 动火单位(部门)负责人意见 - + 现场管辖单位(部门)负责人意见 - + 动火许可证签发单位意见 - + 动火前管辖单位现场人员许可 姓名: - + 动火后管辖单位现场人员验收 姓名: - + @@ -116,7 +116,7 @@ {{ item.userName }} {{ item.TIME }} - + diff --git a/src/views/map/dialog/humiditystation.vue b/src/views/map/dialog/humiditystation.vue index 8c93751..29342b9 100644 --- a/src/views/map/dialog/humiditystation.vue +++ b/src/views/map/dialog/humiditystation.vue @@ -1,7 +1,7 @@