From 895591fc02d18c553fa1b93c1732967b2b787c08 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 06 五月 2023 13:06:04 +0800
Subject: [PATCH] 1.系统首页优化

---
 src/views/xtsy/index.vue |   60 +++++++++++++++++++-----------
 src/views/kb/zhkbc.vue   |   16 ++++----
 src/views/kb/zhkb.vue    |   16 ++++----
 3 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index eda59bb..88f0067 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -29,8 +29,8 @@
               <div class="circle" style="background-color: rgb(255 255 255)" />
               <div style="margin-left: 10px">鏈紑濮�</div>
 
-              <div class="circle" style="margin-left: 10px;background-color: blue;" />
-              <div style="margin-left: 10px">寮�宸�</div>
+              <!--              <div class="circle" style="margin-left: 10px;background-color: blue;" />-->
+              <!--              <div style="margin-left: 10px">寮�宸�</div>-->
 
               <div class="circleYellow" style="margin-left: 10px" />
               <div style="margin-left: 10px">鎵ц涓�</div>
@@ -95,13 +95,13 @@
                       class="kb_block03_02_content flex_c_c"
                     >
                       <div class="flex_c_c content01">
+                        <!--                        <div-->
+                        <!--                          v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"-->
+                        <!--                          class="circle"-->
+                        <!--                          style="background-color: blue;"-->
+                        <!--                        />-->
                         <div
-                          v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
-                          class="circle"
-                          style="background-color: blue;"
-                        />
-                        <div
-                          v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+                          v-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
                           class="circle"
                           style="background-color: rgb(255 255 255)"
                         />
diff --git a/src/views/kb/zhkbc.vue b/src/views/kb/zhkbc.vue
index 436f7e6..db6d63f 100644
--- a/src/views/kb/zhkbc.vue
+++ b/src/views/kb/zhkbc.vue
@@ -29,8 +29,8 @@
               <div class="circle" style="background-color: rgb(255 255 255)" />
               <div style="margin-left: 10px">鏈紑濮�</div>
 
-              <div class="circle" style="margin-left: 10px;background-color: blue;" />
-              <div style="margin-left: 10px">寮�宸�</div>
+              <!--              <div class="circle" style="margin-left: 10px;background-color: blue;" />-->
+              <!--              <div style="margin-left: 10px">寮�宸�</div>-->
 
               <div class="circleYellow" style="margin-left: 10px" />
               <div style="margin-left: 10px">鎵ц涓�</div>
@@ -91,13 +91,13 @@
                       class="kb_block03_02_content flex_c_c"
                     >
                       <div class="flex_c_c content01">
+                        <!--                        <div-->
+                        <!--                          v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"-->
+                        <!--                          class="circle"-->
+                        <!--                          style="background-color: blue;"-->
+                        <!--                        />-->
                         <div
-                          v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
-                          class="circle"
-                          style="background-color: blue;"
-                        />
-                        <div
-                          v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+                          v-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
                           class="circle"
                           style="background-color: rgb(255 255 255)"
                         />
diff --git a/src/views/xtsy/index.vue b/src/views/xtsy/index.vue
index 55dde80..bb38e4d 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -11,14 +11,18 @@
             <div class="top_card_content_flex">
               <div class="content" style="width: 84%">
                 <div class="content_title1">浠婃棩鐧诲綍</div>
-                <div class="content_end1" :style="{color:`rgb(${barTopColor01[0]})`}">1/409</div>
+                <div class="content_end1" :style="{color:`rgb(${barTopColor01[0]})`}">15/
+                  <countTo :start-val="0" :end-val="37" :duration="3000" />
+                </div>
               </div>
               <div id="barTop01" class="barTop" style="width: 100%;" />
               <div class="content" style="width: 84%">
                 <div class="content_title1">鏄ㄦ棩鐧诲綍</div>
-                <div class="content_end1">0/409</div>
+                <div class="content_end1">18/
+                  <countTo :start-val="0" :end-val="37" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop02" class="barTop" />
+              <div id="barTop02" class="barTop" style="width: 92%;" />
             </div>
           </div>
         </div>
@@ -29,14 +33,18 @@
             <div class="top_card_content_flex">
               <div class="content" style="width: 84%">
                 <div class="content_title1">浠婃棩娲昏穬</div>
-                <div class="content_end1" :style="{color:`rgb(${barTopColor02[0]})`}">0/409</div>
+                <div class="content_end1" :style="{color:`rgb(${barTopColor02[0]})`}">15/
+                  <countTo :start-val="0" :end-val="37" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop03" class="barTop" />
+              <div id="barTop03" class="barTop" style="width: 100%;" />
               <div class="content" style="width: 84%">
                 <div class="content_title1">鏄ㄦ棩娲昏穬</div>
-                <div class="content_end1">0/409</div>
+                <div class="content_end1">18/
+                  <countTo :start-val="0" :end-val="37" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop04" class="barTop" />
+              <div id="barTop04" class="barTop" style="width: 92%;" />
             </div>
           </div>
         </div>
@@ -47,14 +55,18 @@
             <div class="top_card_content_flex">
               <div class="content" style="width: 84%">
                 <div class="content_title1">浠婃棩娲昏穬</div>
-                <div class="content_end1" :style="{color:`rgb(${barTopColor03[0]})`}">0/409</div>
+                <div class="content_end1" :style="{color:`rgb(${barTopColor03[0]})`}">15/
+                  <countTo :start-val="0" :end-val="37" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop05" class="barTop" />
+              <div id="barTop05" class="barTop" style="width:100%;" />
               <div class="content" style="width: 84%">
                 <div class="content_title1">鏄ㄦ棩娲昏穬</div>
-                <div class="content_end1">0/409</div>
+                <div class="content_end1">18/
+                  <countTo :start-val="0" :end-val="37" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop06" class="barTop" />
+              <div id="barTop06" class="barTop" style="width: 92%;" />
             </div>
           </div>
         </div>
@@ -65,14 +77,18 @@
             <div class="top_card_content_flex">
               <div class="content" style="width: 84%">
                 <div class="content_title1">浠婃棩娲昏穬</div>
-                <div class="content_end1" :style="{color:`rgb(${barTopColor04[0]})`}">0/409</div>
+                <div class="content_end1" :style="{color:`rgb(${barTopColor04[0]})`}">0/
+                  <countTo :start-val="0" :end-val="37" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop07" class="barTop" />
+              <div id="barTop07" class="barTop" style="width: 92%;" />
               <div class="content" style="width: 84%">
                 <div class="content_title1">鏄ㄦ棩娲昏穬</div>
-                <div class="content_end1">0/409</div>
+                <div class="content_end1">0/
+                  <countTo :start-val="0" :end-val="37" :duration="3000" />
+                </div>
               </div>
-              <div id="barTop08" class="barTop" />
+              <div id="barTop08" class="barTop" style="width: 92%;" />
             </div>
           </div>
         </div>
@@ -116,7 +132,7 @@
       mainHeight: 0,
       tableHeight: 0,
       barTopColor01: ['42,197,137', '187,236,218'],
-      barTopColor02: ['248,216,76', '255,250,238'],
+      barTopColor02: ['248,216,76', '255,250,188'],
       barTopColor03: ['42,197,137', '187,236,218'],
       barTopColor04: ['232,103,103', '253,240,240']
     }
@@ -149,12 +165,12 @@
       this.getLine01()
     },
     getTopData() {
-      loadEcharts('barTop01', barTop(1, this.barTopColor01))
-      loadEcharts('barTop02', barTop(0, this.barTopColor01))
-      loadEcharts('barTop03', barTop(0, this.barTopColor02))
-      loadEcharts('barTop04', barTop(0, this.barTopColor02))
-      loadEcharts('barTop05', barTop(0, this.barTopColor03))
-      loadEcharts('barTop06', barTop(0, this.barTopColor03))
+      loadEcharts('barTop01', barTop(15, this.barTopColor01))
+      loadEcharts('barTop02', barTop(18, this.barTopColor01))
+      loadEcharts('barTop03', barTop(15, this.barTopColor02))
+      loadEcharts('barTop04', barTop(18, this.barTopColor02))
+      loadEcharts('barTop05', barTop(15, this.barTopColor03))
+      loadEcharts('barTop06', barTop(18, this.barTopColor03))
       loadEcharts('barTop07', barTop(0, this.barTopColor04))
       loadEcharts('barTop08', barTop(0, this.barTopColor04))
     },

--
Gitblit v1.9.3