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

大屏样式和时间更新

Browse Source
This commit is contained in:
zhangjunwen 2024-04-16 15:56:32 +08:00
parent 3638e08897
commit 78054f3e6e
10 changed files with 514 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData2SyncThread.java
View File

@ -176,7 +176,7 @@ public class IPCData2SyncThread implements Runnable {
//报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList));
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList,1));
if (!alarmRecordList.isEmpty()){//运行需放开
// alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
}

2
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData3SyncThread.java
View File

@ -152,7 +152,7 @@ public class IPCData3SyncThread implements Runnable {
// fields.put("insertTime",format);
//报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList));
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList, 1));
if (!alarmRecordList.isEmpty()){//运行需放开
// alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
}

11
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataSyncTask.java
View File

@ -139,12 +139,14 @@ public class IPCDataSyncTask implements ApplicationRunner {
String bottomCylId = equipList.stream().filter(equip -> equip.getEquipName().equals("超压底缸")).collect(Collectors.toList()).get(0).getId();
String topScollerId = equipList.stream().filter(equip -> equip.getEquipName().equals("可控中高辊顶辊")).collect(Collectors.toList()).get(0).getId();
String bottomScollerId = equipList.stream().filter(equip -> equip.getEquipName().equals("可控中高辊底辊")).collect(Collectors.toList()).get(0).getId();
//TODO 需要统一处理系统状态，停机运维、待机、试运行、正常生产--丢掉停机运维数据
bottomCylinderDataProcess(null, bottomCylId, i, ipcUtil, alarmRulesService, alarmRecordService);
scollerDataProcess(null, topScollerId, topScollerMeasurement, i, ipcUtil, alarmRulesService, alarmRecordService);
scollerDataProcess(null, bottomScollerId, bottomScollerMeasurement, i, ipcUtil, alarmRulesService, alarmRecordService);
//TODO 需要统一处理系统状态，停机运维、待机、试运行、正常生产
//TODO 状态切换时候需要存储状态切换时间
@ -165,11 +167,10 @@ public class IPCDataSyncTask implements ApplicationRunner {
String measurement = "zfipc_industrial_monitor_data1";
List<IpcAlarmRecord> alarmRecordList = new ArrayList<>();
//TODO 获取状态
Map<String, String> tags = new TreeMap();
tags.put("equ_id", equipId);
Map<String, Object> fields = new TreeMap();
// 系统电流
fields.put("sys_cur", (float) 0 + Math.random());
// 系统流量
@ -238,7 +239,7 @@ public class IPCDataSyncTask implements ApplicationRunner {
fields.put("driven_bottom_dis", (float) 0 + Math.random());
//报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(equipId);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList));
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList, 1));
i.insert(measurement, tags, fields);
if (!alarmRecordList.isEmpty()) {//运行需放开
@ -333,7 +334,7 @@ public class IPCDataSyncTask implements ApplicationRunner {
//报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(equipId);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList));
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList, 1));
if (!alarmRecordList.isEmpty()) {//运行需放开
// alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
}

2
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataSyncThread.java
View File

@ -186,7 +186,7 @@ public class IPCDataSyncThread implements Runnable {
//报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList));
//alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList));
i.insert(measurement,tags,fields);
if (!alarmRecordList.isEmpty()){//运行需放开

11
zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IpcDataProcess.java
View File

@ -187,7 +187,7 @@ public class IpcDataProcess implements Runnable {
fields.put("driven_bottom_dis", (float) 0 + Math.random());
//报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesConfigListByCache(equipId);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList));//TODO 根据运行状态确定规则
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList, 1));//TODO 根据运行状态确定规则
i.insert(measurement, tags, fields);
if (!alarmRecordList.isEmpty()) {//运行需放开
@ -282,7 +282,7 @@ public class IpcDataProcess implements Runnable {
//报警处理
List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesConfigListByCache(equipId);
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList));//TODO 根据运行状态确定规则
alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields, tags, Constant.RUNNING, rulesList, 1));//TODO 根据运行状态确定规则
if (!alarmRecordList.isEmpty()) {//运行需放开
// alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
}
@ -296,11 +296,8 @@ public class IpcDataProcess implements Runnable {
*/
private IpcAlarmRules getLevelAlarmRule(String equipId,Integer type) {
IIpcAlarmRulesService ipcAlarmRulesService = SpringUtils.getBean(IIpcAlarmRulesService.class);
IpcAlarmRules query = new IpcAlarmRules();
query.setEquipId(equipId);
query.setAlarmNameKey("sys_level");
query.setType(type);//运行中
return ipcAlarmRulesService.selectIpcAlarmRulesList(query).get(0) == null ? null : ipcAlarmRulesService.selectIpcAlarmRulesList(query).get(0);
List<IpcAlarmRules> list = ipcAlarmRulesService.selectIpcAlarmRulesConfigListByCache(equipId);
return list == null || list.size() == 0 ? null : list.stream().filter(item -> item.getAlarmNameKey().equals("sys_level")).collect(Collectors.toList()).get(0);
}
/**

297
zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/DataQueryService.java
View File

@ -43,41 +43,40 @@ public class DataQueryService implements IDataQueryService {
return null;
}
Map<String, Object> resMap = new HashMap<>();
resMap.put("sysstatus", list.get(0).get("status") == null ? 0 : list.get(0).get("status") );//系统状态
resMap.put("sysflw", list.get(0).get("sys_flw") == null ? 0 : list.get(0).get("sys_flw"));//系统流量
resMap.put("sysprs", list.get(0).get("sys_press") == null ? 0 : list.get(0).get("sys_press"));//系统压力
resMap.put("syslevel", list.get(0).get("sys_level") == null ? 0 : list.get(0).get("sys_level"));//系统液位
resMap.put("sysstatus", list.get(0).get("status") == null ? 0.0 : list.get(0).get("status") );//系统状态
resMap.put("sysflw", list.get(0).get("sys_flw") == null ? 0.0 : list.get(0).get("sys_flw"));//系统流量
resMap.put("sysprs", list.get(0).get("sys_press") == null ? 0.0 : list.get(0).get("sys_press"));//系统压力
resMap.put("syslevel", list.get(0).get("sys_level") == null ? 0.0 : list.get(0).get("sys_level"));//系统液位
resMap.put("syslevelinit", Float.parseFloat(sysConfigService.selectConfigByKey("sys.liquidlevel.init") == null ?
"0" : sysConfigService.selectConfigByKey("sys.liquidlevel.init")));//液位初始值
resMap.put("levelmax", list.get(0).get("level_max") == null ? 0 : list.get(0).get("level_max"));
resMap.put("levelmin", list.get(0).get("level_min") == null ? 0 : list.get(0).get("level_min"));
resMap.put("levelmax", list.get(0).get("level_max") == null ? 0.0 : list.get(0).get("level_max"));
resMap.put("levelmin", list.get(0).get("level_min") == null ? 0.0 : list.get(0).get("level_min"));
resMap.put("systemp",list.get(0).get("sys_temp") == null ? 0 : list.get(0).get("sys_temp"));//系统温度
resMap.put("syshumid",list.get(0).get("oil_water") == null ? 0 : list.get(0).get("oil_water"));//系统湿度
resMap.put("sysvisc",list.get(0).get("visc") == null ? 0 : list.get(0).get("visc"));//系统粘度
resMap.put("systemp",list.get(0).get("sys_temp") == null ? 0.0 : list.get(0).get("sys_temp"));//系统温度
resMap.put("syshumid",list.get(0).get("oil_water") == null ? 0.0 : list.get(0).get("oil_water"));//系统湿度
resMap.put("sysvisc",list.get(0).get("visc") == null ? 0.0 : list.get(0).get("visc"));//系统粘度
//系统颗粒度
resMap.put("sysgran4",list.get(0).get("gran4") == null ? 0 : list.get(0).get("gran4"));
resMap.put("sysgran6",list.get(0).get("gran6") == null ? 0 : list.get(0).get("gran6"));
resMap.put("sysgran14",list.get(0).get("gran14") == null ? 0 : list.get(0).get("gran14"));
resMap.put("sysgran21",list.get(0).get("gran21") == null ? 0 : list.get(0).get("gran21"));
resMap.put("sysgran4",list.get(0).get("gran4") == null ? 0.0 : list.get(0).get("gran4"));
resMap.put("sysgran6",list.get(0).get("gran6") == null ? 0.0 : list.get(0).get("gran6"));
resMap.put("sysgran14",list.get(0).get("gran14") == null ? 0.0 : list.get(0).get("gran14"));
resMap.put("sysgran21",list.get(0).get("gran21") == null ? 0.0: list.get(0).get("gran21"));
// Map<String, Object> oprsoftflw = (Map<String, Object>) new HashMap<>().put("oprsoftflw",list.get(0).get("opr_soft_flw") );//操作侧软辊流量
// Map<String, Object> oprhotflw = (Map<String, Object>) new HashMap<>().put("oprhotflw",list.get(0).get("opr_hot_flw") );//操作侧热辊流量
// Map<String, Object> drivensoftflw = (Map<String, Object>) new HashMap<>().put("drivensoftflw",list.get(0).get("driven_soft_flw") );//传动侧软辊流量
// Map<String, Object> drivenhotflw = (Map<String, Object>) new HashMap<>().put("drivenhotflw",list.get(0).get("driven_hot_flw") );//传动侧软辊流量
resMap.put("oprservo",list.get(0).get("opr_servo") == null ? 0 : list.get(0).get("opr_servo"));//操作侧底缸比例换向阀
resMap.put("drivenservo",list.get(0).get("driven_servo") == null ? 0 : list.get(0).get("driven_servo"));//操作侧底缸比例换向阀
resMap.put("oprservo",list.get(0).get("opr_servo") == null ? 0.0 : list.get(0).get("opr_servo"));//操作侧底缸比例换向阀
resMap.put("drivenservo",list.get(0).get("driven_servo") == null ? 0.0 : list.get(0).get("driven_servo"));//操作侧底缸比例换向阀
//功率= √3IUcosΦ/1000
resMap.put("syspower",list.get(0).get("sys_cur") == null ? 0 : Math.sqrt(3)*Float.parseFloat(list.get(0).get("sys_cur").toString())*380*0.86/1000);
resMap.put("syspower",list.get(0).get("sys_cur") == null ? 0.0 : Math.sqrt(3)*Float.parseFloat(list.get(0).get("sys_cur").toString())*380*0.86/1000);
//系统效率 = 系统压力*系统流量/系统功率
double power = (double)resMap.get("syspower") == 0 ? 0 : (double)resMap.get("syspower");
double sysflw = (double)resMap.get("sysflw") == 0 ? 0 : (double)resMap.get("sysflw");
double pressure = (double)resMap.get("sysprs") == 0 ? 0 : (double)resMap.get("sysprs");
resMap.put("syseff",power == 0 ? 0 : pressure * sysflw/power*100);
double power = (double)resMap.get("syspower") == 0 ? 0.0 : (double)resMap.get("syspower");
double sysflw = (double)resMap.get("sysflw") == 0 ? 0.0 : (double)resMap.get("sysflw");
double pressure = (double)resMap.get("sysprs") == 0 ? 0.0 : (double)resMap.get("sysprs");
resMap.put("syseff",power == 0 ? 0.0 : pressure * sysflw/power*100);
List<Object> syscur = new ArrayList<>();//系统电流
@ -113,34 +112,34 @@ public class DataQueryService implements IDataQueryService {
for (int i = list.size() - 1; i >= 0; i--) {
Map<String, Object> data = list.get(i);
syscur.add(data.get("sys_cur") == null ? 0 : data.get("sys_cur"));
syscur.add(data.get("sys_cur") == null ? 0.0 : data.get("sys_cur"));
oprsoftflw.add(data.get("opr_soft_flw") == null ? 0 : data.get("opr_soft_flw"));
oprhotflw.add(data.get("opr_hot_flw") == null ? 0 : data.get("opr_hot_flw"));
drivensoftflw.add(data.get("driven_soft_flw") == null ? 0 : data.get("driven_soft_flw"));
drivenhotflw.add(data.get("driven_hot_flw") == null ? 0 : data.get("driven_hot_flw"));
oprsoftflw.add(data.get("opr_soft_flw") == null ? 0.0 : data.get("opr_soft_flw"));
oprhotflw.add(data.get("opr_hot_flw") == null ? 0.0 : data.get("opr_hot_flw"));
drivensoftflw.add(data.get("driven_soft_flw") == null ? 0.0 : data.get("driven_soft_flw"));
drivenhotflw.add(data.get("driven_hot_flw") == null ? 0.0 : data.get("driven_hot_flw"));
oprbottompress.add(data.get("opr_bottom_press") == null ? 0 : data.get("opr_bottom_press"));
drivenbottompress.add(data.get("driven_bottom_press") == null ? 0 : data.get("driven_bottom_press"));
oprbottomsetpress.add(data.get("opr_bottom_set_press") == null ? 0 : data.get("opr_bottom_set_press"));
drivenbottomsetpress.add(data.get("driven_bottom_set_press") == null ? 0 : data.get("driven_bottom_set_press"));
oprbottompress.add(data.get("opr_bottom_press") == null ? 0.0 : data.get("opr_bottom_press"));
drivenbottompress.add(data.get("driven_bottom_press") == null ? 0.0 : data.get("driven_bottom_press"));
oprbottomsetpress.add(data.get("opr_bottom_set_press") == null ? 0.0 : data.get("opr_bottom_set_press"));
drivenbottomsetpress.add(data.get("driven_bottom_set_press") == null ? 0.0 : data.get("driven_bottom_set_press"));
oprsoftrealpress.add(data.get("opr_soft_real_press") == null ? 0 : data.get("opr_soft_real_press"));
oprsoftbondpress.add(data.get("opr_soft_bond_press") == null ? 0 : data.get("opr_soft_bond_press"));
oprsoftactpress.add(data.get("opr_soft_act_press") == null ? 0 : data.get("opr_soft_act_press"));
oprhotrealpress.add(data.get("opr_hot_real_press") == null ? 0 : data.get("opr_hot_real_press"));
oprhotbondpress.add(data.get("opr_hot_bond_press") == null ? 0 : data.get("opr_hot_bond_press"));
oprhotactpress.add(data.get("opr_hot_act_press") == null ? 0 : data.get("opr_hot_act_press"));
oprsoftrealpress.add(data.get("opr_soft_real_press") == null ? 0.0 : data.get("opr_soft_real_press"));
oprsoftbondpress.add(data.get("opr_soft_bond_press") == null ? 0.0 : data.get("opr_soft_bond_press"));
oprsoftactpress.add(data.get("opr_soft_act_press") == null ? 0.0 : data.get("opr_soft_act_press"));
oprhotrealpress.add(data.get("opr_hot_real_press") == null ? 0.0 : data.get("opr_hot_real_press"));
oprhotbondpress.add(data.get("opr_hot_bond_press") == null ? 0.0 : data.get("opr_hot_bond_press"));
oprhotactpress.add(data.get("opr_hot_act_press") == null ? 0.0 : data.get("opr_hot_act_press"));
drivensoftrealpress.add(data.get("driven_soft_real_press") == null ? 0 : data.get("driven_soft_real_press"));
drivensoftbondpress.add(data.get("driven_soft_bond_press") == null ? 0 : data.get("driven_soft_bond_press"));
drivensoftactpress.add(data.get("driven_soft_act_press") == null ? 0 : data.get("driven_soft_act_press"));
drivenhotrealpress.add(data.get("driven_hot_real_press") == null ? 0 : data.get("driven_hot_real_press"));
drivenhotbondpress.add(data.get("driven_hot_bond_press") == null ? 0 : data.get("driven_hot_bond_press"));
drivenhotactpress.add(data.get("driven_hot_act_press") == null ? 0 : data.get("driven_hot_act_press"));
drivensoftrealpress.add(data.get("driven_soft_real_press") == null ? 0.0 : data.get("driven_soft_real_press"));
drivensoftbondpress.add(data.get("driven_soft_bond_press") == null ? 0.0 : data.get("driven_soft_bond_press"));
drivensoftactpress.add(data.get("driven_soft_act_press") == null ? 0.0 : data.get("driven_soft_act_press"));
drivenhotrealpress.add(data.get("driven_hot_real_press") == null ? 0.0 : data.get("driven_hot_real_press"));
drivenhotbondpress.add(data.get("driven_hot_bond_press") == null ? 0.0 : data.get("driven_hot_bond_press"));
drivenhotactpress.add(data.get("driven_hot_act_press") == null ? 0.0 : data.get("driven_hot_act_press"));
oprbottomdis.add(data.get("opr_bottom_dis") == null ? 0 : data.get("opr_bottom_dis"));
drivenbottomdis.add(data.get("driven_bottom_dis") == null ? 0 : data.get("driven_bottom_dis"));
oprbottomdis.add(data.get("opr_bottom_dis") == null ? 0.0 : data.get("opr_bottom_dis"));
drivenbottomdis.add(data.get("driven_bottom_dis") == null ? 0.0 : data.get("driven_bottom_dis"));
LocalDateTime time = InfluxdbTimeUtil.utcToCst(data.get("time").toString());
timelist.add( time.getMinute() < 10 ? "0" + time.getMinute() : time.getMinute() + ":" + (time.getSecond() < 10 ? "0" + time.getSecond() : time.getSecond()));
@ -268,49 +267,49 @@ public class DataQueryService implements IDataQueryService {
BottomCylData ipcData = new BottomCylData();
ipcData.setTime(InfluxdbTimeUtil.utcToCst(data.get("time").toString()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ipcData.setStatus(data.get("status") == null ? "0" : (String) data.get("status"));
ipcData.setSysCur(data.get("sys_cur") == null ? 0 : (double) data.get("sys_cur"));
ipcData.setSysLevel(data.get("sys_level") == null ? 0 : (double) data.get("sys_level"));
ipcData.setSysTemp(data.get("sys_temp") == null ? 0 : (double) data.get("sys_temp"));
ipcData.setSysPress(data.get("sys_press") == null ? 0 : (double) data.get("sys_press"));
ipcData.setSysFlow(data.get("sys_flw") == null ? 0 : (double) data.get("sys_flw"));
ipcData.setHumi(data.get("oil_water") == null ? 0 : (double) data.get("oil_water"));
ipcData.setVisc(data.get("visc") == null ? 0 : (double) data.get("visc"));
ipcData.setSysCur(data.get("sys_cur") == null ? 0.0 : (double) data.get("sys_cur"));
ipcData.setSysLevel(data.get("sys_level") == null ? 0.0 : (double) data.get("sys_level"));
ipcData.setSysTemp(data.get("sys_temp") == null ? 0.0 : (double) data.get("sys_temp"));
ipcData.setSysPress(data.get("sys_press") == null ? 0.0 : (double) data.get("sys_press"));
ipcData.setSysFlow(data.get("sys_flw") == null ? 0.0 : (double) data.get("sys_flw"));
ipcData.setHumi(data.get("oil_water") == null ? 0.0 : (double) data.get("oil_water"));
ipcData.setVisc(data.get("visc") == null ? 0.0 : (double) data.get("visc"));
ipcData.setGran4(data.get("gran4") == null ? 0 : (double) data.get("gran4"));
ipcData.setGran6(data.get("gran6") == null ? 0 : (double) data.get("gran6"));
ipcData.setGran14(data.get("gran14") == null ? 0 : (double) data.get("gran14"));
ipcData.setGran21(data.get("gran21") == null ? 0 : (double) data.get("gran21"));
ipcData.setGran4(data.get("gran4") == null ? 0.0 : (double) data.get("gran4"));
ipcData.setGran6(data.get("gran6") == null ? 0.0 : (double) data.get("gran6"));
ipcData.setGran14(data.get("gran14") == null ? 0.0 : (double) data.get("gran14"));
ipcData.setGran21(data.get("gran21") == null ? 0.0 : (double) data.get("gran21"));
ipcData.setOpServoPress(data.get("opr_servo") == null ? 0 : (double) data.get("opr_servo"));
ipcData.setTranServoPress(data.get("driven_servo") == null ? 0 : (double) data.get("driven_servo"));
ipcData.setOpServoPress(data.get("opr_servo") == null ? 0.0 : (double) data.get("opr_servo"));
ipcData.setTranServoPress(data.get("driven_servo") == null ? 0.0 : (double) data.get("driven_servo"));
ipcData.setOpSoftFlow(data.get("opr_soft_flw") == null ? 0 : (double) data.get("opr_soft_flw"));
ipcData.setOpHotFlow(data.get("opr_hot_flw") == null ? 0 : (double) data.get("opr_hot_flw"));
ipcData.setOpSoftFlow(data.get("opr_soft_flw") == null ? 0.0 : (double) data.get("opr_soft_flw"));
ipcData.setOpHotFlow(data.get("opr_hot_flw") == null ? 0.0 : (double) data.get("opr_hot_flw"));
ipcData.setTranSoftFlow(data.get("driven_soft_flw") == null ? 0 : (double) data.get("driven_soft_flw"));
ipcData.setTranHotFlow(data.get("driven_hot_flw") == null ? 0 : (double) data.get("driven_hot_flw"));
ipcData.setTranSoftFlow(data.get("driven_soft_flw") == null ? 0.0 : (double) data.get("driven_soft_flw"));
ipcData.setTranHotFlow(data.get("driven_hot_flw") == null ? 0.0 : (double) data.get("driven_hot_flw"));
ipcData.setOpBottomPress(data.get("opr_bottom_press") == null ? 0 : (double) data.get("opr_bottom_press"));
ipcData.setTranBottomPress(data.get("driven_bottom_press") == null ? 0 : (double) data.get("driven_bottom_press"));
ipcData.setOpBottomPress(data.get("opr_bottom_press") == null ? 0.0 : (double) data.get("opr_bottom_press"));
ipcData.setTranBottomPress(data.get("driven_bottom_press") == null ? 0.0 : (double) data.get("driven_bottom_press"));
ipcData.setOpSoftPress(data.get("opr_soft_real_press") == null ? 0 : (double) data.get("opr_soft_real_press"));
ipcData.setOpSoftHoldPress(data.get("opr_soft_bond_press") == null ? 0 : (double) data.get("opr_soft_bond_press"));
ipcData.setOpSoftPushPress(data.get("opr_soft_act_press") == null ? 0 : (double) data.get("opr_soft_act_press"));
ipcData.setOpSoftPress(data.get("opr_soft_real_press") == null ? 0.0 : (double) data.get("opr_soft_real_press"));
ipcData.setOpSoftHoldPress(data.get("opr_soft_bond_press") == null ? 0.0 : (double) data.get("opr_soft_bond_press"));
ipcData.setOpSoftPushPress(data.get("opr_soft_act_press") == null ? 0.0 : (double) data.get("opr_soft_act_press"));
ipcData.setOpHotPress(data.get("opr_hot_real_press") == null ? 0 : (double) data.get("opr_hot_real_press"));
ipcData.setOpHotHoldPress(data.get("opr_hot_bond_press") == null ? 0 : (double) data.get("opr_hot_bond_press"));
ipcData.setOpHotPushPress(data.get("opr_hot_act_press") == null ? 0 : (double) data.get("opr_hot_act_press"));
ipcData.setOpHotPress(data.get("opr_hot_real_press") == null ? 0.0 : (double) data.get("opr_hot_real_press"));
ipcData.setOpHotHoldPress(data.get("opr_hot_bond_press") == null ? 0.0 : (double) data.get("opr_hot_bond_press"));
ipcData.setOpHotPushPress(data.get("opr_hot_act_press") == null ? 0.0 : (double) data.get("opr_hot_act_press"));
ipcData.setTranSoftPress(data.get("driven_soft_real_press") == null ? 0 : (double) data.get("driven_soft_real_press"));
ipcData.setTranSoftHoldPress(data.get("driven_soft_bond_press") == null ? 0 : (double) data.get("driven_soft_bond_press"));
ipcData.setTranSoftPushPress(data.get("driven_soft_act_press") == null ? 0 : (double) data.get("driven_soft_act_press"));
ipcData.setTranSoftPress(data.get("driven_soft_real_press") == null ? 0.0 : (double) data.get("driven_soft_real_press"));
ipcData.setTranSoftHoldPress(data.get("driven_soft_bond_press") == null ? 0.0 : (double) data.get("driven_soft_bond_press"));
ipcData.setTranSoftPushPress(data.get("driven_soft_act_press") == null ? 0.0 : (double) data.get("driven_soft_act_press"));
ipcData.setTranHotPress(data.get("driven_hot_real_press") == null ? 0 : (double) data.get("driven_hot_real_press"));
ipcData.setTranHotHoldPress(data.get("driven_hot_bond_press") == null ? 0 : (double) data.get("driven_hot_bond_press"));
ipcData.setTranHotPushPress(data.get("driven_hot_act_press") == null ? 0 : (double) data.get("driven_hot_act_press"));
ipcData.setTranHotPress(data.get("driven_hot_real_press") == null ? 0.0 : (double) data.get("driven_hot_real_press"));
ipcData.setTranHotHoldPress(data.get("driven_hot_bond_press") == null ? 0.0 : (double) data.get("driven_hot_bond_press"));
ipcData.setTranHotPushPress(data.get("driven_hot_act_press") == null ? 0.0 : (double) data.get("driven_hot_act_press"));
ipcData.setOpBottomDis(data.get("opr_bottom_dis") == null ? 0 : (double) data.get("opr_bottom_dis"));
ipcData.setTranBottomDis(data.get("driven_bottom_dis") == null ? 0 : (double) data.get("driven_bottom_dis"));
ipcData.setOpBottomDis(data.get("opr_bottom_dis") == null ? 0.0 : (double) data.get("opr_bottom_dis"));
ipcData.setTranBottomDis(data.get("driven_bottom_dis") == null ? 0.0 : (double) data.get("driven_bottom_dis"));
resList.add(ipcData);
});
@ -411,33 +410,33 @@ public class DataQueryService implements IDataQueryService {
private Map<String, Object> queryScollerData(List<Map<String, Object>> list)
{
Map<String, Object> resMap = new HashMap<>();
resMap.put("sysflw", list.get(0).get("sys_flw") == null ? 0 : (double) list.get(0).get("sys_flw"));//系统流量
resMap.put("sysprs", list.get(0).get("sys_press") == null ? 0 : (double) list.get(0).get("sys_press"));//系统压力
resMap.put("syslevel", list.get(0).get("sys_level") == null ? 0 : (double) list.get(0).get("sys_level"));//系统液位
resMap.put("sysflw", list.get(0).get("sys_flw") == null ? 0.0 : (double) list.get(0).get("sys_flw"));//系统流量
resMap.put("sysprs", list.get(0).get("sys_press") == null ? 0.0 : (double) list.get(0).get("sys_press"));//系统压力
resMap.put("syslevel", list.get(0).get("sys_level") == null ? 0.0 : (double) list.get(0).get("sys_level"));//系统液位
resMap.put("syslevelinit", Integer.parseInt(sysConfigService.selectConfigByKey("sys.liquidlevel.init") == null ? "0" : sysConfigService.selectConfigByKey("sys.liquidlevel.init")));//液位初始值
//TODO 获取系统液位高值和低值
resMap.put("levelmax", list.get(0).get("level_max") == null ? 0 : (double) list.get(0).get("level_max"));
resMap.put("levelmin", list.get(0).get("level_min") == null ? 0 : (double) list.get(0).get("level_min"));
resMap.put("levelmax", list.get(0).get("level_max") == null ? 0.0 : (double) list.get(0).get("level_max"));
resMap.put("levelmin", list.get(0).get("level_min") == null ? 0.0 : (double) list.get(0).get("level_min"));
resMap.put("systemp",list.get(0).get("sys_temp") == null ? 0 : (double) list.get(0).get("sys_temp"));//系统温度
resMap.put("syshumid",list.get(0).get("oil_water") == null ? 0 : (double) list.get(0).get("oil_water"));//系统湿度
resMap.put("sysvisc",list.get(0).get("visc") == null ? 0 : (double) list.get(0).get("visc"));//系统粘度
resMap.put("systemp",list.get(0).get("sys_temp") == null ? 0.0 : (double) list.get(0).get("sys_temp"));//系统温度
resMap.put("syshumid",list.get(0).get("oil_water") == null ? 0.0 : (double) list.get(0).get("oil_water"));//系统湿度
resMap.put("sysvisc",list.get(0).get("visc") == null ? 0.0 : (double) list.get(0).get("visc"));//系统粘度
//系统颗粒度
resMap.put("sysgran4",list.get(0).get("gran4") == null ? 0 : (double) list.get(0).get("gran4"));
resMap.put("sysgran6",list.get(0).get("gran6") == null ? 0 : (double) list.get(0).get("gran6"));
resMap.put("sysgran14",list.get(0).get("gran14") == null ? 0 : (double) list.get(0).get("gran14"));
resMap.put("sysgran21",list.get(0).get("gran21") == null ? 0 : (double) list.get(0).get("gran21"));
resMap.put("sysgran4",list.get(0).get("gran4") == null ? 0.0 : (double) list.get(0).get("gran4"));
resMap.put("sysgran6",list.get(0).get("gran6") == null ? 0.0 : (double) list.get(0).get("gran6"));
resMap.put("sysgran14",list.get(0).get("gran14") == null ? 0.0 : (double) list.get(0).get("gran14"));
resMap.put("sysgran21",list.get(0).get("gran21") == null ? 0.0 : (double) list.get(0).get("gran21"));
resMap.put("linespeed",list.get(0).get("line_speed") == null ? 0 : (double) list.get(0).get("line_speed"));//车速
resMap.put("linespeed",list.get(0).get("line_speed") == null ? 0.0 : (double) list.get(0).get("line_speed"));//车速
//功率= √3IUcosΦ/1000
resMap.put("syspower",list.get(0).get("sys_cur") == null ? 0 : Math.sqrt(3)*Float.parseFloat(list.get(0).get("sys_cur").toString())*380*0.86/1000);
resMap.put("syspower",list.get(0).get("sys_cur") == null ? 0.0 : Math.sqrt(3)*Float.parseFloat(list.get(0).get("sys_cur").toString())*380*0.86/1000);
//系统效率 = 系统压力*系统流量/系统功率
double power = (double) resMap.get("syspower");
double sysflw = (double)resMap.get("sysflw");
double pressure = (double)resMap.get("sysprs");
resMap.put("syseff",power == 0 ? 0 : pressure * sysflw/power);
resMap.put("syseff",power == 0 ? 0.0 : pressure * sysflw/power);
List<Object> syscur = new ArrayList<>();//系统电流
@ -470,31 +469,31 @@ public class DataQueryService implements IDataQueryService {
for (int i = list.size() - 1; i >= 0; i--) {
Map<String, Object> data = list.get(i);
syscur.add(data.get("sys_cur") == null ? 0 : data.get("sys_cur"));
syscur.add(data.get("sys_cur") == null ? 0.0 : data.get("sys_cur"));
flw1.add(data.get("flw1") == null ? 0 : data.get("flw1"));
flw2.add(data.get("flw2") == null ? 0 : data.get("flw2"));
flw3.add(data.get("flw3") == null ? 0 : data.get("flw3"));
flw4.add(data.get("flw4") == null ? 0 : data.get("flw4"));
flw5.add(data.get("flw5") == null ? 0 : data.get("flw5"));
flw6.add(data.get("flw6") == null ? 0 : data.get("flw6"));
flw7.add(data.get("flw7") == null ? 0 : data.get("flw7"));
flw8.add(data.get("flw8") == null ? 0 : data.get("flw8"));
flw9.add(data.get("flw9") == null ? 0 : data.get("flw9"));
flw10.add(data.get("flw10") == null ? 0 : data.get("flw10"));
flw11.add(data.get("flw11") == null ? 0 : data.get("flw11"));
flw1.add(data.get("flw1") == null ? 0.0 : data.get("flw1"));
flw2.add(data.get("flw2") == null ? 0.0 : data.get("flw2"));
flw3.add(data.get("flw3") == null ? 0.0 : data.get("flw3"));
flw4.add(data.get("flw4") == null ? 0.0 : data.get("flw4"));
flw5.add(data.get("flw5") == null ? 0.0 : data.get("flw5"));
flw6.add(data.get("flw6") == null ? 0.0 : data.get("flw6"));
flw7.add(data.get("flw7") == null ? 0.0 : data.get("flw7"));
flw8.add(data.get("flw8") == null ? 0.0 : data.get("flw8"));
flw9.add(data.get("flw9") == null ? 0.0 : data.get("flw9"));
flw10.add(data.get("flw10") == null ? 0.0 : data.get("flw10"));
flw11.add(data.get("flw11") == null ? 0.0 : data.get("flw11"));
prs1.add(data.get("press1") == null ? 0 : data.get("press1"));
prs2.add(data.get("press2") == null ? 0 : data.get("press2"));
prs3.add(data.get("press3") == null ? 0 : data.get("press3"));
prs4.add(data.get("press4") == null ? 0 : data.get("press4"));
prs5.add(data.get("press5") == null ? 0 : data.get("press5"));
prs6.add(data.get("press6") == null ? 0 : data.get("press6"));
prs7.add(data.get("press7") == null ? 0 : data.get("press7"));
prs8.add(data.get("press8") == null ? 0 : data.get("press8"));
prs9.add(data.get("press9") == null ? 0 : data.get("press9"));
prs10.add(data.get("press10") == null ? 0 : data.get("press10"));
prs11.add(data.get("press11") == null ? 0 : data.get("press11"));
prs1.add(data.get("press1") == null ? 0.0 : data.get("press1"));
prs2.add(data.get("press2") == null ? 0.0 : data.get("press2"));
prs3.add(data.get("press3") == null ? 0.0 : data.get("press3"));
prs4.add(data.get("press4") == null ? 0.0 : data.get("press4"));
prs5.add(data.get("press5") == null ? 0.0 : data.get("press5"));
prs6.add(data.get("press6") == null ? 0.0 : data.get("press6"));
prs7.add(data.get("press7") == null ? 0.0 : data.get("press7"));
prs8.add(data.get("press8") == null ? 0.0 : data.get("press8"));
prs9.add(data.get("press9") == null ? 0.0: data.get("press9"));
prs10.add(data.get("press10") == null ? 0.0 : data.get("press10"));
prs11.add(data.get("press11") == null ? 0.0 : data.get("press11"));
LocalDateTime time = InfluxdbTimeUtil.utcToCst(data.get("time").toString());
timelist.add( time.getMinute() < 10 ? "0" + time.getMinute() : time.getMinute() + ":" + (time.getSecond() < 10 ? "0" + time.getSecond() : time.getSecond()));
@ -540,44 +539,44 @@ public class DataQueryService implements IDataQueryService {
ScollerData ipcData = new ScollerData();
ipcData.setTime(InfluxdbTimeUtil.utcToCst(data.get("time").toString()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ipcData.setStatus(data.get("status") == null ? "0" : (String) data.get("status"));
ipcData.setSysCur(data.get("sys_cur") == null ? 0 : (double) data.get("sys_cur"));
ipcData.setSysLevel(data.get("sys_level") == null ? 0 : (double) data.get("sys_level"));
ipcData.setSysTemp(data.get("sys_temp") == null ? 0 : (double) data.get("sys_temp"));
ipcData.setSysPress(data.get("sys_press") == null ? 0 : (double) data.get("sys_press"));
ipcData.setSysFlow(data.get("sys_flw") == null ? 0 : (double) data.get("sys_flw"));
ipcData.setHumi(data.get("oil_water") == null ? 0 : (double) data.get("oil_water"));
ipcData.setVisc(data.get("visc") == null ? 0 : (double) data.get("visc"));
ipcData.setSysCur(data.get("sys_cur") == null ? 0.0 : (double) data.get("sys_cur"));
ipcData.setSysLevel(data.get("sys_level") == null ? 0.0 : (double) data.get("sys_level"));
ipcData.setSysTemp(data.get("sys_temp") == null ? 0.0 : (double) data.get("sys_temp"));
ipcData.setSysPress(data.get("sys_press") == null ? 0.0 : (double) data.get("sys_press"));
ipcData.setSysFlow(data.get("sys_flw") == null ? 0.0 : (double) data.get("sys_flw"));
ipcData.setHumi(data.get("oil_water") == null ? 0.0 : (double) data.get("oil_water"));
ipcData.setVisc(data.get("visc") == null ? 0.0 : (double) data.get("visc"));
ipcData.setGran4(data.get("gran4") == null ? 0 : (double) data.get("gran4"));
ipcData.setGran6(data.get("gran6") == null ? 0 : (double) data.get("gran6"));
ipcData.setGran14(data.get("gran14") == null ? 0 : (double) data.get("gran14"));
ipcData.setGran21(data.get("gran21") == null ? 0 : (double) data.get("gran21"));
ipcData.setGran4(data.get("gran4") == null ? 0.0 : (double) data.get("gran4"));
ipcData.setGran6(data.get("gran6") == null ? 0.0 : (double) data.get("gran6"));
ipcData.setGran14(data.get("gran14") == null ? 0.0 : (double) data.get("gran14"));
ipcData.setGran21(data.get("gran21") == null ? 0.0 : (double) data.get("gran21"));
ipcData.setSpeed(data.get("line_speed") == null ? 0 : (double) data.get("line_speed"));
ipcData.setSpeed(data.get("line_speed") == null ? 0.0 : (double) data.get("line_speed"));
ipcData.setPress1(data.get("press1") == null ? 0 : (double) data.get("press1"));
ipcData.setPress2(data.get("press2") == null ? 0 : (double) data.get("press2"));
ipcData.setPress3(data.get("press3") == null ? 0 : (double) data.get("press3"));
ipcData.setPress4(data.get("press4") == null ? 0 : (double) data.get("press4"));
ipcData.setPress5(data.get("press5") == null ? 0 : (double) data.get("press5"));
ipcData.setPress6(data.get("press6") == null ? 0 : (double) data.get("press6"));
ipcData.setPress7(data.get("press7") == null ? 0 : (double) data.get("press7"));
ipcData.setPress8(data.get("press8") == null ? 0 : (double) data.get("press8"));
ipcData.setPress9(data.get("press9") == null ? 0 : (double) data.get("press9"));
ipcData.setPress10(data.get("press10") == null ? 0 : (double) data.get("press10"));
ipcData.setPress11(data.get("press11") == null ? 0 : (double) data.get("press11"));
ipcData.setPress1(data.get("press1") == null ? 0.0 : (double) data.get("press1"));
ipcData.setPress2(data.get("press2") == null ? 0.0 : (double) data.get("press2"));
ipcData.setPress3(data.get("press3") == null ? 0.0 : (double) data.get("press3"));
ipcData.setPress4(data.get("press4") == null ? 0.0 : (double) data.get("press4"));
ipcData.setPress5(data.get("press5") == null ? 0.0 : (double) data.get("press5"));
ipcData.setPress6(data.get("press6") == null ? 0.0 : (double) data.get("press6"));
ipcData.setPress7(data.get("press7") == null ? 0.0 : (double) data.get("press7"));
ipcData.setPress8(data.get("press8") == null ? 0.0: (double) data.get("press8"));
ipcData.setPress9(data.get("press9") == null ? 0.0 : (double) data.get("press9"));
ipcData.setPress10(data.get("press10") == null ? 0.0 : (double) data.get("press10"));
ipcData.setPress11(data.get("press11") == null ? 0.0 : (double) data.get("press11"));
ipcData.setFlow1(data.get("flw1") == null ? 0 : (double) data.get("flw1"));
ipcData.setFlow2(data.get("flw2") == null ? 0 : (double) data.get("flw2"));
ipcData.setFlow3(data.get("flw3") == null ? 0 : (double) data.get("flw3"));
ipcData.setFlow4(data.get("flw4") == null ? 0 : (double) data.get("flw4"));
ipcData.setFlow5(data.get("flw5") == null ? 0 : (double) data.get("flw5"));
ipcData.setFlow6(data.get("flw6") == null ? 0 : (double) data.get("flw6"));
ipcData.setFlow7(data.get("flw7") == null ? 0 : (double) data.get("flw7"));
ipcData.setFlow8(data.get("flw8") == null ? 0 : (double) data.get("flw8"));
ipcData.setFlow9(data.get("flw9") == null ? 0 : (double) data.get("flw9"));
ipcData.setFlow10(data.get("flw10") == null ? 0 : (double) data.get("flw10"));
ipcData.setFlow11(data.get("flw11") == null ? 0 : (double) data.get("flw11"));
ipcData.setFlow1(data.get("flw1") == null ? 0.0 : (double) data.get("flw1"));
ipcData.setFlow2(data.get("flw2") == null ? 0.0 : (double) data.get("flw2"));
ipcData.setFlow3(data.get("flw3") == null ? 0.0 : (double) data.get("flw3"));
ipcData.setFlow4(data.get("flw4") == null ? 0.0 : (double) data.get("flw4"));
ipcData.setFlow5(data.get("flw5") == null ? 0.0 : (double) data.get("flw5"));
ipcData.setFlow6(data.get("flw6") == null ? 0.0 : (double) data.get("flw6"));
ipcData.setFlow7(data.get("flw7") == null ? 0.0 : (double) data.get("flw7"));
ipcData.setFlow8(data.get("flw8") == null ? 0.0 : (double) data.get("flw8"));
ipcData.setFlow9(data.get("flw9") == null ? 0.0 : (double) data.get("flw9"));
ipcData.setFlow10(data.get("flw10") == null ? 0.0 : (double) data.get("flw10"));
ipcData.setFlow11(data.get("flw11") == null ? 0.0 : (double) data.get("flw11"));
resList.add(ipcData);
});

6
zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/utils/IpcUtil.java
View File

@ -64,11 +64,11 @@ public class IpcUtil {
/**
* 批量处理实时数据
*/
public List<IpcAlarmRecord> dealRealTimeData(Map<String, Object> map, Map<String, String> tags,int type, List<IpcAlarmRules> rulesList) {
public List<IpcAlarmRecord> dealRealTimeData(Map<String, Object> map, Map<String, String> tags,int type, List<IpcAlarmRules> rulesList, int status) {
List<IpcAlarmRecord> returnList = new ArrayList<>();
for (IpcAlarmRules rule : rulesList) {
// 判断是否当前参数类型 0:运行中 1：待机
// 判断是否当前参数类型 0:待
if (type == rule.getType()) {
if (judgeAlarm(map.get(rule.getAlarmNameKey()), rule.getAlertLowerBound(), rule.getAlertUpperBound(), rule.getReferenceCon())) {
// 报警数据
@ -82,7 +82,7 @@ public class IpcUtil {
double value = (double) map.get(name);
ipcAlarmRecord.setAlarmValue(BigDecimal.valueOf(value));
ipcAlarmRecord.setNameKey(name);
ipcAlarmRecord.setContent(rule.getReferenceName());
ipcAlarmRecord.setContent(status == 2 || status == 3 ? "(开机监测)" + rule.getReferenceName() : rule.getReferenceName());
ipcAlarmRecord.setStatus(0);
ipcAlarmRecord.setOperator(1L);
ipcAlarmRecord.setAlarmLevel(rule.getAlarmLevel());

350
zfipc-ui/src/views/zf/cydg/yxjk.vue
View File

@ -6,7 +6,10 @@
class="second-col"
style="height: 100%;"
>
<el-container class="container" style="height: 100%;">
<el-container
class="container"
style="height: 100%;"
>
<el-header class="header">ZFSC4超压平衡缸P/Q特性</el-header>
<el-main class="main">
<el-row style="height: 50%">
@ -145,7 +148,11 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="sjyltxWarning"></lbCompents> -->
<div class="warn">{{ sjyltxWarning }} </div>
<div
v-if="sjyltxWarning.length > 0"
class="warn"
> <router-link to="/detection/alarm/record">{{sjyltxWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
@ -154,7 +161,10 @@
class="first-col"
style="height: 100%;"
>
<el-container class="container" style="height: 100%;">
<el-container
class="container"
style="height: 100%;"
>
<el-header class="header">ZFSC4超压底缸加压液压系统主参数</el-header>
<el-main class="main">
<el-row style="height: 50%">
@ -166,8 +176,11 @@
id="xtyl"
style="height: 90%"
></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#26DE86"><span @click="trendClick('sys_press'
,'系统压力','bar')">系统压力</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#26DE86"><span
@click="trendClick('sys_press'
,'系统压力','bar')"
style='cursor:pointer;'
>系统压力</span></div>
</el-col>
<el-col
:span="8"
@ -177,34 +190,46 @@
id="xtyw"
style="height: 90%"
></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB"><span @click="trendClick('sys_temp'
,'系统液温','℃')">系统液温</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB"><span
@click="trendClick('sys_temp'
,'系统液温','℃')"
style='cursor:pointer;'
>系统液温</span></div>
</el-col>
<el-col
:span="8"
style="height: 100%;"
>
<el-col :span="10" style="height: 90%;">
<el-col
:span="10"
style="height: 90%;"
>
<div
id="xtywei"
style="height: 100%;width: 100%;margin-left:40%"
></div>
</el-col>
<el-col :span="14" style="height: 90%;">
<!-- <div
<el-col
:span="14"
style="height: 90%;"
>
<!-- <div
class="dataCol1"
>-->
<div style="position: absolute;top: 12%;">
<div class="font-size-10">当前值<span class="yeweiSpan font-size-16">{{ xtywei }}</span></div>
<div class="font-size-10">初始值<span class="yeweiSpan font-size-16">{{ xtyweicsz }}</span></div>
<div class="font-size-10">最小值<span class="yeweiSpan font-size-16">{{ xtyweimin }}</span></div>
<div class="font-size-10">最大值<span class="yeweiSpan font-size-16">{{ xtyweimax }}</span></div>
</div>
<!-- </div>-->
<div style="position: absolute;top: 12%;">
<div class="font-size-10">当前值<span class="yeweiSpan font-size-16">{{ xtywei }}</span></div>
<div class="font-size-10">初始值<span class="yeweiSpan font-size-16">{{ xtyweicsz }}</span></div>
<div class="font-size-10">最小值<span class="yeweiSpan font-size-16">{{ xtyweimin }}</span></div>
<div class="font-size-10">最大值<span class="yeweiSpan font-size-16">{{ xtyweimax }}</span></div>
</div>
<!-- </div>-->
</el-col>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:revert;z-index: 999;top:-110%;"><span @click="trendClick('sys_level'
,'系统液位','cP')">系统液位(CP)</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:revert;z-index: 999;top:-110%;"><span
@click="trendClick('sys_level'
,'系统液位','cP')"
style='cursor:pointer;'
>系统液位(CP)</span></div>
</el-col>
</el-row>
@ -217,8 +242,11 @@
id="bscll"
style="height: 90%"
></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"><span @click="trendClick('sys_flw'
,'泵输出流量','L/min')">泵输出流量</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"><span
@click="trendClick('sys_flw'
,'泵输出流量','L/min')"
style='cursor:pointer;'
>泵输出流量</span></div>
</el-col>
<el-col
:span="8"
@ -245,7 +273,11 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="mainWarning"></lbCompents> -->
<div class="warn">{{mainWarning}}</div>
<div
v-if="mainWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{mainWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
@ -254,7 +286,10 @@
class="third-col"
style="height: 100%;"
>
<el-container class="container" style="height: 100%;">
<el-container
class="container"
style="height: 100%;"
>
<el-header class="header">系统状态信息</el-header>
<el-main class="main">
<div style="text-align: center;height: 10%;padding-top: 2%;">
@ -264,7 +299,7 @@
>电机总耗电量<span class="numSpan">{{powerConsumption}}</span>度</el-col> -->
<div
:span="24"
style="height: 100%;"
style="height: 100%;cursor:pointer;"
@click="trendClick('sys_cur'
,'电机电流','A')"
>电机实时电流<span class="numSpan">{{zdjdl}}</span>A</div>
@ -277,7 +312,11 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="sysecWarning"></lbCompents> -->
<div class="warn">{{sysecWarning}}</div>
<div
v-if="sysecWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{sysecWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
@ -288,7 +327,10 @@
class="first-col"
style="height: 100%;"
>
<el-container class="container" style="height: 100%;">
<el-container
class="container"
style="height: 100%;"
>
<el-header class="header">ZFSC4超压底缸加压压区P/Q特性</el-header>
<el-main class="main">
<el-row style="height: 50%">
@ -386,7 +428,11 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="llyltxWarning"></lbCompents> -->
<div class="warn">{{llyltxWarning}}</div>
<div
v-if="llyltxWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{llyltxWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
@ -395,7 +441,10 @@
class="second-col"
style="height: 100%;"
>
<el-container class="container" style="height: 100%;">
<el-container
class="container"
style="height: 100%;"
>
<el-header class="header">ZFSC4超压底缸加压系统油品特性</el-header>
<el-main class="main">
<el-row style="height: 40%">
@ -405,7 +454,7 @@
>
<div
id="dlnd"
style="width: 100%;height: 100%;"
style="width: 100%;height: 100%;cursor:pointer;"
@click="trendClick('visc'
,'油品粘度','')"
></div>
@ -416,7 +465,7 @@
>
<div
id="xdsd"
style="width: 100%;height: 100%;"
style="width: 100%;height: 100%;cursor:pointer;"
@click="trendClick('oil_water'
,'油品湿度','%')"
></div>
@ -426,30 +475,42 @@
<el-col
:span="3"
style="text-align: right;;height: 100%"
><span @click="trendClick('gran4'
,'油液颗粒度（4um）','PM')">4um</span></el-col>
><span
@click="trendClick('gran4'
,'油液颗粒度（4um）','PM')"
style="cursor:pointer;"
>4um</span></el-col>
<el-col :span="3">
<span class="numCol">{{ yykld4 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
><span @click="trendClick('gran6'
,'油液颗粒度（6um）','PM')">6um</span></el-col><el-col :span="3">
><span
@click="trendClick('gran6'
,'油液颗粒度（6um）','PM')"
style="cursor:pointer;"
>6um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld6 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
><span @click="trendClick('gran14'
,'油液颗粒度（14um）','PM')">14um</span></el-col><el-col :span="3">
><span
@click="trendClick('gran14'
,'油液颗粒度（14um）','PM')"
style="cursor:pointer;"
>14um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld14 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
><span @click="trendClick('gran21'
,'油液颗粒度（21um）','PM')">21um</span></el-col><el-col :span="3">
><span
@click="trendClick('gran21'
,'油液颗粒度（21um）','PM')"
style="cursor:pointer;"
>21um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld21 }}</span>
</el-col>
</el-row>
@ -466,7 +527,11 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="ylkldWarning"></lbCompents> -->
<div class="warn">{{ylkldWarning}}</div>
<div
v-if="ylkldWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{ylkldWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
@ -475,7 +540,10 @@
class="third-col"
style="height: 100%;"
>
<el-container class="container" style="height: 100%;">
<el-container
class="container"
style="height: 100%;"
>
<el-header class="header">系统状态</el-header>
<el-main class="main">
<div class="device-card-content">
@ -989,6 +1057,9 @@ export default {
},
handleQuery() {
this.loading = true;
if (this.datetime == null) {
this.datetime = this.getDefaultTimeRange();
}
let startTime = new Date(this.datetime[0]);
this.queryParams.startTime = this.formatDateTime(startTime);
let endTime = new Date(this.datetime[1]);
@ -1190,6 +1261,7 @@ export default {
item.nameKey == "sys_level" ||
item.nameKey == "sys_temp"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1216,6 +1288,7 @@ export default {
item.nameKey == "driven_soft_flw" ||
item.nameKey == "driven_hot_flw"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1224,6 +1297,7 @@ export default {
// 系统能耗及预警
this.sysecWarning = response.data
.filter((item) => item.nameKey == "sys_cur")
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1238,6 +1312,7 @@ export default {
item.nameKey == "opr_bottom_set_press" ||
item.nameKey == "driven_bottom_set_press"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1254,6 +1329,7 @@ export default {
item.nameKey == "gran14" ||
item.nameKey == "gran21"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1436,14 +1512,14 @@ export default {
cdcjyylqxOption.xAxis[0].data = this.XDATA;
cdcjyylqxOption.series[0].data = this.showdata.drivensoftrealpress;
cdcjyylqxOption.series[1].data = this.showdata.drivenhotrealpress;
cdcjyylqxOption.series[0].markLine.data[0].yAxis =
this.showdata.drivensoftbondpress.slice(-1)[0];
cdcjyylqxOption.series[0].markLine.data[1].yAxis =
this.showdata.drivensoftactpress.slice(-1)[0];
cdcjyylqxOption.series[1].markLine.data[0].yAxis =
this.showdata.drivenhotbondpress.slice(-1)[0];
cdcjyylqxOption.series[1].markLine.data[1].yAxis =
this.showdata.drivenhotactpress.slice(-1)[0];
// cdcjyylqxOption.series[0].markLine.data[0].yAxis =
// this.showdata.drivensoftbondpress.slice(-1)[0];
// cdcjyylqxOption.series[0].markLine.data[1].yAxis =
// this.showdata.drivensoftactpress.slice(-1)[0];
// cdcjyylqxOption.series[1].markLine.data[0].yAxis =
// this.showdata.drivenhotbondpress.slice(-1)[0];
// cdcjyylqxOption.series[1].markLine.data[1].yAxis =
// this.showdata.drivenhotactpress.slice(-1)[0];
// cdcjyylqxOption.series[2].data = this.showdata.dsrghgyl;
// cdcjyylqxOption.series[3].data = this.showdata.dsrgjyyl;
// cdcjyylqxOption.series[4].data = this.showdata.dsreghgyl;
@ -1460,14 +1536,14 @@ export default {
czcjyylqxOption.xAxis[0].data = this.XDATA;
czcjyylqxOption.series[0].data = this.showdata.oprsoftrealpress;
czcjyylqxOption.series[1].data = this.showdata.oprhotrealpress;
czcjyylqxOption.series[0].markLine.data[0].yAxis =
this.showdata.oprsoftbondpress.slice(-1)[0];
czcjyylqxOption.series[0].markLine.data[1].yAxis =
this.showdata.oprsoftactpress.slice(-1)[0];
czcjyylqxOption.series[1].markLine.data[0].yAxis =
this.showdata.oprhotbondpress.slice(-1)[0];
czcjyylqxOption.series[1].markLine.data[1].yAxis =
this.showdata.oprhotactpress.slice(-1)[0];
// czcjyylqxOption.series[0].markLine.data[0].yAxis =
// this.showdata.oprsoftbondpress.slice(-1)[0];
// czcjyylqxOption.series[0].markLine.data[1].yAxis =
// this.showdata.oprsoftactpress.slice(-1)[0];
// czcjyylqxOption.series[1].markLine.data[0].yAxis =
// this.showdata.oprhotbondpress.slice(-1)[0];
// czcjyylqxOption.series[1].markLine.data[1].yAxis =
// this.showdata.oprhotactpress.slice(-1)[0];
// czcjyylqxOption.series[2].data = this.showdata.tsrghgyl;
// czcjyylqxOption.series[3].data = this.showdata.tsrgjyyl;
// czcjyylqxOption.series[4].data = this.showdata.tsreghgyl;
@ -1483,16 +1559,16 @@ export default {
let cdcylbhqxOption = this.cdcylbhqxCharts.getOption();
cdcylbhqxOption.xAxis[0].data = this.XDATA;
cdcylbhqxOption.series[0].data = this.showdata.drivenbottompress;
cdcylbhqxOption.series[0].markLine.data[0].yAxis =
this.showdata.oprbottomsetpress.slice(-1)[0];
// cdcylbhqxOption.series[0].markLine.data[0].yAxis =
// this.showdata.oprbottomsetpress.slice(-1)[0];
// cdcylbhqxOption.series[1].data = this.showdata.dgcdcblsff;
this.cdcylbhqxCharts.setOption(cdcylbhqxOption);
let czcylbhqxOption = this.czcylbhqxCharts.getOption();
czcylbhqxOption.xAxis[0].data = this.XDATA;
czcylbhqxOption.series[0].data = this.showdata.oprbottompress;
czcylbhqxOption.series[0].markLine.data[0].yAxis =
this.showdata.oprbottomsetpress.slice(-1)[0];
// czcylbhqxOption.series[0].markLine.data[0].yAxis =
// this.showdata.oprbottomsetpress.slice(-1)[0];
// czcylbhqxOption.series[1].data = this.showdata.dgczcblsff;
this.czcylbhqxCharts.setOption(czcylbhqxOption);
@ -1682,33 +1758,6 @@ export default {
},
data: this.showdata.drivensoftrealpress,
symbol: "none",
markLine: {
symbol: ["none", "none"],
silent: true,
lineStyle: {
type: "dashed",
},
label: {
position: "middle",
color: "inherit",
},
data: [
{
yAxis: this.showdata.drivensoftbondpress.slice(-1)[0],
lineStyle: {
width: 1,
color: "#FF0087",
},
},
{
yAxis: this.showdata.drivensoftactpress.slice(-1)[0],
lineStyle: {
width: 1,
color: "#FFBF00",
},
},
],
},
},
{
name: "热辊实际压力",
@ -1718,33 +1767,6 @@ export default {
},
data: this.showdata.drivenhotrealpress,
symbol: "none",
markLine: {
symbol: ["none", "none"],
silent: true,
lineStyle: {
type: "dashed",
},
label: {
position: "middle",
color: "inherit",
},
data: [
{
yAxis: this.showdata.drivenhotbondpress.slice(-1)[0],
lineStyle: {
width: 1,
color: "#fc8452",
},
},
{
yAxis: this.showdata.drivenhotactpress.slice(-1)[0],
lineStyle: {
width: 1,
color: "#ea7ccc",
},
},
],
},
},
// {
// name: "软辊合辊压力",
@ -1858,33 +1880,6 @@ export default {
},
data: this.showdata.oprsoftrealpress,
symbol: "none",
markLine: {
symbol: ["none", "none"],
silent: true,
lineStyle: {
type: "dashed",
},
label: {
position: "middle",
color: "inherit",
},
data: [
{
yAxis: this.showdata.oprsoftbondpress.slice(-1)[0],
lineStyle: {
width: 1,
color: "#FF0087",
},
},
{
yAxis: this.showdata.oprsoftactpress.slice(-1)[0],
lineStyle: {
width: 1,
color: "#FFBF00",
},
},
],
},
},
{
name: "热辊实际压力",
@ -1894,33 +1889,6 @@ export default {
},
data: this.showdata.oprhotrealpress,
symbol: "none",
markLine: {
symbol: ["none", "none"],
silent: true,
lineStyle: {
type: "dashed",
},
label: {
position: "middle",
color: "inherit",
},
data: [
{
yAxis: this.showdata.oprhotbondpress.slice(-1)[0],
lineStyle: {
width: 1,
color: "#fc8452",
},
},
{
yAxis: this.showdata.oprhotactpress.slice(-1)[0],
lineStyle: {
width: 1,
color: "#ea7ccc",
},
},
],
},
},
// {
// name: "软辊合辊压力",
@ -2065,26 +2033,6 @@ export default {
},
data: this.showdata.oprbottompress,
symbol: "none",
markLine: {
symbol: ["none", "none"],
silent: true,
lineStyle: {
type: "dashed",
},
label: {
position: "middle",
color: "#FFFF00",
},
data: [
{
yAxis: this.showdata.oprbottomsetpress.slice(-1)[0], //底缸操作侧设定压力
lineStyle: {
width: 1,
color: "#FFFF00",
},
},
],
},
},
// {
// name: "底缸加压设定压力",
@ -2128,27 +2076,6 @@ export default {
},
data: this.showdata.drivenbottompress,
symbol: "none",
markLine: {
symbol: ["none", "none"],
// symbol: ["circle", "arrow"], //箭头
silent: true,
lineStyle: {
type: "dashed",
},
label: {
position: "middle",
color: "#FFFF00",
},
data: [
{
yAxis: this.showdata.drivenbottompress.slice(-1)[0], //底缸传动侧设定压力
lineStyle: {
width: 1,
color: "#FFFF00",
},
},
],
},
},
// {
// name: "底缸加压设定压力",
@ -2273,14 +2200,14 @@ export default {
data: ["4um", "6um", "14um", "21um"],
},
yAxis: {
name: "Y(mA)",
name: "颗粒度",
min: 0,
max: 1,
interval: 0.2, // 指定刻度间隔
},
series: [
{
name: "位移",
name: "颗粒度",
type: "bar",
barWidth: "30",
itemStyle: {
@ -2815,6 +2742,7 @@ export default {
font-weight: 400;
color: #ffffff;
padding-left: 10%;
white-space: nowrap;
}
.device-bottom-value {
font-size: 14px;

130
zfipc-ui/src/views/zf/zgdgBottom/index.vue
View File

@ -4,8 +4,12 @@
<el-col
:span="10"
class="first-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">ZFSC4中高底辊液压压区P/Q特性</el-header>
<el-main class="main">
<el-row style="height: 20%;margin:0 3%;">
@ -157,15 +161,23 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="sjyltxWarning"></lbCompents> -->
<div class="warn">{{sjyltxWarning}}</div>
<div
v-if="sjyltxWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{sjyltxWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
<el-col
:span="7"
class="second-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">ZFSC4中高底辊液压系统主参数</el-header>
<el-main class="main">
<el-row style="height: 50%">
@ -177,8 +189,11 @@
id="xtyl"
style="height: 90%"
></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#26DE86"><span @click="trendClick('sys_press'
,'系统压力','bar')">系统压力</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#26DE86"><span
@click="trendClick('sys_press'
,'系统压力','bar')"
style='cursor:pointer;'
>系统压力</span></div>
</el-col>
<el-col
:span="8"
@ -188,8 +203,11 @@
id="xtyw"
style="height: 90%"
></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB"><span @click="trendClick('sys_temp'
,'系统液温','℃')">系统液温</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB"><span
@click="trendClick('sys_temp'
,'系统液温','℃')"
style='cursor:pointer;'
>系统液温</span></div>
</el-col>
<el-col
:span="8"
@ -210,8 +228,11 @@
<div>最大值<span class="yeweiSpan">{{ xtyweimax }}</span></div>
</div>
</div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;"><span @click="trendClick('sys_level'
,'系统液位','cP')">系统液位(CP)</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;"><span
@click="trendClick('sys_level'
,'系统液位','cP')"
style='cursor:pointer;'
>系统液位(CP)</span></div>
</el-col>
</el-row>
@ -224,8 +245,11 @@
id="zbscll"
style="height: 90%"
></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"><span @click="trendClick('sys_flw'
,'泵输出流量','L/min')">泵输出流量</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"><span
@click="trendClick('sys_flw'
,'泵输出流量','L/min')"
style='cursor:pointer;'
>泵输出流量</span></div>
</el-col>
<el-col
:span="8"
@ -252,21 +276,29 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="mainWarning"></lbCompents> -->
<div class="warn">{{mainWarning}}</div>
<div
v-if="mainWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{mainWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
<el-col
:span="7"
class="third-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">系统状态信息</el-header>
<el-main class="main">
<div style="text-align: center;height: 10%;padding-top: 2%;">
<div
:span="12"
style="height: 100%"
style="height: 100%;cursor:pointer;"
@click="trendClick('sys_cur'
,'电机电流','A')"
>电机实时电流<span class="numSpan">{{zdjdl}}</span>A</div>
@ -279,7 +311,11 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="sysecWarning"></lbCompents> -->
<div class="warn">{{sysecWarning}}</div>
<div
v-if="sysecWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{sysecWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
@ -441,38 +477,44 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="llyltxWarning"></lbCompents> -->
<div class="warn">{{ llyltxWarning }}</div>
<div
v-if="llyltxWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{llyltxWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
<el-col
:span="7"
class="second-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">ZFSC4超压底缸加压系统油品特性</el-header>
<el-main class="main">
<el-row style="height: 40%">
<el-col
:span="12"
id="dlnd"
style="height: 100%"
>
<div
id="dlnd"
style="width: 100%;height: 100%;"
style="width: 100%;height: 100%;cursor:pointer;"
@click="trendClick('visc'
,'油品粘度','')"
></div>
</el-col>
<el-col
:span="12"
id="xdsd"
style="height: 100%"
>
<div
id="xdsd"
style="width: 100%;height: 100%;"
style="width: 100%;height: 100%;cursor:pointer;"
@click="trendClick('oil_water'
,'油品湿度','%')"
></div>
@ -482,26 +524,42 @@
<el-col
:span="3"
style="text-align: right;height: 100%"
>4um</el-col>
><span
@click="trendClick('gran4'
,'油液颗粒度（4um）','PM')"
style="cursor:pointer;"
>4um</span></el-col>
<el-col :span="3">
<span class="numCol">{{ yykld4 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
>6um</el-col><el-col :span="3">
><span
@click="trendClick('gran6'
,'油液颗粒度（6um）','PM')"
style="cursor:pointer;"
>6um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld6 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
>14um</el-col><el-col :span="3">
><span
@click="trendClick('gran14'
,'油液颗粒度（14um）','PM')"
style="cursor:pointer;"
>14um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld14 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
>21um</el-col><el-col :span="3">
><span
@click="trendClick('gran21'
,'油液颗粒度（21um）','PM')"
style="cursor:pointer;"
>21um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld21 }}</span>
</el-col>
</el-row>
@ -518,15 +576,23 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="ylkldWarning"></lbCompents> -->
<div class="warn">{{ylkldWarning}}</div>
<div
v-if="ylkldWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{ylkldWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
<el-col
:span="7"
class="third-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">系统状态</el-header>
<el-main class="main">
<div class="device-card-content">
@ -1032,6 +1098,9 @@ export default {
},
handleQuery() {
this.loading = true;
if (this.datetime == null) {
this.datetime = this.getDefaultTimeRange();
}
let startTime = new Date(this.datetime[0]);
this.queryParams.startTime = this.formatDateTime(startTime);
let endTime = new Date(this.datetime[1]);
@ -1233,6 +1302,7 @@ export default {
item.nameKey == "sys_level" ||
item.nameKey == "sys_temp"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1254,6 +1324,7 @@ export default {
item.nameKey == "press10" ||
item.nameKey == "press11"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1263,6 +1334,7 @@ export default {
// 系统能耗及预警
this.sysecWarning = response.data
.filter((item) => item.nameKey == "sys_cur")
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1285,6 +1357,7 @@ export default {
item.nameKey == "flw10" ||
item.nameKey == "flw11"
)
.slice(0, 10)
.map((obj) => obj.alarmDetail);
// .join("，");
// ZFSC4超压底缸加压系统油品特性报警
@ -1298,6 +1371,7 @@ export default {
item.nameKey == "gran14" ||
item.nameKey == "gran21"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -2496,6 +2570,7 @@ export default {
font-weight: 400;
color: #ffffff;
padding-left: 10%;
white-space: nowrap;
}
.device-bottom-value {
font-size: 14px;
@ -2557,6 +2632,7 @@ export default {
}
.font-size-14 {
font-size: 14px;
cursor: pointer;
}
.font-size-18 {
font-size: 18px;

136
zfipc-ui/src/views/zf/zgdgTop/index.vue
View File

@ -4,8 +4,12 @@
<el-col
:span="10"
class="first-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">ZFSC4中高底辊液压压区P/Q特性</el-header>
<el-main class="main">
<el-row style="height: 20%;margin:0 3%;">
@ -157,15 +161,23 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="sjyltxWarning"></lbCompents> -->
<div class="warn">{{sjyltxWarning}}</div>
<div
v-if="sjyltxWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{sjyltxWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
<el-col
:span="7"
class="second-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">ZFSC4中高底辊液压系统主参数</el-header>
<el-main class="main">
<el-row style="height: 50%">
@ -177,8 +189,11 @@
id="xtyl"
style="height: 90%"
></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#26DE86"><span @click="trendClick('sys_press'
,'系统压力','bar')">系统压力</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#26DE86"><span
@click="trendClick('sys_press'
,'系统压力','bar')"
style='cursor:pointer;'
>系统压力</span></div>
</el-col>
<el-col
:span="8"
@ -188,8 +203,11 @@
id="xtyw"
style="height: 90%"
></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB"><span @click="trendClick('sys_temp'
,'系统液温','℃')">系统液温</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB"><span
@click="trendClick('sys_temp'
,'系统液温','℃')"
style='cursor:pointer;'
>系统液温</span></div>
</el-col>
<el-col
:span="8"
@ -210,8 +228,11 @@
<div>最大值<span class="yeweiSpan">{{ xtyweimax }}</span></div>
</div>
</div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;"><span @click="trendClick('sys_level'
,'系统液位','cP')">系统液位(CP)</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;"><span
@click="trendClick('sys_level'
,'系统液位','cP')"
style='cursor:pointer;'
>系统液位(CP)</span></div>
</el-col>
</el-row>
@ -224,8 +245,11 @@
id="zbscll"
style="height: 90%"
></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"><span @click="trendClick('sys_flw'
,'泵输出流量','L/min')">泵输出流量</span></div>
<div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"><span
@click="trendClick('sys_flw'
,'泵输出流量','L/min')"
style='cursor:pointer;'
>泵输出流量</span></div>
</el-col>
<el-col
:span="8"
@ -252,21 +276,29 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="mainWarning"></lbCompents> -->
<div class="warn">{{mainWarning}}</div>
<div
v-if="mainWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{mainWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
<el-col
:span="7"
class="third-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">系统状态信息</el-header>
<el-main class="main">
<div style="text-align: center;height: 10%;padding-top: 2%;">
<div
:span="12"
style="height: 100%"
style="height: 100%;cursor:pointer;"
@click="trendClick('sys_cur'
,'电机电流','A')"
>电机实时电流<span class="numSpan">{{zdjdl}}</span>A</div>
@ -279,7 +311,11 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="sysecWarning"></lbCompents> -->
<div class="warn">{{sysecWarning}}</div>
<div
v-if="sysecWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{sysecWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
@ -288,8 +324,12 @@
<el-col
:span="10"
class="first-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">ZFSC4中高底辊液压压区P/Q特性</el-header>
<el-main class="main">
<el-row style="height: 20%;margin:0 3%;">
@ -441,38 +481,44 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="llyltxWarning"></lbCompents> -->
<div class="warn">{{ llyltxWarning }}</div>
<div
v-if="llyltxWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{llyltxWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
<el-col
:span="7"
class="second-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">ZFSC4超压底缸加压系统油品特性</el-header>
<el-main class="main">
<el-row style="height: 40%">
<el-col
:span="12"
id="dlnd"
style="height: 100%"
>
<div
id="dlnd"
style="width: 100%;height: 100%;"
style="width: 100%;height: 100%;cursor:pointer"
@click="trendClick('visc'
,'油品粘度','')"
></div>
</el-col>
<el-col
:span="12"
id="xdsd"
style="height: 100%"
>
<div
id="xdsd"
style="width: 100%;height: 100%;"
style="width: 100%;height: 100%;cursor:pointer"
@click="trendClick('oil_water'
,'油品湿度','%')"
></div>
@ -482,26 +528,42 @@
<el-col
:span="3"
style="text-align: right;height: 100%"
>4um</el-col>
><span
@click="trendClick('gran4'
,'油液颗粒度（4um）','PM')"
style="cursor:pointer;"
>4um</span></el-col>
<el-col :span="3">
<span class="numCol">{{ yykld4 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
>6um</el-col><el-col :span="3">
><span
@click="trendClick('gran6'
,'油液颗粒度（6um）','PM')"
style="cursor:pointer;"
>6um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld6 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
>14um</el-col><el-col :span="3">
><span
@click="trendClick('gran14'
,'油液颗粒度（14um）','PM')"
style="cursor:pointer;"
>14um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld14 }}</span>
</el-col>
<el-col
:span="3"
style="text-align: right;height: 100%"
>21um</el-col><el-col :span="3">
><span
@click="trendClick('gran21'
,'油液颗粒度（21um）','PM')"
style="cursor:pointer;"
>21um</span></el-col><el-col :span="3">
<span class="numCol">{{ yykld21 }}</span>
</el-col>
</el-row>
@ -518,15 +580,23 @@
<el-footer class="footer">
<div class="bottom-line"></div>
<!-- <lbCompents :showData="ylkldWarning"></lbCompents> -->
<div class="warn">{{ylkldWarning}}</div>
<div
v-if="ylkldWarning.length > 0"
class="warn"
><router-link to="/detection/alarm/record">{{ylkldWarning}}</router-link></div>
<div v-else />
</el-footer>
</el-container>
</el-col>
<el-col
:span="7"
class="third-col"
style="height:100%"
>
<el-container class="container">
<el-container
class="container"
style="height:100%"
>
<el-header class="header">系统状态</el-header>
<el-main class="main">
<div class="device-card-content">
@ -1032,6 +1102,9 @@ export default {
},
handleQuery() {
this.loading = true;
if (this.datetime == null) {
this.datetime = this.getDefaultTimeRange();
}
let startTime = new Date(this.datetime[0]);
this.queryParams.startTime = this.formatDateTime(startTime);
let endTime = new Date(this.datetime[1]);
@ -1233,6 +1306,7 @@ export default {
item.nameKey == "sys_level" ||
item.nameKey == "sys_temp"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1254,6 +1328,7 @@ export default {
item.nameKey == "press10" ||
item.nameKey == "press11"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1263,6 +1338,7 @@ export default {
// 系统能耗及预警
this.sysecWarning = response.data
.filter((item) => item.nameKey == "sys_cur")
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -1285,6 +1361,7 @@ export default {
item.nameKey == "flw10" ||
item.nameKey == "flw11"
)
.slice(0, 10)
.map((obj) => obj.alarmDetail);
// .join("，");
// ZFSC4超压底缸加压系统油品特性报警
@ -1298,6 +1375,7 @@ export default {
item.nameKey == "gran14" ||
item.nameKey == "gran21"
)
.slice(0, 10)
.map(
(obj) =>
"报警内容：" + obj.content + " 报警时间：" + obj.alarmTime
@ -2496,6 +2574,7 @@ export default {
font-weight: 400;
color: #ffffff;
padding-left: 10%;
white-space: nowrap;
}
.device-bottom-value {
font-size: 14px;
@ -2557,6 +2636,7 @@ export default {
}
.font-size-14 {
font-size: 14px;
cursor: pointer;
}
.font-size-18 {
font-size: 18px;