diff --git a/package-lock.json b/package-lock.json index 6d6af0c9..3d6a2c79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9170,12 +9170,12 @@ }, "node_modules/jquery": { "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz", "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "node_modules/jquery-ui": { "version": "1.13.2", - "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.2.tgz", + "resolved": "https://registry.npmmirror.com/jquery-ui/-/jquery-ui-1.13.2.tgz", "integrity": "sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==", "dependencies": { "jquery": ">=1.8.0 <4.0.0" @@ -22776,12 +22776,12 @@ }, "jquery": { "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz", "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "jquery-ui": { "version": "1.13.2", - "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.2.tgz", + "resolved": "https://registry.npmmirror.com/jquery-ui/-/jquery-ui-1.13.2.tgz", "integrity": "sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==", "requires": { "jquery": ">=1.8.0 <4.0.0" diff --git a/src/api/modules/highFormwork.ts b/src/api/modules/highFormwork.ts new file mode 100644 index 00000000..cc0ba4ce --- /dev/null +++ b/src/api/modules/highFormwork.ts @@ -0,0 +1,32 @@ +// 有毒气体监测 接口API +import http from "@/api"; +const BASEURL = import.meta.env.VITE_API_URL; + +// 监测点位数量 +export const measurePointCount = (params: {}) => { + return http.post(BASEURL + `/xmgl/highFormworkMeasurePoint/countHighFormworkMeasurePoint`, params); +}; +// 高支模监测动态 +export const monitorDynamic = (params: {}) => { + return http.post(BASEURL + `/xmgl/highFormworkMeasurePoint/countMonitorDynamic`, params); +}; +// 高支模实时监测(选择平面图) +export const selectPlanView = (params: {}) => { + return http.post(BASEURL + `/xmgl/highFormworkPlaneFigure/selectList`, params); +}; +// 高支模实时监测(平面图传感器) +export const selectPlanViewPoint = (params: {}) => { + return http.post(BASEURL + `/xmgl/highFormworkPlaneFigureCoordinate/selectList`, params); +}; +// 实时监测列表数据(实时值、历史数据) +export const realMonitorList = (params: {}) => { + return http.post(BASEURL + `/xmgl/highFormworkMeasureCurrentData/list`, params); +}; +// 实时监测列表数据(报警记录) +export const alarmRecordList = (params: {}) => { + return http.get(BASEURL + `/xmgl/highFormworkAlarmData/list`, params); +}; +// 查询测点 +export const highFormworkPoint = (params: {}) => { + return http.post(BASEURL + `/xmgl/highFormworkMeasurePoint/list`, params); +}; \ No newline at end of file diff --git a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue index 0a9d1ce0..ce3092f4 100644 --- a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue +++ b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue @@ -39,7 +39,6 @@ left: item.mapX + 'px', top: item.mapY + 'px' }" - :title="item.pointName" @click="openDialog(item)" >
- +
序号
-
监测点编号
-
告警开始时间
-
告警结束时间
-
告警等级
+
监测点名称
+
告警创建时间
+
告警类型
告警值
-
恢复值
- +
{{ index + 1 }}
-
{{ item.monitorCode }}
-
{{ item.warnStartTime }}
-
{{ item.warnEndTime }}
-
{{ item.warnGrade }}
-
{{ item.warnType }}
-
{{ item.warnData }}
-
{{ item.recoverData }}
+
{{ item.measurePointName }}
+
{{ item.createTime }}
+ +
{{ item.alarmType == 1?'报警':'预警' }}
+
{{ item.alarmValue }}
@@ -57,9 +54,15 @@ diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomLeft.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomLeft.vue index 38dba20e..32a4e213 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomLeft.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomLeft.vue @@ -12,12 +12,12 @@
{{ index + 1 }}
-
{{ item.reportTime }}
-
{{ item.devName }}
-
- {{ formworkOption[item.formworkState].label }} +
{{ item.realTime?.substring(0,10) }}
+
{{ item.measurePointName }}
+
+ {{ formworkOption[item.alarmState - 1].label }}
-
{{ item.monitorTime }}
+
{{ item.monitorDuration }}
@@ -31,117 +31,34 @@ diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/topLeft.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/topLeft.vue index e2f509cb..06868c56 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/topLeft.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/topLeft.vue @@ -1,17 +1,17 @@