修改

jinlin

2024-03-20 991a2c14f0e118112a3ea60ff7c464fba1512b5b

修改

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java

@@ -42,6 +42,10 @@
           @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = "name", value = "名称", dataType = Constant.QT.STRING, format = "NAME^LK"),
            @ApiImplicitParam(name = "reliabDistribType", value = "可靠性分布", dataType = Constant.QT.STRING, format = "reliab_distrib_type^EQ"),
            @ApiImplicitParam(name = "repairDistribType", value = "维修分布", dataType = Constant.QT.STRING, format = "repair_distrib_type^EQ"),
            @ApiImplicitParam(name = "repairable", value = "可维修", dataType = Constant.QT.STRING, format = "repairable^EQ"),
            @ApiImplicitParam(name = "basicJoinCompute", value = "参与计算", dataType = Constant.QT.STRING, format = "basic_join_compute^EQ"),
            @ApiImplicitParam(name = "nodeType", value = "类型", dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = "srcId", value = "上级ID", dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = "pageCode", value = "", dataType = Constant.QT.STRING)})

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java

@@ -6,7 +6,6 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
@@ -14,21 +13,17 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.TyProductModelService;
import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.oss.service.SysOssService;
import com.zt.modules.sys.model.SysMenu;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import java.util.List;
import java.util.Objects;


/**

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java

@@ -6,29 +6,24 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.oss.service.SysOssService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java

@@ -3,7 +3,6 @@
import com.zt.common.dao.BaseDao;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import org.apache.ibatis.annotations.Mapper;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java

@@ -6,14 +6,10 @@
import com.zt.common.utils.TreeUtils;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.modules.sys.model.SysMenu;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;

import javax.annotation.Resource;
import java.util.List;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/controller/SysPictureBaseController.java
@@ -1,34 +1,21 @@
package com.zt.life.modules.sysPictureBase.controller;
package com.zt.life.modules.mainPart.sysPictureBase.controller;


import com.spire.xls.Workbook;
import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.oss.enums.CloudChannel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/dao/SysPictureBaseDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/dao/SysPictureBaseDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.sysPictureBase.dao;
package com.zt.life.modules.mainPart.sysPictureBase.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase;
import org.apache.ibatis.annotations.Mapper;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/model/SysPictureBase.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/model/SysPictureBase.java
@@ -1,16 +1,10 @@
package com.zt.life.modules.sysPictureBase.model;
package com.zt.life.modules.mainPart.sysPictureBase.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import com.zt.life.sys.dto.OssDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.web.multipart.MultipartFile;

import java.util.Date;

/**
 * sys_picture_base

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/service/SysPictureBaseService.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/service/SysPictureBaseService.java
@@ -1,8 +1,8 @@
package com.zt.life.modules.sysPictureBase.service;
package com.zt.life.modules.mainPart.sysPictureBase.service;

import com.zt.common.service.BaseService;
import com.zt.life.modules.sysPictureBase.dao.SysPictureBaseDao;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.life.modules.mainPart.sysPictureBase.dao.SysPictureBaseDao;
import com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase;
import com.zt.modules.oss.service.SysOssService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/ModelLineController.java
@@ -1,4 +1,4 @@
package com.zt.life.modules.taskReliability.controller;
package com.zt.life.modules.mainPart.taskReliability.controller;


import com.zt.common.annotation.LogOperation;
@@ -12,9 +12,9 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.taskReliability.model.ModelLine;
import com.zt.life.modules.taskReliability.model.ModelRbd;
import com.zt.life.modules.taskReliability.service.ModelLineService;
import com.zt.life.modules.mainPart.taskReliability.model.ModelLine;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.service.ModelLineService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,9 +22,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;


/**

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelRbdController.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/ModelRbdController.java
@@ -1,4 +1,4 @@
package com.zt.life.modules.taskReliability.controller;
package com.zt.life.modules.mainPart.taskReliability.controller;


import com.zt.common.annotation.LogOperation;
@@ -6,14 +6,13 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.taskReliability.model.ModelRbd;
import com.zt.life.modules.taskReliability.service.ModelRbdService;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.service.ModelRbdService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;


@@ -45,6 +43,8 @@
        @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
        @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
        @ApiImplicitParam(name = "productId", value = "节点ID", dataType = Constant.QT.STRING),
        @ApiImplicitParam(name = "modelName", value = "模型名称", dataType = Constant.QT.STRING, format = "model_name^LK"),
        @ApiImplicitParam(name = "modelTag", value = "模型标识", dataType = Constant.QT.STRING, format = "model_tag^LK"),
    })
    public Result<List<ModelRbd>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){


 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskController.java
@@ -1,4 +1,4 @@
package com.zt.life.modules.taskReliability.controller;
package com.zt.life.modules.mainPart.taskReliability.controller;


import com.zt.common.annotation.LogOperation;
@@ -6,14 +6,13 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.taskReliability.model.Task;
import com.zt.life.modules.taskReliability.service.TaskService;
import com.zt.life.modules.mainPart.taskReliability.model.Task;
import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskPhaseController.java
@@ -1,4 +1,4 @@
package com.zt.life.modules.taskReliability.controller;
package com.zt.life.modules.mainPart.taskReliability.controller;


import com.zt.common.annotation.LogOperation;
@@ -6,14 +6,13 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.taskReliability.model.TaskPhase;
import com.zt.life.modules.taskReliability.service.TaskPhaseService;
import com.zt.life.modules.mainPart.taskReliability.model.TaskPhase;
import com.zt.life.modules.mainPart.taskReliability.service.TaskPhaseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseModelController.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/controller/TaskPhaseModelController.java
@@ -1,4 +1,4 @@
package com.zt.life.modules.taskReliability.controller;
package com.zt.life.modules.mainPart.taskReliability.controller;


import com.zt.common.annotation.LogOperation;
@@ -6,14 +6,13 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.taskReliability.model.TaskPhaseModel;
import com.zt.life.modules.taskReliability.service.TaskPhaseModelService;
import com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel;
import com.zt.life.modules.mainPart.taskReliability.service.TaskPhaseModelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/AlgorithmDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/AlgorithmDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.taskReliability.dao;
package com.zt.life.modules.mainPart.taskReliability.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.taskReliability.model.Algorithm;
import com.zt.life.modules.mainPart.taskReliability.model.Algorithm;
import org.apache.ibatis.annotations.Mapper;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelLineDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelLineDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.taskReliability.dao;
package com.zt.life.modules.mainPart.taskReliability.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.taskReliability.model.ModelLine;
import com.zt.life.modules.mainPart.taskReliability.model.ModelLine;
import org.apache.ibatis.annotations.Mapper;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeAlgorithmDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelNodeAlgorithmDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.taskReliability.dao;
package com.zt.life.modules.mainPart.taskReliability.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.taskReliability.model.ModelNodeAlgorithm;
import com.zt.life.modules.mainPart.taskReliability.model.ModelNodeAlgorithm;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelNodeDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelNodeDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.taskReliability.dao;
package com.zt.life.modules.mainPart.taskReliability.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.taskReliability.model.ModelNode;
import com.zt.life.modules.mainPart.taskReliability.model.ModelNode;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ModelRbdDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/ModelRbdDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.taskReliability.dao;
package com.zt.life.modules.mainPart.taskReliability.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import org.apache.ibatis.annotations.Mapper;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.taskReliability.dao;
package com.zt.life.modules.mainPart.taskReliability.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.taskReliability.model.Task;
import com.zt.life.modules.mainPart.taskReliability.model.Task;
import org.apache.ibatis.annotations.Mapper;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskPhaseDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.taskReliability.dao;
package com.zt.life.modules.mainPart.taskReliability.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.taskReliability.model.TaskPhase;
import com.zt.life.modules.mainPart.taskReliability.model.TaskPhase;
import org.apache.ibatis.annotations.Mapper;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseModelDao.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dao/TaskPhaseModelDao.java
@@ -1,7 +1,7 @@
package com.zt.life.modules.taskReliability.dao;
package com.zt.life.modules.mainPart.taskReliability.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.taskReliability.model.TaskPhaseModel;
import com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel;
import org.apache.ibatis.annotations.Mapper;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/ModelLinePair.java

New file
@@ -0,0 +1,10 @@
package com.zt.life.modules.mainPart.taskReliability.dto;

import com.zt.life.modules.mainPart.taskReliability.model.ModelLine;
import lombok.Data;

@Data
public class ModelLinePair {
    private ModelLine line1;
    private ModelLine line2;
}

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Algorithm.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/Algorithm.java
@@ -1,12 +1,10 @@
package com.zt.life.modules.taskReliability.model;
package com.zt.life.modules.mainPart.taskReliability.model;

import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.List;

/**
 * model_line

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelLine.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelLine.java
@@ -1,13 +1,10 @@
package com.zt.life.modules.taskReliability.model;
package com.zt.life.modules.mainPart.taskReliability.model;

import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * model_line

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNode.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelNode.java
@@ -1,4 +1,4 @@
package com.zt.life.modules.taskReliability.model;
package com.zt.life.modules.mainPart.taskReliability.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelNodeAlgorithm.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelNodeAlgorithm.java
@@ -1,9 +1,6 @@
package com.zt.life.modules.taskReliability.model;
package com.zt.life.modules.mainPart.taskReliability.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;


 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/ModelRbd.java
@@ -1,14 +1,11 @@
package com.zt.life.modules.taskReliability.model;
package com.zt.life.modules.mainPart.taskReliability.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * model_rbd

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/Task.java
@@ -1,13 +1,10 @@
package com.zt.life.modules.taskReliability.model;
package com.zt.life.modules.mainPart.taskReliability.model;

import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * task

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/TaskPhase.java
@@ -1,14 +1,11 @@
package com.zt.life.modules.taskReliability.model;
package com.zt.life.modules.mainPart.taskReliability.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * task_phase

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/model/TaskPhaseModel.java
@@ -1,14 +1,11 @@
package com.zt.life.modules.taskReliability.model;
package com.zt.life.modules.mainPart.taskReliability.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * task_phase_model

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelLineService.java
@@ -1,15 +1,14 @@
package com.zt.life.modules.taskReliability.service;
package com.zt.life.modules.mainPart.taskReliability.service;

import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.zt.common.service.BaseService;
import com.zt.common.utils.JsonUtils2;
import com.zt.common.utils.UUIDUtil;
import com.zt.life.modules.taskReliability.dao.*;
import com.zt.life.modules.taskReliability.dto.ModelLinePair;
import com.zt.life.modules.taskReliability.model.*;
import com.zt.life.modules.mainPart.taskReliability.dao.*;
import com.zt.life.modules.mainPart.taskReliability.dto.ModelLinePair;
import com.zt.life.modules.mainPart.taskReliability.model.*;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelRbdService.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/ModelRbdService.java
@@ -1,11 +1,11 @@
package com.zt.life.modules.taskReliability.service;
package com.zt.life.modules.mainPart.taskReliability.service;

import com.zt.common.service.BaseService;
import com.zt.life.modules.taskReliability.dao.ModelRbdDao;
import com.zt.life.modules.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.dao.ModelRbdDao;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;

import java.util.List;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskPhaseModelService.java
@@ -1,11 +1,11 @@
package com.zt.life.modules.taskReliability.service;
package com.zt.life.modules.mainPart.taskReliability.service;

import com.zt.common.service.BaseService;
import com.zt.life.modules.taskReliability.dao.TaskPhaseModelDao;
import com.zt.life.modules.taskReliability.model.TaskPhaseModel;
import com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseModelDao;
import com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;

import java.util.List;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskPhaseService.java
@@ -1,11 +1,11 @@
package com.zt.life.modules.taskReliability.service;
package com.zt.life.modules.mainPart.taskReliability.service;

import com.zt.common.service.BaseService;
import com.zt.life.modules.taskReliability.dao.TaskPhaseDao;
import com.zt.life.modules.taskReliability.model.TaskPhase;
import com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseDao;
import com.zt.life.modules.mainPart.taskReliability.model.TaskPhase;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;

import java.util.List;



 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java

File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/service/TaskService.java
@@ -1,11 +1,11 @@
package com.zt.life.modules.taskReliability.service;
package com.zt.life.modules.mainPart.taskReliability.service;

import com.zt.common.service.BaseService;
import com.zt.life.modules.taskReliability.dao.TaskDao;
import com.zt.life.modules.taskReliability.model.Task;
import com.zt.life.modules.mainPart.taskReliability.dao.TaskDao;
import com.zt.life.modules.mainPart.taskReliability.model.Task;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;

import java.util.List;



 modules/mainPart/src/main/java/com/zt/life/modules/taskReliability/dto/ModelLinePair.java

File was deleted

 modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml

@@ -18,9 +18,7 @@
                and ${whereSql}
            </if>
        </where>
        <if test="orderBySql!=null">
            ORDER BY ${orderBySql}
        </if>
            ORDER BY sort
    </select>
    <select id="getNo" resultType="java.lang.Integer">
        SELECT COUNT(*)
@@ -34,7 +32,6 @@
                and pid is null
            </if>
        </where>
        Group by product_type
    </select>
    <select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
        select a.name, a.id
@@ -64,7 +61,8 @@
                 left join param_data p on p.product_id = a.id and p.page_code = 'expect'
                 left join sys_picture_base s on s.id = a.operat_img
        WHERE a.is_delete = 0
          AND a.PID = ${productId}
          AND ((a.PID = ${productId})
                or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10)  and a.product_type &lt;&gt; 10))

    </select>
    <select id="getTaskProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">

 modules/mainPart/src/main/resources/mapper/basicInfo/sysPictureBase/SysPictureBaseDao.xml

File was renamed from modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.sysPictureBase.dao.SysPictureBaseDao">
<mapper namespace="com.zt.life.modules.mainPart.sysPictureBase.dao.SysPictureBaseDao">
    <update id="updateByDefault">
        update sys_picture_base
        set is_default=2
@@ -20,7 +20,7 @@
          and is_delete = 0
    </update>

    <select id="getList" resultType="com.zt.life.modules.sysPictureBase.model.SysPictureBase">
    <select id="getList" resultType="com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase">
        select a.*
        from sys_picture_base a
        <where>

 modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/AlgorithmDao.xml

File was renamed from modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.taskReliability.dao.AlgorithmDao">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.AlgorithmDao">

    <update id="deleteByModelId">
        delete from algorithm where model_id=#{modelId}

 modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelLineDao.xml

File was renamed from modules/mainPart/src/main/resources/mapper/taskReliability/ModelLineDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelLineDao">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelLineDao">

    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelLine">
    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelLine">
        select a.*
        from model_line a
        <where>

 modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeAlgorithmDao.xml

File was renamed from modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelNodeAlgorithmDao">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelNodeAlgorithmDao">

    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelNodeAlgorithm">
    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelNodeAlgorithm">
        select a.*
        from model_node_algorithm a
        <where>

 modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeDao.xml

File was renamed from modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelNodeDao">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelNodeDao">

    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelNode">
    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelNode">
        select a.*
        from model_node a
        <where>

 modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelRbdDao.xml

File was renamed from modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.taskReliability.dao.ModelRbdDao">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.ModelRbdDao">

    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
        select a.*,
        CASE
        WHEN b.end =1  THEN '已完成'
@@ -22,7 +22,7 @@
            </if>
        </where>
    </select>
    <select id="getDiagram" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
    <select id="getDiagram" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
        select a.*
        from model_rbd a
        <where>

 modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml

File was renamed from modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.taskReliability.dao.TaskDao">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.TaskDao">

    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.Task">
    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.Task">
        select a.*
        from task a
        <where>

 modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseDao.xml

File was renamed from modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.taskReliability.dao.TaskPhaseDao">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseDao">

    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.TaskPhase">
    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskPhase">
        select a.*
        from task_phase a
        <where>

 modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseModelDao.xml

File was renamed from modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.taskReliability.dao.TaskPhaseModelDao">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseModelDao">

    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.TaskPhaseModel">
    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel">
        SELECT a.id     as productId,
               a.`NAME` as `system`,
               c.model_name,

 web/src/views/modules/basicInfo/ParamData.vue

@@ -9,13 +9,22 @@
      <el-col :span="19">
        <div class="mod-basicInfo-paramData}">
          <zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/basicInfo/ParamData/page"
                           delete-url="/basicInfo/ParamData"
                           delete-url="/basicInfo/ParamData/"
                           @dataLoaded="dataLoaded"
                           v-slot="{ table }"
                           :paging='false'>
            <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
              <el-form-item>
                <el-input v-model="dataForm.name" placeholder="请输入名称" clearable></el-input>
                <zt-dict v-model="dataForm.basicJoinCompute" dict="is_or_not" placeholder="是否参与计算" clearable></zt-dict>
              </el-form-item>
              <el-form-item>
                <zt-dict v-model="dataForm.repairable" dict="is_or_not" placeholder="是否可维修" clearable></zt-dict>
              </el-form-item>
              <el-form-item>
                <zt-dict v-model="dataForm.reliabDistribType" dict="ReliabDistribType" placeholder="请选择可靠性分布类型" clearable></zt-dict>
              </el-form-item>
              <el-form-item>
                <zt-dict v-model="dataForm.repairDistribType" dict="RepairDistribType"  placeholder="请选择维修分布类型" clearable></zt-dict>
              </el-form-item>
              <el-form-item>
                <zt-button type="warning" @click="handleSaveRows">保存</zt-button>
@@ -269,7 +278,11 @@
          srcId: '',
          name: '',
          dataThreeList: null,
          nodeType: '5'
          nodeType: '5',
          basicJoinCompute:'',
          repairable:'',
          repairDistribType:'',
          reliabDistribType:''
        },
        isOrNot: [{
          value: 1,

 web/src/views/modules/basicInfo/SelectTyModel.vue

@@ -13,7 +13,8 @@
                    @selection-change="changeRow">
            <el-table-column type="selection" width="40" align="center"/>
            <el-table-column prop="name" label="名称"/>
            <zt-table-column-dict prop="nodeType" label="节点类型" dict="product"/>
            <zt-table-column-dict v-if="!pageCode" prop="nodeType" label="节点类型" dict="product"/>
            <zt-table-column-dict v-else prop="productType" label="节点类型" dict="product"/>
          </el-table>
        </zt-table-wraper>
      </div>

 web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue

@@ -38,6 +38,7 @@
  import PictureSelect from "@/views/modules/basicInfo/SelectPicture";

  export default {
    name:'TyProductModel',
    data() {
      return {
        fileId: '',

 web/src/views/modules/basicInfo/TyProductModel.vue

@@ -5,7 +5,7 @@
      <zt-table-wraper query-url="/basicInfo/TyProductModel/tree" delete-url="/basicInfo/TyProductModel/" v-bind:paging='false'
                       v-slot="{ table }">
        <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
          <el-form-item>
          <!--<el-form-item>
            <zt-dict v-model="dataForm.nodeType" dict="product" placeholder="请选择节点类型" clearable></zt-dict>
          </el-form-item>
          <el-form-item>
@@ -13,9 +13,9 @@
          </el-form-item>
          <el-form-item>
            <zt-dict v-model="dataForm.repairDistrib" dict="RepairDistribType"  placeholder="请选择维修分布类型" clearable></zt-dict>
          </el-form-item>
          </el-form-item>-->
          <el-form-item>
            <zt-button type="query" @click="table.query()"/>
            <!--<zt-button type="query" @click="table.query()"/>-->
            <zt-button type="add"  @click="table.editHandle()"/>
            <zt-button type="delete"  @click="table.deleteHandle()"/>
          </el-form-item>

 web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue

@@ -50,19 +50,14 @@
    },
    methods: {
      init(id,params) {
        if (params.type == 'tree') {
        if (params.type === 'tree') {
          this.isTree = true
          this.isShow = false
          this.getProductList()
        } else {
          this.dataForm.pid = params.pid
          this.dataForm.productType = params.type
        }
      },
      // 获取系统列表
      async getProductList() {
        let res = await this.$http.get('/basicInfo/XhProductModel/getProductList')
        this.productList = res.data
        console.log(this.productList, 'getProductList')
      },
      selectPicture() {
        this.$refs.pictureSelect.$refs.dialog.init()

 web/src/views/modules/basicInfo/XhProductModel.vue

@@ -19,6 +19,7 @@
              <el-form-item>
                <zt-button type="query" @click="table.query()"/>
                <zt-button type="add" @click="add()"/>
                <zt-button v-if="productType==='3'" type="primary" @click="addCell()">新增虚单元</zt-button>
                <zt-button type="delete" @click="table.deleteHandle()"/>
              </el-form-item>
            </el-form>
@@ -37,7 +38,7 @@
              <zt-table-column-handle :table="table"/>
            </el-table>
            <!-- 弹窗, 新增 / 修改 -->
            <add-or-update @refreshDataList="table.query"/>
            <add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
            <select-ty-model @refreshDataList="table.query" ref="SelectTyModel"/>
          </zt-table-wraper>
        </div>
@@ -51,6 +52,7 @@
  import SelectTyModel from './SelectTyModel'
  import ProductModelTree from "./ProductModelTree";
  import Cookies from "js-cookie";
  import TyProductModel from "./TyProductModel-AddOrUpdate";

  export default {
    data() {
@@ -66,6 +68,7 @@
      }
    },
    components: {
      TyProductModel,
      ProductModelTree,
      AddOrUpdate,
      SelectTyModel
@@ -88,14 +91,13 @@
        }
        this.$refs.SelectTyModel.$refs.dialog.init(null,{type:this.dataForm.type,id:this.dataForm.pid})
      },
      addCell(){
        this.$refs.AddOrUpdate.$refs.dialog.init(null,{type:10,pid:this.dataForm.pid})
      },
      cellStyle({column}) {
        if (column.label === '名称') {
          return 'text-align: left !important;'
        }
      },
      getPath(id) {
        console.log(id, 'path')
        return `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${id}`
      },
      onProductSelected(data) {
        console.log(data)

 web/src/views/modules/taskReliability/ModelRbd.vue

@@ -14,6 +14,12 @@
                           v-slot="{ table }">
            <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
              <el-form-item>
                <el-input v-model="dataForm.modelName" placeholder="请输入模型名称" clearable></el-input>
              </el-form-item>
              <el-form-item>
                <el-input v-model="dataForm.modelTag" placeholder="请输入模型标识" clearable></el-input>
              </el-form-item>
              <el-form-item>
                <zt-button type="query" @click="table.query()"/>
                <zt-button type="add" @click="add()"/>
                <zt-button type="delete" @click="table.deleteHandle()"/>
@@ -60,6 +66,7 @@
          modelName: '',
          modelState:'',
          productId: '',
          modelTag: '',
        }
      }
    },