From 8eefad51b8c427762073af4fc610d9ffc2a78cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Tue, 22 Apr 2025 19:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E5=B9=BF=E6=92=AD,=E6=99=BA?=
 =?UTF-8?q?=E8=83=BD=E8=AE=BE=E5=A4=87=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/HomeDevice/SmartDevice.vue     | 40 +++++++++----------
 .../pages/service/broadcast/index.vue         |  6 +--
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/SmartDevice.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/SmartDevice.vue
index 5a5180d3..c32e50bc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/SmartDevice.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeDevice/SmartDevice.vue
@@ -2,7 +2,6 @@
     <Dialog v-model="visibleModel"
      title="智能设备箱" width="470px" >
       <Video class="video-stream" :camId="camId" img="设备箱" />
-  
       <div class="SmartDevice">
         <ElTabs v-model="activeName" class="tabs">
           <ElTabPane label="基本信息" name="first" style="height: 195px">
@@ -16,7 +15,7 @@
             <LineChart
               v-if="activeName === 'third'"
               :productId="dialogData.id"
-              style="height: 180px"
+              style="height: 150px"
             />
           </ElTabPane>
         </ElTabs>
@@ -41,14 +40,14 @@
           设备离线
         </Button>
       </template>
-  
+
       <DeviceControlDialog
         v-model="deviceControlVisible"
         :dialogData="dialogData"
       />
     </Dialog>
   </template>
-  
+
   <script>
   import Dialog from "@screen/components/Dialog/index.vue";
   import Button from "@screen/components/Buttons/Button.vue";
@@ -57,17 +56,17 @@
   import LineChart from "../LineChart/index.vue";
   import DeviceParams from "../Dialogs/SmartDevice/components/DeviceParams.vue";
   import DeviceControlDialog from "../Dialogs/SmartDevice/components/DeviceControlDialog.vue";
-  
+
   import { checkPermi } from "@/utils/permission.js";
   import request from "@/utils/request";
-  
+
   import {
     getRoadInfoByStakeMark,
     getProduct,
   } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
   import { dialogDelayVisible } from "../Dialogs/mixin.js";
   import { resolve } from "@antv/x6/lib/registry/node-anchor/util";
-  
+
   // 广播发布
   export default {
     name: "SmartDevice",
@@ -150,7 +149,7 @@
     },
     async created() {
       // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
-   
+
       if(typeof this.data.otherConfig === 'string'){
         const oConfig = JSON.parse(this.data.otherConfig)
         if(oConfig && oConfig.camId){
@@ -158,7 +157,7 @@
         }
       }
       this.data = { ...this.dialogData, roadName: '济菏高速' };
-  
+
       let deviceInfo;
         if(this.dialogData.iotDeviceId!=null){
          deviceInfo = await this.getDeviceInfo();
@@ -170,7 +169,7 @@
         ...this.data,
          deviceStateName: (this.data.deviceState === '0'?'离线':'在线')
       };
-  
+
       // console.log(
       //   "%c [ dialogData ]-103-「index.vue」",
       //   "font-size:15px; background:#36347c; color:#7a78c0;",
@@ -182,10 +181,10 @@
         this.dialogData.brand = data.brand;
        });
       }
-   
-  
+
+
       // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
-  
+
       // if (roadInfo) this.data.roadName = roadInfo.roadName;
     },
     methods: {
@@ -204,7 +203,7 @@
     },
   };
   </script>
-  
+
   <style lang="scss">
   div.switcher {
     font-size: 12px;
@@ -218,34 +217,34 @@
     color: #fff;
     display: flex;
     flex-direction: column;
-  
+
     .camera-video {
       flex: 1.5;
     }
-  
+
     .tabs {
       flex: 1;
       display: flex;
       flex-direction: column;
-  
+
       ::v-deep {
         .el-tabs__content {
           flex: 1;
-  
+
           .el-tab-pane {
             height: 100%;
           }
         }
       }
     }
-  
+
     .bottom {
       margin-top: 12px;
       display: flex;
       gap: 9px;
       align-items: center;
       justify-content: end;
-  
+
       > div {
         font-size: 16px;
         padding: 6px 12px;
@@ -253,4 +252,3 @@
     }
   }
   </style>
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue
index 037a24eb..4ccf006d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue
@@ -108,7 +108,7 @@
             <el-button class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()"
               :disabled="selectedBdMsg.length>=1">添加信息</el-button>
             <el-button v-hasPermi="['service:broadcast:publish']" class="btnInfoBoard" type="publish" @click="____onPublish"
-              :disabled="selectedBdMsg.length <= 0 || deviceList.length <= 0">发布信息</el-button>
+              :disabled="selectedBdMsg.length <= 0 || checkedDeviceIds.length <= 0">发布信息</el-button>
           </div>
         </WgtTitle>
         <!-- <div class="partTitle partDeviceTempateTitle">
@@ -536,7 +536,7 @@ export default {
 
     // 发布信息
     ____onPublish() {
-      if (!this.deviceList.length) {
+      if (!this.checkedDeviceIds.length) {
         this.$message.warning("请选择设备");
         return;
       }
@@ -662,9 +662,9 @@ export default {
       this.allVmsTemplate("no");
     },
 
+
     // 多选
     ____onSelectDevices(arr) {
-      this.updateCheckAllStatus();
 
       this.selectedDevices = [];
       if (this.checkedDeviceIds.length == 0) {