From 8ec1c7504322cdd6c0c5a5109749ef9d99ffae8d Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 27 Mar 2024 10:17:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A4=E8=B0=83=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/Intermodulation/index.vue         | 28 ++++++-------------
 .../RoadAndEvents/utils/httpList.js           |  2 +-
 2 files changed, 10 insertions(+), 20 deletions(-)

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 @@
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">
           <div class="content-second" style="height: 185px">
-            <RadioGroup
-              v-model="roadType"
-              :options="roadTypeList"
-              @input="changeRadio"
-            />
+            <RadioGroup v-model="roadType" :options="roadTypeList" @input="changeRadio" />
             <span>当前车流量: {{ carNum }}辆</span>
-            <LineChartForTraffic
-              style="flex: 1"
-              v-if="isShowCar && activeName === 'second'"
-              :xData="xData"
-              :yData="yData"
-            />
+            <LineChartForTraffic style="flex: 1" v-if="isShowCar && activeName === 'second'" :xData="xData"
+              :yData="yData" />
           </div>
         </ElTabPane>
         <ElTabPane label="在线率统计" name="third">
@@ -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,
       },
     })

From 753f2de61b555932d55bac6851e6d0f620ec5a26 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Wed, 27 Mar 2024 14:50:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=92=99=E5=B1=82=20ZIndex=E8=B0=83=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/JiHeExpressway/components/Dialog/index.vue  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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);
   },
 };
 </script>
@@ -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;