From ef92e58eb2ae70d435ab976a46f64660fa5a94f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 17 Jun 2025 23:14:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-bigscreen/src/api/tower.js                 |  2 +-
 yanzhu-bigscreen/src/views/safety/powerIot.vue    | 14 +++++++-------
 .../device/mapper/DevTowerDataWarningMapper.java  |  1 -
 .../service/impl/ProPlanScheduleServiceImpl.java  | 15 ++++++++++-----
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/yanzhu-bigscreen/src/api/tower.js b/yanzhu-bigscreen/src/api/tower.js
index 0e624620..c58b2462 100644
--- a/yanzhu-bigscreen/src/api/tower.js
+++ b/yanzhu-bigscreen/src/api/tower.js
@@ -41,7 +41,7 @@ const selectDevTowerDataRunList = (proId,deviceSn) => {
   });
 };
 
-// 查询塔基实时数据
+// 查询塔基预警数据
 const findDevTowerDataWarningDatas = (query) => {
   return request({
     url: `manage/bgscreen/tower/findDevTowerDataWarningDatas`,
diff --git a/yanzhu-bigscreen/src/views/safety/powerIot.vue b/yanzhu-bigscreen/src/views/safety/powerIot.vue
index 2748e02a..172a2f17 100644
--- a/yanzhu-bigscreen/src/views/safety/powerIot.vue
+++ b/yanzhu-bigscreen/src/views/safety/powerIot.vue
@@ -12,7 +12,7 @@
                                 <div>A相电压</div>
                                 <p v-cloak>
                                     {{ runData.voltageA }}
-                                    <span>℃</span>
+                                    <span>V</span>
                                 </p>
                             </div>
                         </div>
@@ -26,7 +26,7 @@
                                 <div>B相电压</div>
                                 <p v-cloak>
                                     {{ runData.voltageB }}
-                                    <span>℃</span>
+                                    <span>V</span>
                                 </p>
                             </div>
                         </div>
@@ -40,7 +40,7 @@
                                 <div>C相电压</div>
                                 <p v-cloak>
                                     {{ runData.voltageC }}
-                                    <span>℃</span>
+                                    <span>V</span>
                                 </p>
                             </div>
                         </div>
@@ -191,9 +191,9 @@
                     </div>
                     <div class="afoot-content">
                         <div class="afoot-overflow process-afoot-overflow" style="height: 530px" id="afootOverflow" @mouseout="listMinMouseout" @mouseover="listMinMouseover">
-                            <div v-if="warningDataList.length == 0" class="not-data">暂无预警数据</div>
-                            <template v-if="warningDataList.length > 0">
-                                <div :key="i" :class="forIndex == i ? 'afoot-con-for active' : 'afoot-con-for '" v-for="(item, i) in warningDataList">
+                            <div v-if="warningData.length == 0" class="not-data">暂无预警数据</div>
+                            <template v-if="warningData.length > 0">
+                                <div :key="i" :class="forIndex == i ? 'afoot-con-for active' : 'afoot-con-for '" v-for="(item, i) in warningData">
                                     <div class="afoot-machinery-nam" v-cloak>{{ item.warningType }}</div>
                                     <div class="afoot-machinery-info">
                                         <div class="afoot-machinery-data">
@@ -229,9 +229,9 @@ export default {
             warningDataList: [],
             forIndex: 0,
             warningInterval: undefined,
-            dpi: '',
             chartKey: 0,
             chartHeight: 220,
+            project:{},
         }
     },
     mounted() {
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataWarningMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataWarningMapper.java
index 88753cab..0be3eb90 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataWarningMapper.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataWarningMapper.java
@@ -1,6 +1,5 @@
 package com.yanzhu.device.mapper;
 
-import com.yanzhu.device.domain.DevTowerDataRound;
 import com.yanzhu.device.domain.DevTowerDataWarning;
 
 import java.util.List;
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java
index 63f4319e..775af41a 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java
@@ -247,16 +247,15 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService
         if(res>0){
             ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId());
             if(entity!=null){
-                if(plan.getFinishDate()!=null){
-                    entity.setFinishDate(plan.getFinishDate());
+                if(entity.getStartDate()==null){
+                    entity.setStartDate(entity.getUpdateTime());
                     entity.setUpdateTime(plan.getUpdateTime());
-                    if(entity.getStartDate()==null){
-                        entity.setStartDate(entity.getUpdateTime());
-                    }
                 }
+
                 List<ProPlan> belows = proPlanMapper.selectProPlanBelows(entity.getProjectId(),entity.getTaskId());
                 Float Finished = 0.0F;
                 int totalTaskDuation = 0;
+                boolean planFinishDate = true;
                 try {
                     if(belows.size()>0){
                         for(ProPlan item:belows){
@@ -266,8 +265,11 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService
                                 if(sNode>=100){
                                     Finished += Convert.toFloat(item.getTaskDuation(),0.0F);
                                 }else{
+                                    planFinishDate = false;
                                     Finished += Convert.toFloat(item.getTaskDuation()*(sNode/100));
                                 }
+                            }else{
+                                planFinishDate = false;
                             }
                         }
                     }
@@ -284,6 +286,9 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService
                         entity.setScheduleNode(String.format("%.2f", _cn));
                     }
                 }
+                if(planFinishDate && plan.getFinishDate()!=null){
+                    entity.setFinishDate(plan.getFinishDate());
+                }
                 // 更新总进度
                 if(entity.getTaskOutlineLevel()==1L){
                     proPlanScheduleMapper.updateProPlanTotalSchedule(entity.getProjectId(),entity.getScheduleNode());