diff --git a/ruoyi-ui/src/views/board/GPS/index.vue b/ruoyi-ui/src/views/board/GPS/index.vue index 70901c8..f0e9e83 100644 --- a/ruoyi-ui/src/views/board/GPS/index.vue +++ b/ruoyi-ui/src/views/board/GPS/index.vue @@ -87,7 +87,6 @@ export default { watch:{ async $route(to,from){ await this.getData() - console.log(123) } }, data() { diff --git a/ruoyi-ui/src/views/board/smartScene/index.vue b/ruoyi-ui/src/views/board/smartScene/index.vue index 185094f..b7c6f7d 100644 --- a/ruoyi-ui/src/views/board/smartScene/index.vue +++ b/ruoyi-ui/src/views/board/smartScene/index.vue @@ -149,7 +149,7 @@ export default { await this.setAllNum(e) await this.setLimitSubMonitorUnit(e) await this.setAlarmCountGroupAlarmType(e) - await this.setAlarmInfos() + await this.setAlarmInfos(e) }, async setAllNum(e) { const {subSum, sum} = await sceneAllNums(e) @@ -173,8 +173,8 @@ export default { data = data.slice(0, 6) this.alarmCountGroupAlarmType = data }, - async setAlarmInfos() { - const {rows: data} = await getAlarmInfos({"sceneId":this.sceneId}) + async setAlarmInfos(e) { + const {rows: data} = await getAlarmInfos({"sceneId":e}) this.table1Data = data.map((e,i)=>{ return { data1: e.alarmInfoId,