xyc
2024-11-15 fbde4ed692dd1d5da72fb7a41bd0e3c4103fc898
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
@@ -273,8 +273,8 @@
    private void calcLayoutSize(RbdTreeNode root) {
        double childrenWidth = 0.0;
        double childrenHeight = 0.0;
        double lineWidth = 80;
        double lineHeight = 80;
        double lineWidth = 120;
        double lineHeight = 90;
        if (!"vnode".equals(root.getNodeType())) {
            root.setBlockWidth(root.getObjectWidth() + lineWidth);
            root.setBlockHeight(root.getObjectHeight() + lineHeight);
@@ -366,6 +366,12 @@
                    String productType = JsonUtils2.getJsonValueByPath(jsonObject, "data/productType".split("/")).toString();
                    productImg.setProductType(productType);
                    if ("product_sb".equals(productType)) {
                        jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/deviceNo".split("/"));
                        if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
                            modelNode.setDeviceNo(Integer.valueOf(jsonValue.toString()));
                        } else {
                            modelNode.setDeviceNo(0);
                        }
                        jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/reliabDistribType".split("/"));
                        if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
                            productImg.setReliabDistribType(Integer.valueOf(jsonValue.toString()));
@@ -489,6 +495,7 @@
                treeNode.setNodeType(node.getNodeType());
                treeNode.setPicId(node.getPicId());
                treeNode.setDataId(node.getDataId());
                treeNode.setDeviceNo(node.getDeviceNo());
                treeNode.setObjectWidth(node.getWidth());
                treeNode.setObjectHeight(node.getHeight());
                parent.getChildren().add(treeNode);
@@ -785,6 +792,7 @@
            node.setId(root.getId());
            node.setPicId(root.getPicId());
            node.setDataId(root.getDataId());
            node.setDeviceNo(root.getDeviceNo());
            node.setNodeType(root.getNodeType());
            node.setName(root.getName());
            node.setVoteNum(root.getVoteNum());