From 9f58ccbd8ed371f8e20b37b45b412c33a7f0dfcc Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期二, 22 十月 2024 14:43:20 +0800 Subject: [PATCH] 关于修改可靠性产品重复 --- web/src/views/modules/taskReliability/RBD-edit-img.vue | 4 +++- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dto/ProductDto.java | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dto/ProductDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dto/ProductDto.java new file mode 100644 index 0000000..0a3f721 --- /dev/null +++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dto/ProductDto.java @@ -0,0 +1,42 @@ +package com.zt.life.modules.mainPart.basicInfo.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.zt.common.entity.TreeNode; +import com.zt.life.modules.mainPart.basicInfo.model.ParamData; +import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class ProductDto implements TreeNode<ProductDto> { + private Integer num; + private Integer productType; + private String name; + private String namePath; + private Long id; + private Long pid; + private String sameSbName; + private String equipType; //璁惧绫诲瀷 + private Integer reliabDistribType; //鍙潬鎬у垎甯冪被鍨� + private Integer basicJoinCompute; //鍙傚姞璁$畻 + private Double basicMtbfRegulate; //mtbf + private Double basicMtbfRegulSuccRate; //鎴愬姛鐜� + private Double basicMtbfOperatingRatio; //杩愯姣� + private Double taskMtbcfRegulate; //mtbcf + private Double taskMtbcfOtherParams2 ;//mtbcf鍏朵粬鍙傛暟2 + private Double taskMtbcfOtherParams3; //mtbcf鍏朵粬鍙傛暟3 + private Double taskMtbcfRegulSuccRate; //mtbcf鎴愬姛鐜� + private Double taskMtbcfOperatingRatio; //mtbcf杩愯姣� + private Integer repairable; //鏄惁鍙淮淇� + private Integer repairDistribType; //缁翠慨鍙戝竷绫诲瀷 + private Double repairMttcr; //mttcr + private Double repairMttcrOtherParams2; //mttcr鍏朵粬鍙傛暟2 + private Double repairMttcrOtherParams3; + + @ApiModelProperty(value = "瀛愯妭鐐�") + @TableField(exist = false) + private List<ProductDto> children = new ArrayList<>(); +} diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue index e0edfc2..accfeeb 100644 --- a/web/src/views/modules/taskReliability/RBD-edit-img.vue +++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue @@ -929,7 +929,9 @@ if (deviceNoArr.findIndex(item => item === i) === -1) { no = i node.getData().deviceNo = i - node.attr('text/text', node.attr('text/text') + '-' + i) + if (node.getData().basicUnitNum>1){ + node.attr('text/text', node.attr('text/text') + '-' + i) + } break } } -- Gitblit v1.9.1