From c1f6c851612cccdf01ef65926a7a18c1e89f31e2 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Thu, 21 Mar 2024 11:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/equipment/type/api.js        |  2 +-
 .../components/Dialogs/Broadcast/index.vue    |  2 +-
 .../Home/components/Dialogs/Camera/index.vue  |  2 +-
 .../Dialogs/DrivingGuidance/index.vue         |  2 +-
 .../Dialogs/FatigueWakesUp/index.vue          | 27 +++++++++---
 .../Dialogs/GuardrailCollision/index.vue      |  4 +-
 .../Dialogs/Intermodulation/index.vue         | 42 +++++++++++--------
 .../components/Dialogs/SmartDevice/index.vue  | 33 ++++++++++-----
 .../pages/Home/components/InfoBoard/index.vue |  2 +-
 9 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/ruoyi-ui/src/api/equipment/type/api.js b/ruoyi-ui/src/api/equipment/type/api.js
index 72980505..f4a47dd1 100644
--- a/ruoyi-ui/src/api/equipment/type/api.js
+++ b/ruoyi-ui/src/api/equipment/type/api.js
@@ -145,7 +145,7 @@ export function listDevicesType() {
 // 设备在线率统计
 export function deviceStatusList(id) {
   return request({
-    url: "/system/status/deviceStatusList?deviceld=" + id,
+    url: "/system/status/deviceStatusList/" + id,
     method: "get",
   });
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
index 2cc5b2f8..1c85889a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
@@ -12,7 +12,7 @@
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
-            :productId="dialogData.productId"
+            :productId="dialogData.id"
             style="height: 150px"
           />
         </ElTabPane>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index c1666b0a..6c78bec1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -27,7 +27,7 @@
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
-            :productId="dialogData.productId"
+            :productId="dialogData.id"
             style="height: 180px"
           />
         </ElTabPane>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 8ba65e9e..2b75466b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -11,7 +11,7 @@
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
-            :productId="dialogData.productId"
+            :productId="dialogData.id"
             style="height: 180px"
           />
         </ElTabPane>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
index 03508f22..22e2b3b1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
@@ -4,11 +4,20 @@
       <Video class="video-stream" :pileNum="dialogData.stakeMark" />
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="基本信息" name="first">
-          <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" />
+          <Descriptions
+            labelWidth="72px"
+            :list="list"
+            :data="data"
+            style="gap: 18px"
+          />
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">设备参数</ElTabPane>
         <ElTabPane label="在线率统计" name="third">
-          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" style="height: 180px" />
+          <LineChart
+            v-if="activeName === 'third'"
+            :productId="dialogData.id"
+            style="height: 180px"
+          />
         </ElTabPane>
       </ElTabs>
     </div>
@@ -17,7 +26,10 @@
       <Button @click.native="deviceControlVisible = true">设备操作</Button>
     </template>
 
-    <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId" />
+    <DeviceControlDialog
+      v-model="deviceControlVisible"
+      :deviceId="dialogData.iotDeviceId"
+    />
   </Dialog>
 </template>
 
@@ -25,7 +37,10 @@
 import Dialog from "@screen/components/Dialog/index.vue";
 import Descriptions from "@screen/components/Descriptions.vue";
 import Button from "@screen/components/Buttons/Button.vue";
-import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import {
+  getRoadInfoByStakeMark,
+  getProduct,
+} from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
 import Video from "@screen/components/Video";
 import DeviceControlDialog from "./components/DeviceControlDialog.vue";
 
@@ -99,7 +114,7 @@ export default {
     if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
   },
   methods: {
-    handleClickTabs() { },
+    handleClickTabs() {},
   },
 };
 </script>
@@ -140,7 +155,7 @@ export default {
     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/Dialogs/GuardrailCollision/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
index 05a05c68..61581fdc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
@@ -9,7 +9,7 @@
         </ElTabPane>
 
         <ElTabPane label="在线率统计" name="third">
-          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" />
         </ElTabPane>
       </ElTabs>
     </div>
@@ -179,7 +179,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/Dialogs/Intermodulation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
index 5c905f9d..7c78195f 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,14 +9,22 @@
         </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">
-          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" />
         </ElTabPane>
       </ElTabs>
     </div>
@@ -40,7 +48,7 @@ import { dialogDelayVisible } from "./../mixin";
 import request from "@/utils/request";
 import { Message } from "element-ui";
 import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/index.vue";
-import moment from 'moment/moment';
+import moment from "moment/moment";
 
 // 广播发布
 export default {
@@ -72,8 +80,8 @@ export default {
       },
       carNum: 0,
       objectValue: {
-        '1': 0,
-        '3': 0
+        1: 0,
+        3: 0,
       },
       xData: [],
       yData: [],
@@ -150,7 +158,7 @@ export default {
   },
   methods: {
     changeRadio(value) {
-      this.carNum = this.objectValue[value + ''];
+      this.carNum = this.objectValue[value + ""];
       this.isShowCar = false;
       if (value == 3) {
         this.yData = this.jnYData;
@@ -162,7 +170,7 @@ export default {
       // console.log('rdata', this.jnYData);
       setTimeout(() => {
         this.isShowCar = true;
-      }, 1000)
+      }, 1000);
     },
     getPropertiesHistory(deviceId) {
       this.xData = [];
@@ -177,17 +185,17 @@ export default {
       }).then((result) => {
         if (result.code != 200) return Message.error(result?.msg);
         this.objectValue = result.data[result.data.length - 1];
-        this.carNum = result.data[result.data.length - 1]['1'];
-        result.data.forEach(it => {
+        this.carNum = result.data[result.data.length - 1]["1"];
+        result.data.forEach((it) => {
           this.xData.push(moment(it.timestamp).format("HH:mm"));
-          this.hzYData.push(it['1']);
-          this.jnYData.push(it['3']);
+          this.hzYData.push(it["1"]);
+          this.jnYData.push(it["3"]);
           this.yData = this.hzYData;
-        })
+        });
         this.isShowCar = true;
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -240,7 +248,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/Dialogs/SmartDevice/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
index a539da76..39049f20 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
@@ -14,15 +14,22 @@
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
-            :productId="dialogData.productId"
+            :productId="dialogData.id"
             style="height: 180px"
           />
         </ElTabPane>
       </ElTabs>
     </div>
     <template #footer>
-      <Button v-if="activeName != 'first' && data.deviceState == '1'" @click.native="deviceControlVisible = true"> 设备操作 </Button>
-      <Button v-else-if="activeName != 'first'" style="background-color: #bbb;"> 设备离线 </Button>
+      <Button
+        v-if="activeName != 'first' && data.deviceState == '1'"
+        @click.native="deviceControlVisible = true"
+      >
+        设备操作
+      </Button>
+      <Button v-else-if="activeName != 'first'" style="background-color: #bbb">
+        设备离线
+      </Button>
     </template>
 
     <DeviceControlDialog
@@ -99,7 +106,7 @@ export default {
           label: "设备状态",
           key: "deviceState",
           // enum: "DeviceTypeEnum",
-          visible: false
+          visible: false,
         },
         {
           label: "设备状态",
@@ -117,7 +124,11 @@ export default {
     // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
 
     let deviceInfo = await this.getDeviceInfo();
-    this.data = { ...this.dialogData, roadName: null, deviceStateLiteral : deviceInfo.data.formatValue.deviceState };
+    this.data = {
+      ...this.dialogData,
+      roadName: null,
+      deviceStateLiteral: deviceInfo.data.formatValue.deviceState,
+    };
 
     // console.log(
     //   "%c [ dialogData ]-103-「index.vue」",
@@ -134,15 +145,17 @@ export default {
 
     if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
-  methods:{
+  methods: {
     async getDeviceInfo() {
       return request({
-        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/3`,
+        url: `/business/device/properties/latest/${
+          this.dialogData.iotDeviceId || "10.0.36.143-1883"
+        }/3`,
         method: "get",
-        params: {}
+        params: {},
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
index c3377bd1..cf5c629e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
@@ -94,7 +94,7 @@
                   <el-tab-pane label="在线率统计" name="third">
                     <LineChart
                       v-if="activeTab === 'third'"
-                      :productId="selectedDevice.productId"
+                      :productId="selectedDevice.id"
                       style="height: 160px"
                     />
                   </el-tab-pane>