diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue index ca9e257c..62813d9a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -408,6 +408,12 @@ export default { }, }, methods: { + ____getCompatibleSize(screenSize) { + if (screenSize === '576*48') { + return '480*48'; + } + return screenSize; + }, handleCheckAllChange(val) { this.checkedDeviceIds = this.boardSizeDic[this.selectedSize].list.filter(itm => itm.iotDeviceId && !itm.iotDeviceId.includes('null') && !(itm.deviceState === "0" || itm.deviceState === null)).map(itm => itm.iotDeviceId); @@ -548,10 +554,11 @@ console.log(this.checkedDeviceIds.length) let stakeThis = +item?.stakeMark?.replace(/[K\+]/g, "") || -1; if (stakeThis >= stakeFrom && stakeThis <= stakeTo && statusForm.includes(item.deviceState)) { - this.boardSizeDic[item.otherConfig.screenSize].list.push(item); + let compatibleSize = this.____getCompatibleSize(item.otherConfig.screenSize); + this.boardSizeDic[compatibleSize].list.push(item); } if (!this.selectedSize) { - this.selectedSize = item.otherConfig.screenSize; + this.selectedSize = this.____getCompatibleSize(item.otherConfig.screenSize); } // console.log(item, item.otherConfig.screenSize) // if (!this.selectedDevices.deviceName) { @@ -846,7 +853,8 @@ console.log(this.checkedDeviceIds.length) if (arr.length > 0) { let temp = []; arr.forEach((tpl) => { - if (tpl.screenSize == this.selectedSize) { + let compatibleSize = this.____getCompatibleSize(tpl.screenSize); + if (compatibleSize == this.selectedSize) { temp.push(tpl); } });