jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-06-17 23:14:30 +08:00
parent f00b11679f
commit ef92e58eb2
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-bigscreen/src/api/tower.js
View File

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

14
yanzhu-bigscreen/src/views/safety/powerIot.vue
View File

@ -12,7 +12,7 @@
<div>A相电压</div> <div>A相电压</div>
<p v-cloak> <p v-cloak>
{{ runData.voltageA }} {{ runData.voltageA }}
<span>℃</span> <span>V</span>
</p> </p>
</div> </div>
</div> </div>
@ -26,7 +26,7 @@
<div>B相电压</div> <div>B相电压</div>
<p v-cloak> <p v-cloak>
{{ runData.voltageB }} {{ runData.voltageB }}
<span>℃</span> <span>V</span>
</p> </p>
</div> </div>
</div> </div>
@ -40,7 +40,7 @@
<div>C相电压</div> <div>C相电压</div>
<p v-cloak> <p v-cloak>
{{ runData.voltageC }} {{ runData.voltageC }}
<span>℃</span> <span>V</span>
</p> </p>
</div> </div>
</div> </div>
@ -191,9 +191,9 @@
</div> </div>
<div class="afoot-content"> <div class="afoot-content">
<div class="afoot-overflow process-afoot-overflow" style="height: 530px" id="afootOverflow" @mouseout="listMinMouseout" @mouseover="listMinMouseover"> <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> <div v-if="warningData.length == 0" class="not-data">暂无预警数据</div>
<template v-if="warningDataList.length > 0"> <template v-if="warningData.length > 0">
<div :key="i" :class="forIndex == i ? 'afoot-con-for active' : 'afoot-con-for '" v-for="(item, i) in warningDataList"> <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-nam" v-cloak>{{ item.warningType }}</div>
<div class="afoot-machinery-info"> <div class="afoot-machinery-info">
<div class="afoot-machinery-data"> <div class="afoot-machinery-data">
@ -229,9 +229,9 @@ export default {
warningDataList: [], warningDataList: [],
forIndex: 0, forIndex: 0,
warningInterval: undefined, warningInterval: undefined,
dpi: '',
chartKey: 0, chartKey: 0,
chartHeight: 220, chartHeight: 220,
project:{},
} }
}, },
mounted() { mounted() {

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

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

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

@ -247,16 +247,15 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService
if(res>0){ if(res>0){
ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId()); ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId());
if(entity!=null){ if(entity!=null){
if(plan.getFinishDate()!=null){ if(entity.getStartDate()==null){
entity.setFinishDate(plan.getFinishDate()); entity.setStartDate(entity.getUpdateTime());
entity.setUpdateTime(plan.getUpdateTime()); entity.setUpdateTime(plan.getUpdateTime());
if(entity.getStartDate()==null){
entity.setStartDate(entity.getUpdateTime());
}
} }
List<ProPlan> belows = proPlanMapper.selectProPlanBelows(entity.getProjectId(),entity.getTaskId()); List<ProPlan> belows = proPlanMapper.selectProPlanBelows(entity.getProjectId(),entity.getTaskId());
Float Finished = 0.0F; Float Finished = 0.0F;
int totalTaskDuation = 0; int totalTaskDuation = 0;
boolean planFinishDate = true;
try { try {
if(belows.size()>0){ if(belows.size()>0){
for(ProPlan item:belows){ for(ProPlan item:belows){
@ -266,8 +265,11 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService
if(sNode>=100){ if(sNode>=100){
Finished += Convert.toFloat(item.getTaskDuation(),0.0F); Finished += Convert.toFloat(item.getTaskDuation(),0.0F);
}else{ }else{
planFinishDate = false;
Finished += Convert.toFloat(item.getTaskDuation()*(sNode/100)); 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)); entity.setScheduleNode(String.format("%.2f", _cn));
} }
} }
if(planFinishDate && plan.getFinishDate()!=null){
entity.setFinishDate(plan.getFinishDate());
}
// 更新总进度 // 更新总进度
if(entity.getTaskOutlineLevel()==1L){ if(entity.getTaskOutlineLevel()==1L){
proPlanScheduleMapper.updateProPlanTotalSchedule(entity.getProjectId(),entity.getScheduleNode()); proPlanScheduleMapper.updateProPlanTotalSchedule(entity.getProjectId(),entity.getScheduleNode());