From 7d1dfd0bde2aff648582de5e0fdcf6daba520506 Mon Sep 17 00:00:00 2001 From: cjp <3096114695@qq.com> Date: Tue, 14 Nov 2023 09:37:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- .../schedulePlan/leftBottom.vue | 17 +++++--- .../schedulePlan/rightBottomLeft.vue | 4 +- .../towerCraneMonitoring/right.vue | 40 ++++++++++--------- 4 files changed, 38 insertions(+), 27 deletions(-) diff --git a/.env.production b/.env.production index 81f31e6..712f7e8 100644 --- a/.env.production +++ b/.env.production @@ -7,8 +7,10 @@ NODE_ENV = "production" # VITE_API_URL = "http://jxj.zhgdyun.com:6688" # 沈阳合盈线上 # VITE_API_URL = "http://101.43.164.214:45022" -# 七参数标准版 +# 七参数标准版(演示平台) VITE_API_URL = 'http://jxj.zhgdyun.com:9809' +# 七参数标准版(测试平台) +# VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # 打包 VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' diff --git a/src/views/sevenLargeScreen/qualityControl/schedulePlan/leftBottom.vue b/src/views/sevenLargeScreen/qualityControl/schedulePlan/leftBottom.vue index f083326..dd53a9d 100644 --- a/src/views/sevenLargeScreen/qualityControl/schedulePlan/leftBottom.vue +++ b/src/views/sevenLargeScreen/qualityControl/schedulePlan/leftBottom.vue @@ -14,19 +14,19 @@
工作总数
{{ workTotal.workCount || 0 }}
-
+
延迟工作
{{ workTotal.delayCount || 0 }}
-
+
提前工作
{{ workTotal.aheadCount || 0 }}
-
进行中
-
未开始
-
已完成
+
进行中
+
未开始
+
已完成
@@ -225,7 +225,7 @@ const list = reactive([ } ]); -let checked = ref(1); +let checked = ref(1 as any); const stateChange = async (e: any) => { checked.value = e; // await getProjectInfo(); @@ -246,6 +246,11 @@ let dayList = ref([ ]); let tabIndex = ref(1 as any); const selectChange = async (e: any) => { + if (e === 1) { + checked.value = 1; + } else { + checked.value = ""; + } tabIndex.value = e; await getProjectInfo(); await getRaskList(); diff --git a/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightBottomLeft.vue b/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightBottomLeft.vue index da023a4..77ecab4 100644 --- a/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightBottomLeft.vue +++ b/src/views/sevenLargeScreen/qualityControl/schedulePlan/rightBottomLeft.vue @@ -214,8 +214,8 @@ let listData = ref([] as any); const getChartTotal = async () => { const res: any = await getCountMppStatus({ projectSn: store.sn }); console.log("状态统计", res); - listData.value = res.result; - if (res.result.length > 0) { + listData.value = res.result.data; + if (res.result.data.length > 0) { xData.value = res.result.data.map((item: any) => item.name); yData.value = res.result.data.map((item: any) => Number(item.count)); } diff --git a/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue b/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue index 5b49686..df95f58 100644 --- a/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue +++ b/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue @@ -6,7 +6,7 @@ 塔吊信息
-
+
-
-
-
-
-
+
+
+
+
+
荷载比
{{ towerDetail.loadRatio || 0 }}%
-
+
力矩比
{{ towerDetail.torqueRatio || 0 }}%
-
+
吊重
{{ towerDetail.loading || 0 }}kg
-
+
幅度
{{ towerDetail.ranger || 0 }}m
-
+
高度
{{ towerDetail.height || 0 }}m
-
+
风速
{{ towerDetail.windspeed || 0 }}m/s
-
+
转角
{{ towerDetail.angle || 0 }}°
-
+
倾角
{{ towerDetail.obliguity || 0 }}°
@@ -308,9 +308,13 @@ const getTowerDetail = async () => { if (res.result) { towerDetailData.value = res.result; // towerDevSn.value = res.result.devSn; - towerVideoId.value = res.result.videoList[0].serialNumber; - mitts.emit("serialNumberId", towerVideoId.value); console.log("塔吊信息详情", res.result); + if (res.result.videoList.length > 0) { + towerVideoId.value = res.result.videoList[0].serialNumber; + mitts.emit("serialNumberId", towerVideoId.value); + } else { + mitts.emit("serialNumberId", ""); + } } }; //获取塔吊实时数据 @@ -689,9 +693,9 @@ onMounted(async () => { } .notoDta { width: 20%; - height: 20%; - margin-top: 20%; - margin-left: 40%; + height: 20%; + margin-top: 20%; + margin-left: 40%; img { width: 30%; margin: 6% 36%;