From 826cd5b51d5106cfea07e397eda184fb15ec7a30 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 02 八月 2024 14:33:59 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 19 +-
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 137 +++++++++++++-----
web/src/views/modules/taskReliability/TimeDiagram.vue | 148 ---------------------
modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml | 14 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java | 2
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 45 +++--
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java | 3
8 files changed, 157 insertions(+), 213 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
index 164c3c5..0f705e1 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
@@ -36,4 +36,6 @@
List<XhProductModel> getProductTree(Long shipId);
void deleteByShipId(Long shipId);
+
+ List<XhProductModel> getProductPath(Long shipId);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
index bd48c30..0f744ae 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
@@ -49,6 +49,8 @@
private String equipType;
+ private String namePath;
+
@ApiModelProperty(value = "鎺掑簭")
private Integer sort;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 590b0c6..2154a48 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -136,8 +136,8 @@
Map<String, Object> errMap = new HashMap<>();
Map<String, Integer> reliabType = new HashMap<>();
reliabType.put("鎸囨暟鍒嗗竷", 1);
- reliabType.put("浜岄」鍒嗗竷", 2);
- reliabType.put("濞佸竷灏斿垎甯�", 3);
+ reliabType.put("浜岄」鍒嗗竷", 3);
+ reliabType.put("濞佸竷灏斿垎甯�", 2);
Map<String, Integer> repairType = new HashMap<>();
repairType.put("鎸囨暟鍒嗗竷", 1);
repairType.put("濞佸竷灏斿垎甯�", 2);
@@ -146,14 +146,14 @@
isOrNot.put("鍚�", 0);
//鑾峰彇鏄惁鏈夋暟鎹紝濡傛灉鏈夊垯鍒犻櫎鏁版嵁
- List<XhProductModel> productList = this.getByShipId(shipId);
+ /* List<XhProductModel> productList = this.getByShipId(shipId);
List<ParamData> dataList = paramDataService.getByShipId(shipId);
if (productList.size() > 0) {
this.deleteByShipId(shipId);
}
if (dataList.size() > 0) {
paramDataService.deleteByShipId(shipId);
- }
+ }*/
try {
// 鑾峰彇瀵煎叆鏂囦欢鐨勫悗缂�鍚�
@@ -169,33 +169,42 @@
int sheets = workbook.getNumberOfSheets();
//List<LifeManagement> lifeManagementList = new ArrayList<LifeManagement>();
- String xt = null;
- String fxt = null;
- Long xtId = null;
- Long fxtId = null;
+ Long curXtId = null;
+ Long curFxtId = null;
+ Long curSbId = null;
+ String curXtName = "";
+ String curFxtName = "";
- //瀵煎叆棰勮鍙傛暟
- ParamData itemEntity1 = new ParamData();
- itemEntity1.setShipId(shipId);
- itemEntity1.setProductId(shipId);
- itemEntity1.setPageCode("expect");
- paramDataService.insert(itemEntity1);
+ Map<String, XhProductModel> modelMap = new HashMap<>();
+ List<XhProductModel> prductList =baseDao.getProductPath(shipId);
+ for (XhProductModel product :prductList){
+ if(StringUtils.isNotBlank(product.getNamePath())){
+ modelMap.put(product.getNamePath(),product);
+ }
+ }
+
+ boolean insertXt;
+ boolean insertFxt;
+ Boolean insertSb;
for (int i = 0; i < sheets; i++) {
Sheet sheet = workbook.getSheetAt(i);
int num = sheet.getLastRowNum(); // 涓�鍏辨湁澶氬皯琛�
String sheetName = sheet.getSheetName(); //鑾峰彇褰撳墠sheet鍚嶇О
for (int j = 1; j <= num; j++) {
+ insertXt = false;
+ insertFxt = false;
+ insertSb = false;
CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
CacheUtils.put(progressId, "msg", "鍏�" + num + "琛岋紝宸插畬鎴愮" + j + "琛�");
- boolean isToggleXt = false;
- boolean isToggleFxt = false;
+ /* boolean isToggleXt = false;
+ boolean isToggleFxt = false;*/
row1 = j + 1;
String pattern = "yyyy-MM-dd";
Row row = sheet.getRow(row1);
String sort = com.zt.core.shiro.ImportUtil.getCellValue(row, 0, pattern); //搴忓彿
- if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern))) {
+/* if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern))) {
if (!com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern).equals(xt)) {
isToggleXt = true;
xtId = UUIDUtil.generateId();
@@ -216,8 +225,10 @@
fxt = null;
isToggleFxt = true;
}
- }
+ }*/
+ String xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //绯荤粺
+ String fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern);
String sb = com.zt.core.shiro.ImportUtil.getCellValue(row, 3, pattern); //璁惧
String equipType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //璁惧绫诲瀷
String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //鍙潬鎬у垎甯冪被鍨�
@@ -236,6 +247,48 @@
String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr鍏朵粬鍙傛暟2
String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 19, pattern); //mttcr鍏朵粬鍙傛暟3
+ if (StringUtils.isBlank(sb))
+ continue;
+
+ if (StringUtils.isBlank(xt)) {
+ if (StringUtils.isBlank(curXtName))
+ continue;
+ else
+ xt = curXtName;
+ } else {
+ if (StringUtils.isBlank(curXtName) || !xt.equals(curXtName)) {
+ curXtName = xt;
+ if (modelMap.get(curXtName) == null) {
+ curXtId = UUIDUtil.generateId();
+ insertXt = true;
+ } else {
+ curXtId = modelMap.get(curXtName).getId();
+ }
+ curFxtId = null;
+ curFxtName = "";
+ }
+ }
+ String fxtPath = "";
+ if (StringUtils.isNotBlank(fxt) && !fxt.equals(curFxtName)) {
+ curFxtName = fxt;
+ fxtPath = curXtName + "," + curFxtName;
+ if (modelMap.get(fxtPath) == null) {
+ curFxtId = UUIDUtil.generateId();
+ insertFxt = true;
+ } else {
+ curFxtId = modelMap.get(fxtPath).getId();
+ }
+ }
+
+ String sbPath = curXtName + "," + (StringUtils.isBlank(curFxtName) ? "" : curFxtName + ",") + sb;
+ if (modelMap.get(sbPath) == null) {
+ curSbId = UUIDUtil.generateId();
+ insertSb = true;
+ } else {
+ curSbId = modelMap.get(sbPath).getId();
+ }
+
+
if (StringUtils.isEmpty(sb)) {
com.zt.life.util.ImportUtil.updateErrMap(errMap, "娌℃湁濉啓璁惧鍚嶇О", sheetName, row1);
continue;
@@ -247,63 +300,64 @@
xhProductModel.setShipId(shipId);
//娣诲姞绯荤粺
- if (isToggleXt) {
+ if (insertXt) {
xhProductModel.setPid(shipId);
- xhProductModel.setId(xtId);
+ xhProductModel.setId(curXtId);
xhProductModel.setName(xt);
xhProductModel.setProductType("3");
xhProductModel.setSort(Integer.valueOf(sort));
defultImg = sysPictureBaseService.getDefaultImg(3).getId();
xhProductModel.setOperatImg(defultImg);
+ xhProductModel.setNamePath(curXtName);
this.insert(xhProductModel);
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity = new ParamData();
itemEntity.setShipId(shipId);
- itemEntity.setProductId(xtId);
+ itemEntity.setProductId(curXtId);
itemEntity.setPageCode("expect");
paramDataService.insert(itemEntity);
}
- if (StringUtils.isNotBlank(fxt) && isToggleFxt) {
- xhProductModel.setPid(xtId);
- xhProductModel.setId(fxtId);
+ if (insertFxt) {
+ xhProductModel.setPid(curXtId);
+ xhProductModel.setId(curFxtId);
xhProductModel.setName(fxt);
xhProductModel.setProductType("4");
xhProductModel.setSort(Integer.valueOf(sort));
defultImg = sysPictureBaseService.getDefaultImg(4).getId();
xhProductModel.setOperatImg(defultImg);
+ xhProductModel.setNamePath(fxtPath);
this.insert(xhProductModel);
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity = new ParamData();
itemEntity.setShipId(shipId);
- itemEntity.setProductId(fxtId);
+ itemEntity.setProductId(curFxtId);
itemEntity.setPageCode("expect");
paramDataService.insert(itemEntity);
}
- Long sbId = UUIDUtil.generateId();
- if (StringUtils.isNotBlank(fxt)) {
- xhProductModel.setPid(fxtId);
- } else {
- xhProductModel.setPid(xtId);
+ if (insertSb) {
+ xhProductModel.setPid(curFxtId == null ? curXtId : curFxtId);
+ xhProductModel.setId(curSbId);
+ xhProductModel.setName(sb);
+ xhProductModel.setEquipType(equipType);
+ xhProductModel.setProductType("5");
+ xhProductModel.setSort(Integer.valueOf(sort));
+ defultImg = sysPictureBaseService.getDefaultImg(5).getId();
+ xhProductModel.setOperatImg(defultImg);
+ xhProductModel.setNamePath(sbPath);
+ this.insert(xhProductModel);
}
- xhProductModel.setId(sbId);
- xhProductModel.setName(sb);
- xhProductModel.setEquipType(equipType);
- xhProductModel.setProductType("5");
- xhProductModel.setSort(Integer.valueOf(sort));
- defultImg = sysPictureBaseService.getDefaultImg(5).getId();
- xhProductModel.setOperatImg(defultImg);
- this.insert(xhProductModel);
+
//瀵煎叆棰勮鍙傛暟
ParamData itemEntity = new ParamData();
//缁戝畾璁惧ID
itemEntity.setShipId(shipId);
- itemEntity.setProductId(sbId);
+ itemEntity.setProductId(curSbId);
itemEntity.setPageCode("expect");
itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
@@ -346,7 +400,10 @@
if (StringUtils.isNotBlank(repairMttcrOtherParams3)) {
itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
}
- paramDataService.insert(itemEntity);
+ if (modelMap.get(sbPath) == null)
+ paramDataService.insert(itemEntity);
+ else
+ paramDataService.update(itemEntity);
}
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
index 58a53dc..17f4aa5 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
@@ -3,6 +3,7 @@
import com.zt.common.dao.BaseDao;
import com.zt.life.modules.mainPart.taskReliability.dto.ModelDto;
import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel;
import com.zt.life.modules.mainPart.taskReliability.model.TimeDiagram;
@@ -36,4 +37,6 @@
List<TimeDiagram> getTimeDiagram(Map<String, Object> params);
List<SimulatAssessTaskPhaseModel> getModelList(Long productId, Long fzId);
+
+ ModelRbd getModelByProductGk(Long gkId, Long productId);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index aab2440..23b87cf 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -14,6 +14,7 @@
import com.zt.life.modules.mainPart.taskReliability.dto.ModelDto;
import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
import com.zt.life.modules.mainPart.taskReliability.dto.StatusDto;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel;
import com.zt.life.modules.mainPart.taskReliability.model.TimeDiagram;
@@ -39,14 +40,10 @@
@Service
public class SimulatAssessService extends BaseService<SimulatAssessDao, SimulatAssess> {
@Autowired
- private TaskPhaseService taskPhaseService;
-
- @Autowired
private TimeDiagramDao timeDiagramDao;
@Value("${data.reliaSimLib.resultHome}")
private String path;
-
private JSONObject dialgramJson;
@@ -199,13 +196,21 @@
} else {
setlineXy(modelJson2, x2, y1, x2, y2, null);
}
-
jsonArray.add(modelJson2);
+ //鍒ゆ柇鏄惁鏈夋ā鍨�
+ ModelRbd modelRbd = baseDao.getModelByProductGk(modelDto.getGkId(), productId);
+ String modelName = "鏈敤";
+ String modelId = "";
+ if (modelRbd != null) {
+ modelName = modelRbd.getModelName();
+ modelId = modelRbd.getId().toString();
+ }
+
JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
- JsonUtils2.setJsonValueByPath(textJson, "data/dataId".split("/"), modelDto.getGkId());
+ JsonUtils2.setJsonValueByPath(textJson, "data/dataId".split("/"), modelId);
JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
- JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), modelDto.getGkName());
+ JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), modelName);
JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), x1 + 30);
JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y1);
jsonArray.add(textJson);
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index d4016bb..b85f6bd 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -3,7 +3,10 @@
<mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao">
<delete id="deleteByShipId">
- delete from product_model where ship_id =${shipId} and product_type > 2
+ delete
+ from product_model
+ where ship_id = ${shipId}
+ and product_type > 2
</delete>
<select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
@@ -46,23 +49,23 @@
and a.product_type = 1
</select>
<select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
- SELECT a.operat_img as imgPath,
- a.`NAME` as imgName,
- 'node' as nodeType,
- '' as nodeTypeExt,
- s.svg_content as svgContent,
- s.width as imgWidth,
- s.height as imgHeight,
- a.id as dataId,
- '' as statusImg,
- d.dict_code as productType,
- p.repairable as isRepair,
- p.task_mtbcf_accept as taskMtbcf,
+ SELECT a.operat_img as imgPath,
+ a.`NAME` as imgName,
+ 'node' as nodeType,
+ '' as nodeTypeExt,
+ s.svg_content as svgContent,
+ s.width as imgWidth,
+ s.height as imgHeight,
+ a.id as dataId,
+ '' as statusImg,
+ d.dict_code as productType,
+ p.repairable as isRepair,
+ p.task_mtbcf_accept as taskMtbcf,
p.task_mtbcf_other_params2 as taskMtbcfOtherParams2,
p.task_mtbcf_other_params3 as taskMtbcfOtherParams3,
- p.reliab_distrib_type as reliabDistribType,
- p.repair_distrib_type as repairDistribType,
- p.repair_mttcr as repairMttcr,
+ p.reliab_distrib_type as reliabDistribType,
+ p.repair_distrib_type as repairDistribType,
+ p.repair_mttcr as repairMttcr,
p.repair_mttcr_other_params2 as repairMttcrOtherParams2,
p.repair_mttcr_other_params3 as repairMttcrOtherParams3
FROM product_model a
@@ -94,10 +97,10 @@
where product_id in (
select id
from product_model
- where is_delete = 0 and pid = ${productId}
+ where is_delete = 0
+ and pid = ${productId}
)
)
-
</select>
@@ -129,4 +132,10 @@
and a.ship_id = #{shipId}
</if>
</select>
+ <select id="getProductPath" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
+ select *
+ from product_model
+ where IS_DELETE = 0
+ and ship_id =${shipId}
+ </select>
</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
index 6112800..6d3d256 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
@@ -104,11 +104,23 @@
and d.model_id = e.id
order by c.CREATE_DATE
</select>
- <select id="getModelList" resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel">
+ <select id="getModelList"
+ resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel">
SELECT *
FROM simulat_assess_task_phase_model
WHERE fz_id = ${fzId}
AND is_delete = 0
order by sort
</select>
+ <select id="getModelByProductGk" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
+ select a.*
+ from model_rbd a,
+ operat_condit_model b
+ where a.id = b.model_id
+ and b.operat_condit_id = ${gkId}
+ and b.product_id = ${productId}
+ and a.is_delete = 0
+ and b.is_delete = 0
+ limit 1
+ </select>
</mapper>
diff --git a/web/src/views/modules/taskReliability/TimeDiagram.vue b/web/src/views/modules/taskReliability/TimeDiagram.vue
index 5d7577f..5806178 100644
--- a/web/src/views/modules/taskReliability/TimeDiagram.vue
+++ b/web/src/views/modules/taskReliability/TimeDiagram.vue
@@ -118,7 +118,6 @@
},
mounted() {
this.getProductList()
- this.init()
},
components: {
ProductModelTree,
@@ -151,19 +150,6 @@
})
}
},
- // translating: {
- // restrict(view) {
- // const cell = view.cell
- // if (cell.isNode()) {
- // const parent = cell.getParent()
- // if (parent) {
- // return parent.getBBox()
- // }
- // }
- //
- // return null
- // },
- // },
onToolItemCreated({tool}) {
const handle = tool
const options = handle.options
@@ -173,9 +159,6 @@
},
autoResize: true,
history: true,
- // panning: {
- // enabled: true,
- // },
scroller: {
enabled: true,
pageVisible: true,
@@ -230,21 +213,10 @@
text: ''
}
},
- // position: {
- // distance: 0.5,
- // angle: 180,
- // options: {
- // keepGradient: true,
- // ensureLegibility: true
- // }
- // }
}],
zIndex: 0,
})
},
- // validateConnection({targetMagnet}) {
- // return !!targetMagnet
- // },
},
highlighting: {
magnetAdsorbed: {
@@ -345,133 +317,14 @@
stroke: '#5F95FF',
fill: '#EFF4FF',
},
- // title:{
- // text:'',
- // refX: 40,
- // refY: 38,
- // fontSize: 20,
- // fill: '#262626',
- // 'text-anchor': 'start',
- // },
text: {
- // refX: 40,
- // refY: 20,
fontSize: 20,
fill: '#262626',
- // 'text-anchor': 'start',
},
},
- // markup: [
- // {
- // tagName: 'polygon',
- // selector: 'body',
- // },
- // {
- // tagName: 'text',
- // selector: 'title',
- // },
- // {
- // tagName: 'text',
- // selector: 'text',
- // },
- // ],
ports: {
...this.ports
- // items: [
- // {
- // group: 'top',
- // },
- // {
- // group: 'bottom',
- // },
- // ],
},
- },
- true,
- )
- //
- Graph.registerNode(
- 'custom-circle',
- {
- inherit: 'ellipse',
- width: 120,
- height: 120,
- data: {
- dataId: '',
- finishDate: ''
- },
- attrs: {
- body: {
- strokeWidth: 1,
- stroke: '#5F95FF',
- fill: '#EFF4FF',
- },
- //鏃ユ湡
- title: {
- text: '',
- fontSize: 12,
- fill: '#262626',
- refX: 0.5,
- refY: '100%',
- refY2: -10,
- textAnchor: 'middle',
- textVerticalAnchor: 'bottom',
- },
- // 鍚嶇О
- text: {
- // fontFamily: '浠垮畫',
- fontSize: 20,
- fill: '#262626',
- textWrap: {
- width: 80, // 瀹藉害涓� 80px鎹㈣
- ellipsis: false, // 鏂囨湰瓒呭嚭鏄剧ず鑼冨洿鏃讹紝鑷姩娣诲姞鐪佺暐鍙�
- breakWord: true, // 鏄惁鎴柇鍗曡瘝
- }
- },
- },
- markup: [
- {
- tagName: 'ellipse',
- selector: 'body',
- },
- {
- tagName: 'text',
- selector: 'title',
- },
- {
- tagName: 'text',
- selector: 'text',
- },
- ],
- ports: {...this.ports},
- },
- true,
- )
- Graph.registerNode(
- 'custom-circle1',
- {
- inherit: 'ellipse',
- width: 65,
- height: 65,
- data: {
- dataId: '',
- finishDate: ''
- },
- attrs: {
- body: {
- strokeWidth: 1,
- stroke: '#5F95FF',
- fill: '#EFF4FF',
- },
- //鏃ユ湡
- text: {
- // fontFamily: '浠垮畫',
- fontSize: 12,
- text: '鏃ユ湡鑺傜偣',
- fill: '#262626',
- },
- },
- ports: {...this.ports},
},
true,
)
@@ -873,6 +726,7 @@
this.dataForm.simulatFrequency = result.data.simulatFrequency
},
async getDiagram() {
+ this.init()
let params = {
productId: this.dataForm.productId,
taskId: this.dataForm.taskModelId,
--
Gitblit v1.9.1