Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue

@@ -75,8 +75,7 @@ export default {
   },
   methods: {
     updateDialogVisible(bool) {
-      this.modelVisible = bool;
+      this.modelVisible = bool;;
-      console.log("modelVisible", this.modelVisible);
     },
   },
   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;

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
+            <RadioGroup v-model="roadType" :options="roadTypeList" @input="changeRadio" />
-              v-model="roadType"
-              :options="roadTypeList"
-              @input="changeRadio"
-            />
             <span>当前车流量: {{ carNum }}辆</span>
-            <LineChartForTraffic
+            <LineChartForTraffic style="flex: 1" v-if="isShowCar && activeName === 'second'" :xData="xData"
-              style="flex: 1"
+              :yData="yData" />
-              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;
     }

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,
       },
     })