From 9ccb016d4b95ae902521afa5ba307c3f131225ef Mon Sep 17 00:00:00 2001 From: zhanghan11 Date: Thu, 11 Apr 2024 17:51:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=A4=A7=E5=B1=8Fvue?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=B0ipc=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/inspur/datasyn/modbus/IPCPlcDataSyncThread.java | 2 +- tzipc-ui/src/views/ipc/faultTree/faultTreeShow.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCPlcDataSyncThread.java b/tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCPlcDataSyncThread.java index 381a4af..fb17ff8 100644 --- a/tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCPlcDataSyncThread.java +++ b/tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCPlcDataSyncThread.java @@ -70,7 +70,7 @@ public class IPCPlcDataSyncThread implements Runnable { // 获取运行状态，不一致则新增运行状态 String status = iIpcRunningStatusRecordService.selectLatestStatus(); String sss = iIpcRunningStatusRecordService.getSSS(); - if(sss==null){sss="4";} + if(sss==null){sss=IpcConstant.RUNNING_STATUS_SHUTDOWN;} if (StringUtils.isNull(status) || !status.equals(sss)) { status = sss; iIpcRunningStatusRecordService.insertIpcRunningStatusRecord(new IpcRunningStatusRecord(status)); diff --git a/tzipc-ui/src/views/ipc/faultTree/faultTreeShow.vue b/tzipc-ui/src/views/ipc/faultTree/faultTreeShow.vue index fdc29b8..f726740 100644 --- a/tzipc-ui/src/views/ipc/faultTree/faultTreeShow.vue +++ b/tzipc-ui/src/views/ipc/faultTree/faultTreeShow.vue @@ -68,7 +68,6 @@ export default { getFaultTreeShow(this.part).then((response) => { const nodes = this.handleTree(response.data, "nodeId", "parentId"); this.updateParentStatusBasedOnLogic(nodes); - console.log(nodes); this.treeData = nodes[0].children; this.loading = false; });