|
@@ -75,7 +75,11 @@
|
|
|
height="40vh"
|
|
height="40vh"
|
|
|
>
|
|
>
|
|
|
<el-table-column :label="form.singleWeightDivision" align="center">
|
|
<el-table-column :label="form.singleWeightDivision" align="center">
|
|
|
- <el-table-column label="参数上限" align="center" v-if='form.parameterType==3'>
|
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="参数上限"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ v-if="form.parameterType == 3"
|
|
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<el-form-item label-width="0" prop="finalValue">
|
|
<el-form-item label-width="0" prop="finalValue">
|
|
|
<el-input
|
|
<el-input
|
|
@@ -86,7 +90,11 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="参数下限" align="center" v-if='form.parameterType==3'>
|
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="参数下限"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ v-if="form.parameterType == 3"
|
|
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<el-form-item label-width="0" prop="initialValue">
|
|
<el-form-item label-width="0" prop="initialValue">
|
|
|
<el-input
|
|
<el-input
|
|
@@ -97,7 +105,11 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="默认值" align="center" v-if='form.parameterType!=3'>
|
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="默认值"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ v-if="form.parameterType != 3"
|
|
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<el-form-item label-width="0" prop="defaultValue">
|
|
<el-form-item label-width="0" prop="defaultValue">
|
|
|
<el-input
|
|
<el-input
|
|
@@ -117,7 +129,16 @@
|
|
|
clearable
|
|
clearable
|
|
|
v-model="scope.row.toleranceValue"
|
|
v-model="scope.row.toleranceValue"
|
|
|
placeholder="请输入"
|
|
placeholder="请输入"
|
|
|
- />
|
|
|
|
|
|
|
+ >
|
|
|
|
|
+ <DictSelection
|
|
|
|
|
+ style="width: 100px"
|
|
|
|
|
+ slot="prepend"
|
|
|
|
|
+ clearable
|
|
|
|
|
+ dictName="数学字符"
|
|
|
|
|
+ v-model="scope.row.symbol"
|
|
|
|
|
+ ></DictSelection>
|
|
|
|
|
+ </el-input>
|
|
|
|
|
+ <!-- </el-form-item> -->
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -178,7 +199,7 @@ export default {
|
|
|
singleWeightDivision: '',
|
|
singleWeightDivision: '',
|
|
|
tolerance: '',
|
|
tolerance: '',
|
|
|
parameterStandards: [],
|
|
parameterStandards: [],
|
|
|
- parameterType:''
|
|
|
|
|
|
|
+ parameterType: ''
|
|
|
};
|
|
};
|
|
|
};
|
|
};
|
|
|
return {
|
|
return {
|
|
@@ -217,12 +238,13 @@ export default {
|
|
|
if (this.type == 'edit') {
|
|
if (this.type == 'edit') {
|
|
|
if (!row.parameterStandards) {
|
|
if (!row.parameterStandards) {
|
|
|
row.parameterStandards = [];
|
|
row.parameterStandards = [];
|
|
|
- }else{
|
|
|
|
|
- row.singleWeightDivision=row.parameterStandards[0]?.singleWeightDivision
|
|
|
|
|
- row.tolerance=row.parameterStandards[0]?.tolerance
|
|
|
|
|
- row.parameterType=row.parameterStandards[0]?.parameterType
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ row.singleWeightDivision =
|
|
|
|
|
+ row.parameterStandards[0]?.singleWeightDivision;
|
|
|
|
|
+ row.tolerance = row.parameterStandards[0]?.tolerance;
|
|
|
|
|
+ row.parameterType = row.parameterStandards[0]?.parameterType;
|
|
|
}
|
|
}
|
|
|
- this.form = JSON.parse(JSON.stringify(row)) ;
|
|
|
|
|
|
|
+ this.form = JSON.parse(JSON.stringify(row));
|
|
|
}
|
|
}
|
|
|
this.visible = true;
|
|
this.visible = true;
|
|
|
},
|
|
},
|
|
@@ -232,14 +254,16 @@ export default {
|
|
|
finalValue: data.parameter?.maxValue,
|
|
finalValue: data.parameter?.maxValue,
|
|
|
initialValue: data.parameter?.minValue,
|
|
initialValue: data.parameter?.minValue,
|
|
|
toleranceValue: data.project?.inspectionStandard,
|
|
toleranceValue: data.project?.inspectionStandard,
|
|
|
- singleWeightDivision: data.parameter?.name +' '+ data.parameter?.unitName,
|
|
|
|
|
- tolerance: data.project?.inspectionName+' '+data.project?.unit,
|
|
|
|
|
- parameterType:data.parameter?.textType,
|
|
|
|
|
- defaultValue:data.parameter?.defaultValue,
|
|
|
|
|
|
|
+ symbol: data.project?.symbol,
|
|
|
|
|
+ singleWeightDivision:
|
|
|
|
|
+ data.parameter?.name + ' ' + data.parameter?.unitName,
|
|
|
|
|
+ tolerance: data.project?.inspectionName + ' ' + data.project?.unit,
|
|
|
|
|
+ parameterType: data.parameter?.textType,
|
|
|
|
|
+ defaultValue: data.parameter?.defaultValue
|
|
|
};
|
|
};
|
|
|
- this.form.singleWeightDivision =obj.singleWeightDivision
|
|
|
|
|
- this.form.tolerance = obj.tolerance
|
|
|
|
|
- this.form.parameterType = obj.parameterType
|
|
|
|
|
|
|
+ this.form.singleWeightDivision = obj.singleWeightDivision;
|
|
|
|
|
+ this.form.tolerance = obj.tolerance;
|
|
|
|
|
+ this.form.parameterType = obj.parameterType;
|
|
|
this.form.parameterStandards.push(obj);
|
|
this.form.parameterStandards.push(obj);
|
|
|
},
|
|
},
|
|
|
add() {
|
|
add() {
|