yanzhu-bigscreen/src/api/tower.js

@@ -41,7 +41,7 @@ const selectDevTowerDataRunList = (proId,deviceSn) => {
   });
 };
 
-// 查询塔基预警数据
+// 查询塔基实时数据
 const findDevTowerDataWarningDatas = (query) => {
   return request({
     url: `manage/bgscreen/tower/findDevTowerDataWarningDatas`,

yanzhu-bigscreen/src/views/safety/powerIot.vue

@@ -12,7 +12,7 @@
                                 <div>A相电压</div>
                                 <p v-cloak>
                                     {{ runData.voltageA }}
-                                    <span>V</span>
+                                    <span>℃</span>
                                 </p>
                             </div>
                         </div>
@@ -26,7 +26,7 @@
                                 <div>B相电压</div>
                                 <p v-cloak>
                                     {{ runData.voltageB }}
-                                    <span>V</span>
+                                    <span>℃</span>
                                 </p>
                             </div>
                         </div>
@@ -40,7 +40,7 @@
                                 <div>C相电压</div>
                                 <p v-cloak>
                                     {{ runData.voltageC }}
-                                    <span>V</span>
+                                    <span>℃</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="warningData.length == 0" class="not-data">暂无预警数据</div>
+                            <div v-if="warningDataList.length == 0" class="not-data">暂无预警数据</div>
-                            <template v-if="warningData.length > 0">
+                            <template v-if="warningDataList.length > 0">
-                                <div :key="i" :class="forIndex == i ? 'afoot-con-for active' : 'afoot-con-for '" v-for="(item, i) in warningData">
+                                <div :key="i" :class="forIndex == i ? 'afoot-con-for active' : 'afoot-con-for '" v-for="(item, i) in warningDataList">
                                     <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() {

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataWarningMapper.java

@@ -1,5 +1,6 @@
 package com.yanzhu.device.mapper;
 
+import com.yanzhu.device.domain.DevTowerDataRound;
 import com.yanzhu.device.domain.DevTowerDataWarning;
 
 import java.util.List;

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java

@@ -247,15 +247,16 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService
         if(res>0){
             ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId());
             if(entity!=null){
-                if(entity.getStartDate()==null){
+                if(plan.getFinishDate()!=null){
-                    entity.setStartDate(entity.getUpdateTime());
+                    entity.setFinishDate(plan.getFinishDate());
                     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){
@@ -265,11 +266,8 @@ 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;
                             }
                         }
                     }
@@ -286,9 +284,6 @@ 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());