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 @@
- +