From e2dde7449df00d3260b3fc721dd229ea47596f56 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 16 七月 2024 10:31:47 +0800
Subject: [PATCH] 小修改

---
 src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue |   47 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index c25e547..acb9a04 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -15,7 +15,7 @@
                   :maxTagCount="1"
                   @change="selectChange($event,'equipmentType')"
                 >
-                  <a-select-option v-for="item in equipmentTypeList" :value="item.value">
+                  <a-select-option v-for="(item,index) in equipmentTypeList" :value="item.value" :key="index">
                     {{item.label}}
                   </a-select-option>
                 </a-select>
@@ -31,7 +31,7 @@
                   :maxTagCount="1"
                   @change="selectChange($event,'driveType')"
                 >
-                  <a-select-option v-for="item in driveTypeList" :value="item.value">
+                  <a-select-option v-for="(item,index) in driveTypeList" :value="item.value" :key="index">
                     {{item.label}}
                   </a-select-option>
                 </a-select>
@@ -47,7 +47,7 @@
                   :maxTagCount="1"
                   @change="selectChange($event,'deviceLevel')"
                 >
-                  <a-select-option v-for="item in device_level_list" :value="item.value">
+                  <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                     {{item.label}}
                   </a-select-option>
                 </a-select>
@@ -63,7 +63,7 @@
                   :maxTagCount="1"
                   @change="selectChange($event,'deviceCategory')"
                 >
-                  <a-select-option v-for="item in device_category_list" :value="item.value">
+                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
                     {{item.label}}
                   </a-select-option>
                 </a-select>
@@ -101,7 +101,7 @@
       </div>
     </div>
 
-    <div id="EfficiencyShift" style="flex:1;overflow: hidden">
+    <div id="EfficiencyShift" style="flex:1;overflow: hidden;height: inherit">
       <a-table :columns="columns" rowKey="id" :dataSource="dataSource.records" :loading="tableLoading"
                :pagination="false" :scroll="{x:'max-content',y:scrollY}" bordered></a-table>
     </div>
@@ -189,9 +189,8 @@
           {
             title: '鐝',
             align: 'center',
-            width: 100,
-            dataIndex: 'shift',
-            ellipsis: true
+            width: 300,
+            dataIndex: 'shift'
           },
           {
             title: '姣忕彮灏忔椂',
@@ -363,7 +362,7 @@
     },
     mounted() {
       window.addEventListener('resize', this.handleWindowResize)
-      this.handleWindowResize()
+      // this.handleWindowResize()
     },
     beforeDestroy() {
       window.removeEventListener('resize', this.handleWindowResize)
@@ -515,6 +514,7 @@
           })
           .finally(() => {
             this.tableLoading = false
+            this.handleWindowResize()
           })
       },
 
@@ -543,16 +543,31 @@
        */
       handleWindowResize() {
         const devicePixelRatio = window.devicePixelRatio // 娴忚鍣ㄧ缉鏀炬瘮
+        console.log('devicePixelRatio', devicePixelRatio)
         if (devicePixelRatio < 1) return // 缂╂斁姣斿皬浜�1鏃朵笉杩涜楂樺害閲嶆柊璁剧疆锛屽洜涓簊crollY鍙樺ぇ鍚庤〃鏍艰秴鍑洪儴鍒嗕細琚殣钘忓鑷存粴鍔ㄦ潯涓嶅彲瑙�
-        const clientHeight = document.body.clientHeight // 娴忚鍣ㄥ彲瑙嗗尯鍩熼珮搴�
+        const clientHeight = document.body.clientHeight || document.documentElement.clientHeight// 娴忚鍣ㄥ彲瑙嗗尯鍩熼珮搴�
+        console.log('clientHeight', clientHeight)
         const containerTopToClientTopHeight = document.getElementById('EfficiencyShift').getBoundingClientRect().top // 琛ㄦ牸瀹瑰櫒椤堕儴鍒版祻瑙堝櫒鍙鍖哄煙椤堕儴鐨勯棿璺�
-        const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0, -2) // 琛ㄦ牸琛ㄥご楂樺害
-        this.scrollY = clientHeight - containerTopToClientTopHeight - tableHeadHeight  // 琛ㄦ牸鍨傜洿婊氬姩鏉￠珮搴�
+        console.log('containerTopToClientTopHeight', containerTopToClientTopHeight)
+        // const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0, -2) // 琛ㄦ牸琛ㄥご楂樺害
+        const tableHeadHeight = document.querySelector('.ant-table-thead th').offsetHeight // 琛ㄦ牸琛ㄥご楂樺害
+        console.log('tableHeadHeight', tableHeadHeight)
+        // this.scrollY = clientHeight - containerTopToClientTopHeight - tableHeadHeight
+        const tableSuitableScrollY = clientHeight - containerTopToClientTopHeight - tableHeadHeight // 琛ㄦ牸鍨傜洿婊氬姩鏉″悎閫傞珮搴︼紙琛ㄦ牸姘村钩婊氬姩鏉″垰濂藉湪鍙鍖哄煙鏈�涓嬫柟锛�
+        // const tableSuitableScrollY = 600
+        console.log('tableSuitableScrollY', tableSuitableScrollY)
+        const tableContainerHeight = document.getElementById('EfficiencyShift').offsetHeight
+        console.log('tableContainerHeight', tableContainerHeight)
+        const tableMaxScrollY = tableContainerHeight - tableHeadHeight // 琛ㄦ牸鍨傜洿婊氬姩鏉℃渶澶ч珮搴︼紙鑻ヨ秴鍑哄垯姘村钩婊氬姩鏉¤閬尅锛�
+        console.log('tableMaxScrollY', tableMaxScrollY)
+        if (tableSuitableScrollY && tableSuitableScrollY < tableMaxScrollY) this.scrollY = tableSuitableScrollY
+        else this.scrollY = tableMaxScrollY
+        console.log('scrollY', this.scrollY)
       }
     }
   }
 </script>
-<style scoped>
+<style scoped lang="less">
   .pagination {
     display: flex;
     justify-content: end;
@@ -595,4 +610,10 @@
     }
   }
 
+  /deep/ .ant-table-body {
+    &::-webkit-scrollbar {
+      height: 12px;
+    }
+  }
+
 </style>
\ No newline at end of file

--
Gitblit v1.9.3