From ebccd92eea376eb865ce18719e558ad475be1e3e Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Wed, 20 Mar 2024 11:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/JiHeExpressway/components/Descriptions.vue   |  6 +-----
 .../Home/components/Dialogs/SmartDevice/index.vue      |  3 ++-
 .../JiHeExpressway/pages/control/qrCode/index.vue      |  2 +-
 ruoyi-ui/src/views/JiHeExpressway/utils/enum.js        | 10 ++++++++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
index df76b8c5..efd1ad72 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
@@ -2,10 +2,7 @@
   <div class="Descriptions keep-ratio" origin="left" :style="getStyle()">
     <div class="item" v-for="(item, index) in getResolveList" :key="`${item.key || item.label}${index}`"
       :style="[gridStyle(item, index), transformStyle(itemStyle)]">
-      <div class="text title" :style="{
-    ...transformStyle(titleStyle),
-    width: labelWidth,
-  }">
+      <div class="text title" :style="{...transformStyle(titleStyle), width: labelWidth }">
         <p>
           <slot :name="`title-${item.key || item.label}`" :data="item">
             {{ item.label || "-" }}
@@ -85,7 +82,6 @@ export default {
         }
 
         prev.push(data);
-
         return prev;
       }, []);
     },
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 c621f52f..520976d3 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
@@ -107,7 +107,8 @@ export default {
     console.log(
       "%c [ dialogData ]-103-「index.vue」",
       "font-size:15px; background:#36347c; color:#7a78c0;",
-      this.dialogData
+      this.dialogData,
+      "+++========"
     );
 
     getProduct(this.dialogData.productId).then((data) => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/qrCode/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/qrCode/index.vue
index 15c8cbf6..3a7377f6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/qrCode/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/qrCode/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class='comp_box'>
-   <iframe class="iframe" src="http://10.168.56.206:8888/alarm-ui/single?u=pDo/guSkRP8=&p=u4johJJOFTyugiay04vYxQ==&t=za4NgrFfeTdF76uSUrhJuA==&route=/warning/QRCode" frameborder="0"></iframe>
+   <iframe class="iframe" src="https://10.0.81.202:83/alarm-ui/single?u=pDo/guSkRP8=&p=u4johJJOFTyugiay04vYxQ==&t=za4NgrFfeTdF76uSUrhJuA==&route=/warning/QRCode" frameborder="0"></iframe>
   </div>
 </template>
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index 31a7c8ab..f8d39568 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -62,8 +62,14 @@ export const CameraDirectionEnumList = Object.keys(CameraDirectionEnum).map(
 
 // 设备的状态
 export const DeviceTypeEnum = {
-  0: "异常",
-  1: "正常",
+  0: {
+    text: "异常",
+    color: "#FF5F5F",
+  },
+  1: {
+    text: "正常",
+    color: "#19E1B1",
+  },
 };
 
 // 摄像 是否可控 是否有云台控制 0 有（球机） 1 ⽆（枪机）