From bdcef51b982dc5652940b87502513bb6fb381a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Fri, 5 Jul 2024 13:32:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/board/GPS/index.vue | 156 +++++++++++++----- ruoyi-ui/src/views/board/index/index.vue | 145 ++++++++++++---- ruoyi-ui/src/views/board/smartScene/index.vue | 136 ++++++++++----- .../src/views/business/alarmRule/index.vue | 1 - ruoyi-ui/src/views/business/device/index.vue | 8 +- 5 files changed, 334 insertions(+), 112 deletions(-) diff --git a/ruoyi-ui/src/views/board/GPS/index.vue b/ruoyi-ui/src/views/board/GPS/index.vue index 0b8c832..c2db3d5 100644 --- a/ruoyi-ui/src/views/board/GPS/index.vue +++ b/ruoyi-ui/src/views/board/GPS/index.vue @@ -119,15 +119,9 @@ - {{ equipmentInfo.longitude }} - - - - {{ equipmentInfo.latitude }} + {{ equipmentInfo.deviceId }} {{ equipmentInfo.deviceName }} + + + {{ equipmentInfo.monitorUnitName }} + {{ equipmentInfo.deviceLocation }} + + + {{ equipmentInfo.longitude }} + + + + {{ equipmentInfo.latitude }} + @@ -230,8 +326,12 @@ export default { }, data() { return { - loading:false, - equipmentInfo:{}, + warInfo: {}, + textarea: '', + isDispose: false, + disposeNo: '', + loading: false, + equipmentInfo: {}, num1: 0, num2: 0, num3: 0, @@ -301,33 +401,11 @@ export default { await this.getTable2Data() }, dispose(e) { - this.$confirm('该问题已处理？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - handleAlarmInfo({ - alarmInfoId: e.value1 - }).then(e => { - if (e.code === 200) { - this.$message({ - type: 'success', - message: '已处理!' - }); - this.setAlarmInfos() - } else { - this.$message({ - type: 'info', - message: '网络错误' - }); - } - }) - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消' - }); - }); + + this.warInfo = e + this.textarea = '' + this.isDispose = true + this.disposeNo = e.no }, createMap() { map = new AMap.Map('map', { @@ -449,14 +527,14 @@ export default { offset: new AMap.Pixel(-15, -30), content: `
- +
` }); marker.on('click', async () => { - if(polygons.length >0 || circles.length >0){ + if (polygons.length > 0 || circles.length > 0) { map.remove(polygons) map.remove(circles) polygons = [] diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue index 49321c4..7c11b8a 100644 --- a/ruoyi-ui/src/views/board/index/index.vue +++ b/ruoyi-ui/src/views/board/index/index.vue @@ -176,7 +176,7 @@ - + - + + {{ warInfo.deviceId }} + + + + {{ warInfo.monitorUnitName }} + + + + {{ warInfo.monitorUnitTypeName }} + + + + {{ warInfo.alarmInfoId }} + + + + {{ warInfo.alarmTypeName }} + + + + {{ warInfo.location }} + + + {{ warInfo.alarmLevelName }} - {{ warInfo.location }} + {{ warInfo.createTime }} + + + + {{ warInfo.areaName }} @@ -247,26 +289,65 @@ - - - - {{ equipmentInfo.longitude }} - - - - {{ equipmentInfo.latitude }} - - - - {{ equipmentInfo.deviceName }} - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
关 闭 设备信息 @@ -312,6 +393,7 @@ export default { data() { return { containerPic, + markerData:[], isTown: false, value: [], loading: false, @@ -320,7 +402,7 @@ export default { monitorUnitId: null, equipmentInfoDialog: false, exTableTime: [new Date(new Date().getTime() - 1000 * 60 * 60 * 24), new Date()], - equipmentInfo: {}, + equipmentInfo: [], warInfo: {}, formInline: {}, textarea: '', @@ -893,6 +975,7 @@ export default { this.$nextTick(async () => { this.createMap() const data = await getDeviceByAreaId(this.$store.getters.tenantId) + this.markerData = data.data.map(e => e.devicesList).flat(1) data.data.map(e => e.devicesList).flat(1).forEach(e => { this.setMarker(e) }) @@ -929,7 +1012,7 @@ export default { }) marker.on('dblclick', () => { this.equipmentInfoDialog = true - this.equipmentInfo = e + this.equipmentInfo = this.markerData.filter(v=>v.monitorUnitId === e.monitorUnitId) this.monitorUnitId = e.monitorUnitId // this.$router.push({path: '/board/equipment', query: {monitorUnitId: e.monitorUnitId}}) }); @@ -964,7 +1047,7 @@ export default { }) marker.on('dblclick', () => { this.equipmentInfoDialog = true - this.equipmentInfo = e + this.equipmentInfo = this.markerData.filter(v=>v.monitorUnitId === e.monitorUnitId) this.monitorUnitId = e.monitorUnitId // this.$router.push({path: '/board/equipment', query: {monitorUnitId: e.monitorUnitId}}) }); @@ -1030,6 +1113,8 @@ export default { map.remove(polygons) map.remove(circles) markers = [] + this.markerData = data + console.log(data) data.forEach(e => { if (e.latitude && e.longitude) { this.setMarker1(e) @@ -1045,10 +1130,12 @@ export default { markers = [] this.loading = true; const {data} = await selectDeviceByName({name: name}) + this.markerData = data + console.log(data) this.loading = false; let option = [] data.forEach(e => { - if (e.latitude && e.longitude) { + if (e.latitude && e.longitude && e.deviceName.includes(name)) { option.push({ label: e.deviceName, value: e diff --git a/ruoyi-ui/src/views/board/smartScene/index.vue b/ruoyi-ui/src/views/board/smartScene/index.vue index 6a465f6..9bde450 100644 --- a/ruoyi-ui/src/views/board/smartScene/index.vue +++ b/ruoyi-ui/src/views/board/smartScene/index.vue @@ -54,7 +54,8 @@ {{ item.alarmTime }}
- 处理 + 处理 + 已处理
@@ -63,7 +64,7 @@
- +
@@ -80,6 +81,82 @@
+ + + + + + + {{ warInfo.deviceId }} + + + + {{ warInfo.monitorUnitName }} + + + + {{ warInfo.monitorUnitTypeName }} + + + + {{ warInfo.alarmInfoId }} + + + + {{ warInfo.alarmTypeName }} + + + + {{ warInfo.location }} + + + + {{ warInfo.alarmLevelName }} + + + + {{ warInfo.createTime }} + + + + {{ warInfo.areaName }} + + + + 备注 + + + + 取 消 + 处理当前 + 处理所有 + +