From 25d464c1f052b808e69cbe31750d5c3ebcb49512 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Mon, 22 Jan 2024 20:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 .../pages/Home/components/InfoBoard/index.vue | 19 ++++++++++++-------
 .../pages/service/board/index.vue             |  7 ++++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 88cff102..0729bba1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ node_modules
 package-lock.json
 dist.zip
 ruoyi-ui/dist.zip
+.DS_Store
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
index 2f3deacb..3fe25bd9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
@@ -57,8 +57,10 @@
                 </el-tabs>
               </div>
               <div class="dialogContent_bottom_btn">
-                <div class="show_bottom_btn_add" @click="____onAddDeviceItem">添加信息</div>
-                <div class="show_bottom_btn_del" @click="____publishInfo">信息发布</div>
+                <!-- <div class="show_bottom_btn_add" @click="____onAddDeviceItem">添加信息</div>
+                <div class="show_bottom_btn_del" @click="____publishInfo" :disabled="selectedBdMsg.length <= 0">信息发布</div> -->
+                <el-button class="show_bottom_btn_add" type="primary" @click.native="____onAddDeviceItem()">添加信息</el-button>
+                <el-button class="show_bottom_btn_del" type="warning" @click="____publishInfo" :disabled="selectedBdMsg.length <= 0">发布信息</el-button>
               </div>
               <div class="sideSwitch" @click="showSidePanel">
                 <img class="img" src="@/assets/screen/xtb/leftd.png" alt=""
@@ -1201,24 +1203,27 @@ export default {
 
 .show_bottom_btn_add {
   width: 90px;
-  height: 23px;
+  height: 24px;
   color: #fff;
   font-size: 14px;
-  line-height: 23px;
+  line-height: 10px;
   background: #00b3cc;
   border-radius: 48px 48px 48px 48px;
+  padding:0;
   opacity: 1;
   margin-right: 0.5vw;
   cursor: pointer;
 }
 
 .show_bottom_btn_del {
+  border: none;
+  padding: 0;
   width: 90px;
-  height: 23px;
+  height: 24px;
   color: #fff;
   font-size: 14px;
-  line-height: 23px;
-  background: #c87800;
+  line-height: 10px;
+  // background: #c87800;
   border-radius: 48px 48px 48px 48px;
   opacity: 1;
   cursor: pointer;
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 20a60477..b6669549 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -55,12 +55,12 @@
 
           <div class="controlBox">
             <el-button type="primary" @click.native="____onAddDeviceItem()">添加信息</el-button>
-            <el-button type="primary" @click="____publishInfo" :disabled="selectedBdMsg.length == 0">发布信息</el-button>
+            <el-button type="primary" @click="____publishInfo" :disabled="selectedBdMsg.length <= 0">发布信息</el-button>
           </div>
         </div>
         <div class="partCon">
           <!-- {{ selectedBdMsg }} -->
-          <vuescroll :ops="scrollOptions" class="templateBox">
+          <vuescroll :ops="scrollOptions" class="templateBox" v-if="selectedBdMsg.length>0">
             <div v-for="(itm, indx) in selectedBdMsg" :key="indx" class="tplItem">
               <!-- 模板内容 -->
               <BoardPreview class="boardPreview" :boardWH="selectedSize" :tpl="itm"></BoardPreview>
@@ -75,6 +75,7 @@
               </div>
             </div>
           </vuescroll>
+          <p style="text-align: center; margin: 100px; 0" v-else>请从设备回读或从模板添加信息...</p>
         </div>
       </div>
       <!-- ++++++++++右边部分：信息模板++++++++++ -->
@@ -751,7 +752,7 @@ export default {
         this.$message.warning('该设备缺少iotDeviceId参数!');
       }
       this.selectedDevice = _.find(this.boardSizeDic[this.selectedSize].list , {iotDeviceId : this.checkedDeviceIds[0]});
-      this.____forkDeviceInfo(this.selectedDevice);
+      // this.____forkDeviceInfo(this.selectedDevice);
     },
     // ____onCheckDeviceInfo(item) {
       // this.selectedDevice = _.find(this.boardSizeDic[this.selectedSize].list, { iotDeviceId: value[0] });