From b82cf6ea881a2d6b8f76f38bb0cef35c69bf5da5 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期二, 15 八月 2023 11:00:00 +0800
Subject: [PATCH] 提示调整
---
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 31c8a6e..c49e432 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -71,15 +71,15 @@
</thead>
<tbody>
<tr class="mathData" v-for="(item, index) in dataList">
- <td class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis}" v-show="!item.level1dis">{{item.level1}}</td>
- <td class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis}" v-show="!item.level2dis">{{item.level2}}</td>
- <td class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: item.level3dis}" v-show="!item.level3dis">{{item.level3}}</td>
+ <td class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}" v-show="!item.level1dis">{{item.level1}}</td>
+ <td class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}" v-show="!item.level2dis">{{item.level2}}</td>
+ <td class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}" v-show="!item.level3dis">{{item.level3}}</td>
<td class="tdgu3 kaitou">{{item.equipmentId}}</td>
<td class="tdgu4 kaitou">{{item.equipmentName}}</td>
<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()
}
@@ -333,7 +333,11 @@
efficiencyOptionsOnChange(checkedList) {
let index = checkedList.indexOf('lyl')
if (index < 0) {
- this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
+ // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�"
+ })
return false
}
this.checkedList = checkedList
@@ -341,10 +345,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 +356,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 +381,7 @@
this.checkSameData1(this.dataList)
this.checkSameData2(this.dataList)
this.combineCell();
- this.initDeviceType(this.dataList)
+ // this.initDeviceType(this.dataList)
}
})
}
--
Gitblit v1.9.3