diff --git a/src/components.d.ts b/src/components.d.ts index f31bc6a..2461bf8 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -50,7 +50,6 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] - MaskLayer: typeof import('./components/MaskLayer/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] diff --git a/src/components.d.ts b/src/components.d.ts index f31bc6a..2461bf8 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -50,7 +50,6 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] - MaskLayer: typeof import('./components/MaskLayer/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] diff --git a/src/views/business/measure/item/components/eleventh/templateDetail.vue b/src/views/business/measure/item/components/eleventh/templateDetail.vue index f33fa65..00a4dd0 100644 --- a/src/views/business/measure/item/components/eleventh/templateDetail.vue +++ b/src/views/business/measure/item/components/eleventh/templateDetail.vue @@ -49,7 +49,7 @@ { text: '频率单位', value: 'frequencyUnit', align: 'center', required: true, type: 'select' }, { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'number' }, { text: '标称值单位', value: 'nominalValueUnit', align: 'center', required: true, type: 'select' }, - { text: '组合方式', value: 'composition', align: 'center', required: true, type: 'select' }, + { text: '组合方式', value: 'composition', align: 'center', required: false, type: 'select' }, { text: 'U(k=2)', value: 'urel', align: 'center', required: false, type: 'number' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) diff --git a/src/components.d.ts b/src/components.d.ts index f31bc6a..2461bf8 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -50,7 +50,6 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] - MaskLayer: typeof import('./components/MaskLayer/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] diff --git a/src/views/business/measure/item/components/eleventh/templateDetail.vue b/src/views/business/measure/item/components/eleventh/templateDetail.vue index f33fa65..00a4dd0 100644 --- a/src/views/business/measure/item/components/eleventh/templateDetail.vue +++ b/src/views/business/measure/item/components/eleventh/templateDetail.vue @@ -49,7 +49,7 @@ { text: '频率单位', value: 'frequencyUnit', align: 'center', required: true, type: 'select' }, { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'number' }, { text: '标称值单位', value: 'nominalValueUnit', align: 'center', required: true, type: 'select' }, - { text: '组合方式', value: 'composition', align: 'center', required: true, type: 'select' }, + { text: '组合方式', value: 'composition', align: 'center', required: false, type: 'select' }, { text: 'U(k=2)', value: 'urel', align: 'center', required: false, type: 'number' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index b4f7bcb..98d9991 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -611,7 +611,16 @@ { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', required: true }, { text: '依据的技术文件', value: 'basedDocuments', required: true }, ] - +// ---------------------------------------初次配置鉴定项------------------------------------------ +function soveFirstConfig(response: any, config: string[], configArr: string) { +// 判断是否初次加载 如果是 将配置项都改为1 + if (!response[configArr] && !response.appearanceFunctionCheck) { + console.log('第一次配置') + for (let i = 0; i < config.length; i++) { + response[config[i]] = 1 + } + } +} // ---------------------------------------获取详情------------------------------------------------ /** @@ -680,6 +689,10 @@ else if (form.value.belongStandardEquipment === '9') { // 第9套：频谱分析仪 getList.value = response.measureItemDataSpectrumAnalyzerList // 检定项表格 getObject.value = response // 检定项表单 + // 判断是否初次加载 如果是 将配置项都改为1 + const formDisplay = ['appearanceFunctionCheck', 'frequencyDisplay', 'sweepWidth', 'middleFrequencyWidth', 'middleConversionDeviation', 'referenceLevel', + 'verticalScale', 'inputFrequency', 'averageNoiseLevel', 'harmonicDistortion', 'inputAttenuation', 'gainCompression', 'calibratingSignal'] + soveFirstConfig(response, formDisplay, 'measureItemDataSpectrumAnalyzerList') } else if (form.value.belongStandardEquipment === '10') { // 第10套：信号发生器 getList.value = response.measureItemDataSignalGeneratorList // 检定项表格 diff --git a/src/components.d.ts b/src/components.d.ts index f31bc6a..2461bf8 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -50,7 +50,6 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] - MaskLayer: typeof import('./components/MaskLayer/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] diff --git a/src/views/business/measure/item/components/eleventh/templateDetail.vue b/src/views/business/measure/item/components/eleventh/templateDetail.vue index f33fa65..00a4dd0 100644 --- a/src/views/business/measure/item/components/eleventh/templateDetail.vue +++ b/src/views/business/measure/item/components/eleventh/templateDetail.vue @@ -49,7 +49,7 @@ { text: '频率单位', value: 'frequencyUnit', align: 'center', required: true, type: 'select' }, { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'number' }, { text: '标称值单位', value: 'nominalValueUnit', align: 'center', required: true, type: 'select' }, - { text: '组合方式', value: 'composition', align: 'center', required: true, type: 'select' }, + { text: '组合方式', value: 'composition', align: 'center', required: false, type: 'select' }, { text: 'U(k=2)', value: 'urel', align: 'center', required: false, type: 'number' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index b4f7bcb..98d9991 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -611,7 +611,16 @@ { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', required: true }, { text: '依据的技术文件', value: 'basedDocuments', required: true }, ] - +// ---------------------------------------初次配置鉴定项------------------------------------------ +function soveFirstConfig(response: any, config: string[], configArr: string) { +// 判断是否初次加载 如果是 将配置项都改为1 + if (!response[configArr] && !response.appearanceFunctionCheck) { + console.log('第一次配置') + for (let i = 0; i < config.length; i++) { + response[config[i]] = 1 + } + } +} // ---------------------------------------获取详情------------------------------------------------ /** @@ -680,6 +689,10 @@ else if (form.value.belongStandardEquipment === '9') { // 第9套：频谱分析仪 getList.value = response.measureItemDataSpectrumAnalyzerList // 检定项表格 getObject.value = response // 检定项表单 + // 判断是否初次加载 如果是 将配置项都改为1 + const formDisplay = ['appearanceFunctionCheck', 'frequencyDisplay', 'sweepWidth', 'middleFrequencyWidth', 'middleConversionDeviation', 'referenceLevel', + 'verticalScale', 'inputFrequency', 'averageNoiseLevel', 'harmonicDistortion', 'inputAttenuation', 'gainCompression', 'calibratingSignal'] + soveFirstConfig(response, formDisplay, 'measureItemDataSpectrumAnalyzerList') } else if (form.value.belongStandardEquipment === '10') { // 第10套：信号发生器 getList.value = response.measureItemDataSignalGeneratorList // 检定项表格 diff --git a/src/views/business/measure/item/dialog/confirmConfigDialog.vue b/src/views/business/measure/item/dialog/confirmConfigDialog.vue index 07ff05d..2ecb672 100644 --- a/src/views/business/measure/item/dialog/confirmConfigDialog.vue +++ b/src/views/business/measure/item/dialog/confirmConfigDialog.vue @@ -94,6 +94,7 @@ const params = { ...form.value, isFirstConfig: isFirstConfig.value, + deviceType: form.value.deviceType, } emits('confirm', params) dialogFormVisible.value = false diff --git a/src/components.d.ts b/src/components.d.ts index f31bc6a..2461bf8 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -50,7 +50,6 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] - MaskLayer: typeof import('./components/MaskLayer/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] diff --git a/src/views/business/measure/item/components/eleventh/templateDetail.vue b/src/views/business/measure/item/components/eleventh/templateDetail.vue index f33fa65..00a4dd0 100644 --- a/src/views/business/measure/item/components/eleventh/templateDetail.vue +++ b/src/views/business/measure/item/components/eleventh/templateDetail.vue @@ -49,7 +49,7 @@ { text: '频率单位', value: 'frequencyUnit', align: 'center', required: true, type: 'select' }, { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'number' }, { text: '标称值单位', value: 'nominalValueUnit', align: 'center', required: true, type: 'select' }, - { text: '组合方式', value: 'composition', align: 'center', required: true, type: 'select' }, + { text: '组合方式', value: 'composition', align: 'center', required: false, type: 'select' }, { text: 'U(k=2)', value: 'urel', align: 'center', required: false, type: 'number' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index b4f7bcb..98d9991 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -611,7 +611,16 @@ { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', required: true }, { text: '依据的技术文件', value: 'basedDocuments', required: true }, ] - +// ---------------------------------------初次配置鉴定项------------------------------------------ +function soveFirstConfig(response: any, config: string[], configArr: string) { +// 判断是否初次加载 如果是 将配置项都改为1 + if (!response[configArr] && !response.appearanceFunctionCheck) { + console.log('第一次配置') + for (let i = 0; i < config.length; i++) { + response[config[i]] = 1 + } + } +} // ---------------------------------------获取详情------------------------------------------------ /** @@ -680,6 +689,10 @@ else if (form.value.belongStandardEquipment === '9') { // 第9套：频谱分析仪 getList.value = response.measureItemDataSpectrumAnalyzerList // 检定项表格 getObject.value = response // 检定项表单 + // 判断是否初次加载 如果是 将配置项都改为1 + const formDisplay = ['appearanceFunctionCheck', 'frequencyDisplay', 'sweepWidth', 'middleFrequencyWidth', 'middleConversionDeviation', 'referenceLevel', + 'verticalScale', 'inputFrequency', 'averageNoiseLevel', 'harmonicDistortion', 'inputAttenuation', 'gainCompression', 'calibratingSignal'] + soveFirstConfig(response, formDisplay, 'measureItemDataSpectrumAnalyzerList') } else if (form.value.belongStandardEquipment === '10') { // 第10套：信号发生器 getList.value = response.measureItemDataSignalGeneratorList // 检定项表格 diff --git a/src/views/business/measure/item/dialog/confirmConfigDialog.vue b/src/views/business/measure/item/dialog/confirmConfigDialog.vue index 07ff05d..2ecb672 100644 --- a/src/views/business/measure/item/dialog/confirmConfigDialog.vue +++ b/src/views/business/measure/item/dialog/confirmConfigDialog.vue @@ -94,6 +94,7 @@ const params = { ...form.value, isFirstConfig: isFirstConfig.value, + deviceType: form.value.deviceType, } emits('confirm', params) dialogFormVisible.value = false diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 2776256..4b9f536 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -141,11 +141,11 @@ }) let getId = '' if (form.configType === 'add') { - const res = await addItem({ ...selectedRow.value!, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) - getId = res.data + const res = await addItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) + getId = res.dat } else { - const res = await updateItem({ ...selectedRow.value!, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) + const res = await updateItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) getId = res.data } loading.close() diff --git a/src/components.d.ts b/src/components.d.ts index f31bc6a..2461bf8 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -50,7 +50,6 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] - MaskLayer: typeof import('./components/MaskLayer/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] diff --git a/src/views/business/measure/item/components/eleventh/templateDetail.vue b/src/views/business/measure/item/components/eleventh/templateDetail.vue index f33fa65..00a4dd0 100644 --- a/src/views/business/measure/item/components/eleventh/templateDetail.vue +++ b/src/views/business/measure/item/components/eleventh/templateDetail.vue @@ -49,7 +49,7 @@ { text: '频率单位', value: 'frequencyUnit', align: 'center', required: true, type: 'select' }, { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'number' }, { text: '标称值单位', value: 'nominalValueUnit', align: 'center', required: true, type: 'select' }, - { text: '组合方式', value: 'composition', align: 'center', required: true, type: 'select' }, + { text: '组合方式', value: 'composition', align: 'center', required: false, type: 'select' }, { text: 'U(k=2)', value: 'urel', align: 'center', required: false, type: 'number' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index b4f7bcb..98d9991 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -611,7 +611,16 @@ { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', required: true }, { text: '依据的技术文件', value: 'basedDocuments', required: true }, ] - +// ---------------------------------------初次配置鉴定项------------------------------------------ +function soveFirstConfig(response: any, config: string[], configArr: string) { +// 判断是否初次加载 如果是 将配置项都改为1 + if (!response[configArr] && !response.appearanceFunctionCheck) { + console.log('第一次配置') + for (let i = 0; i < config.length; i++) { + response[config[i]] = 1 + } + } +} // ---------------------------------------获取详情------------------------------------------------ /** @@ -680,6 +689,10 @@ else if (form.value.belongStandardEquipment === '9') { // 第9套：频谱分析仪 getList.value = response.measureItemDataSpectrumAnalyzerList // 检定项表格 getObject.value = response // 检定项表单 + // 判断是否初次加载 如果是 将配置项都改为1 + const formDisplay = ['appearanceFunctionCheck', 'frequencyDisplay', 'sweepWidth', 'middleFrequencyWidth', 'middleConversionDeviation', 'referenceLevel', + 'verticalScale', 'inputFrequency', 'averageNoiseLevel', 'harmonicDistortion', 'inputAttenuation', 'gainCompression', 'calibratingSignal'] + soveFirstConfig(response, formDisplay, 'measureItemDataSpectrumAnalyzerList') } else if (form.value.belongStandardEquipment === '10') { // 第10套：信号发生器 getList.value = response.measureItemDataSignalGeneratorList // 检定项表格 diff --git a/src/views/business/measure/item/dialog/confirmConfigDialog.vue b/src/views/business/measure/item/dialog/confirmConfigDialog.vue index 07ff05d..2ecb672 100644 --- a/src/views/business/measure/item/dialog/confirmConfigDialog.vue +++ b/src/views/business/measure/item/dialog/confirmConfigDialog.vue @@ -94,6 +94,7 @@ const params = { ...form.value, isFirstConfig: isFirstConfig.value, + deviceType: form.value.deviceType, } emits('confirm', params) dialogFormVisible.value = false diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 2776256..4b9f536 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -141,11 +141,11 @@ }) let getId = '' if (form.configType === 'add') { - const res = await addItem({ ...selectedRow.value!, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) - getId = res.data + const res = await addItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) + getId = res.dat } else { - const res = await updateItem({ ...selectedRow.value!, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) + const res = await updateItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) getId = res.data } loading.close() diff --git a/src/views/business/taskMeasure/measureData/components/eleventh/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eleventh/templateDetail.vue index 3eb29cd..59588c4 100644 --- a/src/views/business/taskMeasure/measureData/components/eleventh/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/eleventh/templateDetail.vue @@ -66,7 +66,7 @@ { text: '直通测量值', value: 'directMeasureValue', align: 'center', required: false, type: 'number' }, { text: '加入衰减测量值', value: 'addMeasureValue', align: 'center', required: false, type: 'number' }, { text: '指标下限', value: 'lowerIndex', align: 'center', required: false, type: 'text' }, - { text: '衰减量', value: 'attenuationAmount', align: 'center', required: true, type: 'text' }, + { text: '衰减量', value: 'attenuationAmount', align: 'center', required: false, type: 'text' }, { text: '指标上限', value: 'upperIndex', align: 'center', required: false, type: 'text' }, { text: 'U(k=2)', value: 'urel', align: 'center', required: false, type: 'text' }, { text: '结论', value: 'conclusion', align: 'center', required: false, type: 'text' }, @@ -265,6 +265,10 @@ + + diff --git a/src/components.d.ts b/src/components.d.ts index f31bc6a..2461bf8 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -50,7 +50,6 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] - MaskLayer: typeof import('./components/MaskLayer/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] MultiHeaderTable: typeof import('./components/MultiHeaderTable/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] diff --git a/src/views/business/measure/item/components/eleventh/templateDetail.vue b/src/views/business/measure/item/components/eleventh/templateDetail.vue index f33fa65..00a4dd0 100644 --- a/src/views/business/measure/item/components/eleventh/templateDetail.vue +++ b/src/views/business/measure/item/components/eleventh/templateDetail.vue @@ -49,7 +49,7 @@ { text: '频率单位', value: 'frequencyUnit', align: 'center', required: true, type: 'select' }, { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'number' }, { text: '标称值单位', value: 'nominalValueUnit', align: 'center', required: true, type: 'select' }, - { text: '组合方式', value: 'composition', align: 'center', required: true, type: 'select' }, + { text: '组合方式', value: 'composition', align: 'center', required: false, type: 'select' }, { text: 'U(k=2)', value: 'urel', align: 'center', required: false, type: 'number' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'number' }, ]) diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue index b4f7bcb..98d9991 100644 --- a/src/views/business/measure/item/detail.vue +++ b/src/views/business/measure/item/detail.vue @@ -611,7 +611,16 @@ { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', required: true }, { text: '依据的技术文件', value: 'basedDocuments', required: true }, ] - +// ---------------------------------------初次配置鉴定项------------------------------------------ +function soveFirstConfig(response: any, config: string[], configArr: string) { +// 判断是否初次加载 如果是 将配置项都改为1 + if (!response[configArr] && !response.appearanceFunctionCheck) { + console.log('第一次配置') + for (let i = 0; i < config.length; i++) { + response[config[i]] = 1 + } + } +} // ---------------------------------------获取详情------------------------------------------------ /** @@ -680,6 +689,10 @@ else if (form.value.belongStandardEquipment === '9') { // 第9套：频谱分析仪 getList.value = response.measureItemDataSpectrumAnalyzerList // 检定项表格 getObject.value = response // 检定项表单 + // 判断是否初次加载 如果是 将配置项都改为1 + const formDisplay = ['appearanceFunctionCheck', 'frequencyDisplay', 'sweepWidth', 'middleFrequencyWidth', 'middleConversionDeviation', 'referenceLevel', + 'verticalScale', 'inputFrequency', 'averageNoiseLevel', 'harmonicDistortion', 'inputAttenuation', 'gainCompression', 'calibratingSignal'] + soveFirstConfig(response, formDisplay, 'measureItemDataSpectrumAnalyzerList') } else if (form.value.belongStandardEquipment === '10') { // 第10套：信号发生器 getList.value = response.measureItemDataSignalGeneratorList // 检定项表格 diff --git a/src/views/business/measure/item/dialog/confirmConfigDialog.vue b/src/views/business/measure/item/dialog/confirmConfigDialog.vue index 07ff05d..2ecb672 100644 --- a/src/views/business/measure/item/dialog/confirmConfigDialog.vue +++ b/src/views/business/measure/item/dialog/confirmConfigDialog.vue @@ -94,6 +94,7 @@ const params = { ...form.value, isFirstConfig: isFirstConfig.value, + deviceType: form.value.deviceType, } emits('confirm', params) dialogFormVisible.value = false diff --git a/src/views/business/measure/item/list.vue b/src/views/business/measure/item/list.vue index 2776256..4b9f536 100644 --- a/src/views/business/measure/item/list.vue +++ b/src/views/business/measure/item/list.vue @@ -141,11 +141,11 @@ }) let getId = '' if (form.configType === 'add') { - const res = await addItem({ ...selectedRow.value!, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) - getId = res.data + const res = await addItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) + getId = res.dat } else { - const res = await updateItem({ ...selectedRow.value!, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) + const res = await updateItem({ ...selectedRow.value!, deviceType: form.deviceType, appearanceFunctionCheck: '', dataSync: '', itemCategoryName: form.itemCategoryName, itemCategoryId: form.itemCategoryId, belongStandardEquipment: form.belongStandardEquipment, belongStandardEquipmentName: form.belongStandardEquipmentName }) getId = res.data } loading.close() diff --git a/src/views/business/taskMeasure/measureData/components/eleventh/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eleventh/templateDetail.vue index 3eb29cd..59588c4 100644 --- a/src/views/business/taskMeasure/measureData/components/eleventh/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/eleventh/templateDetail.vue @@ -66,7 +66,7 @@ { text: '直通测量值', value: 'directMeasureValue', align: 'center', required: false, type: 'number' }, { text: '加入衰减测量值', value: 'addMeasureValue', align: 'center', required: false, type: 'number' }, { text: '指标下限', value: 'lowerIndex', align: 'center', required: false, type: 'text' }, - { text: '衰减量', value: 'attenuationAmount', align: 'center', required: true, type: 'text' }, + { text: '衰减量', value: 'attenuationAmount', align: 'center', required: false, type: 'text' }, { text: '指标上限', value: 'upperIndex', align: 'center', required: false, type: 'text' }, { text: 'U(k=2)', value: 'urel', align: 'center', required: false, type: 'text' }, { text: '结论', value: 'conclusion', align: 'center', required: false, type: 'text' }, @@ -265,6 +265,10 @@ + + diff --git a/src/views/equipement/standard/book/components/project.vue b/src/views/equipement/standard/book/components/project.vue index 30e878b..44ed5fd 100644 --- a/src/views/equipement/standard/book/components/project.vue +++ b/src/views/equipement/standard/book/components/project.vue @@ -210,11 +210,10 @@ *{{ item.text }}