From 0dace7ad08ac04c90961827e96b90f2ede12e417 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 21 Feb 2024 18:52:31 +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 --- src/views/sevenLargeScreen/indexL.vue | 35 ++++++----- .../foundationPitMonitor/leftBottom.vue | 58 +++++++++++++------ .../foundationPitMonitor/rightFirst.vue | 2 +- .../foundationPitMonitor/topLeft.vue | 4 +- .../highFormwork/alarm-list.vue | 12 ++-- .../highFormwork/bottomRight.vue | 4 +- .../highFormwork/history-list.vue | 9 +-- .../highFormwork/real-time-list.vue | 2 +- .../highFormwork/topRight.vue | 16 +++-- .../safetyManagement/highSlope/alarm-list.vue | 4 +- .../highSlope/bottomRight.vue | 1 + .../safetyManagement/highSlope/topRight.vue | 18 +++--- 12 files changed, 104 insertions(+), 61 deletions(-) diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 183fc0a..c13c319 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -66,11 +66,13 @@
-
-
- {{ data.menuName }} + +
+
+ {{ data.menuName }} +
-
+
@@ -568,7 +570,7 @@ function jumpBgd() { line-height: 55px; margin: -4% auto 0 2%; font-family: pmzd; - div { + > div { position: relative; margin-top: 1%; height: 60%; @@ -601,15 +603,22 @@ function jumpBgd() { font-family: none; background: url("@/assets/images/subTabImg.gif") no-repeat; background-size: 100% 100%; - .subMenuItem { - width: 75%; - margin-top: -2.5%; + .scrollItem { + width: 73%; + height: max-content; + margin-top: -2%; margin-left: 2%; - display: flex; - } - .subItem { - width: 100px; - text-align: center; + .subMenuItem { + width: 100%; + display: flex; + .subItem { + width: 100px; + text-align: center; + } + .subItem:not(:last-child) { + margin-right: 0.3%; + } + } } // :nth-child(1) { // margin-left: 2%; diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue index 842983d..493b885 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue @@ -16,7 +16,12 @@ />
- + @@ -38,8 +43,11 @@ import symbolIcon2 from "@/assets/images/toxicGasMonitor/lineIcon2.png"; import { onMounted, reactive, ref, onBeforeUnmount } from "vue"; import * as echarts from "echarts"; -import { selectDeepExcavationCurrentDataList, selectDeepExcavationAllMeasurePointList, getSensorListByMeasurePointNumber } from "@/api/modules/securityManagement"; - +import { + selectDeepExcavationCurrentDataList, + selectDeepExcavationAllMeasurePointList, + getSensorListByMeasurePointNumber +} from "@/api/modules/securityManagement"; // import { getSelectDataListApi } from "@/api/modules/distribution"; // import Card from "@/components/card.vue"; @@ -163,13 +171,23 @@ function initOption() { // console.log("tooltip", params); // let currentMarker = ""; let currentState = ""; - if (params[0].value[1] > positiveAlarmValue.value || params[0].value[1] < negativeAlarmValue.value) { - currentState = "超出报警值"; - // currentMarker = ` `; - } else { - // currentMarker = params[0].marker; - currentState = "正常"; - } + // if (params[0].value[1] > positiveAlarmValue.value || params[0].value[1] < negativeAlarmValue.value) { + // currentState = "超出报警值"; + // // currentMarker = ` `; + // } else { + // // currentMarker = params[0].marker; + // currentState = "正常"; + // } + currentState = + params[0].value[2] == 1 + ? "正常" + : params[0].value[2] == 2 + ? "超报警" + : params[0].value[2] == 3 + ? "超控制" + : params[0].value[2] == 4 + ? "变化速率报警" + : ""; return ( params[0].axisValueLabel + params[0].name + @@ -303,7 +321,7 @@ function initOption() { // { type: 'average', name: '平均值' }, // 平均值标注线 { yAxis: positiveAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线 // { yAxis: 150, name: "控制值", lineStyle: { color: "#EEA959" } }, // 自定义阈值标注线 - { yAxis: negativeAlarmValue.value, name: "报警值", lineStyle: { color: "red" } }, // 自定义阈值标注线 + { yAxis: negativeAlarmValue.value, name: "报警值", lineStyle: { color: "red" } } // 自定义阈值标注线 // { yAxis: -150, name: "控制值", lineStyle: { color: "#EEA959" } } // 自定义阈值标注线 ], label: { @@ -390,7 +408,7 @@ const getTestPointList = async () => { }; // 查传感器列表 const getDevList = async () => { - const res: any = await getSensorListByMeasurePointNumber({ projectSn: store.sn, measurePointNumber: measurePointNumber.value}); + const res: any = await getSensorListByMeasurePointNumber({ projectSn: store.sn, measurePointNumber: measurePointNumber.value }); timeList.value = res.result; sensorSn.value = res.result[0].sensorSn; console.log("查传感器列表", res); @@ -402,14 +420,20 @@ let positiveAlarmValue = ref(0) as any; //正报警值 // 土体分层竖向位移 const getEdgeAlarmTrend = async () => { - const res: any = await selectDeepExcavationCurrentDataList({ projectSn: store.sn, sensorSn: sensorSn.value, measurePointNumber: measurePointNumber.value, pageNo: 1, pageSize: 10 }); + const res: any = await selectDeepExcavationCurrentDataList({ + projectSn: store.sn, + sensorSn: sensorSn.value, + measurePointNumber: measurePointNumber.value, + pageNo: 1, + pageSize: 10 + }); if (res.result) { // option.value.xAxis.data = res.result.data.records.map((item: any) => item.x); // option.value.series[0].data = res.result.map((item: any) => Number(item.y)); - const twoDimensionalArray = res.result.data.records.map(item => [item.receiveTime, item.data]); - yData1.value = twoDimensionalArray - positiveAlarmValue.value = res.result.positiveAlarmValue - negativeAlarmValue.value = res.result.negativeAlarmValue + const twoDimensionalArray = res.result.data.records.map(item => [item.receiveTime, item.data, item.alarmState]); + yData1.value = twoDimensionalArray; + positiveAlarmValue.value = res.result.positiveAlarmValue; + negativeAlarmValue.value = res.result.negativeAlarmValue; } // twenty_four_time.value = res.result.map((item: any) => item.x); // yData.value = res.result.map((item: any) => Number(item.y)); diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue index 083d7d7..001b565 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue @@ -383,7 +383,7 @@ function drawChart() { // getSensorListByMeasurePointNumber // 查测点列表 const getTestPointList = async () => { - const res: any = await selectDeepExcavationAllMeasurePointList({ projectSn: store.sn, monitorTypeId: 1 }); + const res: any = await selectDeepExcavationAllMeasurePointList({ projectSn: store.sn, monitorTypeId: 13 }); pointList.value = res.result; measurePointNumber.value = res.result[0].measurePointNumber; getDevList(); diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue index 49efa6d..093fd8e 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue @@ -35,8 +35,8 @@ : '' " :style="{ - left: item.mapX - 130 + 'px', - top: item.mapY - 80 + 'px' + left: (+item.mapX*100/706.276) + '%', + top: (+item.mapY*100/519) + '%' }" @click="openDialog(item)" > diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/alarm-list.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/alarm-list.vue index fedb484..fe69478 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/alarm-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/alarm-list.vue @@ -157,8 +157,8 @@ const getAlarmRecord = async (type: any) => { pageSize: pageSize.value }; if (rangeTime.value) { - requestData.startTime = rangeTime.value[0]; - requestData.endTime = rangeTime.value[0]; + requestData.createTime_begin = rangeTime.value[0]; + requestData.createTime_end = rangeTime.value[1]; } const res: any = await alarmRecordList(requestData); // console.log("下拉加载安全管理记录列表", res); @@ -253,7 +253,7 @@ onMounted(async () => { } } .list-box { - height: 80%; + height: 85%; .list-style:nth-child(even) { background: rgba(39, 88, 192, 0.06); } @@ -276,9 +276,9 @@ onMounted(async () => { } } .not-data { - top: 19%; - width: 35%; - left: 33%; + top: 21%; + width: 40%; + left: 31%; position: absolute; img { width: 40%; diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomRight.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomRight.vue index 8c369ff..93a7093 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomRight.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomRight.vue @@ -49,7 +49,7 @@ let selectPoint = ref(""); // 当前对应的种类 // let nowType = ref("温度"); -let pointList = ref([] as any); +const pointList = ref([] as any); let typeList = ref([ { @@ -326,7 +326,7 @@ function drawChart() { const getCountTransform = async () => { const res: any = await countTransform({ projectSn: store.sn, measurePointNumber: selectPoint.value }); console.log("获取高支模累计变形量", res); - + option.value.series = []; // 每次渲染先置空 for (let i = 0; i < typeList.value.length; i++) { // 根据点位的种类画图(立杆倾斜,水平位移,立杆轴力,地基沉降) let responseData = res.result; diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/history-list.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/history-list.vue index 73fc60e..4e57856 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/history-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/history-list.vue @@ -266,7 +266,7 @@ onMounted(async () => { } } .list-box { - height: 80%; + height: 85%; .list-style:nth-child(even) { background: rgba(39, 88, 192, 0.06); } @@ -289,9 +289,9 @@ onMounted(async () => { } } .not-data { - top: 73%; - width: 12%; - left: 44%; + top: 21%; + width: 40%; + left: 31%; position: absolute; img { width: 40%; @@ -301,6 +301,7 @@ onMounted(async () => { color: #fff; font-size: calc(100vw * 14 / 1920); margin: -6% 37%; + text-align: center; } } diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue index 39e2c1e..04c3073 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue @@ -288,7 +288,7 @@ 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/highFormwork/topRight.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue index c34239d..93bf195 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 + 'px', - top: item.mapY + 'px' + left: (+item.mapX*100/331) + '%', + top: (+item.mapY*100/403) + '%' }" @click="openDialog(item)" >
{ width: 100%; height: 100%; } + .history-list { + width: 100%; + height: 100%; + } + .alarm-list { + width: 100%; + height: 100%; + } } .list-tab { display: flex; diff --git a/src/views/sevenLargeScreen/safetyManagement/highSlope/alarm-list.vue b/src/views/sevenLargeScreen/safetyManagement/highSlope/alarm-list.vue index 602dbfd..4da9c11 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highSlope/alarm-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highSlope/alarm-list.vue @@ -117,8 +117,8 @@ const getAlarmRecord = async (type: any) => { pageSize: pageSize.value }; if (rangeTime.value) { - requestData.startTime = rangeTime.value[0]; - requestData.endTime = rangeTime.value[0]; + requestData.createTime_begin = rangeTime.value[0]; + requestData.createTime_end = rangeTime.value[1]; } const res: any = await highSlopeRealMonitorList(requestData); // console.log("下拉加载安全管理记录列表", res); diff --git a/src/views/sevenLargeScreen/safetyManagement/highSlope/bottomRight.vue b/src/views/sevenLargeScreen/safetyManagement/highSlope/bottomRight.vue index fca1441..417cacd 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highSlope/bottomRight.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highSlope/bottomRight.vue @@ -295,6 +295,7 @@ function drawChart() { const getCountTransform = async () => { const res: any = await countTransform({ projectSn: store.sn, highSlopeEngineeringId: selectSlope.value }); console.log("获取高支模累计变形量", res); + option.value.series = []; // 每次渲染先置空 let responseData = res.result; for (let i = 0; i < responseData.length; i++) { let data = [] as any; diff --git a/src/views/sevenLargeScreen/safetyManagement/highSlope/topRight.vue b/src/views/sevenLargeScreen/safetyManagement/highSlope/topRight.vue index 20200a2..ebe5723 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highSlope/topRight.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highSlope/topRight.vue @@ -34,28 +34,28 @@ item.alarmState == 1 ? 'changeColor1' : item.alarmState == 2 - ? 'changeColor2' - : item.alarmState == 3 ? 'changeColor3' + : item.alarmState == 3 + ? 'changeColor2' : '' " :style="{ - left: item.xMap + 'px', - top: item.yMap + 'px' + left: item.mapX + 'px', + top: item.mapY + 'px' }" @click="openDialog(item)" >
-
{{ item.pointName }}
+
{{ item.measurePointName }}
@@ -131,7 +131,7 @@ watch( ); // 获取监测类型 const getMonitorType = async () => { - const res: any = await highSlopeMonitorType({ planeFigureId: selectView.value }); + const res: any = await highSlopeMonitorType({ highSlopePlaneFigureId: selectView.value }); console.log("获取监测类型", res); pointList.value = res.result; if (res.result && res.result.length > 0) { @@ -145,7 +145,7 @@ const slopeListChange = async (e: any) => { }; // 获取监测点数据 const getMonitorViewPoint = async () => { - const res: any = await selectPlanViewPoint({ planeFigureId: selectView.value }); + const res: any = await selectPlanViewPoint({ highSlopeEngineeringId: selectSlope.value, highSlopePlaneFigureId: selectView.value }); console.log("获取监测点数据", res); list.value = res.result; };