From 62bf09dd4a6a4c9eed78db5996a5cd290d39b07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 18 Jun 2024 16:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E6=84=9F=E5=99=A8?=
=?UTF-8?q?=E6=B1=87=E6=80=BB=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/components/BoardTopNav/index.vue | 14 +++++++-------
.../views/board/equipmentMonitoring/index.vue | 19 ++++++++++++++++---
ruoyi-ui/src/views/board/index/index.vue | 7 ++-----
ruoyi-ui/src/views/board/senso/index.vue | 17 ++++++++++-------
4 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/ruoyi-ui/src/components/BoardTopNav/index.vue b/ruoyi-ui/src/components/BoardTopNav/index.vue
index 62208af..986d5d8 100644
--- a/ruoyi-ui/src/components/BoardTopNav/index.vue
+++ b/ruoyi-ui/src/components/BoardTopNav/index.vue
@@ -60,9 +60,9 @@
导入
-
-
-
+
+
+
data.Header[e])
+ this.tableTh = Object.keys(data.Header).map(e => data.Header[e])
},
importf() {
this.uploadDialog = true
},
- async uploadSuccess(e){
+ async uploadSuccess(e) {
this.uploadDialog = false
const data = await getRedisFile(this.$store.getters.tenantId)
this.tableData = JSON.parse(data.content)
- this.tableTh = Object.keys(data.Header).map(e=>data.Header[e])
+ this.tableTh = Object.keys(data.Header).map(e => data.Header[e])
}
}
};
diff --git a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
index 396643e..a6cffde 100644
--- a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
+++ b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
@@ -98,6 +98,13 @@
+
+
+
+
@@ -106,9 +113,10 @@ import {
selectLatestDataByDeviceMode,
getDeviceModesBySceneId,
} from '@/api/board/equipmentMonitoring'
+import Sensor from '@/views/board/senso'
export default {
- components: {},
+ components: {Sensor},
data() {
return {
loading: false,
@@ -127,7 +135,9 @@ export default {
limit: 10,
total: 0,
deviceDataColumns: [],
- tableDataRow: []
+ tableDataRow: [],
+ dialogVisible:false,
+ dialogData:null
}
},
async mounted() {
@@ -196,7 +206,10 @@ export default {
toHistory(e, i) {
console.log(e)
console.log(i)
- this.$router.push({path: "/board/senso", query: {id: e, deviceModeId: i}});
+ this.dialogData = {id: e, deviceModeId: i}
+ this.dialogVisible = true
+
+ // this.$router.push({path: "/board/senso", query: {id: e, deviceModeId: i}});
}
}
};
diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue
index e7ba351..389ef5f 100644
--- a/ruoyi-ui/src/views/board/index/index.vue
+++ b/ruoyi-ui/src/views/board/index/index.vue
@@ -780,12 +780,9 @@ export default {
position: [e.longitude, e.latitude],
title: `信息\n经度：${e.longitude}\n纬度：${e.latitude}\n名称：${e.deviceName}\n`,
offset: new AMap.Pixel(-15, -30),
- content: ``
});
marker.on('click', async () => {
if (markerIds.includes(e.deviceId)) {
diff --git a/ruoyi-ui/src/views/board/senso/index.vue b/ruoyi-ui/src/views/board/senso/index.vue
index 15eddd7..fd1603f 100644
--- a/ruoyi-ui/src/views/board/senso/index.vue
+++ b/ruoyi-ui/src/views/board/senso/index.vue
@@ -162,6 +162,7 @@ let mapMarker = null
let flag = true
export default {
components: {},
+ props:['dialogData'],
data() {
return {
mapOffset: 0,
@@ -189,9 +190,9 @@ export default {
zoom: 11,
center: [113.4, 23.35],
});
- if (this.$route.query.id) {
- this.deviceId = this.$route.query.id
- this.deviceModeId = this.$route.query.deviceModeId
+ if (this.$route.query.id || this.dialogData.id) {
+ this.deviceId = this.$route.query.id || this.dialogData.id
+ this.deviceModeId = this.$route.query.deviceModeId || this.dialogData.deviceModeId
}
await this.getData()
},
@@ -421,20 +422,22 @@ export default {