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/efficiencyShiftReport/EfficiencyShiftList.vue | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 85f3870..3d09bf0 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -16,7 +16,7 @@
:maxTagCount="1"
@change="selectChange($event,'equipmentType')"
>
- <a-select-option v-for="item in equipmentTypeList" :value="item.value">
+ <a-select-option v-for="(item,index) in equipmentTypeList" :value="item.value" :key="index">
{{item.label}}
</a-select-option>
</a-select>
@@ -32,7 +32,7 @@
:maxTagCount="1"
@change="selectChange($event,'driveType')"
>
- <a-select-option v-for="item in driveTypeList" :value="item.value">
+ <a-select-option v-for="(item,index) in driveTypeList" :value="item.value" :key="index">
{{item.label}}
</a-select-option>
</a-select>
@@ -77,6 +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
@@ -87,23 +103,24 @@
:maxTagCount="1"
@change="selectChange($event,'deviceLevel')"
>
- <a-select-option v-for="item in device_level_list" :value="item.value">
+ <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-form-item label="閲嶈绋嬪害">
<a-select
- :value="queryParams.deviceCategory"
+ :value="queryParams.deviceImportanceLevel"
mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
+ placeholder="璇烽�夋嫨璁惧閲嶈绋嬪害"
allow-clear
:maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
+ @change="selectChange($event,'deviceImportanceLevel')"
>
- <a-select-option v-for="item in device_category_list" :value="item.value">
+ <a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
+ :key="index">
{{item.label}}
</a-select-option>
</a-select>
@@ -141,6 +158,7 @@
</a-form>
</div>
</div>
+
<a-spin :spinning="spinning">
<div class="container" id="EfficiencyShift" style="margin-top: 20px;">
<div class="table2">
@@ -148,7 +166,9 @@
v-if="dataList.length>0">
<thead>
<tr class="thead fixed equipname">
- <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;height: 66px">鍏徃</th>
+ <th class="thgu dong1 name" rowspan="2"
+ style="min-width: 50px; max-width: 50px;width: 50px;height: 66px">鍏徃
+ </th>
<th class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">杞﹂棿</th>
<th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">宸ユ</th>
<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿
@@ -156,6 +176,8 @@
<th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О
</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
+ </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: 100px; max-width: 100px;width: 100px;">鐝</th>
<template v-for="(tableHead, index) in tableHeads">
@@ -199,6 +221,7 @@
{{item.equipmentName}}
</td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
+ <td class="tdgu5 kaitou">{{item.equipmentModel}}</td>
<td class="tdgu6 kaitou">{{item.shiftSubName}}</td>
</template>
@@ -207,7 +230,9 @@
</template>
<!--<td>{{item.tierType}}</td>-->
<template v-for="(tableHead, index) in item.dataList">
- <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">{{tableHead.utilizationRate | numFilter}}</td>
+ <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">
+ {{tableHead.utilizationRate | numFilter}}
+ </td>
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
{{tableHead.openLong | getFormattedTime}}
</td>
@@ -254,13 +279,15 @@
driveTypeList: [],
device_level_list: [],
device_category_list: [],
+ device_importance_level_list: [],
identifying: [],
queryParam: {},
queryParams: {
equipmentType: [],
driveType: [],
deviceLevel: [],
- deviceCategory: []
+ deviceCategory: [],
+ deviceImportanceLevel: []
},
queryParamEquip: {},
queryParamPeople: {},
@@ -305,6 +332,7 @@
this.getDriveTypeByApi()
this.initDictData('device_level')
this.initDictData('device_category')
+ this.initDictData('device_importance_level')
},
mounted() {
window.addEventListener('resize', this.handleWindowResize)
--
Gitblit v1.9.3