From d08e770ff49e4ea6a6f65392f9ee2e38748658ba Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Fri, 29 Dec 2023 14:16:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/information/board/addinfo.vue   | 10 +++----
 .../src/views/information/board/editInfo.vue  | 29 ++++++++++---------
 .../src/views/information/board/index.vue     |  9 +++---
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/ruoyi-ui/src/views/information/board/addinfo.vue b/ruoyi-ui/src/views/information/board/addinfo.vue
index 2d061cb4..dc968de2 100644
--- a/ruoyi-ui/src/views/information/board/addinfo.vue
+++ b/ruoyi-ui/src/views/information/board/addinfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container infoBoardDialog">
     <!-- 添加信息弹窗 -->
-    <el-dialog title="新增" :visible.sync="dialogVisible" width="42%" :before-close="handleClose" :close-on-click-modal="false">
+    <el-dialog title="新增" :visible.sync="dialogVisible" width="43%" :before-close="handleClose" :close-on-click-modal="false">
       <div class="dialogStyleBox">
         <div class="dialogLine"></div>
         <div class="dialogCloseButton"></div>
@@ -564,7 +564,7 @@ export default {
           if (this.isAdd) {
             if (this.infoType == 1) {
               // 不走接口 存到待下发信息里
-              this.dataForm.STAY = Number(this.dataForm.STAY) * 100
+              this.dataForm.STAY = Number(this.dataForm.STAY) * 10
               this.$emit('addInfo', this.dataForm)
             } else {
               // 走接口 存到信息模板里
@@ -579,7 +579,7 @@ export default {
                 inScreenMode: this.dataForm.ACTION,
                 remark: '',
                 screenSize: this.dataForm.screenSize,
-                stopTime: Number(this.dataForm.STAY) * 100,
+                stopTime: Number(this.dataForm.STAY) * 10,
                 vmsType: '',
                 width: ''
               }
@@ -641,7 +641,7 @@ export default {
       if (this.isAdd) {
         if (this.infoType == 1) {
           // 不走接口 存到待下发信息里
-          this.dataForm.STAY = Number(this.dataForm.STAY) * 100
+          this.dataForm.STAY = Number(this.dataForm.STAY) * 10
           this.$emit('addInfo', this.dataForm)
         } else {
           // 走接口 存到信息模板里
@@ -656,7 +656,7 @@ export default {
             inScreenMode: this.dataForm.ACTION,
             remark: '',
             screenSize: this.dataForm.screenSize,
-            stopTime: Number(this.dataForm.STAY) * 100,
+            stopTime: Number(this.dataForm.STAY) * 10,
             vmsType: '',
             width: ''
           }
diff --git a/ruoyi-ui/src/views/information/board/editInfo.vue b/ruoyi-ui/src/views/information/board/editInfo.vue
index e8409b6b..ac17eff4 100644
--- a/ruoyi-ui/src/views/information/board/editInfo.vue
+++ b/ruoyi-ui/src/views/information/board/editInfo.vue
@@ -1,16 +1,17 @@
 <template>
   <div class="container infoBoardDialog">
     <!-- 添加信息弹窗 -->
-    <el-dialog title="修改" :visible.sync="dialogVisible" width="42%" :before-close="closeDialog" :close-on-click-modal="false">
+    <el-dialog title="修改" :visible.sync="dialogVisible" width="43%" :before-close="closeDialog" :close-on-click-modal="false">
       <div class="dialogStyleBox">
         <div class="dialogLine"></div>
         <div class="dialogCloseButton"></div>
       </div>
-      <el-card class="box-card">
+      <el-card class="box-card" >
         <div class="blackBoard1" v-on:ondragenter="ondragenter" v-on:drop="faceDrop" v-on:dragover="allowDrop" :style="{
             width: getDevicePixel(boardWidth, 0),
             height: getDevicePixel(boardHeight, 1),
             position: 'relative',
+
             display:'flex',
             'align-items': getTextAlign(dataForm.formatStyle),
             'justify-content': getTextAlign(dataForm.formatStyle)
@@ -18,7 +19,7 @@
           <span class="textBoard1 boardTextStyle" :style="{
               color: getColorStyle(dataForm.COLOR),
               fontSize: getFontSize(dataForm.FONT_SIZE),
-              fontFamily: dataForm.FONT,
+              fontFamily: getFontStyle(dataForm.FONT),
               zIndex: '1000',
               position:'relative',
               /*left: getCoordinate(dataForm.COORDINATE.substring(0, 3), 0),
@@ -485,7 +486,7 @@ export default {
       console.log(this.dataForm, 'this.dataForm')
       // this.dataForm.FONT = this.getFont(this.boardEmitItem.FONT)
       this.dataForm.CONTENT = JSON.parse(JSON.stringify(this.boardEmitItem.CONTENT.replace('<br>', '\n').replace(/ /g, ' ').replace('<r><n>', '\n')))
-      this.dataForm.STAY = JSON.parse(JSON.stringify(Number(this.boardEmitItem.STAY) / 100))
+      this.dataForm.STAY = JSON.parse(JSON.stringify(Number(this.boardEmitItem.STAY) / 10))
       this.getFontSizeList()
     },
     getColorValue(color) {
@@ -603,7 +604,7 @@ export default {
       this.loading = false
       this.isAdd = false
       if (this.dataForm.type == 1) {
-        this.dataForm.STAY = Number(this.dataForm.STAY) * 100
+        this.dataForm.STAY = Number(this.dataForm.STAY) * 10
         this.$emit('receiveForm', this.dataForm)
         console.log(this.dataForm, 'this.dataForm修改后给父组件传表单内容')
       } else {
@@ -641,7 +642,7 @@ export default {
           remark: '',
           screenSize: this.dataForm.screenSize,
           searchValue: null,
-          stopTime: Number(this.dataForm.STAY) * 100,
+          stopTime: Number(this.dataForm.STAY) * 10,
           tcontents: null,
           templateType: null,
           updateBy: null,
@@ -690,7 +691,7 @@ export default {
           this.loading = false
           this.isAdd = false
           if (this.dataForm.type == 1) {
-            this.dataForm.STAY = Number(this.dataForm.STAY) * 100
+            this.dataForm.STAY = Number(this.dataForm.STAY) * 10
             this.$emit('receiveForm', this.dataForm)
             console.log(this.dataForm, 'this.dataForm修改后给父组件传表单内容')
           } else {
@@ -728,7 +729,7 @@ export default {
               remark: '',
               screenSize: this.dataForm.screenSize,
               searchValue: null,
-              stopTime: Number(this.dataForm.STAY) * 100,
+              stopTime: Number(this.dataForm.STAY) * 10,
               tcontents: null,
               templateType: null,
               updateBy: null,
@@ -769,13 +770,13 @@ export default {
     getFontStyle(font) {
       if (font == '宋体') {
         return 'Simsun'
-      } else if (font == '黑体') {
+      } else if (font == '黑体' || font == '1') {
         return 'SimHei'
-      } else if (font == '楷体') {
+      } else if (font == '楷体' || font == '2') {
         return 'KaiTi'
-      } else if (font == '仿宋') {
+      } else if (font == '仿宋' || font == '4') {
         return 'FangSong'
-      } else if (font == '隶书') {
+      } else if (font == '隶书' || font == '5') {
         return 'LiSu'
       }
     },
@@ -804,8 +805,8 @@ export default {
           return devicePixel + 'px'
         }
       } else if (num == 1) {
-        if (devicePixel > 128) {
-          return 128 + 'px'
+        if (devicePixel > 160) {
+          return 160 + 'px'
         } else {
           return devicePixel + 'px'
         }
diff --git a/ruoyi-ui/src/views/information/board/index.vue b/ruoyi-ui/src/views/information/board/index.vue
index 512c6d4c..1cc150c7 100644
--- a/ruoyi-ui/src/views/information/board/index.vue
+++ b/ruoyi-ui/src/views/information/board/index.vue
@@ -1190,16 +1190,16 @@ export default {
                   console.log('发布消息,播放文件-----------------------------')
                   console.log(res)
                 }).catch(()=>{
-                  this.$modal.msgError("发布失败,请重试");
+                  this.$modal.msgWarning("发布失败,请重试");
                 })
 
               }
             }).catch(()=>{
-              this.$modal.msgError("发布失败,请重试");
+              this.$modal.msgWarning("发布失败,请重试");
             })
           }
         }).catch(()=>{
-          this.$modal.msgError("发布失败,请重试");
+          this.$modal.msgWarning("发布失败,请重试");
         })
         loading.close()
       }).catch(() => {
@@ -1347,6 +1347,7 @@ export default {
               item.FONT_SIZE = item.fontSize + 'px'
               item.ID = i
               item.FONT = item.font
+              item.STAY = item.playbackDuration
               item.COORDINATE = this.covering(item.xCoordinate) + this.covering(item.yCoordinate)
               item.screenSize = item.displayAreaWidth + '*' + item.displayAreaHeight
               item.CONTENT = item.textContent.replaceAll('\\,',',')
@@ -1366,7 +1367,7 @@ export default {
           this.submitButton = false
         })
         .catch(e => {
-          this.$modal.msgError("回读失败,请重试");
+          this.$modal.msgWarning("回读失败,请重试");
           this.loading = false
           this.submitButton = false
         })