改bug

ruoyi-ui/src/assets/jihe/images/offline.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1709521132238" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1653" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M0 352.832l93.12 98.752c231.296-245.44 606.464-245.44 837.76 0L1024 352.832C741.44 53.056 283.008 53.056 0 352.832z m372.352 395.008L512 896l139.648-148.16c-76.8-81.92-202.048-81.92-279.296 0zM186.24 550.4l93.12 98.752c128.448-136.32 336.96-136.32 465.408 0L837.824 550.4c-179.648-190.592-471.488-190.592-651.648 0z" fill="#154b5f" p-id="1654"></path></svg>

ruoyi-ui/src/assets/jihe/images/online.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1709521132238" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1653" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M0 352.832l93.12 98.752c231.296-245.44 606.464-245.44 837.76 0L1024 352.832C741.44 53.056 283.008 53.056 0 352.832z m372.352 395.008L512 896l139.648-148.16c-76.8-81.92-202.048-81.92-279.296 0zM186.24 550.4l93.12 98.752c128.448-136.32 336.96-136.32 465.408 0L837.824 550.4c-179.648-190.592-471.488-190.592-651.648 0z" p-id="1654" fill="#ffffff"></path></svg>

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

@@ -354,8 +354,8 @@ export default {
       } else {
         //改下判断条件 iotDeviceId为null时不要请求后台  加个提示 设备未接入
         const iotDeviceId = this.selectedDevice.iotDeviceId;
-        if (!(iotDeviceId === null || iotDeviceId === undefined))
-          getBoardDeviceInfo()
+        if (iotDeviceId != null && iotDeviceId != undefined)
+          getBoardDeviceInfo(iotDeviceId)
             .then((res) => {
               this.selectedBdMsg = res.data["3A"].content;
             })

ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

@@ -56,7 +56,9 @@
                       :label="itm.iotDeviceId"
                       :key="index"
                     >
-                      <div>{{ itm.deviceName }}</div>
+                      <div class="title">{{ itm.deviceName }}</div>
+                      <img src="@/assets/jihe/images/offline.svg" class="wifi" v-if="item.deviceState==0 || item.deviceState==null">
+                      <img src="@/assets/jihe/images/online.svg" class="wifi" v-else>
                       <el-tooltip content="回读当前信息" placement="right">
                         <el-button
                           class="el-icon-tickets huiduButton"
@@ -525,7 +527,10 @@ export default {
         // this.____getDeviceInfo();
       } else {
         getBoardList(param).then((res) => {
-          res.data.forEach((item) => {
+          res.data.forEach((item, index) => {
+            if(!item.iotDeviceId){
+              return
+            }
             if (_.isString(item.otherConfig)) {
               item.otherConfig = JSON.parse(item.otherConfig);
             }
@@ -1257,12 +1262,15 @@ export default {
   }
 
   .checkbox {
-    label {
-      width: 100%;
-      padding: 10px 0;
-      box-sizing: border-box;
-      display: flex;
+    .boardLabel{
+
     }
+    // label {
+    //   width: 100%;
+    //   padding: 10px 0;
+    //   box-sizing: border-box;
+    //   display: flex;
+    // }
   }
 }
 
@@ -1283,11 +1291,28 @@ export default {
   display: flex !important;
   justify-content: space-between;
   width: 100%;
+  .title{ flex:1; width:0; overflow: hidden; text-overflow: ellipsis; word-break: keep-all;}
+  .wifi{ width: 18px; height: 18px; margin-right: 4px;}
+  .huiduButton {
+    background: transparent;
+    border: none;
+    height: 18px;
+    width: 18px;
+    line-height: 20px;
+    padding: 0;
+    color: #fff;
+    font-size: 16px;
+  }
+
+  .huiduButton:hover {
+    color: #05afe3 !important;
+  }
 }
 
 .el-checkbox {
   display: flex !important;
   padding-top: 10px;
+  margin: 0;
 }
 
 ::v-deep .el-table {
@@ -1299,20 +1324,6 @@ export default {
   }
 }
 
-.huiduButton {
-  background: transparent;
-  border: none;
-  height: 19px;
-  line-height: 20px;
-  padding: 0;
-  color: #fff;
-  font-size: 16px;
-}
-
-.huiduButton:hover {
-  color: #05afe3 !important;
-}
-
 // .boardListTitle {
 //   // margin-top: 1vh;
 //   color: #fff;