修改

jinlin

2024-07-15 134c06beb2b6b7f7025fb030a9e52bcceebbfc98

修改

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java

@@ -24,6 +24,7 @@
    @ApiModelProperty(value = "源ID")
    private Long productId;

    @TableField(exist = false)
    @ApiModelProperty(value = "名称")
    private String name;


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

@@ -13,6 +13,7 @@
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.sys.dto.DictTypeDto;
import com.zt.modules.sys.model.SysDictData;
import com.zt.modules.sys.model.SysDictType;
@@ -42,7 +43,11 @@
 */
@Service
public class XhProductModelService extends BaseService<XhProductModelDao, XhProductModel> {
      @Autowired ParamDataService paramDataService;
    @Autowired
    ParamDataService paramDataService;
    @Autowired
    SysPictureBaseService sysPictureBaseService;

    /**
     * 分页查询
     *
@@ -67,17 +72,17 @@
        List<XhProductModel> productList = null;
        if (showXdy) {
            productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                    Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
                    Constant.Bool.NO).lt("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
        } else {
            if (ztShow == 1) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).gt("product_type", 1).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                        Constant.Bool.NO).lt("product_type", 5).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
            } else if (ztShow == 2) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).gt("product_type", 2).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                        Constant.Bool.NO).lt("product_type", 4).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
            } else if (ztShow == 3) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).gt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                        Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
            }

        }
@@ -124,8 +129,8 @@
        repairType.put("指数分布", 1);
        repairType.put("威布尔分布", 2);
        Map<String, Integer> isOrNot = new HashMap<>();
        isOrNot.put("是", 1);
        isOrNot.put("否", 2);
        isOrNot.put("是", 0);
        isOrNot.put("否", 1);
        try {
            // 获取导入文件的后缀名
            String fileName = mutFile.getOriginalFilename();
@@ -142,72 +147,177 @@
            //List<LifeManagement> lifeManagementList = new ArrayList<LifeManagement>();
            String xt = null;
            String fxt = null;
            if (sheets == 1) {
                for (int i = 0; i < sheets; i++) {
                    Sheet sheet = workbook.getSheetAt(i);
                    int num = sheet.getLastRowNum(); // 一共有多少行
                    for (int j = 1; j <= num; j++) {
                        CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
                        CacheUtils.put(progressId, "msg", "共" + num + "行，已完成第" + j + "行");
                        DictTypeDto lifeManagement = new DictTypeDto();
                        boolean isErr = 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 (com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern) != null) {
                            xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //系统
                        }
                        if (com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern) != null) {
                            fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //分系统
                        }
                        String sb = com.zt.core.shiro.ImportUtil.getCellValue(row, 3, pattern); //设备
                        String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //可靠性分布类型
                        String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //参加计算
                        String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //mtbf
                        String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //成功率
                        String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //运行比
                        String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //mtbcf
                        String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf其他参数2
                        String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf其他参数3
                        String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf成功率
                        String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf运行比
                        String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //是否可维修
                        String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //维修发布类型
                        String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //mttcr
                        String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr其他参数2
                        String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr其他参数3
            Long xtId = null;
            Long fxtId = null;

                        XhProductModel xhProductModel = new XhProductModel();
                        xhProductModel.setShipId(shipId);
                        Long id =UUIDUtil.generateId();
                        xhProductModel.setId(id);
            //导入预计参数
            ParamData itemEntity1 = new ParamData();
            itemEntity1.setProductId(shipId);
            itemEntity1.setPageCode("expect");
            paramDataService.insert(itemEntity1);

            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++) {
                    CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
                    CacheUtils.put(progressId, "msg", "共" + num + "行，已完成第" + j + "行");
                    DictTypeDto lifeManagement = new DictTypeDto();
                    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 (!com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern).equals(xt)) {
                            isToggleXt = true;
                            xtId = UUIDUtil.generateId();
                        }
                        xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //系统
                    }

                    if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern)) && !isToggleXt) {
                        fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //分系统
                        fxtId = UUIDUtil.generateId();
                        isToggleFxt = true;
                    } else if (isToggleXt) {
                        if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern))) {
                            fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //分系统
                            fxtId = UUIDUtil.generateId();
                            isToggleFxt = true;
                        } else {
                            fxt = null;
                            isToggleFxt = true;
                        }
                    }

                    String sb = com.zt.core.shiro.ImportUtil.getCellValue(row, 3, pattern); //设备
                    String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //可靠性分布类型
                    String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //参加计算
                    String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //mtbf
                    String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //成功率
                    String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //运行比
                    String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //mtbcf
                    String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf其他参数2
                    String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf其他参数3
                    String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf成功率
                    String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf运行比
                    String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //是否可维修
                    String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //维修发布类型
                    String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //mttcr
                    String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr其他参数2
                    String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr其他参数3

                    if (StringUtils.isEmpty(sb)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写设备名称", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(reliabDistribType)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写可靠性分布类型", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(basicJoinCompute)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写是否参加计算", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(basicMtbfRegulate)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写mtbf", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(taskMtbcfRegulate)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写mtbcf", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(repairable)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写是否可维修", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isNotBlank(repairable) && StringUtils.isEmpty(repairDistribType)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "有未填写的维修分布类型", sheetName, row1);
                        continue;
                    }

                    //导入型号产品结果库
                    XhProductModel xhProductModel = new XhProductModel();


                    Long defultImg = null;
                    xhProductModel.setShipId(shipId);

                    //添加系统
                    if (isToggleXt) {
                        xhProductModel.setPid(shipId);
                        xhProductModel.setId(xtId);
                        xhProductModel.setName(xt);
                        xhProductModel.setProductType("3");
                        xhProductModel.setSort(Integer.valueOf(sort));
                        defultImg = sysPictureBaseService.getDefaultImg(3).getId();
                        xhProductModel.setOperatImg(defultImg);
                        this.insert(xhProductModel);

                        //导入预计参数
                        ParamData itemEntity = new ParamData();
                        //绑定设备ID
                        itemEntity.setProductId(id);
                        itemEntity.setName(sb);
                        itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
                        itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
                        itemEntity.setBasicMtbfRegulate(basicMtbfRegulate);
                        itemEntity.setBasicMtbfRegulSuccRate(basicMtbfRegulSuccRate);
                        itemEntity.setBasicMtbfOperatingRatio(basicMtbfOperatingRatio);
                        itemEntity.setTaskMtbcfRegulate(taskMtbcfRegulate);
                        itemEntity.setTaskMtbcfOtherParams(taskMtbcfOtherParams2 + "," + taskMtbcfOtherParams3);
                        itemEntity.setTaskMtbcfRegulSuccRate(taskMtbcfRegulSuccRate);
                        itemEntity.setTaskMtbcfOperatingRatio(taskMtbcfOperatingRatio);
                        itemEntity.setRepairable(isOrNot.get(repairable));
                        itemEntity.setRepairDistribType(repairType.get(repairDistribType));
                        itemEntity.setRepairMttcr(repairMttcr);
                        itemEntity.setRepairMttcrOtherParams(repairMttcrOtherParams2 + "," + repairMttcrOtherParams3);
                        itemEntity.setProductId(xtId);
                        itemEntity.setPageCode("expect");
                        paramDataService.insert(itemEntity);
                    }


                    if (StringUtils.isNotBlank(fxt) && isToggleFxt) {
                        xhProductModel.setPid(xtId);
                        xhProductModel.setId(fxtId);
                        xhProductModel.setName(fxt);
                        xhProductModel.setProductType("4");
                        xhProductModel.setSort(Integer.valueOf(sort));
                        defultImg = sysPictureBaseService.getDefaultImg(4).getId();
                        xhProductModel.setOperatImg(defultImg);
                        this.insert(xhProductModel);

                        //导入预计参数
                        ParamData itemEntity = new ParamData();
                        itemEntity.setProductId(fxtId);
                        itemEntity.setPageCode("expect");
                        paramDataService.insert(itemEntity);
                    }

                    Long sbId = UUIDUtil.generateId();
                    if (StringUtils.isNotBlank(fxt)) {
                        xhProductModel.setPid(fxtId);
                    } else {
                        xhProductModel.setPid(xtId);
                    }
                    xhProductModel.setId(sbId);
                    xhProductModel.setName(sb);
                    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.setProductId(sbId);
                    itemEntity.setPageCode("expect");
                    itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
                    itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
                    itemEntity.setBasicMtbfRegulate(basicMtbfRegulate);
                    itemEntity.setBasicMtbfRegulSuccRate(basicMtbfRegulSuccRate);
                    itemEntity.setBasicMtbfOperatingRatio(basicMtbfOperatingRatio);
                    itemEntity.setTaskMtbcfRegulate(taskMtbcfRegulate);
                    itemEntity.setTaskMtbcfOtherParams(taskMtbcfOtherParams2 + "," + taskMtbcfOtherParams3);
                    itemEntity.setTaskMtbcfRegulSuccRate(taskMtbcfRegulSuccRate);
                    itemEntity.setTaskMtbcfOperatingRatio(taskMtbcfOperatingRatio);
                    itemEntity.setRepairable(isOrNot.get(repairable));
                    itemEntity.setRepairDistribType(repairType.get(repairDistribType));
                    itemEntity.setRepairMttcr(repairMttcr);
                    itemEntity.setRepairMttcrOtherParams(repairMttcrOtherParams2 + "," + repairMttcrOtherParams3);
                    paramDataService.insert(itemEntity);
                }
            }

        } catch (Exception e) {
            e.printStackTrace();
            ImportUtil.updateErrMap(errMap, "导入异常" + e.getMessage(), "", row1);

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

@@ -255,7 +255,7 @@
            Long dataId = node.getDataId();
            XhProductModel xhProductModel = xhProductModelDao.getById(dataId);
            if (xhProductModel == null) return;
            if ("1".equals(xhProductModel.getProductType())) {
            if ("5".equals(xhProductModel.getProductType())) {
                // 设备
                ParamData paramData = paramDataDao.getParamData(dataId, "expect");
                if (paramData == null) return;

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

@@ -40,7 +40,7 @@
        select a.name, a.id
        from product_model a
        where a.is_delete = 0
          and a.product_type = 5
          and a.product_type = 1
    </select>
    <select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
        SELECT a.operat_img                as imgPath,
@@ -100,7 +100,7 @@
        select a.name, a.id
        from product_model a
        where a.is_delete = 0
          and a.product_type = 4
          and a.product_type = 2
    </select>
    <select id="getById" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
        select a.*

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

@@ -45,7 +45,7 @@
        select a.name, a.id
        from sys_picture_base a
        where a.is_delete = 0
          and a.is_default = 1
          and a.is_default = 0
          and a.product_type = ${productType}
    </select>
</mapper>

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

@@ -43,7 +43,7 @@
                          @selection-change="table.selectionChangeHandle">
                  <el-table-column type="selection" :key="1" width="40" align="center"/>
                  <el-table-column prop="name" :key="2" label="名称" fixed="left" width="120"/>
                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'"
                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'"
                                   prop="reliabDistribType"
                                   label="可靠性分布类型" :key="27"
                                   >
@@ -61,13 +61,13 @@
                                   :hit="hit"/>
                    </template>
                  </el-table-column>
                  <el-table-column v-if="dataForm.productType==='4'" :key="3" prop="baseOperatRatio" label="基本可靠性运行比">
                  <el-table-column v-if="dataForm.productType==='2'" :key="3" prop="baseOperatRatio" label="基本可靠性运行比">
                    <template slot-scope="scope">
                      <el-input v-if="scope.row.isEdit" v-model="scope.row.baseOperatRatio"></el-input>
                      <span v-else v-text="scope.row.baseOperatRatio"></span>
                    </template>
                  </el-table-column>
                  <el-table-column v-if="dataForm.productType==='5'||dataForm.productType==='4'" :key="4"
                  <el-table-column v-if="dataForm.productType==='1'||dataForm.productType==='2'" :key="4"
                                   prop="actualRunTime"
                                   label="实际运行时间">
                    <template slot-scope="scope">
@@ -75,7 +75,7 @@
                      <span v-else v-text="scope.row.actualRunTime"></span>
                    </template>
                  </el-table-column>
                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="5"
                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="5"
                                   label="基本可靠性计算">
                    <!--                <zt-table-column-dict prop="joinCompute" :keys="6" label="参加计算" width="100" dict="is_or_not"/>-->
                    <el-table-column prop="basicJoinCompute" label="参加计算" :key="6"  width="100">
@@ -154,7 +154,7 @@
              </el-tab-pane>


              <el-tab-pane label="任务可靠性" name="second" v-if="dataForm.productType==='3'||dataForm.productType==='2'">
              <el-tab-pane label="任务可靠性" name="second" v-if="dataForm.productType==='3'||dataForm.productType==='4'">
                <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
                          v-adaptive="{bottomOffset:30}"
                          class="paramsDataTable"
@@ -162,7 +162,7 @@
                  <el-table-column type="selection" :key="1" width="40" align="center"/>
                  <el-table-column prop="name" :key="2" label="名称" fixed="left" width="120"/>

                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="15"
                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="15"
                                   label="任务可靠性计算">
                    <el-table-column prop="taskMtbcfRegulate" :key="16" label="MTBCF" width="100">
                      <template slot-scope="scope">
@@ -201,7 +201,7 @@
                      </template>
                    </el-table-column>
                  </el-table-column>
                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='2'" :key="22" label="维修分布">
                  <el-table-column v-if="dataForm.productType==='3'||dataForm.productType==='4'" :key="22" label="维修分布">
                    <!--                <zt-table-column-dict prop="repairable" :keys="23" label="可维修" dict="is_or_not"/>-->
                    <el-table-column prop="repairable" label="可维修" :key="23" width="80">
                      <template v-slot="{ row }">
@@ -293,7 +293,7 @@
          srcId: '',
          name: '',
          dataThreeList: null,
          productType: '5',
          productType: '1',
          basicJoinCompute: '',
          repairable: '',
          repairDistribType: '',
@@ -364,7 +364,7 @@
      },
      add() {
        this.$refs.SelectTyModel.$refs.dialog.init(null, {
          type: this.dataForm.productType - 1,
          type: this.dataForm.productType + 1,
          id: this.dataForm.srcId,
          pageCode: this.pageCode
        })

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

@@ -88,6 +88,7 @@
      //   return val1 - val2
      // }),
      init(row) {
        console.log(row,'ship')
        this.fileList = []
        this.resultData = []
        this.progress.id = guid()

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

@@ -56,10 +56,10 @@
        if (params.type === 'xh') {
          this.isShow = false
          this.dataForm.pid = null
          this.dataForm.productType = 5
          this.dataForm.productType = 1
        } else if (params.type === 'zt') {
          this.dataForm.pid = params.pid
          this.dataForm.productType = 4
          this.dataForm.productType = 2
          this.getProductList()
        } else {
          this.dataForm.pid = params.pid
@@ -104,7 +104,7 @@
      async formSubmit() {
        let flag = true
        if (this.isShow) {
          if (this.dataForm.productType === '5') {
          if (this.dataForm.productType === '1') {
            this.$alert("不支持新增此节点")
            flag = false
          }

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

@@ -37,7 +37,7 @@
              <el-table-column prop="sort" label="排序" width="100px"/>
              <zt-table-column-handle :table="table" width="180px">
                <template v-slot="{ row }">
                  <zt-table-button v-if="productType==='5'" size="small" type="primary"
                  <zt-table-button v-if="productType==='1'" size="small" type="primary"
                                   @click="importData(row)">导入
                  </zt-table-button>
                </template>
@@ -85,7 +85,8 @@
    methods: {
      add() {
        this.dataForm.type = this.productType
        if (this.dataForm.type !== '5') {
        alert(this.dataForm.type )
        if (this.dataForm.type !== '1') {
          if (this.dataForm.type !== '3') {
            this.dataForm.type = this.dataForm.type - 1
          } else if (this.dataForm.type === '3') {
@@ -121,7 +122,7 @@
        }
      },
      importData(row) {
        this.$refs.ProductImport.$refs.dialog.init(row.id)
        this.$refs.ProductImport.$refs.dialog.init(row)
      }
    }
  }