diff --git a/ruoyi-ui/src/views/information/board/addinfo.vue b/ruoyi-ui/src/views/information/board/addinfo.vue index 6cade192..bafe987f 100644 --- a/ruoyi-ui/src/views/information/board/addinfo.vue +++ b/ruoyi-ui/src/views/information/board/addinfo.vue @@ -85,7 +85,7 @@ - + @@ -177,7 +177,7 @@ export default { width: '400', height: '40', // content: "", - fontColor: 'yellow', + fontColor: 'FFFF00', fontSize: '24', fontType: 'KaiTi', fontSpacing: 0, @@ -418,7 +418,7 @@ export default { this.height = '40' this.dataForm = { CONTENT: '请输入内容', - COLOR: 'yellow', + COLOR: 'FFFF00', FONT: '黑体', SPEED: '1', ACTION: '1', @@ -659,7 +659,7 @@ export default { templateContent.push({ content: this.dataForm.CONTENT, coordinate: this.dataForm.COORDINATE, - fontColor: this.getColorStyle(this.dataForm.COLOR), + fontColor: this.dataForm.COLOR, fontSize: this.dataForm.FONT_SIZE.substring(0, 2), fontSpacing: this.dataForm.SPEED, fontType: this.getFontStyle(this.dataForm.FONT), diff --git a/ruoyi-ui/src/views/information/board/editInfo.vue b/ruoyi-ui/src/views/information/board/editInfo.vue index 47bed0ea..c2c12390 100644 --- a/ruoyi-ui/src/views/information/board/editInfo.vue +++ b/ruoyi-ui/src/views/information/board/editInfo.vue @@ -75,7 +75,7 @@ - + @@ -253,7 +253,7 @@ export default { width: '400', height: '40', content: '', - fontColor: 'yellow', + fontColor: 'FFFF00', fontSize: '24', fontType: 'KaiTi', fontSpacing: 0, diff --git a/ruoyi-ui/src/views/information/board/index.vue b/ruoyi-ui/src/views/information/board/index.vue index 7686f45b..e3be335a 100644 --- a/ruoyi-ui/src/views/information/board/index.vue +++ b/ruoyi-ui/src/views/information/board/index.vue @@ -904,7 +904,7 @@ export default { obj.CONTENT = item.CONTENT.replace(/\n|\r\n/g, '') obj.width = devicePixel[0] obj.height = devicePixel[1] - obj.horizontalAlignment = item.formatStyle //水平居中 + obj.formatStyle = item.formatStyle return obj }) objAll.parameters = newArr @@ -915,16 +915,16 @@ export default { - invokedFunction(65,'1B',{fileId:'1'}).then(res =>{ + /* invokedFunction(65,'1B',{fileId:'1'}).then(res =>{ debugger console.log('发布消息,播放文件-----------------------------') console.log(res) }).catch(()=>{ this.$modal.msgError("发布失败,请重试"); - }) + })*/ - /*invokedFunction(65,11,{size : '65535',fileName:'play001.lst'}).then(res =>{ + invokedFunction(65,11,{size : '65535',fileName:'play001.lst'}).then(res =>{ debugger console.log('发布消息,校验文件名-------------------------------------') console.log(res) @@ -949,7 +949,7 @@ export default { } }).catch(()=>{ this.$modal.msgError("发布失败,请重试"); - })*/ + }) loading.close() }).catch(() => { this.$message({