Browse Source

情报板雨棚映射576*48

develop
wangsixiang 5 days ago
parent
commit
41e9632131
  1. 14
      ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

14
ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

@ -408,6 +408,12 @@ export default {
}, },
}, },
methods: { methods: {
____getCompatibleSize(screenSize) {
if (screenSize === '576*48') {
return '480*48';
}
return screenSize;
},
handleCheckAllChange(val) { 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); 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; let stakeThis = +item?.stakeMark?.replace(/[K\+]/g, "") || -1;
if (stakeThis >= stakeFrom && stakeThis <= stakeTo && statusForm.includes(item.deviceState)) { 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) { if (!this.selectedSize) {
this.selectedSize = item.otherConfig.screenSize; this.selectedSize = this.____getCompatibleSize(item.otherConfig.screenSize);
} }
// console.log(item, item.otherConfig.screenSize) // console.log(item, item.otherConfig.screenSize)
// if (!this.selectedDevices.deviceName) { // if (!this.selectedDevices.deviceName) {
@ -846,7 +853,8 @@ console.log(this.checkedDeviceIds.length)
if (arr.length > 0) { if (arr.length > 0) {
let temp = []; let temp = [];
arr.forEach((tpl) => { arr.forEach((tpl) => {
if (tpl.screenSize == this.selectedSize) { let compatibleSize = this.____getCompatibleSize(tpl.screenSize);
if (compatibleSize == this.selectedSize) {
temp.push(tpl); temp.push(tpl);
} }
}); });

Loading…
Cancel
Save