From 4992231ce5c601588ae865c185844ca70b930780 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 30 May 2023 10:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/modules/homepage/one.vue |  7 +++--
 src/pages/modules/homepage/two.vue | 50 ++++++++++++++----------------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index 533a60e..00de183 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -104,7 +104,8 @@ export default {
   },
   data () {
     return {
-      finishRate: 80,
+      finishRate1: 80,
+      finishRate2: 90,
       arrL2: [{date: '碾机1', elbow_qty: '15'}, {date: '碾机2', elbow_qty: '25'}, {date: '碾机3', elbow_qty: '8'}],
       echartData1: [{data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}, {data1: '10', data2: '15', data3: '9', data4: '5', device: '盘管双斜切'}],
       myCharts01: '',
@@ -823,7 +824,7 @@ export default {
       })
     },
     setEchart01 () {
-      let value = Number(this.finishRate)
+      let value = Number(this.finishRate1)
       let title = '%'
       let text = '完成率'
       let option = {
@@ -910,7 +911,7 @@ export default {
       }
     },
     setEchart02 () {
-      let value = Number(this.finishRate)
+      let value = Number(this.finishRate2)
       let title = '%'
       let text = '完成率'
       let option = {
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index 0b479c6..1553355 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -8,11 +8,11 @@
                 <div class="box1">
                   <div class="item_wrap">
                     <div class="item_tip">
-                      <div class="item_tip_left">混料</div>
+                      <div class="item_tip_left">包装</div>
                     </div>
                     <div class="item_content_3">
                       <div class="right_1_up">
-                        <div class="item_title fl">混料</div>
+                        <div class="item_title fl">包装</div>
                         <div class="right_1_up_left">
                           <div class="echart_d3_wrap">
                             <div id="echart_d01" style="width: 100%; height: 100%"></div>
@@ -33,11 +33,11 @@
                   </div>
                   <div class="item_wrap">
                     <div class="item_tip">
-                      <div class="item_tip_left">成型</div>
+                      <div class="item_tip_left">成品</div>
                     </div>
                     <div class="item_content_3">
                       <div class="right_1_up">
-                        <div class="item_title fl">成型</div>
+                        <div class="item_title fl">成品</div>
                         <div class="right_1_up_left" style="backgroundImage: none;">
                           <div class="echart_d3_wrap">
                             <div id="echart_d02" style="width: 130%; height: 130%"></div>
@@ -60,7 +60,7 @@
                 <div class="box2">
                   <div class="item_wrap">
                     <div class="item_tip">
-                      <div class="item_tip_left">当日混料生产</div>
+                      <div class="item_tip_left">当日包装生产</div>
                     </div>
                     <div class="item_content item_content_3">
                       <div id="echart_d03" style="width: 100%; height: 100%"></div>
@@ -68,7 +68,7 @@
                   </div>
                   <div class="item_wrap">
                     <div class="item_tip">
-                      <div class="item_tip_left">当日压制生产</div>
+                      <div class="item_tip_left">当日成品进出存</div>
                     </div>
                     <div class="item_content item_content_3">
                       <div id="echart_04" style="width: 100%; height: 100%"></div>
@@ -78,7 +78,7 @@
                 <div class="box2">
                   <div class="item_wrap">
                     <div class="item_tip">
-                      <div class="item_tip_left">本周混料生产</div>
+                      <div class="item_tip_left">本周包装生产</div>
                     </div>
                     <div class="item_content item_content_3">
                       <div id="echart_d05" style="width: 100%; height: 100%"></div>
@@ -86,7 +86,7 @@
                   </div>
                   <div class="item_wrap">
                     <div class="item_tip">
-                      <div class="item_tip_left">本周压制生产</div>
+                      <div class="item_tip_left">本周成品进出存</div>
                     </div>
                     <div class="item_content item_content_3">
                       <div id="echart_06" style="width: 100%; height: 100%"></div>
@@ -910,7 +910,7 @@ export default {
       }
     },
     setEchart02 () {
-      var color = ["#fb734e", "#e32f46", "#94d96c", "#0bbcb7", "#1a9bfc", "#7049f0"];
+      var color = ["#fb734e", "#e32f46", "#94d96c", "#0bbcb7", "#1a9bfc", "#7049f0", "#e2bb0e", "#B68845"];
       var dataStyle = {
         normal: {
           label: {
@@ -961,19 +961,17 @@ export default {
             color: "#fff"
           }
         },
-        legend: {
-          orient: "horizontal",
-          icon: 'circle',
-          position: 'top',
-          // left: "left",
-          // left: "-80",
-          top: "0",
-          itemGap: 12,
-          data: ["入库数", "出库数", "库存数", "04", "05", "06"],
-          textStyle: {
-            color: "#fff",
-          },
-        },
+        // legend: {
+        //   orient: "horizontal",
+        //   icon: 'circle',
+        //   position: 'top',
+        //   top: "0",
+        //   itemGap: 12,
+        //   data: ["入库数", "出库数", "库存数", "04", "05", "06"],
+        //   textStyle: {
+        //     color: "#fff",
+        //   },
+        // },
         series: [
           {
             name: "Line 1",
@@ -996,11 +994,11 @@ export default {
                     color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
                       {
                         offset: 0,
-                        color: color[0],
+                        color: color[4],
                       },
                       {
                         offset: 1,
-                        color: color[1],
+                        color: color[5],
                       },
                     ]),
                   },
@@ -1072,11 +1070,11 @@ export default {
                     color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
                       {
                         offset: 0,
-                        color: color[4],
+                        color: color[6],
                       },
                       {
                         offset: 1,
-                        color: color[5],
+                        color: color[7],
                       },
                     ]),
                   },