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/efficiencyShiftReport/EfficiencyShiftList.vue |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 59a6f7e..44422dc 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -78,6 +78,22 @@
 
             <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.deviceLevel"
@@ -94,16 +110,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>
@@ -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;">璁惧缂栧彿
@@ -207,7 +227,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 +276,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 +329,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