diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index 1da07a6c..347278a0 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -75,8 +75,7 @@ export default { }, methods: { updateDialogVisible(bool) { - this.modelVisible = bool; - console.log("modelVisible", this.modelVisible); + this.modelVisible = bool;; }, }, mounted() { @@ -88,15 +87,12 @@ export default { return this.visible; }, set(val) { - console.log("val", "val") this.$emit("update:value", val); }, }, }, beforeDestroy() { - console.log("beforeDestory111") this.modelVisible = false; - this.emitter.off("updateDialogVisible", this.updateDialogVisible); }, }; @@ -109,7 +105,7 @@ export default { height: 100%; background: rgba(0, 0, 0, 0.36); border-radius: 0px 0px 0px 0px; - z-index: 100; + z-index: 1100; display: flex; align-items: center; justify-content: center; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue index 7c78195f..78bcc1c0 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue @@ -9,18 +9,10 @@
- + 当前车流量: {{ carNum }}辆 - +
@@ -148,13 +140,14 @@ export default { // this.dialogData.brand = data.brand; // }) + if (this.dialogData.iotDeviceId) { + this.getPropertiesHistory(this.dialogData.iotDeviceId); + } + const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark); if (roadInfo) this.data.roadName = roadInfo.roadName; - if (this.dialogData.iotDeviceId) { - this.getPropertiesHistory(this.dialogData.iotDeviceId); - } }, methods: { changeRadio(value) { @@ -165,12 +158,9 @@ export default { } else { this.yData = this.hzYData; } - // console.log('xdata', this.xData); - // console.log('ydata', this.hzYData); - // console.log('rdata', this.jnYData); setTimeout(() => { this.isShowCar = true; - }, 1000); + }, 0); }, getPropertiesHistory(deviceId) { this.xData = []; @@ -248,7 +238,7 @@ div.switcher { align-items: center; justify-content: end; - > div { + >div { font-size: 16px; padding: 6px 12px; } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js index 0c1bbfe1..8faea32f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js @@ -121,7 +121,7 @@ export function getRoadInfoByStakeMark(stakeMark) { url: `/business/stakeMark/query`, method: "get", params: { - id: stakeMark, + stakeMark: stakeMark, direction: 1, }, })