diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/component/IPCFaultTreeTask.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/component/IPCFaultTreeTask.java index 3d7abe8..6a0a05a 100644 --- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/component/IPCFaultTreeTask.java +++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/component/IPCFaultTreeTask.java @@ -97,7 +97,7 @@ public class IPCFaultTreeTask{ } } // System.err.println(treeNode); - insertNode(treeNode.getChild().get(0), 1L); + insertNode(treeNode.getChild().get(0), 3L); //5. 释放资源 wb.close(); } @@ -110,7 +110,7 @@ public class IPCFaultTreeTask{ ipcFaultTreeConfig.setNodeName(node.getName()); ipcFaultTreeConfig.setParentId(parentId); List equipInfos = ipcEquipInfoService.selectIpcEquipInfoList(null); - ipcFaultTreeConfig.setEquipId(equipInfos.stream().filter(data -> data.getEquipNum().equals("KKZGG-T-001")).collect(Collectors.toList()).get(0).getId()); + ipcFaultTreeConfig.setEquipId(equipInfos.stream().filter(data -> data.getEquipNum().equals("KKZGG-B-001")).collect(Collectors.toList()).get(0).getId()); ipcFaultTreeConfig.setNodeDefaultColor("green"); ipcFaultTreeConfig.setNodeAlarmColor("red"); ipcFaultTreeConfig.setStatus("0"); diff --git a/zfipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTree.vue b/zfipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTree.vue index ed71c83..b10ad8f 100644 --- a/zfipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTree.vue +++ b/zfipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTree.vue @@ -323,11 +323,11 @@ export default { width: 0; height: 20px; } -.vertical .org-chart-node-label { +.org-chart-node-label { position: relative; display: inline-block; } -.vertical .org-chart-node-label .org-chart-node-label-inner { +.org-chart-node-label .org-chart-node-label-inner { // box-shadow: 0 1px 10px rgba(31, 35, 41, 0.08); display: inline-block; padding: 10px; diff --git a/zfipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTreeNode.vue b/zfipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTreeNode.vue index 6a50cc1..6170687 100644 --- a/zfipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTreeNode.vue +++ b/zfipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTreeNode.vue @@ -15,7 +15,10 @@ 'only-both-tree-node': node.level === 1 && tree.store.onlyBothTree, }" > - +
- +
@@ -74,13 +83,15 @@ :class="computeLabelClass" :style="computeLabelStyle" > - + {{ node.label }} - +
- +
- +