diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/precisionInputNumber/index.vue b/src/components/precisionInputNumber/index.vue index 4d9b77a..9a2b19e 100644 --- a/src/components/precisionInputNumber/index.vue +++ b/src/components/precisionInputNumber/index.vue @@ -161,6 +161,7 @@ diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/precisionInputNumber/index.vue b/src/components/precisionInputNumber/index.vue index 4d9b77a..9a2b19e 100644 --- a/src/components/precisionInputNumber/index.vue +++ b/src/components/precisionInputNumber/index.vue @@ -161,6 +161,7 @@ diff --git a/src/views/business/measure/item/components/sixteen/templateDetail.vue b/src/views/business/measure/item/components/sixteen/templateDetail.vue index a951929..c6786d9 100644 --- a/src/views/business/measure/item/components/sixteen/templateDetail.vue +++ b/src/views/business/measure/item/components/sixteen/templateDetail.vue @@ -210,6 +210,7 @@ params: '交流电压', ...params, editable: true, + technicalIndexUnit: 'mV', } as any) break case '直流电压': // 直流电压 @@ -342,7 +343,7 @@ break case '2': // 交流电压 - acVoltageList.value.push({ ...item, params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) + acVoltageList.value.push({ ...item, technicalIndexUnit: 'mV', params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) break case '3': // 直流电压 diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/precisionInputNumber/index.vue b/src/components/precisionInputNumber/index.vue index 4d9b77a..9a2b19e 100644 --- a/src/components/precisionInputNumber/index.vue +++ b/src/components/precisionInputNumber/index.vue @@ -161,6 +161,7 @@ diff --git a/src/views/business/measure/item/components/sixteen/templateDetail.vue b/src/views/business/measure/item/components/sixteen/templateDetail.vue index a951929..c6786d9 100644 --- a/src/views/business/measure/item/components/sixteen/templateDetail.vue +++ b/src/views/business/measure/item/components/sixteen/templateDetail.vue @@ -210,6 +210,7 @@ params: '交流电压', ...params, editable: true, + technicalIndexUnit: 'mV', } as any) break case '直流电压': // 直流电压 @@ -342,7 +343,7 @@ break case '2': // 交流电压 - acVoltageList.value.push({ ...item, params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) + acVoltageList.value.push({ ...item, technicalIndexUnit: 'mV', params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) break case '3': // 直流电压 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index a99b370..17ba51f 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -36,6 +36,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -189,6 +190,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -384,7 +386,7 @@ if (newVal && newVal?.length) { // 判断是否通过验证 // if (useCheckList(dailyFrequencyDriftRateList.value, columns_daily_frequency_drift_rate.value, '日频率漂移率') && String(dailyFrequencyDriftRateList.value[0].dailyAgingRateOne)) { - // isShowChart.value = true + isShowChart.value = true xAxisData.value = dailyFrequencyDriftRateList.value.map((item: { serialNumber: string | number }) => item.serialNumber) as any[] if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 @@ -410,7 +412,10 @@ @@ -701,7 +709,10 @@ v-if="pageType !== 'detail'" v-model="scope.correlationCoefficientOne" style="width: 100%;" controls-position="right" /> --> - + {{ scope.correlationCoefficientOne }} @@ -716,6 +727,24 @@ + + + + + + + + + + + diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/precisionInputNumber/index.vue b/src/components/precisionInputNumber/index.vue index 4d9b77a..9a2b19e 100644 --- a/src/components/precisionInputNumber/index.vue +++ b/src/components/precisionInputNumber/index.vue @@ -161,6 +161,7 @@ diff --git a/src/views/business/measure/item/components/sixteen/templateDetail.vue b/src/views/business/measure/item/components/sixteen/templateDetail.vue index a951929..c6786d9 100644 --- a/src/views/business/measure/item/components/sixteen/templateDetail.vue +++ b/src/views/business/measure/item/components/sixteen/templateDetail.vue @@ -210,6 +210,7 @@ params: '交流电压', ...params, editable: true, + technicalIndexUnit: 'mV', } as any) break case '直流电压': // 直流电压 @@ -342,7 +343,7 @@ break case '2': // 交流电压 - acVoltageList.value.push({ ...item, params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) + acVoltageList.value.push({ ...item, technicalIndexUnit: 'mV', params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) break case '3': // 直流电压 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index a99b370..17ba51f 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -36,6 +36,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -189,6 +190,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -384,7 +386,7 @@ if (newVal && newVal?.length) { // 判断是否通过验证 // if (useCheckList(dailyFrequencyDriftRateList.value, columns_daily_frequency_drift_rate.value, '日频率漂移率') && String(dailyFrequencyDriftRateList.value[0].dailyAgingRateOne)) { - // isShowChart.value = true + isShowChart.value = true xAxisData.value = dailyFrequencyDriftRateList.value.map((item: { serialNumber: string | number }) => item.serialNumber) as any[] if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 @@ -410,7 +412,10 @@ @@ -701,7 +709,10 @@ v-if="pageType !== 'detail'" v-model="scope.correlationCoefficientOne" style="width: 100%;" controls-position="right" /> --> - + {{ scope.correlationCoefficientOne }} @@ -716,6 +727,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue index 357ba91..42b4fea 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常;通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -185,6 +186,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -699,6 +701,24 @@ + + + + + + + + + + + diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/precisionInputNumber/index.vue b/src/components/precisionInputNumber/index.vue index 4d9b77a..9a2b19e 100644 --- a/src/components/precisionInputNumber/index.vue +++ b/src/components/precisionInputNumber/index.vue @@ -161,6 +161,7 @@ diff --git a/src/views/business/measure/item/components/sixteen/templateDetail.vue b/src/views/business/measure/item/components/sixteen/templateDetail.vue index a951929..c6786d9 100644 --- a/src/views/business/measure/item/components/sixteen/templateDetail.vue +++ b/src/views/business/measure/item/components/sixteen/templateDetail.vue @@ -210,6 +210,7 @@ params: '交流电压', ...params, editable: true, + technicalIndexUnit: 'mV', } as any) break case '直流电压': // 直流电压 @@ -342,7 +343,7 @@ break case '2': // 交流电压 - acVoltageList.value.push({ ...item, params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) + acVoltageList.value.push({ ...item, technicalIndexUnit: 'mV', params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) break case '3': // 直流电压 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index a99b370..17ba51f 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -36,6 +36,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -189,6 +190,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -384,7 +386,7 @@ if (newVal && newVal?.length) { // 判断是否通过验证 // if (useCheckList(dailyFrequencyDriftRateList.value, columns_daily_frequency_drift_rate.value, '日频率漂移率') && String(dailyFrequencyDriftRateList.value[0].dailyAgingRateOne)) { - // isShowChart.value = true + isShowChart.value = true xAxisData.value = dailyFrequencyDriftRateList.value.map((item: { serialNumber: string | number }) => item.serialNumber) as any[] if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 @@ -410,7 +412,10 @@ @@ -701,7 +709,10 @@ v-if="pageType !== 'detail'" v-model="scope.correlationCoefficientOne" style="width: 100%;" controls-position="right" /> --> - + {{ scope.correlationCoefficientOne }} @@ -716,6 +727,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue index 357ba91..42b4fea 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常;通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -185,6 +186,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -699,6 +701,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue index 5a555e2..c123135 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -283,7 +284,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 - + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) // =======================================表单公共组件数据处理======================================================= @@ -988,6 +989,24 @@ + + + + + + + + + + + diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/precisionInputNumber/index.vue b/src/components/precisionInputNumber/index.vue index 4d9b77a..9a2b19e 100644 --- a/src/components/precisionInputNumber/index.vue +++ b/src/components/precisionInputNumber/index.vue @@ -161,6 +161,7 @@ diff --git a/src/views/business/measure/item/components/sixteen/templateDetail.vue b/src/views/business/measure/item/components/sixteen/templateDetail.vue index a951929..c6786d9 100644 --- a/src/views/business/measure/item/components/sixteen/templateDetail.vue +++ b/src/views/business/measure/item/components/sixteen/templateDetail.vue @@ -210,6 +210,7 @@ params: '交流电压', ...params, editable: true, + technicalIndexUnit: 'mV', } as any) break case '直流电压': // 直流电压 @@ -342,7 +343,7 @@ break case '2': // 交流电压 - acVoltageList.value.push({ ...item, params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) + acVoltageList.value.push({ ...item, technicalIndexUnit: 'mV', params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) break case '3': // 直流电压 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index a99b370..17ba51f 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -36,6 +36,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -189,6 +190,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -384,7 +386,7 @@ if (newVal && newVal?.length) { // 判断是否通过验证 // if (useCheckList(dailyFrequencyDriftRateList.value, columns_daily_frequency_drift_rate.value, '日频率漂移率') && String(dailyFrequencyDriftRateList.value[0].dailyAgingRateOne)) { - // isShowChart.value = true + isShowChart.value = true xAxisData.value = dailyFrequencyDriftRateList.value.map((item: { serialNumber: string | number }) => item.serialNumber) as any[] if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 @@ -410,7 +412,10 @@ @@ -701,7 +709,10 @@ v-if="pageType !== 'detail'" v-model="scope.correlationCoefficientOne" style="width: 100%;" controls-position="right" /> --> - + {{ scope.correlationCoefficientOne }} @@ -716,6 +727,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue index 357ba91..42b4fea 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常;通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -185,6 +186,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -699,6 +701,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue index 5a555e2..c123135 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -283,7 +284,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 - + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) // =======================================表单公共组件数据处理======================================================= @@ -988,6 +989,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue index 55b4ccc..16efa19 100644 --- a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue @@ -40,6 +40,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '/', appearanceFunctionCheck: '1' as any, // 外观（1/0） + appearance: '1', sealingTest: '1', // 标准器示值是否已通过软件 outcome: '', // 结论 remark: '', // 备注 @@ -243,6 +244,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceRemark = `${res.data.appearanceRemark}` // 外观备注 itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0） + itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0） itemFormData.value.sealingTest = `${res.data.sealingTest}` // 标准器示值是否已通过软件 itemFormData.value.outcome = `${res.data.outcome}` // 结论 itemFormData.value.remark = `${res.data.remark}` // 结论 @@ -462,9 +464,9 @@ > - - - + + + 合格 @@ -474,7 +476,7 @@ - + {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/precisionInputNumber/index.vue b/src/components/precisionInputNumber/index.vue index 4d9b77a..9a2b19e 100644 --- a/src/components/precisionInputNumber/index.vue +++ b/src/components/precisionInputNumber/index.vue @@ -161,6 +161,7 @@ diff --git a/src/views/business/measure/item/components/sixteen/templateDetail.vue b/src/views/business/measure/item/components/sixteen/templateDetail.vue index a951929..c6786d9 100644 --- a/src/views/business/measure/item/components/sixteen/templateDetail.vue +++ b/src/views/business/measure/item/components/sixteen/templateDetail.vue @@ -210,6 +210,7 @@ params: '交流电压', ...params, editable: true, + technicalIndexUnit: 'mV', } as any) break case '直流电压': // 直流电压 @@ -342,7 +343,7 @@ break case '2': // 交流电压 - acVoltageList.value.push({ ...item, params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) + acVoltageList.value.push({ ...item, technicalIndexUnit: 'mV', params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) break case '3': // 直流电压 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index a99b370..17ba51f 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -36,6 +36,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -189,6 +190,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -384,7 +386,7 @@ if (newVal && newVal?.length) { // 判断是否通过验证 // if (useCheckList(dailyFrequencyDriftRateList.value, columns_daily_frequency_drift_rate.value, '日频率漂移率') && String(dailyFrequencyDriftRateList.value[0].dailyAgingRateOne)) { - // isShowChart.value = true + isShowChart.value = true xAxisData.value = dailyFrequencyDriftRateList.value.map((item: { serialNumber: string | number }) => item.serialNumber) as any[] if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 @@ -410,7 +412,10 @@ @@ -701,7 +709,10 @@ v-if="pageType !== 'detail'" v-model="scope.correlationCoefficientOne" style="width: 100%;" controls-position="right" /> --> - + {{ scope.correlationCoefficientOne }} @@ -716,6 +727,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue index 357ba91..42b4fea 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常;通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -185,6 +186,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -699,6 +701,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue index 5a555e2..c123135 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -283,7 +284,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 - + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) // =======================================表单公共组件数据处理======================================================= @@ -988,6 +989,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue index 55b4ccc..16efa19 100644 --- a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue @@ -40,6 +40,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '/', appearanceFunctionCheck: '1' as any, // 外观（1/0） + appearance: '1', sealingTest: '1', // 标准器示值是否已通过软件 outcome: '', // 结论 remark: '', // 备注 @@ -243,6 +244,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceRemark = `${res.data.appearanceRemark}` // 外观备注 itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0） + itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0） itemFormData.value.sealingTest = `${res.data.sealingTest}` // 标准器示值是否已通过软件 itemFormData.value.outcome = `${res.data.outcome}` // 结论 itemFormData.value.remark = `${res.data.remark}` // 结论 @@ -462,9 +464,9 @@ > - - - + + + 合格 @@ -474,7 +476,7 @@ - + + @@ -452,10 +459,15 @@ diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/precisionInputNumber/index.vue b/src/components/precisionInputNumber/index.vue index 4d9b77a..9a2b19e 100644 --- a/src/components/precisionInputNumber/index.vue +++ b/src/components/precisionInputNumber/index.vue @@ -161,6 +161,7 @@ diff --git a/src/views/business/measure/item/components/sixteen/templateDetail.vue b/src/views/business/measure/item/components/sixteen/templateDetail.vue index a951929..c6786d9 100644 --- a/src/views/business/measure/item/components/sixteen/templateDetail.vue +++ b/src/views/business/measure/item/components/sixteen/templateDetail.vue @@ -210,6 +210,7 @@ params: '交流电压', ...params, editable: true, + technicalIndexUnit: 'mV', } as any) break case '直流电压': // 直流电压 @@ -342,7 +343,7 @@ break case '2': // 交流电压 - acVoltageList.value.push({ ...item, params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) + acVoltageList.value.push({ ...item, technicalIndexUnit: 'mV', params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) break case '3': // 直流电压 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index a99b370..17ba51f 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -36,6 +36,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -189,6 +190,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -384,7 +386,7 @@ if (newVal && newVal?.length) { // 判断是否通过验证 // if (useCheckList(dailyFrequencyDriftRateList.value, columns_daily_frequency_drift_rate.value, '日频率漂移率') && String(dailyFrequencyDriftRateList.value[0].dailyAgingRateOne)) { - // isShowChart.value = true + isShowChart.value = true xAxisData.value = dailyFrequencyDriftRateList.value.map((item: { serialNumber: string | number }) => item.serialNumber) as any[] if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 @@ -410,7 +412,10 @@ @@ -701,7 +709,10 @@ v-if="pageType !== 'detail'" v-model="scope.correlationCoefficientOne" style="width: 100%;" controls-position="right" /> --> - + {{ scope.correlationCoefficientOne }} @@ -716,6 +727,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue index 357ba91..42b4fea 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常;通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -185,6 +186,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -699,6 +701,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue index 5a555e2..c123135 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -283,7 +284,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 - + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) // =======================================表单公共组件数据处理======================================================= @@ -988,6 +989,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue index 55b4ccc..16efa19 100644 --- a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue @@ -40,6 +40,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '/', appearanceFunctionCheck: '1' as any, // 外观（1/0） + appearance: '1', sealingTest: '1', // 标准器示值是否已通过软件 outcome: '', // 结论 remark: '', // 备注 @@ -243,6 +244,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceRemark = `${res.data.appearanceRemark}` // 外观备注 itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0） + itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0） itemFormData.value.sealingTest = `${res.data.sealingTest}` // 标准器示值是否已通过软件 itemFormData.value.outcome = `${res.data.outcome}` // 结论 itemFormData.value.remark = `${res.data.remark}` // 结论 @@ -462,9 +464,9 @@ > - - - + + + 合格 @@ -474,7 +476,7 @@ - + + @@ -452,10 +459,15 @@ diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue index ee6e5c0..97b0cd4 100644 --- a/src/views/business/taskMeasure/measureData/detail.vue +++ b/src/views/business/taskMeasure/measureData/detail.vue @@ -432,8 +432,9 @@ } } else if (belongStandardEquipment.value === '14') { // 第14套 铯原子 + console.log(templateDetailRef.value.itemFormData, 'templateDetailRef.value.itemFormData') params = { - ...templateDetailRef.value.itemFormData, + measureDataCesiumAtomList: templateDetailRef.value.getList().map((item: any) => ({ ...item, id: pageType.value === 'add' ? '' : item.id })), id: pageType.value === 'edit' ? infoId.value : '', equipmentDTOs: templateDetailRef.value.templateFormAndTableRef.measureEquipmentList.map((item: { id: string; standardId: string; standardName: string }) => { @@ -454,6 +455,7 @@ manufacturer: templateDetailRef.value.templateFormAndTableRef.sampleList[0].manufacturer, // 生产厂家 itemCategoryName: itemCategoryName.value, // 检定项分类名称 itemCategoryId: itemCategoryId.value, // 检定项分类id + ...templateDetailRef.value.itemFormData, } } else if (belongStandardEquipment.value === '15') { // 第15套 小功率 diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue index b23f455..607e221 100644 --- a/src/components/MultiHeaderTable/tableColumn.vue +++ b/src/components/MultiHeaderTable/tableColumn.vue @@ -167,9 +167,11 @@ placeholder="请输入" :min="min" :disabled="scope.row.setDisabled" + resize="none" :step="(`${scope.row.elInputNumberStep}` !== '' && `${scope.row.elInputNumberStep}` !== '0') ? scope.row.elInputNumberStep : undefined" @change="(val: any) => handleInputTypeNumberChange(scope, val, item.value)" @blur="handleInputTypeNumberBlur(scope.row[item.value])" + @mousewheel.prevent /> {{ scope.row[item.value] }} {{ scope.row.showUnitData }} diff --git a/src/components/ScientificNotation/index.vue b/src/components/ScientificNotation/index.vue index 382f98a..24effd5 100644 --- a/src/components/ScientificNotation/index.vue +++ b/src/components/ScientificNotation/index.vue @@ -156,6 +156,7 @@ diff --git a/src/components/precisionInputNumber/index.vue b/src/components/precisionInputNumber/index.vue index 4d9b77a..9a2b19e 100644 --- a/src/components/precisionInputNumber/index.vue +++ b/src/components/precisionInputNumber/index.vue @@ -161,6 +161,7 @@ diff --git a/src/views/business/measure/item/components/sixteen/templateDetail.vue b/src/views/business/measure/item/components/sixteen/templateDetail.vue index a951929..c6786d9 100644 --- a/src/views/business/measure/item/components/sixteen/templateDetail.vue +++ b/src/views/business/measure/item/components/sixteen/templateDetail.vue @@ -210,6 +210,7 @@ params: '交流电压', ...params, editable: true, + technicalIndexUnit: 'mV', } as any) break case '直流电压': // 直流电压 @@ -342,7 +343,7 @@ break case '2': // 交流电压 - acVoltageList.value.push({ ...item, params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) + acVoltageList.value.push({ ...item, technicalIndexUnit: 'mV', params: '交流电压', technicalIndex: clearSymbol(item.technicalIndex), editable: props.pageType !== 'detail' }) break case '3': // 直流电压 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index a99b370..17ba51f 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -36,6 +36,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -189,6 +190,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -384,7 +386,7 @@ if (newVal && newVal?.length) { // 判断是否通过验证 // if (useCheckList(dailyFrequencyDriftRateList.value, columns_daily_frequency_drift_rate.value, '日频率漂移率') && String(dailyFrequencyDriftRateList.value[0].dailyAgingRateOne)) { - // isShowChart.value = true + isShowChart.value = true xAxisData.value = dailyFrequencyDriftRateList.value.map((item: { serialNumber: string | number }) => item.serialNumber) as any[] if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 @@ -410,7 +412,10 @@ @@ -701,7 +709,10 @@ v-if="pageType !== 'detail'" v-model="scope.correlationCoefficientOne" style="width: 100%;" controls-position="right" /> --> - + {{ scope.correlationCoefficientOne }} @@ -716,6 +727,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue index 357ba91..42b4fea 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常;通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -185,6 +186,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) @@ -699,6 +701,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue index 5a555e2..c123135 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue @@ -37,6 +37,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '外观检查正常；通电后仪器工作正常。', appearanceFunctionCheck: 1 as any, // 外观（1/0） + remark: '', }) // -------------------------------------------路由参数------------------------------------------ const pageType = ref('add') // 页面类型: add, edit, detail @@ -283,7 +284,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceFunctionCheck = Number(res.data.appearanceFunctionCheck)// 外观及功能检查 itemFormData.value.appearanceRemark = res.data.appearanceRemark // 外观及功能检查 - + itemFormData.value.remark = res.data.remark // 外观及功能检查 console.log(res, 'res') initInputData(res.data.measureDataCesiumAtomList) // =======================================表单公共组件数据处理======================================================= @@ -988,6 +989,24 @@ + + + + + + + + + + + diff --git a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue index 55b4ccc..16efa19 100644 --- a/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/seventh/templateDetail.vue @@ -40,6 +40,7 @@ belongStandardEquipmentName: '', // 标准装置名称 appearanceRemark: '/', appearanceFunctionCheck: '1' as any, // 外观（1/0） + appearance: '1', sealingTest: '1', // 标准器示值是否已通过软件 outcome: '', // 结论 remark: '', // 备注 @@ -243,6 +244,7 @@ itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id itemFormData.value.appearanceRemark = `${res.data.appearanceRemark}` // 外观备注 itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0） + itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0） itemFormData.value.sealingTest = `${res.data.sealingTest}` // 标准器示值是否已通过软件 itemFormData.value.outcome = `${res.data.outcome}` // 结论 itemFormData.value.remark = `${res.data.remark}` // 结论 @@ -462,9 +464,9 @@ > - - - + + + 合格 @@ -474,7 +476,7 @@ - + + @@ -452,10 +459,15 @@ diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue index ee6e5c0..97b0cd4 100644 --- a/src/views/business/taskMeasure/measureData/detail.vue +++ b/src/views/business/taskMeasure/measureData/detail.vue @@ -432,8 +432,9 @@ } } else if (belongStandardEquipment.value === '14') { // 第14套 铯原子 + console.log(templateDetailRef.value.itemFormData, 'templateDetailRef.value.itemFormData') params = { - ...templateDetailRef.value.itemFormData, + measureDataCesiumAtomList: templateDetailRef.value.getList().map((item: any) => ({ ...item, id: pageType.value === 'add' ? '' : item.id })), id: pageType.value === 'edit' ? infoId.value : '', equipmentDTOs: templateDetailRef.value.templateFormAndTableRef.measureEquipmentList.map((item: { id: string; standardId: string; standardName: string }) => { @@ -454,6 +455,7 @@ manufacturer: templateDetailRef.value.templateFormAndTableRef.sampleList[0].manufacturer, // 生产厂家 itemCategoryName: itemCategoryName.value, // 检定项分类名称 itemCategoryId: itemCategoryId.value, // 检定项分类id + ...templateDetailRef.value.itemFormData, } } else if (belongStandardEquipment.value === '15') { // 第15套 小功率 diff --git a/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue index 5ca69ed..9d7efbf 100644 --- a/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue @@ -14,7 +14,7 @@ import { addCheckData, calculateHandle, getHistoryIndication, getInfo, updateCheckData } from '@/api/equipment/standard/checkData' import { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book' import { getDataNum, getDataUnit } from '@/utils/validate' - +import { removeLetters } from '@/utils/String' const props = defineProps({ selectStandardId: { // 选择的标准装置id type: String, @@ -1738,7 +1738,21 @@ listPhaseStability.value, // 调相相偏-稳定性 listFrequencySpectrumStability.value, // 谐波-稳定性 ) - return tempList + return tempList.map((item: any) => ({ + ...item, + averageValue: removeLetters(String(item.averageValue) || 'a'), + })).map((item: any) => { + const obj = {} as { [key: string]: string } + for (const i in item) { + if (i.includes('testValue') && !i.includes('Date')) { + obj[i] = removeLetters(String(item[i]) || 'a') + } + else { + obj[i] = item[i] + } + } + return obj + }) } // 点击表头日期查询历史稳定性数据 @@ -1896,7 +1910,10 @@