From 18946c6c4f907cf1b542a9f891cffc515a439680 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Thu, 29 Feb 2024 14:43:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/styles/JiHeExpressway.scss     |  3 +-
 .../FormConfig/components/ElCheckboxGroup.vue | 42 ++++++++++++-------
 .../StatsDialogVisible/index.vue              | 22 +++++++---
 .../pages/service/board/index.vue             |  9 ++--
 4 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
index 87fb830d..36e5c973 100644
--- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
+++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
@@ -81,12 +81,13 @@
     line-height: $inputHeight;
     padding: 0;
     width: 100%;
+    border: none;
 
     .el-input-number__decrease,
     .el-input-number__increase {
       width: 22px;
       height: $inputHeight;
-      background-color: #004a69;
+      background-color: #0D5F79;
       border: none;
       color: #fff;
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
index a67596fa..83fdefe0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
@@ -1,15 +1,26 @@
 <template>
-  <ElCheckboxGroup v-bind="$attrs" v-on="$listeners" class='ElCheckboxGroup' :style="{ gap }">
-    <ElCheckbox v-for="item in options" :disabled="item.disabled" :label="item[id] || item[label]"
-      :key="item[id] || item[label]">
-      <slot :name="item[id] || item[label]" :data="item">{{ item[label] }}</slot>
+  <ElCheckboxGroup
+    v-bind="$attrs"
+    v-on="$listeners"
+    class="ElCheckboxGroup"
+    :style="{ gap }"
+  >
+    <ElCheckbox
+      v-for="item in options"
+      :disabled="item.disabled"
+      :label="item[id] || item[label]"
+      :key="item[id] || item[label]"
+    >
+      <slot :name="item[id] || item[label]" :data="item">{{
+        item[label]
+      }}</slot>
     </ElCheckbox>
   </ElCheckboxGroup>
 </template>
 
 <script>
 export default {
-  name: 'ElCheckboxGroup_',
+  name: "ElCheckboxGroup_",
   props: {
     /**
      * {
@@ -19,24 +30,24 @@ export default {
      */
     options: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     id: {
       type: String,
-      default: 'key'
+      default: "key",
     },
     label: {
       type: String,
-      default: 'label'
+      default: "label",
     },
     gap: {
-      default: "24px"
-    }
-  }
-}
+      default: "24px",
+    },
+  },
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .ElCheckboxGroup {
   display: flex;
   flex-wrap: wrap;
@@ -47,6 +58,7 @@ export default {
       display: flex;
       align-items: center;
       gap: 6px;
+      width: 100px;
 
       .el-checkbox__input {
         line-height: 0;
@@ -54,10 +66,10 @@ export default {
         .el-checkbox__inner {
           width: 16px;
           height: 16px;
-          background: #0A3E54;
+          background: #0a3e54;
           border-radius: 2px 2px 2px 2px;
           opacity: 1;
-          border: 1px solid rgba(98, 224, 254, .6);
+          border: 1px solid rgba(98, 224, 254, 0.6);
 
           &::after {
             width: 4.5px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
index 99ecaa4b..f49551b8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/StatsDialogVisible/index.vue
@@ -359,12 +359,22 @@ export default {
         }),
       ]).then((res) => {
         if (res[0].status === "fulfilled" && res[0].value.code == 200) {
-          this.searchFormList[2].options.options = res[0].value.data.map(
-            (item) => ({
-              key: item.id,
-              label: item.facilityName,
-            })
-          );
+          // this.searchFormList[2].options.options = res[0].value.data.map(
+          //   (item) => ({
+          //     key: item.id,
+          //     label: item.facilityName,
+          //   })
+          // );
+          let dataList = [];
+          res[0].value.data.forEach((item) => {
+            if (item.facilityType == 1) {
+              dataList.push({
+                key: item.id,
+                label: item.facilityName,
+              });
+            }
+          });
+          this.searchFormList[2].options.options = dataList;
           this.facilityIds = res[0].value.data.map((item) => item.id);
           // this.searchFormList[2].default = res[0].value.data.map(item => item.id)
           let currentMonth = moment().format("YYYY-MM");
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 05532ebe..5dbddb0c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -32,7 +32,6 @@
             </el-select>
           </el-form-item>
           <vuescroll :ops="scrollOptions" style="flex: 1; height: 0">
-            <!-- {{ boardSizeDic }} -->
             <el-collapse
               v-model="selectedSize"
               accordion
@@ -46,8 +45,6 @@
                 :name="key"
               >
                 <div v-if="item.list.length > 0">
-                  <!-- <el-checkbox style="width: 100%" :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
-                    </el-checkbox> -->
                   <el-checkbox-group
                     class="checkbox"
                     v-model="checkedDeviceIds"
@@ -60,8 +57,6 @@
                       :key="index"
                     >
                       <div>{{ itm.deviceName }}</div>
-                      <!-- <el-tooltip :content="itm.ip" placement="top">
-                      </el-tooltip> -->
                       <el-tooltip content="回读当前信息" placement="right">
                         <el-button
                           class="el-icon-tickets huiduButton"
@@ -91,6 +86,7 @@
             <el-button
               class="btnInfoBoard"
               type="add"
+              :disabled="!selectedSize"
               @click.native="____onAddDeviceItem()"
               >添加信息</el-button
             >
@@ -570,7 +566,7 @@ export default {
         this.selectedBdMsg = _.cloneDeep(testDeviceInfo.data["3A"].content);
       } else {
         if (!deviceFrom.iotDeviceId) {
-          this.$message.warning("提示设备未接入！");
+          this.$message.warning("设备未接入！");
           return;
         }
         this.selectedBdMsg = [];
@@ -811,6 +807,7 @@ export default {
     // },
     // 情报板列表手风琴
     ____onChangeSize(val) {
+      console.log("777777");
       this.____setAvailableTemplate();
       this.checkedDeviceIds = [];
       this.selectedDevice = {};