jinlin
2024-07-26 1b765e3dfdf8ab0d38e587a0a8beaee47a60e32c
修改
13个文件已修改
6个文件已添加
454 ■■■■■ 已修改文件
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskRepairParamController.java 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskRepairParamDao.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskRepairParam.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskRepairParamService.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/resources/mapper/taskReliability/TaskRepairParamDao.xml 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/public/产品结构树导入模板.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/basicInfo/XhProductModel.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/taskReliability/SimulatCurve.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/taskReliability/SimulatHistory.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/taskReliability/Task.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/taskReliability/TaskBinoParam.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/taskReliability/TaskRepairParam.vue 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
@@ -47,6 +47,8 @@
    @ApiModelProperty(value = "图片名称")
    private String operatImgName;
    private String equipType;
    @ApiModelProperty(value = "排序")
    private Integer sort;
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -200,21 +200,22 @@
                    }
                    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
                    String equipType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //设备类型
                    String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //可靠性分布类型
                    String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //参加计算
                    String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //mtbf
                    String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //成功率
                    String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //运行比
                    String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf
                    String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf其他参数2
                    String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf其他参数3
                    String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf成功率
                    String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //mtbcf运行比
                    String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //是否可维修
                    String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //维修发布类型
                    String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr
                    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.isEmpty(sb)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写设备名称", sheetName, row1);
@@ -222,7 +223,6 @@
                    }
                    //导入型号产品结果库
                    XhProductModel xhProductModel = new XhProductModel();
                    Long defultImg = null;
                    xhProductModel.setShipId(shipId);
@@ -273,6 +273,7 @@
                    }
                    xhProductModel.setId(sbId);
                    xhProductModel.setName(sb);
                    xhProductModel.setEquipType(equipType);
                    xhProductModel.setProductType("5");
                    xhProductModel.setSort(Integer.valueOf(sort));
                    defultImg = sysPictureBaseService.getDefaultImg(5).getId();
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
@@ -100,6 +100,14 @@
        return Result.ok(data);
    }
    @GetMapping("getSimulatParams")
    @ApiOperation("信息")
    public Result<List<SimulatAssess>> getSimulatParams(Long id,Long taskModelId) {
        List<SimulatAssess> data = simulatAssessService.getParams(id,taskModelId);
        return Result.ok(data);
    }
    @PostMapping("analyze")
    public Result<Long> analyze(@RequestBody SimulatAssess simulatAssess) {
        //效验数据
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskRepairParamController.java
New file
@@ -0,0 +1,109 @@
package com.zt.life.modules.mainPart.taskReliability.controller;
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.mainPart.taskReliability.model.TaskBinoParam;
import com.zt.life.modules.mainPart.taskReliability.model.TaskRepairParam;
import com.zt.life.modules.mainPart.taskReliability.service.TaskRepairParamService;
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.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
 * task_repair_param
 *
 * @author zt generator
 * @since 1.0.0 2024-07-26
 */
@RestController
@RequestMapping("/taskReliability/TaskRepairParam/")
@Api(tags="task_repair_param")
public class TaskRepairParamController {
    @Autowired
    private TaskRepairParamService taskRepairParamService;
    @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
        @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 = "taskId", value = "任务Id", dataType = Constant.QT.STRING),
    })
    public Result<List<TaskRepairParam>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
        return Result.ok(taskRepairParamService.page(queryFilter));
    }
    @GetMapping("{id}")
    @ApiOperation("信息")
    public Result<TaskRepairParam> get(@PathVariable("id") Long id){
        TaskRepairParam data = taskRepairParamService.get(id);
        return Result.ok(data);
    }
    @PostMapping("save")
    public Result save(@RequestBody TaskRepairParam taskRepairParam) {
        //效验数据
        for (TaskRepairParam param : taskRepairParam.getDataThreeList()) {
            if (param.getId()!=null){
                taskRepairParamService.update(param);
            }else{
                taskRepairParamService.insert(param);
            }
        }
        return Result.ok();
    }
    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")
    public Result insert(@RequestBody TaskRepairParam taskRepairParam){
        //效验数据
        ValidatorUtils.validateEntity(taskRepairParam, AddGroup.class, DefaultGroup.class);
        taskRepairParamService.insert(taskRepairParam);
        return Result.ok();
    }
    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody TaskRepairParam taskRepairParam){
        //效验数据
        ValidatorUtils.validateEntity(taskRepairParam, UpdateGroup.class, DefaultGroup.class);
        taskRepairParamService.update(taskRepairParam);
        return Result.ok();
    }
    @DeleteMapping
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids){
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        taskRepairParamService.delete(ids);
        return Result.ok();
    }
}
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
@@ -22,4 +22,6 @@
    Integer getNumById(Long productId, Long taskModelId);
    List<SimulatAssess> getParams(Long id, Long taskModelId);
}
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskRepairParamDao.java
New file
@@ -0,0 +1,23 @@
package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
import com.zt.life.modules.mainPart.taskReliability.model.TaskRepairParam;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
/**
 * task_repair_param
 *
 * @author zt generator
 * @since 1.0.0 2024-07-26
 */
@Mapper
public interface TaskRepairParamDao extends BaseDao<TaskRepairParam> {
    List<TaskRepairParam> getList(Map<String, Object> params);
}
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskRepairParam.java
New file
@@ -0,0 +1,51 @@
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;
import java.util.List;
/**
 * task_repair_param
 *
 * @author zt generator
 * @since 1.0.0 2024-07-26
 */
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("task_repair_param")
public class TaskRepairParam extends BusiEntity {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value = "任务ID")
    private Long taskId;
    @ApiModelProperty(value = "阶段id")
    private Long phaseId;
    @ApiModelProperty(value = "设备类型")
    private String equipType;
    @ApiModelProperty(value = "状态")
    private Boolean status;
    @ApiModelProperty(value = "备注")
    private String remark;
    @TableField(exist = false)
    private List<TaskRepairParam> dataThreeList;
    @TableField(exist = false)
    private String phaseName;
    @TableField(exist = false)
    private Integer phaseSort;
}
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -44,4 +44,8 @@
    public List<SimulatAssess> getList(Long productId, Long taskModelId) {
        return baseDao.getList(productId,taskModelId);
    }
    public List<SimulatAssess> getParams(Long id, Long taskModelId) {
        return baseDao.getParams(id,taskModelId);
    }
}
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskRepairParamService.java
New file
@@ -0,0 +1,40 @@
package com.zt.life.modules.mainPart.taskReliability.service;
import com.zt.common.service.BaseService;
import com.zt.life.modules.mainPart.taskReliability.dao.TaskRepairParamDao;
import com.zt.life.modules.mainPart.taskReliability.model.TaskRepairParam;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
import java.util.List;
/**
 * task_repair_param
 *
 * @author zt generator
 * @since 1.0.0 2024-07-26
 */
@Service
public class TaskRepairParamService  extends BaseService<TaskRepairParamDao, TaskRepairParam> {
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param queryFilter
     * @return
     */
    public List<TaskRepairParam> page(QueryFilter queryFilter) {
        return baseDao.getList(queryFilter.getQueryParams());
    }
    /**
     * åˆ é™¤
     *
     * @param ids
     */
    public void delete(Long[] ids) {
        super.deleteLogic(ids);
    }
}
modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
@@ -18,5 +18,13 @@
          and task_model_id = ${taskModelId}
          and IS_DELETE = 0
    </select>
    <select id="getParams" resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess">
        select a.sampl_period,b.task_duration
        from simulat_assess a
        left join task b on a.task_model_id = b.id and b.IS_DELETE= 0
        where a.id = ${id}
          and a.task_model_id = ${taskModelId}
          and a.IS_DELETE = 0
    </select>
</mapper>
modules/mainPart/src/main/resources/mapper/taskReliability/TaskRepairParamDao.xml
New file
@@ -0,0 +1,51 @@
<?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.mainPart.taskReliability.dao.TaskRepairParamDao">
    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskRepairParam">
        select d.*,
               case
                   when e.status is null then 0
                   else e.status end as status,
               e.id
        from (
                 select task_id, phase_id, phase_name, phase_sort, equip_type
                 from (
                          SELECT a.task_id
                               , a.id as phase_id
                               , a.phase_name
                               , a.phase_sort
                               , f.equip_type
                          FROM `task_phase` a
                             , task_phase_model b
                             , operat_condit c
                             , operat_condit_model d
                             , model_rbd_node e
                             , product_model f
                             , param_data g
                          where a.task_id = ${taskId}
                            and a.is_delete = 0
                            and b.phase_id = a.id
                            and b.is_delete = 0
                            and c.id = b.operat_condit_id
                            and c.is_delete = 0
                            and d.operat_condit_id = c.id
                            and d.is_delete = 0
                            and e.model_id = d.model_id
                            and e.is_delete = 0
                            and f.id = e.node_id
                            and f.is_delete = 0
                            and f.equip_type is not null and f.equip_type &lt;&gt; ''
                            and g.product_id = f.id
                            and g.is_delete = 0
                            and g.reliab_distrib_type = 2
                            and g.repairable = 1
                      ) c
                 group by task_id, phase_id, phase_name, phase_sort, equip_type
             ) d
                 left join task_repair_param e
                           on e.task_id = d.task_id and e.phase_id = d.phase_id and e.equip_type = d.equip_type
    </select>
</mapper>
web/public/²úÆ·½á¹¹Ê÷µ¼ÈëÄ£°å.xlsx
Binary files differ
web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
@@ -7,6 +7,9 @@
      <zt-form-item label="名称" prop="name" rules="required">
        <el-input v-model="dataForm.name"></el-input>
      </zt-form-item>
      <zt-form-item v-if="dataForm.productType==='5'" prop="equipType" label="设备类型" rules="required">
        <el-input v-model="dataForm.equipType"></el-input>
      </zt-form-item>
      <zt-form-item label="节点类型" prop="productType" rules="required">
        <zt-dict v-model="dataForm.productType" dict="product" @input="getDefaultImg"
                 :disabled="disabled"></zt-dict>
@@ -44,6 +47,7 @@
          operatImg: '',
          operatImgName: '',
          sort: '',
          equipType:'',
          status: ''
        }
      }
web/src/views/modules/basicInfo/XhProductModel.vue
@@ -31,6 +31,7 @@
                      @selection-change="table.selectionChangeHandle"
                      :header-cell-style="{'text-align':'center'}">
              <el-table-column prop="name" label="名称"/>
              <el-table-column v-if="productType==='3'|| productType==='4'" prop="equipType" label="设备类型"/>
              <zt-table-column-dict prop="productType" label="节点类型" dict="product"/>
              <el-table-column prop="operatImg" label="运行图片" align="center">
                <template v-slot="{ row }">
@@ -47,9 +48,9 @@
              </zt-table-column-handle>
            </el-table>
            <!-- å¼¹çª—, æ–°å¢ž / ä¿®æ”¹ -->
            <add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/>
            <select-ty-model @refreshDataList="refreshData" ref="SelectTyModel"/>
            <product-import @refreshDataList="refreshData" ref="ProductImport"/>
            <add-or-update @refreshDataList="refreshData('product')" ref="AddOrUpdate"/>
            <select-ty-model @refreshDataList="refreshData('tree')" ref="SelectTyModel"/>
            <product-import @refreshDataList="refreshData('import')" ref="ProductImport"/>
          </zt-table-wraper>
        </div>
      </el-col>
@@ -102,9 +103,15 @@
          return 'text-align: left !important;'
        }
      },
      refreshData() {
      refreshData(param) {
        if (param==='import'){
        this.$refs.tableObj.query()
        this.$refs.ProductModelTree.getProductList()
        }else if(param==='tree'){
          this.$refs.ProductModelTree.getProductList()
        } else{
          this.$refs.tableObj.query()
        }
      },
      onProductSelected(data) {
        console.log(data, 'onProductSelected')
web/src/views/modules/taskReliability/SimulatCurve.vue
@@ -50,7 +50,7 @@
          },
          xAxis: {
            data: this.xDataList,
            name: '仿真次数'
            name: '仿真总时长'
          },
          yAxis: {
web/src/views/modules/taskReliability/SimulatHistory.vue
@@ -12,6 +12,14 @@
          <zt-form-item label="仿真记录" prop="simulatHis">
            <zt-select v-model="dataForm.id" :datas="simulatList" @change="onSimulatSelected"/>
          </zt-form-item>
          <zt-form-item label="采样周期" prop="samplPeriod">
            <el-input v-model="dataForm.samplPeriod" >
            </el-input>
          </zt-form-item>
          <zt-form-item label="仿真总时长" prop="taskDuration">
            <el-input v-model="dataForm.taskDuration" >
            </el-input>
          </zt-form-item>
        </el-form>
        <div>
          <el-col :span="4">
@@ -52,6 +60,7 @@
        MTTR: '',
        dataForm: {
          id: '',
          taskDuration:'',
          pid: '',
          productId: '',
          showProductId: '',
@@ -116,8 +125,18 @@
      onSimulatSelected(data) {
        this.dataForm.id = data.id
        this.dataForm.samplPeriod = data.samplPeriod
        this.$refs.SimulatCurve.initEcharts(this.dataForm);
        this.getSimulatParams()
        this.$refs.SimulatCurve.initEcharts(this.dataForm)
      },
      async getSimulatParams() {
        let params = {
          id: this.dataForm.id,
          taskModelId: this.dataForm.taskModelId
        }
        let res = await this.$http.get('/taskReliability/SimulatAssess/getSimulatParams', {params: params})
        this.dataForm.taskDuration = res.data.taskDuration
        this.dataForm.samplPeriod = res.data.samplPeriod
      }
    }
  }
</script>
web/src/views/modules/taskReliability/Task.vue
@@ -11,6 +11,7 @@
          <zt-button v-if="dataForm.productId" type="add" @click="add()"/>
          <zt-button v-if="dataForm.productId" type="delete" @click="table.deleteHandle()"/>
          <el-button v-if="dataForm.productId" type="primary" @click="openDialog()">二项分布参数</el-button>
          <el-button v-if="dataForm.productId" type="primary" @click="openDialog2()">不可修设备类型</el-button>
        </el-form-item>
      </el-form>
      <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
@@ -31,6 +32,7 @@
      <!-- å¼¹çª—, æ–°å¢ž / ä¿®æ”¹ -->
      <add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
      <task-bino-param ref="taskBinoParam"></task-bino-param>
      <task-repair-param ref="taskRepairParam"></task-repair-param>
    </zt-table-wraper>
  </div>
</template>
@@ -38,6 +40,7 @@
<script>
  import AddOrUpdate from './Task-AddOrUpdate'
  import TaskBinoParam from "./TaskBinoParam";
  import TaskRepairParam from "./TaskRepairParam";
  export default {
    name: 'Task',
@@ -53,6 +56,7 @@
      }
    },
    components: {
      TaskRepairParam,
      TaskBinoParam,
      AddOrUpdate
    },
@@ -73,6 +77,13 @@
          this.$alert("请选择具体任务")
        }
      },
      openDialog2() {
        if (this.dataForm.id) {
          this.$refs.taskRepairParam.$refs.dialog.init(null, {taskId: this.dataForm.id})
        } else {
          this.$alert("请选择具体任务")
        }
      },
      selectTask(row) {
        this.dataForm.id = row.id
        this.$emit('onTaskSelected', row)
web/src/views/modules/taskReliability/TaskBinoParam.vue
@@ -1,14 +1,8 @@
<template>
  <zt-dialog ref="dialog" column="3" title="二项参数" append-to-body :editAble="false" :hasConfirm="false">
  <zt-dialog ref="dialog" column="3" title="二项参数" append-to-body @confirm="handleSaveRows" :editAble="false">
    <zt-table-wraper :paging='false' ref="tableObj" query-url="/taskReliability/TaskBinoParam/page" delete-url="/taskReliability/TaskBinoParam"
                     v-slot="{ table }" >
      <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
        <el-form-item>
          <!--  <zt-button type="query" @click="table.query()"/>
            <zt-button type="add" perm="taskReliability:add" @click="table.editHandle()"/>
            <zt-button type="delete" perm="taskReliability:delete" @click="table.deleteHandle()"/>-->
          <zt-button type="primary" @click="handleSaveRows">保存</zt-button>
        </el-form-item>
      </el-form>
      <el-table v-loading="table.dataLoading" :data="table.dataList"
                height="600px"
web/src/views/modules/taskReliability/TaskRepairParam.vue
New file
@@ -0,0 +1,62 @@
<template>
  <zt-dialog ref="dialog" column="3" title="强制不可修设备类型" @confirm="handleSaveRows" append-to-body :editAble="true" :hasConfirm="false">
    <zt-table-wraper :paging='false' ref="tableObj" query-url="/taskReliability/TaskRepairParam/page"
                     delete-url="/taskReliability/TaskRepairParam/"
                     v-slot="{ table }">
      <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
      </el-form>
      <el-table v-loading="table.dataLoading" :data="table.dataList"
                height="600px"
                border @selection-change="table.selectionChangeHandle"
                :header-cell-style="{'text-align':'center'}">
        <!--        <el-table-column type="selection" width="40"/>-->
        <el-table-column prop="phaseName" label="阶段" align="left"/>
        <el-table-column prop="equipType" label="设备类型" align="center"/>
        <el-table-column prop="status" label="强制不可修" width="160" align="center">
          <template v-slot="{ row }">
            <el-checkbox v-model="row.status"/>
          </template>
        </el-table-column>
      </el-table>
    </zt-table-wraper>
  </zt-dialog>
</template>
<script>
  export default {
    name: 'taskRepairParam',
    data() {
      return {
        dataForm: {
          phaseName: '',
          equipType: '',
          status: '',
          dataThreeList: '',
        },
        dataList: [],
        originalTableData: [],
        originalData: null,
      }
    },
    components: {},
    methods: {
      init(id, row) {
        this.dataForm.taskId = row.taskId
      },
      async handleSaveRows() {
        this.dataForm.dataThreeList = this.$refs.tableObj.dataList
        console.log(this.dataForm, 'this.dataForm this.dataForm')
        let res = await this.$http.post('/taskReliability/TaskRepairParam/save', this.dataForm)
        if (res.success) {
          console.log(res.data)
          await this.$tip.success()
          this.originalData = null
          this.dataForm.dataThreeList = null
          this.$refs.tableObj.query()
          this.originalTableData = JSON.parse(JSON.stringify(this.dataList)); // æ›´æ–°åˆå§‹æ•°æ®ä¸ºå½“前数据
          console.log(this.originalTableData, 'this.originalTableData å½“前表格json数据')
        }
      },
    }
  }
</script>