Merge remote-tracking branch 'origin/master'

xyc

2024-10-22 e4246536ec8218b0444667cbe457c0d3d6e67bd9

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

@@ -120,12 +120,12 @@
                         <span v-else v-text="scope.row.basicMtbfAcceptSuccRate"></span>
                       </template>
                     </el-table-column>-->
              <!--      <el-table-column prop="basicUnitNum" label="单元数量" :key="11" width="100" align="center">
                    <el-table-column prop="basicUnitNum" label="单元数量" :key="11" width="100" align="center">
                      <template slot-scope="scope">
                        <el-input v-if="scope.row.isEdit" v-model="scope.row.basicUnitNum"></el-input>
                        <span v-else v-text="scope.row.basicUnitNum"></span>
                      </template>
                    </el-table-column>-->
                    </el-table-column>
                    <el-table-column prop="basicRunsNum" label="运行次数" :key="12" width="100" align="center">
                      <template slot-scope="scope">
                        <el-input v-if="scope.row.isEdit" v-model="scope.row.basicRunsNum"></el-input>
@@ -335,7 +335,12 @@
          {
            value: 1,
            label: '指数分布'
          }, {
          },
          {
            value: 2,
            label: '威布尔分布'
          },
          {
            value: 3,
            label: '二项分布'
          }