Browse Source

fix-

wangqin
IAMHERE 1 year ago
parent
commit
3f43307717
  1. 4
      ruoyi-ui/src/views/information/board/addinfo.vue
  2. 7
      ruoyi-ui/src/views/information/board/editInfo.vue

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

@ -12,7 +12,7 @@
height: boardHeight + 'px', height: boardHeight + 'px',
position: 'relative', position: 'relative',
lineHeight:boardHeight + 'px',
textAlign: getTextAlign(dataForm.formatStyle) textAlign: getTextAlign(dataForm.formatStyle)
}" class="blackBoard2"> }" class="blackBoard2">
@ -442,7 +442,7 @@ export default {
getFontSizeList(type) { getFontSizeList(type) {
this.getDicts('iot_device_font_size').then(res => { this.getDicts('iot_device_font_size').then(res => {
this.fontSizeOpt = res.data this.fontSizeOpt = res.data
this.dataForm.FONT_SIZE = res.data[3].dictValue this.dataForm.FONT_SIZE = res.data[1].dictValue
if (type) { if (type) {
this.alignment(2) this.alignment(2)
} }

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

@ -11,8 +11,9 @@
width: getDevicePixel(boardWidth, 0), width: getDevicePixel(boardWidth, 0),
height: getDevicePixel(boardHeight, 1), height: getDevicePixel(boardHeight, 1),
position: 'relative', position: 'relative',
lineHeight:boardHeight + 'px', display:'flex',
textAlign: getTextAlign(dataForm.formatStyle) 'align-items': getTextAlign(dataForm.formatStyle),
'justify-content': getTextAlign(dataForm.formatStyle)
}"> }">
<span class="textBoard1 boardTextStyle" :style="{ <span class="textBoard1 boardTextStyle" :style="{
color: getColorStyle(dataForm.COLOR), color: getColorStyle(dataForm.COLOR),
@ -655,7 +656,7 @@ export default {
coordinate: this.dataForm.COORDINATE, coordinate: this.dataForm.COORDINATE,
id: this.dataForm.tcontentsId, id: this.dataForm.tcontentsId,
templateId: this.dataForm.id, templateId: this.dataForm.id,
formatStyle: this.dataForm.formatStyle, formatStyle: this.dataForm.formatStyle
}) })
var params = { var params = {

Loading…
Cancel
Save