From 73b4af8accf59b71bf7e5856cfe40d45a3e3e84e Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 27 九月 2024 16:26:52 +0800
Subject: [PATCH] 1、设备综合效率分析页面新增百分比筛选查询 2、新增OEE统计页面并完成相应功能
---
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue | 96 ++++++++++++++++++++++++++++++------------------
1 files changed, 60 insertions(+), 36 deletions(-)
diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index caa5613..760f961 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -5,7 +5,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="5" :sm="5" :xs="5">
+ <a-col :md="6" :sm="6" :xs="6">
<a-form-item label="璁惧绫诲瀷">
<a-select
:value="queryParams.equipmentType"
@@ -49,22 +49,22 @@
/>
</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-->
+ <!-- :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
@@ -96,22 +96,22 @@
<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-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-col :md="6" :sm="6" :xs="6">
<a-form-item label="閲嶈绋嬪害">
<a-select
:value="queryParams.deviceImportanceLevel"
@@ -122,6 +122,24 @@
@change="selectChange($event,'deviceImportanceLevel')"
>
<a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
+ :key="index">
+ {{item.label}}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+
+ <a-col :md="6" :sm="6" :xs="6">
+ <a-form-item label="鐧惧垎姣旂瓫閫�">
+ <a-select
+ :value="queryParams.percentageLevel"
+ mode="multiple"
+ placeholder="璇烽�夋嫨鐧惧垎姣旂瓫閫�"
+ allow-clear
+ :maxTagCount="1"
+ @change="selectChange($event,'percentageLevel')"
+ >
+ <a-select-option v-for="(item,index) in percentage_level_list" :value="item.value"
:key="index">
{{item.label}}
</a-select-option>
@@ -197,7 +215,8 @@
driveType: [],
deviceLevel: [],
deviceCategory: [],
- deviceImportanceLevel: []
+ deviceImportanceLevel: [],
+ percentageLevel: []
},
queryParamEquip: {},
queryParamPeople: {},
@@ -398,6 +417,7 @@
equipmentTypeList: [],
device_level_list: [],
device_category_list: [],
+ percentage_level_list: [],
scrollY: 465,
tableLoading: false,
toggleSearchStatus: false
@@ -422,6 +442,7 @@
this.initDictData('device_level')
this.initDictData('device_category')
this.initDictData('device_importance_level')
+ this.initDictData('percentage_level')
},
mounted() {
window.addEventListener('resize', this.handleWindowResize)
@@ -516,9 +537,12 @@
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]
+ console.log('this.queryParam', this.queryParam)
+ }
})
this.loadData()
},
--
Gitblit v1.9.3