From ae4c0a594b0afda1e83c7ed7da36df64fd657524 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Thu, 18 Jan 2024 21:33:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=83=85=E6=8A=A5=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/infoBoard/BoardInfoEditor.vue  |  6 +--
 .../components/infoBoard/BoardPreview.vue     |  2 +-
 .../pages/Home/components/InfoBoard/index.vue | 43 ++++++++++++++++---
 .../views/JiHeExpressway/utils/infoBoard.js   |  6 ++-
 4 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
index 7870aad5..13e1efa4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
@@ -219,7 +219,7 @@ export default {
         "setUpTheSpeaker": "0",
         "flickerSpeed": "0",
         "specialEffectsSpeed": "1",
-        "fontSize": "64",
+        "fontSize": "20",
         "verticalAlignment": "2",
         "speechSpeed": "0",
         "font": "3"
@@ -322,9 +322,9 @@ export default {
             }
           }
           else{
-            tempTpl = this.tplDefault;
+            tempTpl = _.merge(this.tplDefault, this.tpl.origin);    //首页弹窗，新增设备项时，需要传设备尺寸过来
           }
-          this.dataForm = infoBoardUtils.dialogSourceFormat(tplDefault, this.type);
+          this.dataForm = infoBoardUtils.dialogSourceFormat(tempTpl, this.type, this.mode);
         }else{
           this.dataForm = infoBoardUtils.dialogSourceFormat(this.tpl, this.type, this.mode, this.tplDefault);
         }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
index 50285753..828478b6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
@@ -71,7 +71,7 @@ export default {
         },
         tpl:{
             handler(newV){
-                this.contentArr = this.tpl.textContent.replace(/\n|\r\n/g, '&&&&&').replace(/ /g, '&nbsp').split('&&&&&');
+                this.contentArr = this.tpl.textContent.replace(/\+n|\+r\n/g, '&&&&&').replace(/ /g, '&nbsp').split('&&&&&');
                 this.setStyle();
             },
             deep:true,
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 a1f9358a..c2fd36ea 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
@@ -34,17 +34,29 @@
               <el-tabs v-model="activeTab" @tab-click="tabClickFn">
                 <el-tab-pane label="详情信息" name="first">
                   <div class="show_bottom_tab_box">
-                    <div class="show_bottom_tab_item" v-for="item in tabDataInfoList" :key="item.id">
+                    <div class="show_bottom_tab_item">
+                      <div class="show_bottom_tab_item_l">设备名称</div>
+                      <div class="show_bottom_tab_item_r">{{ device.deviceName }}</div>
+                    </div>
+                    <div class="show_bottom_tab_item">
+                      <div class="show_bottom_tab_item_l">设备桩号</div>
+                      <div class="show_bottom_tab_item_r">{{ device.stakeMarkId }}</div>
+                    </div>
+                    <div class="show_bottom_tab_item">
+                      <div class="show_bottom_tab_item_l">屏幕像素</div>
+                      <div class="show_bottom_tab_item_r">{{ JSON.parse(device.otherConfig).screenSize }}</div>
+                    </div>
+                    <!-- <div class="show_bottom_tab_item" v-for="item in tabDataInfoList" :key="item.id">
                       <div class="show_bottom_tab_item_l">{{ item.tit }}: </div>
                       <div class="show_bottom_tab_item_r" :style="{ 'color': item.col }"> {{ item.txt }}</div>
-                    </div>
+                    </div> -->
                   </div>
                 </el-tab-pane>
                 <el-tab-pane label="设备参数" name="second">设备参数</el-tab-pane>
               </el-tabs>
             </div>
             <div class="dialogContent_bottom_btn">
-              <div class="show_bottom_btn_add" @click="addMoDataInfoFn(2, 2)">添加信息</div>
+              <div class="show_bottom_btn_add" @click="____onAddDeviceItem">添加信息</div>
               <div class="show_bottom_btn_del" @click="InformationReleaseFn">信息发布</div>
             </div>
             <div class="sideSwitch" @click="showSidePanel">
@@ -405,18 +417,34 @@ export default {
     // 新增待下发
     ____onAddToDevice(item) {
       let arr = this.selectedSize.split("*");
+      item.origin = {
+          displayAreaWidth: +arr[0],
+          displayAreaHeight: +arr[1]
+          }
       this.editDialog = {
         visible: true,
         mode: "toDevice",
         type: "template",
         tpl: item,
-        origin: {
-          displayAreaWidth: +arr[0],
-          displayAreaHeight: +arr[1]
-        }
       }
     },
 
+    ____onAddDeviceItem() {
+      let arr = this.selectedSize.split("*");
+        this.editDialog = {
+          visible: true,
+          mode: "add",
+          type: "device",
+          tpl: {
+            "textContent": "",
+            origin :  {
+              displayAreaWidth: +arr[0],
+              displayAreaHeight: +arr[1]
+            }
+          }
+        }
+      },
+
 
 
 
@@ -551,6 +579,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
+          return ;
           let loading = this.$loading({
             lock: true,
             text: 'Loading',
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/infoBoard.js b/ruoyi-ui/src/views/JiHeExpressway/utils/infoBoard.js
index 5f3c5573..11e19eab 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/infoBoard.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/infoBoard.js
@@ -31,10 +31,12 @@ export default {
             data1 = _.cloneDeep(data);
             data1.stopTime = data1.stopTime*0.1
             if(mode=="toDevice"){
-                data.origin = tplDefault;
+                // data.origin = tplDefault;
+                data.origin = _.merge(tplDefault, data.origin);
             }
         }
         else{
+            console.log(data.origin , "fdsgfhgjdfss")
             data1 = {
                 formatStyle: data.horizontalAlignment,
                 content: data.textContent,
@@ -44,7 +46,7 @@ export default {
                 fontFamily: data.font,
                 stopTime: data.residenceTime,
                 inScreenMode: data.screenEntryMethod,
-                origin: data
+                origin: data 
             }
         }
         return data1