From 587e00311b8211dbcf529d24d5a3060b0fbec0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Sat, 21 Dec 2024 08:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E9=80=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeviceControl/components/ScopeTable.vue   | 27 ++++++++++---------
 .../pages/service/board/index.vue             |  6 +++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
index 882a162e..53203322 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
@@ -151,18 +151,21 @@
 
               </div>
             </el-col>
-          <el-col  :span="5" >
-            <span style="font-size: 15px" >音量(1-9)</span>
-          </el-col>
-          <el-col :span="6" >
-            <el-input-number placeholder="" v-model="tableInfo.executeConfig.outVol" :min="1":max="9"></el-input-number>
-          </el-col>
-          <el-col  :span="6" style="margin-left: 5px;" >
-            <span style="font-size: 15px">循环次数(1-16)</span>
-          </el-col>
-          <el-col :span="6" >
-            <el-input-number placeholder="" v-model="tableInfo.executeConfig.repeatTimes" :min="1":max="16"></el-input-number>
-          </el-col>
+
+            <el-col  :span="5" v-if="tableInfo.deviceType == 5 ">
+              <span style="font-size: 15px" >音量(1-9)</span>
+            </el-col>
+            <el-col :span="6"  v-if="tableInfo.deviceType == 5 ">
+              <el-input-number placeholder="" v-model="tableInfo.executeConfig.outVol" :min="1":max="9"></el-input-number>
+            </el-col>
+            <el-col  :span="6" style="margin-left: 5px;" v-if="tableInfo.deviceType == 5 " >
+              <span style="font-size: 15px">循环次数(1-16)</span>
+            </el-col>
+            <el-col :span="6"  v-if="tableInfo.deviceType == 5 ">
+              <el-input-number placeholder="" v-model="tableInfo.executeConfig.repeatTimes" :min="1":max="16"></el-input-number>
+            </el-col>
+
+
         </el-row>
         <el-row v-if="tableInfo.deviceType !== 5">
             <el-col :span="3">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
index ef075a2c..ca9e257c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -409,14 +409,16 @@ export default {
   },
   methods: {
     handleCheckAllChange(val) {
-      this.checkedDeviceIds = val ? this.getAllDeviceIds() : [];
 
+      this.checkedDeviceIds = this.boardSizeDic[this.selectedSize].list.filter(itm => itm.iotDeviceId && !itm.iotDeviceId.includes('null') && !(itm.deviceState === "0" || itm.deviceState === null)).map(itm => itm.iotDeviceId);
+console.log(this.checkedDeviceIds)
+console.log(this.checkedDeviceIds.length)
       this.isIndeterminate = false;
     },
     getAllDeviceIds() {
       // 使用 Object.values 遍历对象
       return Object.values(this.boardSizeDic).reduce((acc, item) => {
-        acc.push(...item.list.filter(itm => itm.iotDeviceId && !itm.iotDeviceId.includes('null') && !(itm.deviceState === 0 || itm.deviceState === null)).map(itm => itm.iotDeviceId));
+        acc.push(...item.list.filter(itm =>  itm.iotDeviceId && !itm.iotDeviceId.includes('null') && !(itm.deviceState === "0" || itm.deviceState === null)).map(itm => itm.iotDeviceId));
         return acc;
       }, []);
     },