update

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: "设备状态",

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue

@@ -86,7 +86,7 @@ export default {
         },
         {
           label: "设备厂商",
-          key: "brand",
+          key: "manufacturer",
         },
       ],
     };

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",
         },
       ],
     };

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 ⽆（枪机）