From 36e8795b59c7f7393758ca96e0c2438eddaee8be Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:14:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 77 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 1a46371..f85f45e 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -43,17 +43,33 @@
:allowClear="false"/>
</a-form-item>
</a-col>
+<!-- <a-col :md="5" :sm="5" :xs="5">-->
+<!-- <a-form-item label="璁惧绉嶇被">-->
+<!-- <a-select-->
+<!-- :value="queryParams.deviceCategory"-->
+<!-- mode="multiple"-->
+<!-- placeholder="璇烽�夋嫨璁惧绉嶇被"-->
+<!-- allow-clear-->
+<!-- :maxTagCount="1"-->
+<!-- @change="selectChange($event,'deviceCategory')"-->
+<!-- >-->
+<!-- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
+<!-- {{item.label}}-->
+<!-- </a-select-option>-->
+<!-- </a-select>-->
+<!-- </a-form-item>-->
+<!-- </a-col>-->
<a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绉嶇被">
+ <a-form-item label="璁惧绾у埆">
<a-select
- :value="queryParams.deviceCategory"
+ :value="queryParams.deviceLevel"
mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
+ placeholder="璇烽�夋嫨璁惧绾у埆"
allow-clear
:maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
+ @change="selectChange($event,'deviceLevel')"
>
- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
+ <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
{{item.label}}
</a-select-option>
</a-select>
@@ -72,31 +88,13 @@
</a-row>
<a-row :gutter="24" v-if="toggleSearchStatus">
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绾у埆">
- <a-select
- :value="queryParams.deviceLevel"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绾у埆"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceLevel')"
- >
- <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
- {{item.label}}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
+
<a-col :md="5" :sm="5" :xs="5">
<a-form-item label="閲嶈绋嬪害">
<a-select
- :value="queryParams.deviceImportanceLevel"
- mode="multiple"
+ v-model="queryParam.deviceImportanceLevel"
placeholder="璇烽�夋嫨璁惧閲嶈绋嬪害"
allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceImportanceLevel')"
>
<a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
:key="index">
@@ -155,6 +153,8 @@
</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
</th>
+ <th class="thgu dong7 name" rowspan="2" style="min-width: 120px; max-width: 120px;width: 120px;">璁惧鍨嬪彿
+ </th>
<!--<th rowspan="2">缁勫埆</th>-->
<template v-for="(tableHead, index) in tableHeads">
<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -197,10 +197,11 @@
{{item.equipmentName}}
</td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
+ <td class="tdgu6 kaitou">{{item.equipmentModel}}</td>
</template>
<template v-else>
- <td colspan="6" class="tdgu kaitou">{{item.level1}}</td>
+ <td colspan="7" class="tdgu kaitou">{{item.level1}}</td>
</template>
<template v-for="(tableHead, index) in item.dataList">
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">
@@ -252,14 +253,12 @@
equipmentTypeList: [],
driveTypeList: [],
device_level_list: [],
- device_category_list: [],
+ device_importance_level_list: [],
queryParam: {},
queryParams: {
equipmentType: [],
driveType: [],
deviceLevel: [],
- deviceCategory: [],
- deviceImportanceLevel: []
},
queryParamEquip: {},
queryParamPeople: {},
@@ -535,9 +534,11 @@
this.queryParam.equipmentId = ''
}
Object.keys(this.queryParams).forEach(item => {
- this.queryParam[item] = this.queryParams[item].join()
- // 姝ゅ涓轰繚璇佹帴鍙ｅ弬鏁颁笉澶氫綑锛屽彲鐪佺暐
- if (this.queryParams[item].length === 0) delete this.queryParam[item]
+ if (Array.isArray(this.queryParams[item])) {
+ this.queryParam[item] = this.queryParams[item].join()
+ // 姝ゅ涓轰繚璇佹帴鍙ｅ弬鏁颁笉澶氫綑锛屽彲鐪佺暐
+ if (this.queryParams[item].length === 0) delete this.queryParam[item]
+ }
})
this.loadData()
},
@@ -557,7 +558,6 @@
equipmentType: [],
driveType: [],
deviceLevel: [],
- deviceCategory: []
}
this.loadData()
},
@@ -686,6 +686,12 @@
z-index: 2;
}
+ .table tbody tr .tdgu6 {
+ position: sticky;
+ left: 512px;
+ z-index: 2;
+ }
+
.table2 thead tr .timeth,
.table2 thead tr .thgu {
position: sticky;
@@ -733,6 +739,11 @@
left: 412px;
}
+ .table2 thead .equipname .dong7 {
+ z-index: 5;
+ left: 512px;
+ }
+
#EfficiencyPO {
overflow: hidden;
}
--
Gitblit v1.9.3