From 5b56db98d97064cbde66e5859309f889396c5afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 5 Dec 2023 11:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/data.json                   |  4 ++--
 src/views/board/foaming/index2.vue |  8 ++++----
 src/views/board/scanDown/index.vue | 25 +++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/public/data.json b/public/data.json
index 303e1fc..7c6cbe5 100644
--- a/public/data.json
+++ b/public/data.json
@@ -1296,7 +1296,7 @@
     ],
     "y": [
       {
-        "name": "目标产量",
+        "name": "实际产量",
         "data": [
           300,
           300,
@@ -1310,7 +1310,7 @@
         ]
       },
       {
-        "name": "实际产量",
+        "name": "目标产量",
         "data": [
           300,
           290,
diff --git a/src/views/board/foaming/index2.vue b/src/views/board/foaming/index2.vue
index 35681bc..6907e6d 100644
--- a/src/views/board/foaming/index2.vue
+++ b/src/views/board/foaming/index2.vue
@@ -754,7 +754,7 @@
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
       <div v-for="i in 10"
-        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color: '+ (i === 2 ? '#fff' : '#fff')+';text-align: center;background-color:' + (i === 2 ? '#8a8e9688' : '#1be40944')">
+        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color: '+ (i === 2 ? '#bed4ce' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#8a8e9688' : '#1be40944')">
         <div style="width: 33%;display: inline-block">{{ i }}</div>
         <div style="width: 33%;display: inline-block">487JFY</div>
         <div style="width: 33%;display: inline-block">15-15</div>
@@ -767,7 +767,7 @@
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
       <div v-for="i in 10"
-        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#fff' : '#fff')+';text-align: center;background-color:' + (i === 2 ? '#ff000088' : '#1be40944')">
+        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#ff5959' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#ff000088' : '#1be40944')">
         <div style="width: 33%;display: inline-block">{{ i }}</div>
         <div style="width: 33%;display: inline-block">487JFY</div>
         <div style="width: 33%;display: inline-block">15-15</div>
@@ -780,7 +780,7 @@
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
       <div v-for="i in 10"
-        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#fff' : '#fff')+';text-align: center;background-color:' + (i === 2 ? '#ff800088' : '#1be40944')">
+        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#ffb769' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#ff800088' : '#1be40944')">
         <div style="width: 33%;display: inline-block">{{ i }}</div>
         <div style="width: 33%;display: inline-block">487JFY</div>
         <div style="width: 33%;display: inline-block">15-15</div>
@@ -793,7 +793,7 @@
         <div style="width: 33%;display: inline-block">产量</div>
       </div>
       <div v-for="i in 10"
-        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#fff' : '#fff')+';text-align: center;background-color:' + (i === 2 ? '#8a8e9688' : '#1be40944')">
+        :style="'margin-bottom:2px;height: calc(9% - 2px);line-height:calc(2.6vh - 2px);color:'+ (i === 2 ? '#bed4ce' : '#1be409')+';text-align: center;background-color:' + (i === 2 ? '#8a8e9688' : '#1be40944')">
         <div style="width: 33%;display: inline-block">{{ i }}</div>
         <div style="width: 33%;display: inline-block">487JFY</div>
         <div style="width: 33%;display: inline-block">15-15</div>
diff --git a/src/views/board/scanDown/index.vue b/src/views/board/scanDown/index.vue
index d7e8ff3..f8f182d 100644
--- a/src/views/board/scanDown/index.vue
+++ b/src/views/board/scanDown/index.vue
@@ -7,6 +7,9 @@
     </div>
     <div class="loss">{{loss}}</div>
     <div class="meter">{{meter}}</div>
+    <span style="position: absolute;top: 10%;left: 14%;color: #fff;font-size: 1vw;">目标：1000&nbsp;&nbsp;进度目标：1000&nbsp;&nbsp;实际：1000&nbsp;&nbsp;差异：0&nbsp;&nbsp;达成率：100% </span>
+    <span style="position: absolute;top: 54.3%;left: 19%;color: #fff;font-size: 1vw">目标：3% &nbsp;&nbsp;&nbsp;实际：1% &nbsp;&nbsp;&nbsp;累计不良数：1</span>
+    <span style="position: absolute;top: 54.3%;left: 66.7%;color: #CFD2D0;font-size: 1.0vw">合计：111</span>
 
     <div class="scrollTable">
       <div style="background-color: #094170">
@@ -260,6 +263,15 @@ export default {
             itemStyle: {
               normal: {
                 barBorderRadius: 5,
+                color: function (val) {
+                  console.log()
+                  if (e.chart11.y[0].data[val.dataIndex] >= e.chart11.y[1].data[val.dataIndex]) {
+                    return '#30e391'
+                  } else {
+                    return '#FE70A6'
+                  }
+                  // return "#0D81ED"
+                },
               },
             },
             data: e.chart11.y[0].data,
@@ -379,6 +391,19 @@ export default {
           {
             name: e.chart12.y[0].name,
             type: 'bar',
+            itemStyle: {
+              normal: {
+                color: function (val) {
+                  console.log()
+                  if (e.chart12.y[1].data[val.dataIndex] < e.chart12.y[2].data[val.dataIndex]) {
+                    return '#30e391'
+                  } else {
+                    return '#FE70A6'
+                  }
+                  // return "#0D81ED"
+                },
+              },
+            },
             data: e.chart12.y[0].data,
             label: {
               show: true,