From 65a5e8c7ec6d6eab78b76c5831eaf40c30e23c61 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 13 九月 2024 14:56:50 +0800
Subject: [PATCH] 1、设备管理页面设备种类字段改成重要程度字段；新增设备异常状态字段，若表格记录的设备状态不为正常时，则标红此表格记录 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析新增按照重要程度字段查询表格数据；左侧树数据新增参数key，用来过滤异常状态设备 3、设备利用率页面新增设备型号字段
---
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index 26b51b7..2bc960a 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -22,7 +22,7 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="5" :sm="5">
+ <a-col :md="6" :sm="6">
<a-form-item label="椹卞姩绫诲瀷">
<a-select
:value="queryParams.driveType"
@@ -38,12 +38,41 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="4" :sm="4">
+ <a-col :md="6" :sm="6">
<a-form-item label="鏃堕棿">
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
v-model="dates" :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="2" :sm="2">
+ <a
+ @click="toggleSearchStatus=!toggleSearchStatus"
+ @selectstart="$event.preventDefault()"
+ style="display: inline-block;height: 32px;line-height: 32px"
+ >
+ {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+ </a>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24" v-if="toggleSearchStatus">
<a-col :md="5" :sm="5" :xs="5">
<a-form-item label="璁惧绾у埆">
<a-select
@@ -61,16 +90,17 @@
</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,index) in device_category_list" :value="item.value" :key="index">
+ <a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
+ :key="index">
{{item.label}}
</a-select-option>
</a-select>
@@ -129,6 +159,8 @@
</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 rowspan="2">缁勫埆</th>-->
<template v-for="(tableHead, index) in tableHeads">
<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -173,11 +205,12 @@
{{item.equipmentName}}
</td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
+ <td class="tdgu5 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">
@@ -185,7 +218,7 @@
{{tableHead.utilizationRate | numFilter}}
</td>
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
- {{tableHead.openRate | numFilter}}
+ {{tableHead.openRate | n umFilter}}
</td>
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
{{tableHead.openLong | getFormattedTime}}
@@ -243,7 +276,8 @@
equipmentType: [],
driveType: [],
deviceLevel: [],
- deviceCategory: []
+ deviceCategory: [],
+ deviceImportanceLevel: []
},
queryParamEquip: {},
queryParamPeople: {},
@@ -270,7 +304,8 @@
processLongRowAverage: '',
waitLongRowAverage: '',
closeLongRowAverage: '',
- spinning: false
+ spinning: false,
+ toggleSearchStatus: false
}
},
props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -285,6 +320,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