From e02d56ac5a51903ac85d783cf05eb2e4bf9b6495 Mon Sep 17 00:00:00 2001 From: xiangxy Date: Mon, 24 Apr 2023 09:44:26 +0800 Subject: [PATCH] gai --- src/pages/StorageMonitor2.vue | 102 +++++++++++++++++----------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/src/pages/StorageMonitor2.vue b/src/pages/StorageMonitor2.vue index 329581b..f5cbd60 100644 --- a/src/pages/StorageMonitor2.vue +++ b/src/pages/StorageMonitor2.vue @@ -178,50 +178,50 @@ export default { // struct_status 00为空,01为空盅,02为静置中,03为静置完成,04为强制完成,05为禁用 // 编号排布 // 12排 - let pai1 = [] - let pai2 = [] - let pai12 = [] - for (let i = 1; i <= 20; i++) { - if (i <= 10) { - pai1.push({sequence_number: i * 2 - 1, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) - pai2.push({sequence_number: i * 2, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) - } else { - pai1.push({sequence_number: i * 2 - 1, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) - pai2.push({sequence_number: i * 2, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) - } - } - pai12 = pai1.concat(pai2) - this.group01 = pai12 - // 34排 - let pai3 = [] - let pai4 = [] - let pai34 = [] - for (let i = 21; i <= 38; i++) { - if (i <= 30) { - pai3.push({sequence_number: i * 2 - 1, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) - pai4.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) - } else { - pai3.push({sequence_number: i * 2 - 1, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) - pai4.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) - } - } - pai34 = pai3.concat(pai4) - this.group02 = pai34 - // 56排 - let pai5 = [] - let pai6 = [] - let pai56 = [] - for (let i = 39; i <= 46; i++) { - if (i <= 4) { - pai5.push({sequence_number: i * 2 - 1, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) - pai6.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) - } else { - pai5.push({sequence_number: i * 2 - 1, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) - pai6.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) - } - } - pai56 = pai5.concat(pai6) - this.group03 = pai56 + // let pai1 = [] + // let pai2 = [] + // let pai12 = [] + // for (let i = 1; i <= 20; i++) { + // if (i <= 10) { + // pai1.push({sequence_number: i * 2 - 1, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) + // pai2.push({sequence_number: i * 2, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) + // } else { + // pai1.push({sequence_number: i * 2 - 1, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) + // pai2.push({sequence_number: i * 2, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) + // } + // } + // pai12 = pai1.concat(pai2) + // this.group01 = pai12 + // // 34排 + // let pai3 = [] + // let pai4 = [] + // let pai34 = [] + // for (let i = 21; i <= 38; i++) { + // if (i <= 30) { + // pai3.push({sequence_number: i * 2 - 1, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) + // pai4.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) + // } else { + // pai3.push({sequence_number: i * 2 - 1, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) + // pai4.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) + // } + // } + // pai34 = pai3.concat(pai4) + // this.group02 = pai34 + // // 56排 + // let pai5 = [] + // let pai6 = [] + // let pai56 = [] + // for (let i = 39; i <= 46; i++) { + // if (i <= 4) { + // pai5.push({sequence_number: i * 2 - 1, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) + // pai6.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) + // } else { + // pai5.push({sequence_number: i * 2 - 1, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) + // pai6.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) + // } + // } + // pai56 = pai5.concat(pai6) + // this.group03 = pai56 // end // 加载echarts图表 this.initData() @@ -257,13 +257,13 @@ export default { // } // } // } - for (let i = 0; i < this.structArr.length; i++) { - for (let j = 0; j < this.group03.length; j++) { - if (this.structArr[i].sequence_number === this.group03[j].sequence_number + '') { - this.group03[j] = Object.assign(this.group03[j], this.structArr[i]) - } - } - } + // for (let i = 0; i < this.structArr.length; i++) { + // for (let j = 0; j < this.group03.length; j++) { + // if (this.structArr[i].sequence_number === this.group03[j].sequence_number + '') { + // this.group03[j] = Object.assign(this.group03[j], this.structArr[i]) + // } + // } + // } }, // getdata(e) { // // getdata(21),22,23