diff --git a/src/views/storeManage/warehouse3D/deseCabinet/index.vue b/src/views/storeManage/warehouse3D/deseCabinet/index.vue index 1bd2b21..5b16b19 100644 --- a/src/views/storeManage/warehouse3D/deseCabinet/index.vue +++ b/src/views/storeManage/warehouse3D/deseCabinet/index.vue @@ -108,7 +108,7 @@ export default { return { // D6490DA3D4261E8C26D0E3 档案库 // 8F68A6B645B34B00B7ADFE 走廊 - storeroomId: '8F68A6B645B34B00B7ADFE', // 档案库id + storeroomId: 'D6490DA3D4261E8C26D0E3', // 档案库id deviceData: null, // 获取密集架data cabinetNum: null, // 当前列num isFixed: false, // 是否是固定列 @@ -126,24 +126,24 @@ export default { }, computed: { cellStyle: function() { - // let h - // if (this.cabinetNum > 8) { - // h = '100%/' + (this.deviceData.rowNo - 1) - // } else { - // h = '100%/' + this.deviceData.rowNo - // } - const h = '100%/' + this.deviceData.rowNo + let h + if (this.cabinetNum > 8) { + h = '100%/' + (this.deviceData.rowNo - 1) + } else { + h = '100%/' + this.deviceData.rowNo + } + // const h = '100%/' + this.deviceData.rowNo const w = '100%/' + this.deviceData.partNo return { width: `calc(${w} - 10px )`, height: `calc(${h} - 10px)` } }, heightStyle: function() { - // let h - // if (this.cabinetNum > 8) { - // h = '100%/' + (this.deviceData.rowNo - 1) - // } else { - // h = '100%/' + this.deviceData.rowNo - // } - const h = '100%/' + this.deviceData.rowNo + let h + if (this.cabinetNum > 8) { + h = '100%/' + (this.deviceData.rowNo - 1) + } else { + h = '100%/' + this.deviceData.rowNo + } + // const h = '100%/' + this.deviceData.rowNo return { height: `calc(${h})` } }, widhtStyle: function() { @@ -180,16 +180,16 @@ export default { } getDeviceList(params).then(data => { data.content.map(item => { - if (item.deviceTypeId.name === '密集架' && item.deviceName === '战备密集架测试') { // 写死状态 + if (item.deviceTypeId.name === '密集架' && item.deviceName === '档案库_密集架') { // 写死状态 this.deviceData = item this.totalPartRowNum = item.partNo * item.rowNo - // let rowNo - // if (this.cabinetNum > 8) { // 战备密集架得情况 - // rowNo = item.rowNo - 1 - // } else { - // rowNo = item.rowNo - // } - for (let i = 0; i < item.rowNo; i++) { + let rowNo + if (this.cabinetNum > 8) { // 战备密集架得情况 + rowNo = item.rowNo - 1 + } else { + rowNo = item.rowNo + } + for (let i = 0; i < rowNo; i++) { this.rowNum.push(i + 1) } for (let i = 0; i < item.partNo; i++) {