From ef96d4ff183be8cd8708eac95cb9de2a2505d0bc 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 Nov 2024 09:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BD=E5=9D=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cs/index3.vue | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/cs/index3.vue b/src/views/cs/index3.vue
index fd32a29..6077f38 100644
--- a/src/views/cs/index3.vue
+++ b/src/views/cs/index3.vue
@@ -14,16 +14,16 @@
     <div class="unit1" style="top: 31.3%;left: 63.5%">车</div>
     <div class="unit1" style="top: 51.3%;left: 45.5%;">KWh</div>
     <div class="unit1" style="top: 51.3%;left: 63.5%;">台</div>
-    <div class="num1" style="top: 31.5%;left: 39.5%;">{{ CData.length }}</div>
-    <div class="num1" style="top:31.5%;left:57.7%">{{ HData.length }}</div>
+    <div class="num1" style="top: 31.5%;left: 39.5%;">{{ CData.map(e=>parseFloat(e.quantity)||0).reduce((a,b)=>a+b,0) }}</div>
+    <div class="num1" style="top:31.5%;left:57.7%">{{ HData.map(e=>parseFloat(e.quantity)||0).reduce((a,b)=>a+b,0) }}</div>
     <div class="num1" style="top:51.6%;left:39.5%">{{ expend }}</div>
     <div class="num1" style="top:51.6%;left:57.7%">{{ agvData.length }}</div>
     <div class="title2" style="top: 73.5%;left: 86.8%;">计划生产数量：</div>
     <div class="title2" style="top: 85.3%;left: 86.8%;">实际生产数量：</div>
     <div class="unit2" style="top: 76.5%;left: 95%;">车</div>
     <div class="unit2" style="top: 88.5%;left: 95%;">车</div>
-    <div class="num2" style="top: 76.8%;left: 90.7%;color:#12fdae">{{ proData.totalRecordCount }}</div>
-    <div class="num2" style="top: 88.6%;left: 90.7%;color:#48b5fd">{{ proData.sumChe }}</div>
+    <div class="num2" style="top: 76.8%;left: 90.7%;color:#12fdae">{{ proData.sumChe }}</div>
+    <div class="num2" style="top: 88.6%;left: 90.7%;color:#48b5fd">{{ proData.totalRecordCount }}</div>
     <div class="num3" style="top: 80.3%;left: 78.6%;">{{ percent }}</div>
     <div class="title3" style="top: 91%;left: 78.8%;">计划达成率</div>
 
@@ -71,11 +71,11 @@
             </div>
             <div
               class="scrollTable" style="color:#49b2fc">
-              {{ item.dollyNumber }}
+              {{ item.Intheoven }}
             </div>
             <div
               class="scrollTable" style="color:#49b2fc">
-              {{ item.expend }}KWh
+              {{  (item.expend/item.yield).toFixed(2) }}KWh
             </div>
           </div>
         </div>
@@ -145,7 +145,8 @@ export default {
         this.expend = e.map(v => v.expend).reduce((a, b) => a + b, 0).toFixed(2)
       })
       agvdata().then(e => {
-        this.agvData = e.Data
+        console.log(e)
+        this.agvData = e.Data.filter(v=>v.State===1)
       })
       PlanAchievementRate().then(e => {
         this.proData = e.data
@@ -253,7 +254,6 @@ export default {
         this.$refs.chart1.setData(option)
       })
       getHourProductionLists().then(e => {
-        console.log(e)
         let option1 = {
           grid: {
             top: '15%',
@@ -323,6 +323,12 @@ export default {
           ],
           series: [
             {
+              label: {
+                show: true,
+                position: 'top',
+                formatter: "{c}",
+                color: "#fff"
+              },
               name: '产量',
               type: 'line',
               smooth: true, //平滑曲线显示