From 33ca18fa164d1a2f15377c8e0f9651d590676b25 Mon Sep 17 00:00:00 2001 From: cjp <3096114695@qq.com> Date: Sat, 2 Dec 2023 11:47:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86BUG?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E9=85=8D=E5=90=88?= =?UTF-8?q?=E6=BC=94=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 11 +++ package.json | 1 + .../sevenLargeScreen/headNoise/leftCenter.vue | 10 +-- src/views/sevenLargeScreen/indexL.vue | 22 ++--- .../largeMachinery/erectCrane/topCenter.vue | 2 +- .../largeMachinery/gantryCrane/topCenter.vue | 4 +- .../largeMachinery/hangBasket/hangLeft.vue | 4 +- .../largeMachinery/hangBasket/rightBottom.vue | 24 +++--- .../largeMachinery/hangBasket/topLeft.vue | 12 +-- .../largeMachinery/hangBasket/topRight.vue | 10 +-- .../qualityManagement/rightBoxQ.vue | 81 ++++++++++++++----- 11 files changed, 117 insertions(+), 64 deletions(-) diff --git a/package-lock.json b/package-lock.json index defb18b..1b4511c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,6 +26,7 @@ "echarts-liquidfill": "^3.1.0", "element-china-area-data": "^5.0.2", "element-plus": "^2.2.30", + "ezuikit-js": "^7.7.8", "js-base64": "^3.7.5", "js-md5": "^0.7.3", "mars3d": "^3.5.6", @@ -7542,6 +7543,11 @@ "node": ">=0.10.0" } }, + "node_modules/ezuikit-js": { + "version": "7.7.8", + "resolved": "https://registry.npmjs.org/ezuikit-js/-/ezuikit-js-7.7.8.tgz", + "integrity": "sha512-DfcPxUhLgchkQU5+0WllD3QghAJYG9mCybCCs0znLoSnMupup6WB1+wjrxPtpt49praQDuMrGoBVe0Mtl1z9/w==" + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -21521,6 +21527,11 @@ "to-regex": "^3.0.1" } }, + "ezuikit-js": { + "version": "7.7.8", + "resolved": "https://registry.npmjs.org/ezuikit-js/-/ezuikit-js-7.7.8.tgz", + "integrity": "sha512-DfcPxUhLgchkQU5+0WllD3QghAJYG9mCybCCs0znLoSnMupup6WB1+wjrxPtpt49praQDuMrGoBVe0Mtl1z9/w==" + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", diff --git a/package.json b/package.json index 211fd8f..08569f2 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "echarts-liquidfill": "^3.1.0", "element-china-area-data": "^5.0.2", "element-plus": "^2.2.30", + "ezuikit-js": "^7.7.8", "js-base64": "^3.7.5", "js-md5": "^0.7.3", "mars3d": "^3.5.6", diff --git a/src/views/sevenLargeScreen/headNoise/leftCenter.vue b/src/views/sevenLargeScreen/headNoise/leftCenter.vue index 45b536b..5c87be4 100644 --- a/src/views/sevenLargeScreen/headNoise/leftCenter.vue +++ b/src/views/sevenLargeScreen/headNoise/leftCenter.vue @@ -11,13 +11,13 @@
-
+
- - + + {{ item.deviceName }}
-
{{ item.isClosed == 1 ? "在线" : "离线" }}
+
{{ item.devOnline == 1 ? "在线" : "离线" }}
@@ -46,7 +46,7 @@ const getList = async () => { onlineDevNum.value = 0; offlineDevNum.value = 0; deciData.value.forEach(element => { - if (element.isClosed == 2) { + if (element.devOnline == 0) { offlineDevNum.value++; } else { onlineDevNum.value++; diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 4bb5e46..b7e5e7c 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -4,7 +4,7 @@
-

数字化项目监管平台

+

东沙一号大桥监管平台
{{ nowTime }}
@@ -201,16 +201,16 @@ let menuList = ref([ } ] }, - { - moduleName: "BIM模型", - modulePath: "/bImModel", - menuList: [ - { - menuName: "BIM模型", - companyPath: "/bImModel" - } - ] - } + // { + // moduleName: "BIM模型", + // modulePath: "/bImModel", + // menuList: [ + // { + // menuName: "BIM模型", + // companyPath: "/bImModel" + // } + // ] + // } ]); // let menuList = ref([ // { diff --git a/src/views/sevenLargeScreen/largeMachinery/erectCrane/topCenter.vue b/src/views/sevenLargeScreen/largeMachinery/erectCrane/topCenter.vue index d83f5a6..f199eec 100644 --- a/src/views/sevenLargeScreen/largeMachinery/erectCrane/topCenter.vue +++ b/src/views/sevenLargeScreen/largeMachinery/erectCrane/topCenter.vue @@ -82,7 +82,7 @@
- {{ baseURL }} +
diff --git a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topCenter.vue b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topCenter.vue index 78ae162..5b6a082 100644 --- a/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topCenter.vue +++ b/src/views/sevenLargeScreen/largeMachinery/gantryCrane/topCenter.vue @@ -20,11 +20,11 @@
门机跨度
-
23m
+
30m
吊装高度
-
34m
+
10m
diff --git a/src/views/sevenLargeScreen/largeMachinery/hangBasket/hangLeft.vue b/src/views/sevenLargeScreen/largeMachinery/hangBasket/hangLeft.vue index 6c266b0..f13bacb 100644 --- a/src/views/sevenLargeScreen/largeMachinery/hangBasket/hangLeft.vue +++ b/src/views/sevenLargeScreen/largeMachinery/hangBasket/hangLeft.vue @@ -6,11 +6,11 @@
-
数据截至: 2023-06-29 15:23:59
+
数据截至: 2023-12-01 09:00:00
挂篮是否有人
-
24
+
0
倾角
diff --git a/src/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue b/src/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue index 38143cf..ac33fba 100644 --- a/src/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue +++ b/src/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue @@ -78,7 +78,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 2, @@ -90,7 +90,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 3, @@ -102,7 +102,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 4, @@ -114,7 +114,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 5, @@ -126,7 +126,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 6, @@ -138,7 +138,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 7, @@ -150,7 +150,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { @@ -163,7 +163,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 9, @@ -175,7 +175,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 10, @@ -187,7 +187,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 11, @@ -199,7 +199,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" }, { id: 12, @@ -211,7 +211,7 @@ const list = reactive([ heightDiff: 10, backBoltLeft: "265", backBoltRight: "352.6", - monitorTime: "2023-01-01 12:00:00" + monitorTime: "2023-12-01 09:00:00" } ]); diff --git a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue index 0ff8ee4..add1d2d 100644 --- a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue +++ b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue @@ -2,18 +2,18 @@
-
+ +
+
{{ index + 1 }}#
正常
-
+
diff --git a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue index 3425f9f..83d18d4 100644 --- a/src/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue +++ b/src/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue @@ -5,13 +5,13 @@
1#后梁固定锚杆报警
-
牛尤淆笨闹避案劈深眨随慈勉秧填腕鸣抚噬竹雇容虏埃挑纷采拱食恭仓禽退档茨殿句！
-
2023.06.08 12:00:00
+ +
2023-12-01 09:00:00
-
1#后梁固定锚杆报警
-
牛尤淆笨闹避案劈深眨随慈勉秧填腕鸣抚噬竹雇容虏埃挑纷采拱食恭仓禽退档茨殿句！
-
2023.06.08 12:00:00
+
2#后梁固定锚杆报警
+ +
2023-12-01 09:00:00
diff --git a/src/views/sevenLargeScreen/qualityControl/qualityManagement/rightBoxQ.vue b/src/views/sevenLargeScreen/qualityControl/qualityManagement/rightBoxQ.vue index ba7df79..36df60d 100644 --- a/src/views/sevenLargeScreen/qualityControl/qualityManagement/rightBoxQ.vue +++ b/src/views/sevenLargeScreen/qualityControl/qualityManagement/rightBoxQ.vue @@ -8,33 +8,64 @@
-->
-
-
-
测试
-
整改结果：已逾期
-
编号：ZLJC20230608001
-
-
-
- 检查结果：通过1 - 整改 2 +
+
+
+ {{ item.name || "" }} +
+
整改结果：已逾期
+
编号：ZLJC20230608001
+
+
+
+ 检查结果：通过1 + 整改 2 +
+
发起日期：2023.06.08
-
发起日期：2023.06.08
-
- - - - \ No newline at end of file +