From 02e16ad53403fec71974f8bab8adfd1c7637a724 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Fri, 23 Feb 2024 16:07:24 +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 --- .../highFormwork/real-time-list.vue | 4 +- .../highFormwork/topRight.vue | 30 ++++------ .../safetyManagement/highSlope/alarm-list.vue | 38 +++++++------ .../highSlope/history-list.vue | 57 ++++++++----------- .../highSlope/real-time-list.vue | 47 +++++++-------- .../safetyManagement/highSlope/topRight.vue | 45 ++++++++------- 6 files changed, 105 insertions(+), 116 deletions(-) diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue index 04c3073..91eeba4 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue @@ -55,8 +55,8 @@

暂无数据

-
+ + diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue index 93bf195..92b7787 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue @@ -37,16 +37,16 @@ : '' " :style="{ - left: (+item.mapX*100/331) + '%', - top: (+item.mapY*100/403) + '%' + left: (+item.mapX*100/721) + '%', + top: (+item.mapY*100/545) + '%' }" @click="openDialog(item)" >
- +
- +
- +
- +
@@ -97,7 +97,7 @@ const selectView = ref(""); const viewList = ref([] as any); const monitorTimeText = ref(""); const planViewData = ref(); -const selectProject = ref("" as any); +const selectPoint = ref("" as any); const pointList = ref([] as any); let tabIndex = ref(1 as any); let topText = ref([ @@ -170,7 +170,7 @@ const getMonitorViewPoint = async () => { list.value = res.result pointList.value = res.result if(res.result && res.result.length > 0){ - selectProject.value = res.result[0].measurePointNumber + selectPoint.value = res.result[0].measurePointNumber } }; onMounted(async () => { @@ -308,15 +308,7 @@ onMounted(async () => { .monitor-list { width: 100%; height: 90%; - .realTime-list { - width: 100%; - height: 100%; - } - .history-list { - width: 100%; - height: 100%; - } - .alarm-list { + .realTime-list,.history-list,.alarm-list { width: 100%; height: 100%; } diff --git a/src/views/sevenLargeScreen/safetyManagement/highSlope/alarm-list.vue b/src/views/sevenLargeScreen/safetyManagement/highSlope/alarm-list.vue index 4da9c11..9d1fc81 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highSlope/alarm-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highSlope/alarm-list.vue @@ -16,7 +16,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" - :clearable="false" + :clearable="true" size="small" @change="timeChange" /> @@ -27,18 +27,21 @@
序号
监测点名称
告警创建时间
- +
告警等级
告警类型
告警值
+
恢复值
{{ index + 1 }}
{{ item.measurePointName }}
-
{{ item.createTime }}
+
{{ item.receiveTime }}
{{ item.alarmType == 1?'报警':'预警' }}
+
{{ item.sensorTypeName }}
{{ item.alarmValue }}
+
{{ item.dataThis }}
@@ -58,7 +61,7 @@ import { watch, ref, onMounted } from "vue"; import { highSlopeRealMonitorList } from "@/api/modules/highSlope"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); -const props = defineProps(["selectType"]); +const props = defineProps(["selectPoint"]); const pageNo = ref(1 as any); const pageSize = ref(15 as any); const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 @@ -112,7 +115,7 @@ const timeChange = () => { const getAlarmRecord = async (type: any) => { let requestData: any = { projectSn: store.sn, - measurePointNumber: props.selectType, + measurePointNumber: props.selectPoint, pageNo: pageNo.value, pageSize: pageSize.value }; @@ -123,10 +126,10 @@ const getAlarmRecord = async (type: any) => { const res: any = await highSlopeRealMonitorList(requestData); // console.log("下拉加载安全管理记录列表", res); if (type == "search") { - list.value = res.result.records; + list.value = res.result.data.records; } else { - list.value = list.value.concat(res.result.records); - if (res.result.pages == pageNo.value) { + list.value = list.value.concat(res.result.data.records); + if (res.result.data.pages == pageNo.value) { moreScroll.value = false; } else { pageNo.value = pageNo.value + 1; @@ -134,7 +137,7 @@ const getAlarmRecord = async (type: any) => { } }; watch( - () => props.selectType, + () => props.selectPoint, newVal => { // console.log(newVal, "newVal"); if (newVal) { @@ -211,11 +214,11 @@ onMounted(async () => { div { text-align: center; white-space: nowrap; - width: 20%; + width: 14%; } } .list-box { - height: 80%; + height: 85%; .list-style:nth-child(even) { background: rgba(39, 88, 192, 0.06); } @@ -224,11 +227,11 @@ onMounted(async () => { align-items: center; color: #fff; padding: 0.5% 0; - font-size: 12px; + font-size: calc(100vw * 12 / 1920); div { text-align: center; white-space: nowrap; - width: 10%; + width: 14%; } } .list-style:hover { @@ -238,9 +241,9 @@ onMounted(async () => { } } .not-data { - top: 73%; - width: 12%; - left: 44%; + top: 21%; + width: 40%; + left: 31%; position: absolute; img { width: 40%; @@ -248,8 +251,9 @@ onMounted(async () => { } p { color: #fff; - font-size: 14px; + font-size: calc(100vw * 14 / 1920); margin: -6% 37%; + text-align: center; } } diff --git a/src/views/sevenLargeScreen/safetyManagement/highSlope/history-list.vue b/src/views/sevenLargeScreen/safetyManagement/highSlope/history-list.vue index b723f60..096dc29 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highSlope/history-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highSlope/history-list.vue @@ -19,7 +19,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" - :clearable="false" + :clearable="true" size="small" @change="timeChange" /> @@ -28,28 +28,20 @@
序号
-
时间
-
测量点名称
-
测量点编号
-
电量
-
立杆轴力
-
水平位移
-
横板沉降
-
立杆倾斜
-
地基沉降
+
监测点名称
+
类型
+
预警值
+
报警值
+
实时变化值
{{ index + 1 }}
-
{{ item.collectTime?.substring(0, 10) }}
{{ item.measurePointName }}
-
{{ item.measurePointNumber }}
-
{{ item.electricPower }}
-
{{ item.poleAxialForce }}
-
{{ item.horizontalDisplacement }}
-
{{ item.formworkSettlement }}
-
{{ item.poleTilt }}
-
{{ item.foundationSettlement }}
+
{{ item.sensorTypeName }}
+
{{ item.alarmValue }}
+
{{ item.data }}
+
{{ item.dataThis }}