From 4a13d58a1ce705e93b84d186a0e27cbd4bd8c4a6 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 28 七月 2023 11:46:34 +0800
Subject: [PATCH] 班次利用率调取接口，渲染，测试，样式调整
---
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 31c8a6e..3123670 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -79,7 +79,7 @@
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
<!--<td>{{item.tierType}}</td>-->
<template v-for="(tableHead, index) in item.dataList">
- <td :style="{background:tableHead.color }">{{tableHead.lyl | numFilter}}</td>
+ <td :style="{background:tableHead.color }">{{tableHead.startRate | numFilter}}</td>
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
{{tableHead.openRate | numFilter}}
</td>
@@ -157,24 +157,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()
}
@@ -285,6 +285,7 @@
let dictCode = 'mdc_equipmentType'
let items = []
items = getDictItemsFromCache(dictCode)
+ console.log(items)
if (deviceList && items.length > 0) {
for (let a = 0; a < deviceList.length; a++) {
if (items && items.length > 0) {
@@ -341,10 +342,10 @@
searchQuery() {
if(this.queryParam.typeTree == "1"){
this.queryParam.parentId = this.queryParamEquip.parentId
- this.queryParam.equipmentIds = this.queryParamEquip.equipmentIds
+ this.queryParam.equipmentId = this.queryParamEquip.equipmentId
}else{
this.queryParam.parentId = this.queryParamPeople.parentId
- this.queryParam.equipmentIds = ""
+ this.queryParam.equipmentId = ""
}
this.loadData()
// this.onClearSelected()
@@ -352,12 +353,12 @@
searchReset() {
this.typeTree = this.queryParam.typeTree
this.typeParent = this.queryParam.parentId
- this.typeEquipment = this.queryParam.equipmentIds
+ this.typeEquipment = this.queryParam.equipmentId
this.queryParam = {}
this.dates = []
this.queryParam.typeTree = this.typeTree
this.queryParam.parentId = this.typeParent
- this.queryParam.equipmentIds = this.typeEquipment
+ this.queryParam.equipmentId = this.typeEquipment
// this.ipagination.current = 1
this.loadData();
// this.queryParam = {}
@@ -377,7 +378,7 @@
this.checkSameData1(this.dataList)
this.checkSameData2(this.dataList)
this.combineCell();
- this.initDeviceType(this.dataList)
+ // this.initDeviceType(this.dataList)
}
})
}
--
Gitblit v1.9.3