Browse Source

情报板样式修改

wangqin
lau572 1 year ago
parent
commit
5a6c42ff9d
  1. 8
      ruoyi-ui/src/views/information/board/addinfo.vue
  2. 4
      ruoyi-ui/src/views/information/board/editInfo.vue
  3. 10
      ruoyi-ui/src/views/information/board/index.vue

8
ruoyi-ui/src/views/information/board/addinfo.vue

@ -85,7 +85,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="COLOR" label="字体颜色"> <el-form-item prop="COLOR" label="字体颜色">
<el-select v-model="dataForm.COLOR" filterable placeholder="请选择"> <el-select v-model="dataForm.COLOR" filterable placeholder="请选择">
<el-option v-for="item in colorOptions" :key="item.cssClass" :label="item.dictLabel" :value="item.cssClass"> <el-option v-for="item in colorOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -177,7 +177,7 @@ export default {
width: '400', width: '400',
height: '40', height: '40',
// content: "", // content: "",
fontColor: 'yellow', fontColor: 'FFFF00',
fontSize: '24', fontSize: '24',
fontType: 'KaiTi', fontType: 'KaiTi',
fontSpacing: 0, fontSpacing: 0,
@ -418,7 +418,7 @@ export default {
this.height = '40' this.height = '40'
this.dataForm = { this.dataForm = {
CONTENT: '请输入内容', CONTENT: '请输入内容',
COLOR: 'yellow', COLOR: 'FFFF00',
FONT: '黑体', FONT: '黑体',
SPEED: '1', SPEED: '1',
ACTION: '1', ACTION: '1',
@ -659,7 +659,7 @@ export default {
templateContent.push({ templateContent.push({
content: this.dataForm.CONTENT, content: this.dataForm.CONTENT,
coordinate: this.dataForm.COORDINATE, coordinate: this.dataForm.COORDINATE,
fontColor: this.getColorStyle(this.dataForm.COLOR), fontColor: this.dataForm.COLOR,
fontSize: this.dataForm.FONT_SIZE.substring(0, 2), fontSize: this.dataForm.FONT_SIZE.substring(0, 2),
fontSpacing: this.dataForm.SPEED, fontSpacing: this.dataForm.SPEED,
fontType: this.getFontStyle(this.dataForm.FONT), fontType: this.getFontStyle(this.dataForm.FONT),

4
ruoyi-ui/src/views/information/board/editInfo.vue

@ -75,7 +75,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="COLOR" label="字体颜色"> <el-form-item prop="COLOR" label="字体颜色">
<el-select v-model="dataForm.COLOR" filterable placeholder="请选择"> <el-select v-model="dataForm.COLOR" filterable placeholder="请选择">
<el-option v-for="item in colorOptions" :key="item.cssClass" :label="item.dictLabel" :value="item.cssClass"> <el-option v-for="item in colorOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -253,7 +253,7 @@ export default {
width: '400', width: '400',
height: '40', height: '40',
content: '', content: '',
fontColor: 'yellow', fontColor: 'FFFF00',
fontSize: '24', fontSize: '24',
fontType: 'KaiTi', fontType: 'KaiTi',
fontSpacing: 0, fontSpacing: 0,

10
ruoyi-ui/src/views/information/board/index.vue

@ -904,7 +904,7 @@ export default {
obj.CONTENT = item.CONTENT.replace(/\n|\r\n/g, '<r><n>') obj.CONTENT = item.CONTENT.replace(/\n|\r\n/g, '<r><n>')
obj.width = devicePixel[0] obj.width = devicePixel[0]
obj.height = devicePixel[1] obj.height = devicePixel[1]
obj.horizontalAlignment = item.formatStyle // obj.formatStyle = item.formatStyle
return obj return obj
}) })
objAll.parameters = newArr objAll.parameters = newArr
@ -915,16 +915,16 @@ export default {
invokedFunction(65,'1B',{fileId:'1'}).then(res =>{ /* invokedFunction(65,'1B',{fileId:'1'}).then(res =>{
debugger debugger
console.log('发布消息,播放文件-----------------------------') console.log('发布消息,播放文件-----------------------------')
console.log(res) console.log(res)
}).catch(()=>{ }).catch(()=>{
this.$modal.msgError("发布失败,请重试"); this.$modal.msgError("发布失败,请重试");
}) })*/
/*invokedFunction(65,11,{size : '65535',fileName:'play001.lst'}).then(res =>{ invokedFunction(65,11,{size : '65535',fileName:'play001.lst'}).then(res =>{
debugger debugger
console.log('发布消息,校验文件名-------------------------------------') console.log('发布消息,校验文件名-------------------------------------')
console.log(res) console.log(res)
@ -949,7 +949,7 @@ export default {
} }
}).catch(()=>{ }).catch(()=>{
this.$modal.msgError("发布失败,请重试"); this.$modal.msgError("发布失败,请重试");
})*/ })
loading.close() loading.close()
}).catch(() => { }).catch(() => {
this.$message({ this.$message({

Loading…
Cancel
Save