修改

jinlin

2024-07-16 91861fec4e3113339b2e7e34a10318ff7d891df2

修改

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

@@ -58,11 +58,13 @@
               d.dict_code                 as productType,
               p.repairable                as isRepair,
               p.task_mtbcf_accept         as taskMtbcf,
               p.task_mtbcf_other_params   as taskMtbcfOther,
               p.task_mtbcf_other_params2   as taskMtbcfOtherParams2,
               p.task_mtbcf_other_params3   as taskMtbcfOtherParams3,
               p.reliab_distrib_type       as reliabDistribType,
               p.repair_distrib_type       as repairDistribType,
               p.repair_mttcr              as RepairMttcr,
               p.repair_mttcr_other_params as RepairMttcrOther
               p.repair_mttcr              as repairMttcr,
               p.repair_mttcr_other_params2 as repairMttcrOtherParams2,
               p.repair_mttcr_other_params3 as repairMttcrOtherParams3
        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 and p.page_code = 'expect'

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

@@ -21,8 +21,11 @@
              <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>
              <el-form-item v-show="nodeType=='node'" label="参数2" prop="taskMtbcfOther" label-width="80px">
                <el-input v-model="globalGridAttr.taskMtbcfOther" @change="onTaskMtbcfOtherChange"></el-input>
              <el-form-item v-show="nodeType=='node'" label="参数2" prop="taskMtbcfOtherParams2" label-width="80px">
                <el-input v-model="globalGridAttr.taskMtbcfOtherParams2" @change="onTaskMtbcfOther2Change"></el-input>
              </el-form-item>
              <el-form-item v-show="nodeType=='node'" label="参数3" prop="taskMtbcfOtherParams3" label-width="80px">
                <el-input v-model="globalGridAttr.taskMtbcfOtherParams3" @change="onTaskMtbcfOther3Change"></el-input>
              </el-form-item>
              <el-form-item v-show="nodeType=='node'" label="是否可维修" prop="isRepair" label-width="100px">
                <el-select style="width: 100%" v-model="globalGridAttr.isRepair" @change="onIsRepairChange">
@@ -42,8 +45,11 @@
                <el-form-item label="MTTCR" prop="repairMttcr" label-width="80px">
                  <el-input v-model="globalGridAttr.repairMttcr" @change="onRepairMttcrChange"></el-input>
                </el-form-item>
                <el-form-item label="参数2" prop="repairMttcrOther" label-width="80px">
                  <el-input v-model="globalGridAttr.repairMttcrOther" @change="onRepairMttcrOtherChange"></el-input>
                <el-form-item label="参数2" prop="repairMttcrOtherParams2" label-width="80px">
                  <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-form-item>
              </div>
            </div>
@@ -91,9 +97,11 @@
          reliabDistribType: '',
          repairDistribType: '',
          repairMttcr: '',
          repairMttcrOther: '',
          repairMttcrOtherParams2: '',
          repairMttcrOtherParams3: '',
          taskMtbcfOtherParams2: '',
          taskMtbcfOtherParams3: '',
          taskMtbcf: '',
          taskMtbcfOther: '',
          isRepair: '',
          voteNum: 0,
          productType: ''
@@ -193,19 +201,31 @@
        }
      },
      // 参数2
      onTaskMtbcfOtherChange(e) {
      onTaskMtbcfOther2Change(e) {
        const numberRegex = /^-?\d+(\.\d+)?$/
        console.log(e, 'eeeee')
        if (numberRegex.test(e)) {
          this.globalGridAttr.taskMtbcfOther = e
          let taskMtbcfOther = {
            taskMtbcfOther: this.globalGridAttr.taskMtbcfOther
          this.globalGridAttr.taskMtbcfOtherParams2 = e
          let taskMtbcfOtherParams2 = {
            taskMtbcfOtherParams2: this.globalGridAttr.taskMtbcfOtherParams2
          }
          this.curCel.setData(taskMtbcfOther)
          this.curCel.setData(taskMtbcfOtherParams2)
        } else {
          this.$message.error('输入格式有误，请输入实数')
        }

      },
      onTaskMtbcfOther3Change(e) {
        const numberRegex = /^-?\d+(\.\d+)?$/
        console.log(e, 'eeeee')
        if (numberRegex.test(e)) {
          this.globalGridAttr.taskMtbcfOtherParams3 = e
          let taskMtbcfOtherParams3 = {
            taskMtbcfOtherParams3: this.globalGridAttr.taskMtbcfOtherParams3
          }
          this.curCel.setData(taskMtbcfOtherParams3)
        } else {
          this.$message.error('输入格式有误，请输入实数')
        }
      },
      // 是否可维修
      onIsRepairChange(e) {
@@ -239,14 +259,27 @@

      },
      // 可维修性分布类型 参数2
      onRepairMttcrOtherChange(e) {
      onRepairMttcrOther2Change(e) {
        const numberRegex = /^-?\d+(\.\d+)?$/
        if (numberRegex.test(e)) {
          this.globalGridAttr.repairMttcrOther = e
          let repairMttcrOther = {
            repairMttcrOther: this.globalGridAttr.repairMttcrOther
          this.globalGridAttr.repairMttcrOtherParams2 = e
          let repairMttcrOtherParams2 = {
            repairMttcrOtherParams2: this.globalGridAttr.repairMttcrOtherParams2
          }
          this.curCel.setData(repairMttcrOther)
          this.curCel.setData(repairMttcrOtherParams2)
        } else {
          this.$message.error('输入格式有误，请输入实数')
        }
      },
      // 可维修性分布类型 参数2
      onRepairMttcrOther3Change(e) {
        const numberRegex = /^-?\d+(\.\d+)?$/
        if (numberRegex.test(e)) {
          this.globalGridAttr.repairMttcrOtherParams3 = e
          let repairMttcrOtherParams3 = {
            repairMttcrOtherParams3: this.globalGridAttr.repairMttcrOtherParams3
          }
          this.curCel.setData(repairMttcrOtherParams3)
        } else {
          this.$message.error('输入格式有误，请输入实数')
        }

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

@@ -588,10 +588,12 @@
          productType: '',
          voteNum: '',
          repairMttcr: '',
          repairMttcrOther: '',
          repairMttcrOtherParams2: '',
          repairMttcrOtherParams3: '',
          repairDistribType: '',
          reliabDistribType: '',
          taskMtbcfOther: '',
          taskMtbcfOtherParams2: '',
          taskMtbcfOtherParams3: '',
          isRepair: 0,
          taskMtbcf: '',
          numberInputValue: '',
@@ -1006,12 +1008,14 @@

              reliabDistribType: item.reliabDistribType ? item.reliabDistribType : 1,
              taskMtbcf: item.taskMtbcf,
              taskMtbcfOther: item.taskMtbcfOther,
              taskMtbcfOther2: item.taskMtbcfOtherParams2,
              taskMtbcfOther3: item.taskMtbcfOtherParams3,

              isRepair: item.isRepair,
              repairDistribType: item.repairDistribType ? item.repairDistribType : 1,
              repairMttcr: item.repairMttcr,
              repairMttcrOther: item.repairMttcrOther,
              repairMttcrOther2: item.repairMttcrOtherParams2,
              repairMttcrOther3: item.repairMttcrOtherParams3,

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