This commit is contained in:
2023-04-24 09:44:26 +08:00
parent 11e15a27af
commit e02d56ac5a

View File

@@ -178,50 +178,50 @@ export default {
// struct_status 00为空01为空盅02为静置中03为静置完成04为强制完成05为禁用 // struct_status 00为空01为空盅02为静置中03为静置完成04为强制完成05为禁用
// 编号排布 // 编号排布
// 12排 // 12排
let pai1 = [] // let pai1 = []
let pai2 = [] // let pai2 = []
let pai12 = [] // let pai12 = []
for (let i = 1; i <= 20; i++) { // for (let i = 1; i <= 20; i++) {
if (i <= 10) { // if (i <= 10) {
pai1.push({sequence_number: i * 2 - 1, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) // 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}) // pai2.push({sequence_number: i * 2, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0})
} else { // } else {
pai1.push({sequence_number: i * 2 - 1, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) // 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}) // pai2.push({sequence_number: i * 2, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0})
} // }
} // }
pai12 = pai1.concat(pai2) // pai12 = pai1.concat(pai2)
this.group01 = pai12 // this.group01 = pai12
// 34排 // // 34排
let pai3 = [] // let pai3 = []
let pai4 = [] // let pai4 = []
let pai34 = [] // let pai34 = []
for (let i = 21; i <= 38; i++) { // for (let i = 21; i <= 38; i++) {
if (i <= 30) { // if (i <= 30) {
pai3.push({sequence_number: i * 2 - 1, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) // 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}) // pai4.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0})
} else { // } else {
pai3.push({sequence_number: i * 2 - 1, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) // 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}) // pai4.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0})
} // }
} // }
pai34 = pai3.concat(pai4) // pai34 = pai3.concat(pai4)
this.group02 = pai34 // this.group02 = pai34
// 56排 // // 56排
let pai5 = [] // let pai5 = []
let pai6 = [] // let pai6 = []
let pai56 = [] // let pai56 = []
for (let i = 39; i <= 46; i++) { // for (let i = 39; i <= 46; i++) {
if (i <= 4) { // if (i <= 4) {
pai5.push({sequence_number: i * 2 - 1, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) // 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}) // pai6.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0})
} else { // } else {
pai5.push({sequence_number: i * 2 - 1, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0}) // 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}) // pai6.push({sequence_number: i * 2, coordinate: 'coordinate3', aline: 'aline3', bline: 'bline3', show: 0})
} // }
} // }
pai56 = pai5.concat(pai6) // pai56 = pai5.concat(pai6)
this.group03 = pai56 // this.group03 = pai56
// end // end
// 加载echarts图表 // 加载echarts图表
this.initData() this.initData()
@@ -257,13 +257,13 @@ export default {
// } // }
// } // }
// } // }
for (let i = 0; i < this.structArr.length; i++) { // for (let i = 0; i < this.structArr.length; i++) {
for (let j = 0; j < this.group03.length; j++) { // for (let j = 0; j < this.group03.length; j++) {
if (this.structArr[i].sequence_number === this.group03[j].sequence_number + '') { // if (this.structArr[i].sequence_number === this.group03[j].sequence_number + '') {
this.group03[j] = Object.assign(this.group03[j], this.structArr[i]) // this.group03[j] = Object.assign(this.group03[j], this.structArr[i])
} // }
} // }
} // }
}, },
// getdata(e) { // getdata(e) {
// // getdata(21),22,23 // // getdata(21),22,23