From ca73a173f008c8d7a9d700bad897ca24fe2d2203 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 十月 2023 09:29:57 +0800
Subject: [PATCH] 111

---
 screen_standard/src/views/process.vue |   43 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index c44e935..39e7975 100644
--- a/screen_standard/src/views/process.vue
+++ b/screen_standard/src/views/process.vue
@@ -113,7 +113,7 @@
 </template>
 
 <script setup>
-import { reactive, ref, toRefs, onMounted, onUnmounted } from 'vue'
+import { reactive, ref, toRefs, onMounted, onUnmounted, nextTick } from 'vue'
 import { getProcedurePlanData, getTop, getProcedurePlansList, getRecordLogPage, getUnqualified7DayData, getUnqualifiedCateData } from '@/utils/api.js'
 import { useCounterStore } from '@/stores/counter.js'
 import { useRoute } from 'vue-router'
@@ -148,8 +148,11 @@
 
 onMounted(() => {
   window.addEventListener('resize', () => {
-    setDayChart()
-    setTypeChart()
+    console.log('resize');
+    nextTick(() => {
+      setDayChart()
+      setTypeChart()
+    })
   })
   initData()
   scrollTimer.value = setInterval(() => {
@@ -248,8 +251,12 @@
       data.planScroll = false
       return
     }
+    // scrollTop鎸囩殑鏄�滃厓绱犱腑鐨勫唴瀹光�濊秴鍑衡�滃厓绱犱笂杈圭晫鈥濈殑閭ｉ儴鍒嗙殑楂樺害
+    // scrollHeight鎸囨暣涓厓绱犵殑楂樺害锛屼笌鍏冪礌鏈韩鏈夊叧锛屾槸鍏冪礌鏈韩鐨勯珮搴︿笌浣犳墍璁剧疆鐨剆tyle灞炴�х浉鍔犵殑缁撴灉锛屼絾涓巓verflow:hidden绛夊睘鎬ф棤鍏筹紝涓庢槸鍚﹀湪鍙鑼冨洿鍐呮棤鍏�
+    // clientHeight鍚箟锛氬厓绱犵殑鍍忕礌楂樺害锛屽寘鍚厓绱犵殑楂樺害+鍐呰竟璺濓紝涓嶅寘鍚按骞虫粴鍔ㄦ潯锛岃竟妗嗗拰澶栬竟璺�
     // 缁勪欢杩涜婊氬姩
     scrollDom.scrollTop += 2 
+    console.log(scrollDom.scrollTop);
     // 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
     if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
       // 鑾峰彇缁勪欢绗竴涓妭鐐�
@@ -273,14 +280,15 @@
     scrollDom = reportLogContainer.value
   } else {
     // 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
-    if (scrollDom.children.length < 10) {
+    if (scrollDom.children.length <= 10) {
       data.reportScroll = false
       return
     }
     // 缁勪欢杩涜婊氬姩
-    scrollDom.scrollTop += 2
+    scrollDom.scrollTop += 1
+    console.log(scrollDom.scrollTop);
     // 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
-    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
+    if (scrollDom.scrollTop && scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
       // 鑾峰彇缁勪欢绗竴涓妭鐐�
       let first = scrollDom.children[0]
       // 鍒犻櫎鑺傜偣
@@ -303,7 +311,6 @@
     dateList.push(item.createTime)
     numList.push(item.unqualifiedNum || 0)
   })
-  console.log(data.allBad);
   let option;
   option = {
     title: {
@@ -313,6 +320,10 @@
         fontSize: 12
       }
     },
+    grid: {
+      top: 40,
+      bottom: 40
+    },
     xAxis: {
       type: 'category',
       boundaryGap: false,
@@ -320,6 +331,15 @@
         lineStyle: {
           width: 0.5,
           color: ['#fff']
+        }
+      },
+      axisLine: {
+        show: true,
+        onZero: true,
+        lineStyle: {
+          width: 1,
+          color: '#fff',
+          opacity: .5
         }
       },
       axisLabel: {
@@ -338,6 +358,15 @@
           color: ['#fff']
         }
       },
+      axisLine: {
+        show: true,
+        onZero: true,
+        lineStyle: {
+          width: 1,
+          color: '#fff',
+          opacity: .5
+        }
+      },
       axisLabel: {
         textStyle: {
           color: '#fff'

--
Gitblit v1.9.3