From 1a74c4ab9c4f1fff15e85e57743f6967c4898b91 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 23 八月 2023 16:23:46 +0800
Subject: [PATCH] 大屏适配

---
 screen_standard/src/views/process.vue |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index 9394242..3ac67d4 100644
--- a/screen_standard/src/views/process.vue
+++ b/screen_standard/src/views/process.vue
@@ -23,7 +23,7 @@
                 <div class="scroll_item_row">{{ item.qualifiedNum }}</div>
                 <div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
                 <div class="scroll_item_row">{{ item.undoneNum }}</div>
-                <div class="scroll_item_row">{{ item.unqualifiedRate }}%</div>
+                <div class="scroll_item_row">{{ (item.unqualifiedRate||0).toFixed(2) }}%</div>
               </div>
             </div>
           </div>
@@ -40,10 +40,10 @@
                   <span>{{ item.userName }}</span>
                 </div>
                 <div class="content_left_item1_content_row_line">
-                  <el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
+                  <el-progress :show-text="false" :percentage="(item.doneNum||0) / baseNum * 100">
                   </el-progress>
                 </div>
-                <div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
+                <div class="content_left_item1_content_row_num">{{ item.doneNum||0 }}</div>
               </div>
             </div>
           </div>
@@ -86,10 +86,10 @@
                 <div class="scroll_item_row">{{ item.userName }}</div>
                 <div class="scroll_item_row">{{ item.materialName }}</div>
                 <div class="scroll_item_row">{{ item.materialCode }}</div>
-                <div class="scroll_item_row" style="flex: 1.5;">{{ item.createTime }}</div>
+                <div class="scroll_item_row">{{ dateToSub(item.createTime) }}</div>
                 <div class="scroll_item_row">{{ item.qualifiedNum }}</div>
                 <div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
-                <div class="scroll_item_row">{{ item.unqualifiedRate }}%</div>
+                <div class="scroll_item_row">{{ (item.unqualifiedRate||0).toFixed(2) }}%</div>
               </div>
             </div>
           </div>
@@ -117,6 +117,7 @@
 import { getProcedurePlanData, getTop, getProcedurePlansList, getRecordLogPage, getUnqualified7DayData, getUnqualifiedCateData } from '@/utils/api.js'
 import { useCounterStore } from '@/stores/counter.js'
 import { useRoute } from 'vue-router'
+import { dateToSub } from '@/utils'
 import * as echarts from 'echarts'
 const route = useRoute()
 const enterprise = useCounterStore()
@@ -242,12 +243,13 @@
 }
 function ListScroll() {
   let scrollDom = planContainer.value
+  if (!scrollDom) return
   // 鍒よ缁勪欢鏄惁娓叉煋瀹屾垚
   if (scrollDom.offsetHeight == 0) {
     scrollDom = planContainer.value
   } else {
     // 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
-    if (scrollDom.children.length <= 10) {
+    if (scrollDom.children.length < 10) {
       clearTimeout(planTimer.value)
       return
     }
@@ -275,12 +277,13 @@
 }
 function reportScroll() {
   let scrollDom = reportLogContainer.value
+  if (!scrollDom) return
   // 鍒よ缁勪欢鏄惁娓叉煋瀹屾垚
   if (scrollDom.offsetHeight == 0) {
     scrollDom = reportLogContainer.value
   } else {
     // 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
-    if (scrollDom.children.length <= 10) {
+    if (scrollDom.children.length < 10) {
       clearTimeout(reportTimer.value)
       return
     }
@@ -428,13 +431,16 @@
           show: false
         },
         label: {
-          formatter: '{dot| } {title|{b} {c}}\n\n{per|{d}%}',
+          formatter: '{dot| } {title|{b} {c}}\n{per|{d}%}',
           rich: {
             title: {
-              color: '#fff'
+              color: '#fff',
+              lineHeight: 13,
+              fontSize: 10
             },
             per: {
-              color: '#01D9FE'
+              color: '#01D9FE',
+              fontSize: 10
             },
             dot: {
               backgroundColor: 'inherit',
@@ -470,6 +476,7 @@
 <style lang="scss" scoped>
 .proccess-content {
   display: flex;
+  flex: 1;
   .header-title {
     background-image: url('@/assets/img/gongxu_title@2x.png');
     height: 28px;
@@ -488,7 +495,7 @@
     flex: 1;
     margin-right: 20px;
     .proccess-plan {
-      height: 460px;
+      height: 424px;
       background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
       margin-bottom: 20px;
     }
@@ -594,7 +601,7 @@
     flex: 1;
 
     .report-log {
-      height: 460px;
+      height: 424px;
       background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
       margin-bottom: 20px;
     }

--
Gitblit v1.9.3