Merge remote-tracking branch 'origin/master'

xyc

2024-10-22 e4246536ec8218b0444667cbe457c0d3d6e67bd9

Merge remote-tracking branch 'origin/master'

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dto/ProductDto.java

New file
@@ -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<>();
}

 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
                }
              }