修改

jinlin

2024-08-16 b19917255abcd8b44be207822a116292ba42a0cd

修改

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

@@ -73,4 +73,7 @@
    @TableField(exist = false)
    private String RepairMttcrOtherParams3;

    @ApiModelProperty(value = "成功率")
    private Double successRate;

}

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

@@ -1335,11 +1335,13 @@
        String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
        String xml = null;
        InputStream in = null;

        try {
            in = new FileInputStream(filePath);
            xml = IOUtils.toString(in);
        } catch (IOException e) {
            e.printStackTrace();
            throw new RenException("文件不存在或者文件打不开");
        } finally {
            try {
                in.close();

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

@@ -69,7 +69,8 @@
               p.repair_distrib_type        as repairDistribType,
               p.repair_mttcr               as repairMttcr,
               p.repair_mttcr_other_params2 as repairMttcrOtherParams2,
               p.repair_mttcr_other_params3 as repairMttcrOtherParams3
               p.repair_mttcr_other_params3 as repairMttcrOtherParams3,
               p.task_mtbcf_regul_succ_rate as success_rate
        FROM product_model a
                 left join sys_dict_data d on d.DICT_VALUE = a.product_type and dict_type_id = '1728965873022050306'
                 left join param_data p on p.product_id = a.id

 web/src/views/modules/taskReliability/ConfigNode/configNode.vue

@@ -18,6 +18,18 @@
                <zt-dict style="width: 100%" v-model="globalGridAttr.reliabDistribType" @input="onReliabDistribType"
                         dict="ReliabDistribType" placeholder="可靠性分布类型" clearable/>
              </el-form-item>
              <el-form-item v-show="globalGridAttr.reliabDistribType==='3' && showBinoParam" label="二项分布成功率"
                            prop="successRate" label-width="125px">
                <el-input v-model="globalGridAttr.successRate" @change="onSuccessRateChange"></el-input>
              </el-form-item>
              <el-form-item v-show="globalGridAttr.reliabDistribType==='3' && showBinoParam" label="总次数"
                            prop="simulatTimes" label-width="80px">
                <el-input v-model="globalGridAttr.simulatTimes" @change="onSimulatTimesChange"></el-input>
              </el-form-item>
              <el-form-item v-show="globalGridAttr.reliabDistribType==='3' && showBinoParam" label="成功次数"
                            prop="successTimes" label-width="80px">
                <el-input v-model="globalGridAttr.successTimes" @change="onSuccessTimesChange"></el-input>
              </el-form-item>
              <el-form-item v-show="nodeType=='node'" label="MTBCF" prop="taskMtbcf" label-width="80px">
                <el-input v-model="globalGridAttr.taskMtbcf" @change="onTaskMtbcfChange"></el-input>
              </el-form-item>
@@ -46,10 +58,12 @@
                  <el-input v-model="globalGridAttr.repairMttcr" @change="onRepairMttcrChange"></el-input>
                </el-form-item>
                <el-form-item label="参数2" prop="repairMttcrOtherParams2" label-width="80px">
                  <el-input v-model="globalGridAttr.repairMttcrOtherParams2" @change="onRepairMttcrOther2Change"></el-input>
                  <el-input v-model="globalGridAttr.repairMttcrOtherParams2"
                            @change="onRepairMttcrOther2Change"></el-input>
                </el-form-item>
                <el-form-item label="参数2" prop="repairMttcrOtherParams3" label-width="80px">
                  <el-input v-model="globalGridAttr.repairMttcrOtherParams3" @change="onRepairMttcrOther3Change"></el-input>
                  <el-input v-model="globalGridAttr.repairMttcrOtherParams3"
                            @change="onRepairMttcrOther3Change"></el-input>
                </el-form-item>
              </div>
            </div>
@@ -104,7 +118,10 @@
          taskMtbcf: '',
          isRepair: '',
          voteNum: 0,
          productType: ''
          productType: '',
          successRate: '',
          simulatTimes: '',
          successTimes: '',
        },
        data: {
          dataId: '',
@@ -113,6 +130,7 @@
        },
        showNumberInput: false,
        showRepairInput: false,
        showBinoParam: false,
        isRepair: [
          {
            value: 0,
@@ -130,10 +148,8 @@
      }
    },
    components: {},
    props: {
    },
    watch: {
    },
    props: {},
    watch: {},
    mounted() {
    },
    methods: {
@@ -182,6 +198,9 @@
      // 可靠性分布类型
      onReliabDistribType(e) {
        this.globalGridAttr.reliabDistribType = e
        if (e === '3') {
          this.showBinoParam = true
        }
        let reliabDistribType = {
          reliabDistribType: this.globalGridAttr.reliabDistribType
        }
@@ -284,6 +303,42 @@
          this.$message.error('输入格式有误，请输入实数')
        }
      },
      onSuccessRateChange(e) {
        const numberRegex = /^-?\d+(\.\d+)?$/
        if (numberRegex.test(e)) {
          this.globalGridAttr.successRate = e
          let successRate = {
            successRate: this.globalGridAttr.successRate
          }
          this.curCel.setData(successRate)
        } else {
          this.$message.error('输入格式有误，请输入实数')
        }
      },
      onSimulatTimesChange(e) {
        const numberRegex = /^-?\d+(\.\d+)?$/
        if (numberRegex.test(e)) {
          this.globalGridAttr.simulatTimes = e
          let simulatTimes = {
            simulatTimes: this.globalGridAttr.simulatTimes
          }
          this.curCel.setData(simulatTimes)
        } else {
          this.$message.error('输入格式有误，请输入实数')
        }
      },
      onSuccessTimesChange(e) {
        const numberRegex = /^-?\d+(\.\d+)?$/
        if (numberRegex.test(e)) {
          this.globalGridAttr.successTimes = e
          let successTimes = {
            successTimes: this.globalGridAttr.successTimes
          }
          this.curCel.setData(successTimes)
        } else {
          this.$message.error('输入格式有误，请输入实数')
        }
      },
      onStatusImgChange(e) {
        this.globalGridAttr.statusImg = e
        let statusImg = {
@@ -348,10 +403,17 @@
          this.globalGridAttr.isRepair = cell.getData().isRepair
          this.globalGridAttr.voteNum = cell.getData().voteNum
          this.globalGridAttr.productType = cell.getData().productType
          this.globalGridAttr.successRate = cell.getData().successRate
          this.globalGridAttr.simulatTimes = cell.getData().simulatTimes
          this.globalGridAttr.successTimes = cell.getData().successTimes
          if (this.nodeType === 'vote' || this.globalGridAttr.nodeTypeExt === 'vote' || (cell.getData().voteNum !== undefined && cell.getData().voteNum !== '')) {
            console.log(cell.getData().voteNum, 'cell.getData().voteNum')
            this.showNumberInput = true
          }
          if (cell.getData().reliabDistribType === 3) {
            this.globalGridAttr.reliabDistribType = '3'
            this.showBinoParam = true
          }
          this.showRepairInput = cell.getData().isRepair
          cell.removeTools()
          cell.addTools([

 web/src/views/modules/taskReliability/RBD-edit-img.vue

@@ -1016,6 +1016,7 @@
              repairMttcr: item.repairMttcr,
              repairMttcrOther2: item.repairMttcrOtherParams2,
              repairMttcrOther3: item.repairMttcrOtherParams3,
              successRate:item.successRate,

              imgHeight: item.imgHeight,
              imgWidth: item.imgWidth,

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

@@ -120,7 +120,8 @@

    methods: {
      async onTreeSelected(data) {
        if (this.dataForm.taskModelId) {
        if (this.dataForm.taskModelId.length > 0) {
          console.log(this.dataForm.taskModelId)
          console.log(data, 'onProductSelected')
          this.dataForm.showProductId = data.id
          let params = {
@@ -133,7 +134,6 @@
          this.xDataList = res.data.xdataList
          this.seriesList = res.data.curveList
          this.tableData = res.data.dataList

        }
      },
      // 获取信息
@@ -185,7 +185,14 @@
        this.option = {
          xAxis: {
            data: this.xDataList,
            name: '仿真总时长'
            name: '仿真总时长',
            type: 'category',
            axisLabel: {
              formatter: function(value) {
                // 将 X 轴刻度值格式化为保留两位小数的字符串
                return parseFloat(value).toFixed(2);
              }
            }
          },
          yAxis: {
            type: 'value',