From bfbca619b7a499423bd8b1748f99f8105e5c0954 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期二, 04 七月 2023 11:46:27 +0800 Subject: [PATCH] 利用率界面接口调取,测试,扭矩配置界面绘制,设备工作日历界面bug --- src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 53 ++++++++++++++++++++++++++--------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue index d635058..6352ce8 100644 --- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue +++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue @@ -75,22 +75,22 @@ <td class="tdgu1 kaitou">{{item.equipmentName}}</td> <td class="tdgu2 kaitou">{{item.equipmentType}}</td> <!--<td>{{item.tierType}}</td>--> - <template v-for="(tableHead, index) in tableHeads"> - <td :style="{background:item[tableHead].color }">{{item[tableHead].lyl | numFilter}}</td> - <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('kjl') > -1"> - {{item[tableHead].kjl | numFilter}} + <template v-for="(tableHead, index) in item.dataList"> + <td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td> + <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1"> + {{tableHead.openRate | numFilter}} </td> - <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('kjsj') > -1"> - {{item[tableHead].kjsj}} + <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1"> + {{tableHead.openLong}} </td> - <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('jgsj') > -1"> - {{item[tableHead].jgsj}} + <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('jgsj') > -1"> + {{tableHead.processLong}} </td> - <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('djsj') > -1"> - {{item[tableHead].djsj}} + <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('djsj') > -1"> + {{tableHead.waitLong}} </td> - <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('gjsj') > -1"> - {{item[tableHead].gjsj}} + <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gjsj') > -1"> + {{tableHead.closeLong}} </td> </template> </tr> @@ -158,24 +158,24 @@ }, nodeTree(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢 if (JSON.stringify(val) != '{}') { - if (val.entity.equipmentId) { + if (val.equipmentId != null) { this.queryParamEquip.parentId = '' - this.queryParamEquip.equipmentIds = val.entity.equipmentId + this.queryParamEquip.equipmentId = val.equipmentId } else { - this.queryParamEquip.parentId = val.entity.id - this.queryParamEquip.equipmentIds = '' + this.queryParamEquip.parentId = val.key + this.queryParamEquip.equipmentId = '' } this.searchQuery() } }, nodePeople(val){ if (JSON.stringify(val) != '{}') { - if (val.entity.equipmentId) { - this.queryParamPeople.parentId = val.entity.equipmentId - this.queryParamPeople.equipmentIds = '' + if (val.equipmentId != null) { + this.queryParamPeople.parentId = val.equipmentId + this.queryParamPeople.equipmentId = '' } else { - this.queryParamPeople.parentId = val.entity.id - this.queryParamPeople.equipmentIds = '' + this.queryParamPeople.parentId = val.key + this.queryParamPeople.equipmentId = '' } this.searchQuery() } @@ -253,16 +253,14 @@ this.checkedList = checkedList }, searchQuery() { - // console.log(this.queryParam.typeTree); - // console.log(this.queryParams.parentId); if(this.queryParam.typeTree == "1"){ // this.queryParam.TreeIDTwo = "" this.queryParam.parentId = this.queryParamEquip.parentId - this.queryParam.equipmentIds = this.queryParamEquip.equipmentIds + this.queryParam.equipmentId = this.queryParamEquip.equipmentId }else{ // this.queryParam.TreeIDOne = "" this.queryParam.parentId = this.queryParamPeople.parentId - this.queryParam.equipmentIds = "" + this.queryParam.equipmentId = "" } this.loadData() // this.onClearSelected() @@ -278,11 +276,12 @@ // this.onClearSelected() }, loadData() { - // console.log(this.queryParam) + this.tableHeads = [] + this.dataList = [] getAction(this.url.list, this.queryParam).then(res => { if (res.success) { this.tableHeads = res.result.dates - this.dataList = res.result.list + this.dataList = res.result.mdcEfficiencyList this.initDeviceType(this.dataList) } }) -- Gitblit v1.9.3