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/efficiencyShiftReport/EfficiencyShiftList.vue | 46 +++++++++++++++++++---------------------------
1 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 58abebf..d8fabe4 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -77,22 +77,22 @@
</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.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-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-select
@@ -112,12 +112,9 @@
<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">
@@ -278,16 +275,13 @@
equipmentTypeList: [],
driveTypeList: [],
device_level_list: [],
- device_category_list: [],
device_importance_level_list: [],
identifying: [],
queryParam: {},
queryParams: {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: [],
- deviceImportanceLevel: []
+ deviceLevel: []
},
queryParamEquip: {},
queryParamPeople: {},
@@ -616,8 +610,7 @@
this.queryParams = {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: []
+ deviceLevel: []
}
this.loadData()
// this.onClearSelected()
@@ -810,7 +803,6 @@
z-index: 6;
left: 632px;
}
-
#EfficiencyShift {
overflow: hidden;
--
Gitblit v1.9.3