From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
index ffd26cb..57ff08e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java
@@ -157,7 +157,7 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("cells", rbdJsonArray);
modelRbd.setContent(jsonObject.toString());
- modelRbdDao.updateById(modelRbd);
+// modelRbdDao.updateById(modelRbd);
return result;
}
@@ -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);
@@ -368,7 +368,7 @@
if ("product_sb".equals(productType)) {
jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/deviceNo".split("/"));
if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
- modelNode.setVoteNum(Integer.valueOf(jsonValue.toString()));
+ modelNode.setDeviceNo(Integer.valueOf(jsonValue.toString()));
} else {
modelNode.setDeviceNo(0);
}
--
Gitblit v1.9.1