From 007cc0e8e7cb7cdc4403c5b99b1bb551060e3017 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 31 八月 2023 16:41:20 +0800
Subject: [PATCH] 报表界面的显示调整,OEE管理的各个界面的导入模板,设备监控界面的设备信息的展示,加班管理界面的绘制

---
 src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 63ed876..d1b619d 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -67,9 +67,9 @@
           <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap">
             <thead>
             <tr class="thead fixed equipname">
-              <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
-              <th  class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
-              <th  class="thgu dong3 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
+              <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></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;">璁惧缂栧彿</th>
               <th class="thgu dong5 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧鍚嶇О</th>
               <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷</th>
@@ -101,9 +101,9 @@
             </thead>
             <tbody>
             <tr class="mathData" v-for="(item, index) in dataList">
-              <td  class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}"  v-show="!item.level1dis">{{item.level1}}</td>
-              <td  class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}"  v-show="!item.level2dis">{{item.level2}}</td>
-              <td  class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}"  v-show="!item.level3dis">{{item.level3}}</td>
+              <td  class="tdgu kaitou wenzi" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}"  v-show="!item.level1dis">{{item.level1}}</td>
+              <td  class="tdgu1 kaitou wenzi" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}"  v-show="!item.level2dis">{{item.level2}}</td>
+              <td  class="tdgu2 kaitou wenzi" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}"  v-show="!item.level3dis">{{item.level3}}</td>
               <td class="tdgu3  kaitou">{{item.equipmentId}}</td>
               <td class="tdgu4  kaitou">{{item.equipmentName}}</td>
               <td class="tdgu5  kaitou">{{item.equipmentType}}</td>
@@ -472,38 +472,43 @@
     left: 0;
     z-index: 1;
   }
+  .table tbody tr .wenzi{
+    writing-mode: vertical-lr;
+    text-orientation: upright;
+    letter-spacing: 2px;
+  }
   .table tbody tr .kaitou{
     z-index: 1;
     background-color: white;
   }
   .table tbody tr .tdgu1{
     position: sticky;
-    left: 150px;
+    left: 50px;
     z-index: 2;
   }
   .table tbody tr .tdgu2{
     position: sticky;
-    left: 300px;
+    left: 100px;
     z-index: 2;
   }
   .table tbody tr .tdgu3{
     position: sticky;
-    left: 450px;
+    left: 150px;
     z-index: 2;
   }
   .table tbody tr .tdgu4{
     position: sticky;
-    left: 550px;
+    left: 250px;
     z-index: 2;
   }
   .table tbody tr .tdgu5{
     position: sticky;
-    left: 700px;
+    left: 400px;
     z-index: 2;
   }
   .table tbody tr .tdgu6{
     position: sticky;
-    left: 800px;
+    left: 500px;
     z-index: 2;
   }
 
@@ -528,27 +533,27 @@
   }
   .table2 thead .equipname .dong2{
     z-index: 5;
-    left: 150px;
+    left: 50px;
   }
   .table2 thead .equipname .dong3{
     z-index: 5;
-    left: 300px;
+    left: 100px;
   }
   .table2 thead .equipname .dong4{
     z-index: 5;
-    left: 450px;
+    left: 150px;
   }
   .table2 thead .equipname .dong5{
     z-index: 5;
-    left: 550px;
+    left: 250px;
   }
   .table2 thead .equipname .dong6{
     z-index: 5;
-    left: 700px;
+    left: 400px;
   }
   .table2 thead .equipname .dong7{
     z-index: 6;
-    left: 800px;
+    left: 500px;
   }
 
   @media screen and (min-width: 1920px){
@@ -591,7 +596,7 @@
   .dataContent {
     white-space: nowrap;
     /*margin: 0;*/
-    border: none;
+    /*border: none;*/
     border-collapse: separate;
     border-spacing: 0;
     /*table-layout: fixed;*/
@@ -619,9 +624,9 @@
     width: auto;
   }
 
-  .dataContent tr td {
-    height: 35px
-  }
+  /*.dataContent tr td {*/
+    /*height: 35px*/
+  /*}*/
 
   .dataContent .mathData td {
     padding: 10px;

--
Gitblit v1.9.3