From 76906b0ef979a38017cc5f53d0338327869330ae Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Wed, 20 Mar 2024 14:10:54 +0800
Subject: [PATCH] update

---
 .../components/Dialogs/Broadcast/index.vue    | 23 +++++++++++--------
 .../Dialogs/FatigueWakesUp/index.vue          |  2 +-
 .../components/Dialogs/SmartDevice/index.vue  | 11 ++++++---
 .../src/views/JiHeExpressway/utils/enum.js    |  8 +++++++
 4 files changed, 31 insertions(+), 13 deletions(-)

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 d770c1a9..e9509827 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
@@ -28,8 +28,13 @@
       </div>
     </div>
 
-    <BroadcastReleases v-model="releaseVisible" :deviceId="dialogData.iotDeviceId" :pileNum="dialogData.stakeMark"
-      :otherConfig="dialogData.otherConfig" :currentId="dialogData.id" />
+    <BroadcastReleases
+      v-model="releaseVisible"
+      :deviceId="dialogData.iotDeviceId"
+      :pileNum="dialogData.stakeMark"
+      :otherConfig="dialogData.otherConfig"
+      :currentId="dialogData.id"
+    />
   </Dialog>
 </template>
 
@@ -93,13 +98,13 @@ export default {
           key: "direction",
           enum: "CameraDirectionEnum",
         },
-        {
-          label: "所属机构",
-          key: "organizationName",
-        },
+        // {
+        //   label: "所属机构",
+        //   key: "organizationName",
+        // },
         {
           label: "设备厂商",
-          key: "brand",
+          key: "manufacturer",
         },
         {
           label: "设备状态",
@@ -130,7 +135,7 @@ export default {
     if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
-    handleClickTabs() { },
+    handleClickTabs() {},
   },
 };
 </script>
@@ -170,7 +175,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/FatigueWakesUp/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
index 11fae8ab..e841b8d3 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
@@ -86,7 +86,7 @@ export default {
         },
         {
           label: "设备厂商",
-          key: "brand",
+          key: "manufacturer",
         },
       ],
     };
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 520976d3..83695172 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
@@ -16,8 +16,13 @@
       </ElTabs>
     </div>
     <template #footer>
-      <Button v-if="data.deviceState == '1'" @click.native="deviceControlVisible = true"> 设备操作 </Button>
-      <Button v-else style="background-color: #bbb;"> 设备离线 </Button>
+      <Button
+        v-if="data.deviceState == '1'"
+        @click.native="deviceControlVisible = true"
+      >
+        设备操作
+      </Button>
+      <Button v-else style="background-color: #bbb"> 设备离线 </Button>
     </template>
 
     <DeviceControlDialog
@@ -94,7 +99,7 @@ export default {
         },
         {
           label: "设备厂商",
-          key: "brand",
+          key: "manufacturer",
         },
       ],
     };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index 885ce618..cb1ffa35 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -74,6 +74,14 @@ export const DeviceTypeEnum = {
     text: "异常",
     color: "#FF5F5F",
   },
+  undefined: {
+    text: "异常",
+    color: "#FF5F5F",
+  },
+  "": {
+    text: "异常",
+    color: "#FF5F5F",
+  },
 };
 
 // 摄像 是否可控 是否有云台控制 0 有（球机） 1 ⽆（枪机）