From a9f005e2af294c47d7cd1e4b6ed401bf65f5b080 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 04 三月 2025 16:44:09 +0800
Subject: [PATCH] art: 所有设备 台账 二保工单 根据设备id查询二保工单,并过滤掉已完成和已取消的二保工单

---
 src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue |   59 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 1a46371..a280450 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -43,17 +43,33 @@
                                 :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="5" :sm="5" :xs="5">
-              <a-form-item label="璁惧绉嶇被">
+              <a-form-item label="璁惧绾у埆">
                 <a-select
-                  :value="queryParams.deviceCategory"
+                  :value="queryParams.deviceLevel"
                   mode="multiple"
-                  placeholder="璇烽�夋嫨璁惧绉嶇被"
+                  placeholder="璇烽�夋嫨璁惧绾у埆"
                   allow-clear
                   :maxTagCount="1"
-                  @change="selectChange($event,'deviceCategory')"
+                  @change="selectChange($event,'deviceLevel')"
                 >
-                  <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_level_list" :value="item.value" :key="index">
                     {{item.label}}
                   </a-select-option>
                 </a-select>
@@ -72,22 +88,7 @@
           </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.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-form-item label="閲嶈绋嬪害">
                 <a-select
@@ -155,6 +156,8 @@
                 </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: 120px; max-width: 120px;width: 120px;">璁惧鍨嬪彿
+                </th>
                 <!--<th rowspan="2">缁勫埆</th>-->
                 <template v-for="(tableHead, index) in tableHeads">
                   <th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -197,10 +200,11 @@
                     {{item.equipmentName}}
                   </td>
                   <td class="tdgu5 kaitou">{{item.equipmentType}}</td>
+                  <td class="tdgu6 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">
                   <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">
@@ -686,6 +690,12 @@
     z-index: 2;
   }
 
+  .table tbody tr .tdgu6 {
+    position: sticky;
+    left: 512px;
+    z-index: 2;
+  }
+
   .table2 thead tr .timeth,
   .table2 thead tr .thgu {
     position: sticky;
@@ -733,6 +743,11 @@
     left: 412px;
   }
 
+  .table2 thead .equipname .dong7 {
+    z-index: 5;
+    left: 512px;
+  }
+
   #EfficiencyPO {
     overflow: hidden;
   }

--
Gitblit v1.9.3