TuringsMachine/imt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: TuringsMachine:5d07d0d34bdf075367c7b4a85564bbf1d7b6f64a
Branches Tags
TuringsMachine:master
TuringsMachine:zjw
TuringsMachine:xusd
..
compare: TuringsMachine:9222ec24a91a8aaf1932c0e9d956e9f1a6a2f277
Branches Tags
TuringsMachine:master
TuringsMachine:zjw
TuringsMachine:xusd

No commits in common. "5d07d0d34bdf075367c7b4a85564bbf1d7b6f64a" and "9222ec24a91a8aaf1932c0e9d956e9f1a6a2f277" have entirely different histories.
5d07d0d34b ... 9222ec24a9

2 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

8
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/equip/EquipDashboardServiceImpl.java
View File

@ -67,17 +67,15 @@ public class EquipDashboardServiceImpl implements EquipDashboardService{
vo.setAlarmNum(alarmNum);
if(Objects.nonNull(equipInfoDO.getRunStatus()) && equipInfoDO.getRunStatus() != 2) {
//获取工作数据
//获取工作数据、
Map<String, Object> latestDataMap = dataQueryApi.getLatestFanucData(vo.getEquipId());
Map<String, Object> oldestDataMap = dataQueryApi.getOldestFanucData(vo.getEquipId());
if (CollUtil.isNotEmpty(latestDataMap) && CollUtil.isNotEmpty(oldestDataMap)) {
vo.setPowerTime(Double.parseDouble(latestDataMap.get("power_time").toString()) / 60.0);
vo.setWorkTime(Double.parseDouble(latestDataMap.get("work_time").toString()) / 60.0);
vo.setProcessNum((int) Double.parseDouble(latestDataMap.get("process_num").toString()));
double todayWorkTime = (Double.parseDouble(latestDataMap.get("work_time").toString()) - Double.parseDouble(oldestDataMap.get("work_time").toString())) / 60.0;
int todayProcessNum = (int) (Double.parseDouble(latestDataMap.get("process_num").toString()) - Double.parseDouble(oldestDataMap.get("process_num").toString()));
vo.setTodayWorkTime(todayWorkTime < 0 ? Double.parseDouble(latestDataMap.get("work_time").toString()) : todayWorkTime);
vo.setTodayProcessNum(todayProcessNum < 0 ? (int) Double.parseDouble(latestDataMap.get("process_num").toString()) : todayProcessNum);
vo.setTodayWorkTime((Double.parseDouble(latestDataMap.get("work_time").toString()) - Double.parseDouble(oldestDataMap.get("work_time").toString())) / 60.0);
vo.setTodayProcessNum((int) (Double.parseDouble(latestDataMap.get("process_num").toString()) - Double.parseDouble(oldestDataMap.get("process_num").toString())));
vo.setTodayEfficiency(vo.getTodayProcessNum() / vo.getTodayWorkTime());
}
}else{//维修状态

2
imt-ui/src/views/system/gatewayinfo/index.vue
View File

@ -316,7 +316,7 @@
<!--新增网关采集卡信息-->
<GatewayCardForm
ref="cardFormRef"
@success="getCardList"
@success="getList"
/>
</div>
</template>