From 98f931ed649b1bf3e92e8e2c2e67ae1087ee220a Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 24 十月 2024 15:44:13 +0800
Subject: [PATCH] 设备综合效率分析页面新增班次和组别字段,查询区域班次增加筛选条件“全部”

---
 src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index 3824b64..cf1f614 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -15,6 +15,7 @@
               <a-col :md="4" :sm="4" :xs="4">
                 <a-form-item label="鐝">
                   <a-select v-model="queryParam.shiftSubId" placeholder="璇烽�夋嫨鐝" allow-clear>
+                    <a-select-option key="" value="">鍏ㄩ儴</a-select-option>
                     <a-select-option key="01" value="01">鏃╃彮</a-select-option>
                     <a-select-option key="02" value="02">涓彮</a-select-option>
                     <a-select-option key="03" value="03">鏅氱彮</a-select-option>
@@ -55,7 +56,11 @@
                 </th>
                 <th class="thgu dong2 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О
                 </th>
-                <th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
+                <th class="thgu dong3 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">缁勫埆
+                </th>
+                <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
+                </th>
+                <th class="thgu dong5 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">鐝
                 </th>
                 <template v-for="(tableHead, index) in tableHeads">
                   <th class="timeth">{{tableHead}}</th>
@@ -74,7 +79,11 @@
                 <td class="tdgu2  kaitou" style="min-width: 162px; max-width: 162px;width: 162px;">
                   {{item.equipmentName}}
                 </td>
-                <td class="tdgu3  kaitou">{{item.equipmentType}}</td>
+                <td class="tdgu3  kaitou" style="min-width: 162px; max-width: 162px;width: 162px;">
+                  {{item.clazz}}
+                </td>
+                <td class="tdgu4  kaitou">{{item.equipmentType}}</td>
+                <td class="tdgu5  kaitou">{{item.shiftSubName}}</td>
 
                 <template v-for="(tableHead, index) in item.dataList">
                   <td :style="{background:tableHead.color }">
@@ -442,6 +451,18 @@
     z-index: 2;
   }
 
+  .table tbody tr .tdgu4 {
+    position: sticky;
+    left: 424px;
+    z-index: 2;
+  }
+
+  .table tbody tr .tdgu5 {
+    position: sticky;
+    left: 524px;
+    z-index: 2;
+  }
+
   .table2 thead tr .timeth,
   .table2 thead tr .thgu {
     position: sticky;
@@ -474,6 +495,16 @@
     left: 262px;
   }
 
+  .table2 thead .equipname .dong4 {
+    z-index: 5;
+    left: 424px;
+  }
+
+  .table2 thead .equipname .dong5 {
+    z-index: 5;
+    left: 524px;
+  }
+
   #EfficiencyShift {
     overflow: hidden;
   }

--
Gitblit v1.9.3