From a39227e043b7701673ebd849fed887d55301aa16 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Thu, 25 May 2023 17:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=86=9B=E5=9B=A2=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5=20=E4=BA=A4=E4=BB=98?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../child/component/toptip.vue                |  5 ++-
 src/views/energyConsume/content/left.vue      | 45 +++++++++----------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/views/InPlantProducts/child/component/toptip.vue b/src/views/InPlantProducts/child/component/toptip.vue
index b6445b4..b3a4fdb 100644
--- a/src/views/InPlantProducts/child/component/toptip.vue
+++ b/src/views/InPlantProducts/child/component/toptip.vue
@@ -115,7 +115,8 @@ const setData = (value: any) => {
   }
   if (value.status == '已完成') {
     dateColor.value = 2
-    data.countdown = value.status
+    calctime(data.date)
+    // data.countdown = value.status
   }
   if (value.status == '已交付') {
     dateColor.value = 2
@@ -152,7 +153,7 @@ const calctime = (value: any) => {
 
   // data.countdown = store.DeviceInfo.status
   time = setInterval(function () {
-    if (data.status == '安装中' || value.status == '调试中') {
+    if (data.status == '安装中' || data.status == '调试中'|| data.status == '已完成') {
       data.countdown = "距交付剩余：" + clacendTime(endtime, new Date().getTime())
     } else {
       data.countdown = clacendTime(endtime, new Date().getTime())
diff --git a/src/views/energyConsume/content/left.vue b/src/views/energyConsume/content/left.vue
index 02e93b4..ee3a64b 100644
--- a/src/views/energyConsume/content/left.vue
+++ b/src/views/energyConsume/content/left.vue
@@ -12,12 +12,7 @@
     <el-row>
       <el-col :span="24">
         <div style="display: flex">
-          <chart
-            :title="gasOption.title"
-            :option="gasOption.option"
-            ref="ratio"
-            @click="clickPowerChart"
-          ></chart>
+          <chart :title="gasOption.title" :option="gasOption.option" ref="ratio" @click="clickPowerChart"></chart>
 
           <!-- <power
             ref="yields"
@@ -27,7 +22,7 @@
             <power ref="power1" :title="t('messages.PowerProductionto2023')"></power>
             <power2 ref="yields" :title="t('messages.jixiePowerto2023')"></power2>
           </div>
-          
+
         </div>
       </el-col>
     </el-row>
@@ -45,7 +40,7 @@ import chart from "./chart/chartRatio.vue";
 import { useRoute, useRouter } from "vue-router";
 import { useEnergyConsumeStore } from "@/store/module/energyConsume";
 import { useI18n } from 'vue-i18n'
-let {t} = useI18n();
+let { t } = useI18n();
 const store = useEnergyConsumeStore();
 const router = useRouter();
 
@@ -74,7 +69,7 @@ let gasOption = reactive({
       textStyle: {
         color: "rgb(255,255,255,0.9)",
       },
-      top:'1%'
+      top: '1%'
     },
     tooltip: {
       trigger: "item",
@@ -102,11 +97,11 @@ let gasOption = reactive({
       data: [],
     },
     yAxis: {
-      type: "value",      
-      show:false,
-      splitLine:{
-      show:false
-    }
+      type: "value",
+      show: false,
+      splitLine: {
+        show: false
+      }
     },
     series: [],
   },
@@ -148,7 +143,7 @@ let gasOption2 = reactive({
     },
     yAxis: {
       type: "value",
-      show:false
+      show: false
     },
     series: [],
   },
@@ -164,9 +159,9 @@ function reset(val: any) {
 const powerBox = (width: any, height: any) => {
   let a = calcWH(height, width, 5, 2, 0);
   //修改高度
-  power1.value.setchartWH(a.oWidth +90, a.oHeight*3 - 30);
-  yields.value.setchartWH(a.oWidth+120, a.oHeight*2 - 30);
-  ratio.value.setchartWH(a.oWidth-120, a.oHeight*5);
+  power1.value.setchartWH(a.oWidth + 90, a.oHeight * 3 - 30);
+  yields.value.setchartWH(a.oWidth + 120, a.oHeight * 2 - 20);
+  ratio.value.setchartWH(a.oWidth - 120, a.oHeight * 5);
 };
 const clickPowerChart = () => {
   router.push({
@@ -197,13 +192,13 @@ async function getpower() {
     //   for (let key in res.month) {
     //     let datakey=[]
     //     res.month[key].forEach((ele,index)=>{
-          
+
     //       dataDownIndex.forEach(e=>{
     //         if(index==e){
     //           datakey.push(ele)
     //         }
     //       })
-          
+
     //     })
     //     res.month[key]=datakey
     //     datakey=[]
@@ -257,7 +252,7 @@ watch(
       // console.log(newVal.listData[key]);
       if (newVal.listData[key]) {
         newVal.listData[key].forEach((res, index) => {
-          if (res == "0.0000"||res == "0.000") {
+          if (res == "0.0000" || res == "0.000") {
             res = null;
           }
           if (index != storekey) {
@@ -310,7 +305,7 @@ watch(
           backgroundStyle: {
             color: "rgba(180, 180, 180, 0.2)",
           },
-          barWidth:'60%',
+          barWidth: '60%',
           label: {
             show: true,
             formatter: function (value, index) {
@@ -329,11 +324,11 @@ watch(
           backgroundStyle: {
             color: "rgba(180, 180, 180, 0.2)",
           },
-          barWidth:'22%',
+          barWidth: '22%',
           label: {
             show: true,
             formatter: function (value, index) {
-              
+
               return JSON.parse(value.value).toLocaleString();
             },
           },
@@ -345,7 +340,7 @@ watch(
           data: noData,
           type: "bar",
           showBackground: true,
-          barWidth:'20%',
+          barWidth: '20%',
           backgroundStyle: {
             color: "rgba(180, 180, 180, 0.2)",
           },