diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index fbb4f7c..b6ec3f2 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -294,9 +294,10 @@
+
{{ scope.row[item.value] }}
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index fbb4f7c..b6ec3f2 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -294,9 +294,10 @@
+
{{ scope.row[item.value] }}
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index d84c838..a09cc0d 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -115,7 +115,7 @@
+
{{ scope.row[item.value] }}
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index d84c838..a09cc0d 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -115,7 +115,7 @@
props.precision, (newVal) => {
+ console.log(newVal, 'precision')
+}, {
+ immediate: true,
+ deep: true,
+})
// 输入框失焦
const handler = () => {
+ console.log(props.precision, 'props.precision')
const inputValue = value.value
console.log(inputValue, '输入框的值')
if (value.value === '' || value.value === null || value.value === undefined || isNaN(value.value)) {
@@ -117,6 +123,7 @@
// 输入框获取焦点
const focus = () => {
console.log('输入框获取焦点')
+ console.log(props.precision, 'props.precision')
isFirst.value = false
emit('focus', value.value)
}
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index fbb4f7c..b6ec3f2 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -294,9 +294,10 @@
+
{{ scope.row[item.value] }}
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index d84c838..a09cc0d 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -115,7 +115,7 @@
props.precision, (newVal) => {
+ console.log(newVal, 'precision')
+}, {
+ immediate: true,
+ deep: true,
+})
// 输入框失焦
const handler = () => {
+ console.log(props.precision, 'props.precision')
const inputValue = value.value
console.log(inputValue, '输入框的值')
if (value.value === '' || value.value === null || value.value === undefined || isNaN(value.value)) {
@@ -117,6 +123,7 @@
// 输入框获取焦点
const focus = () => {
console.log('输入框获取焦点')
+ console.log(props.precision, 'props.precision')
isFirst.value = false
emit('focus', value.value)
}
diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
index e1c443f..b03eadc 100644
--- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
@@ -589,6 +589,11 @@
if (title === '输入频响') {
list = list.map((item: any) => ({ ...item, averageValue: ((Number(item.oneValue) + Number(item.twoValue) + Number(item.threeValue)) / 3).toFixed(2) }))
}
+ if (title === '谐波失真') {
+ list = list.map((item: any) => ({
+ ...item,
+ }))
+ }
const res = await calculateFun(list.map((item: any) => ({ ...item, technicalIndex: String(item.technicalIndex) ? (clearSymbol(item.technicalIndex) || '/') : '/' })))
return res.map(item => ({ ...item, params: title }))
}
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index fbb4f7c..b6ec3f2 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -294,9 +294,10 @@
+
{{ scope.row[item.value] }}
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index d84c838..a09cc0d 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -115,7 +115,7 @@
props.precision, (newVal) => {
+ console.log(newVal, 'precision')
+}, {
+ immediate: true,
+ deep: true,
+})
// 输入框失焦
const handler = () => {
+ console.log(props.precision, 'props.precision')
const inputValue = value.value
console.log(inputValue, '输入框的值')
if (value.value === '' || value.value === null || value.value === undefined || isNaN(value.value)) {
@@ -117,6 +123,7 @@
// 输入框获取焦点
const focus = () => {
console.log('输入框获取焦点')
+ console.log(props.precision, 'props.precision')
isFirst.value = false
emit('focus', value.value)
}
diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
index e1c443f..b03eadc 100644
--- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
@@ -589,6 +589,11 @@
if (title === '输入频响') {
list = list.map((item: any) => ({ ...item, averageValue: ((Number(item.oneValue) + Number(item.twoValue) + Number(item.threeValue)) / 3).toFixed(2) }))
}
+ if (title === '谐波失真') {
+ list = list.map((item: any) => ({
+ ...item,
+ }))
+ }
const res = await calculateFun(list.map((item: any) => ({ ...item, technicalIndex: String(item.technicalIndex) ? (clearSymbol(item.technicalIndex) || '/') : '/' })))
return res.map(item => ({ ...item, params: title }))
}
diff --git a/src/views/equipement/standard/book/components/config/seventh/config.vue b/src/views/equipement/standard/book/components/config/seventh/config.vue
index 8661bdc..b192fdc 100644
--- a/src/views/equipement/standard/book/components/config/seventh/config.vue
+++ b/src/views/equipement/standard/book/components/config/seventh/config.vue
@@ -2,13 +2,16 @@
+
+
@@ -297,37 +343,31 @@
-
-
-
- 增加行
-
-
- 删除行
-
+
+ handleSelectionChange(e, '核查项')"
+ @add-row="addRow"
+ @del-row="delRow"
+ @change-load-situationa="changeLoadSituationa"
+ >
+
+ 核查项
-
-
-
-
-
- *{{ item.text }}
-
-
-
-
+
+
+
+
+
+ 选择
+
+
+
+
+
+
+
{{ scope.row[item.value] }}
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index d84c838..a09cc0d 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -115,7 +115,7 @@
props.precision, (newVal) => {
+ console.log(newVal, 'precision')
+}, {
+ immediate: true,
+ deep: true,
+})
// 输入框失焦
const handler = () => {
+ console.log(props.precision, 'props.precision')
const inputValue = value.value
console.log(inputValue, '输入框的值')
if (value.value === '' || value.value === null || value.value === undefined || isNaN(value.value)) {
@@ -117,6 +123,7 @@
// 输入框获取焦点
const focus = () => {
console.log('输入框获取焦点')
+ console.log(props.precision, 'props.precision')
isFirst.value = false
emit('focus', value.value)
}
diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
index e1c443f..b03eadc 100644
--- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
@@ -589,6 +589,11 @@
if (title === '输入频响') {
list = list.map((item: any) => ({ ...item, averageValue: ((Number(item.oneValue) + Number(item.twoValue) + Number(item.threeValue)) / 3).toFixed(2) }))
}
+ if (title === '谐波失真') {
+ list = list.map((item: any) => ({
+ ...item,
+ }))
+ }
const res = await calculateFun(list.map((item: any) => ({ ...item, technicalIndex: String(item.technicalIndex) ? (clearSymbol(item.technicalIndex) || '/') : '/' })))
return res.map(item => ({ ...item, params: title }))
}
diff --git a/src/views/equipement/standard/book/components/config/seventh/config.vue b/src/views/equipement/standard/book/components/config/seventh/config.vue
index 8661bdc..b192fdc 100644
--- a/src/views/equipement/standard/book/components/config/seventh/config.vue
+++ b/src/views/equipement/standard/book/components/config/seventh/config.vue
@@ -2,13 +2,16 @@
+
+
@@ -297,37 +343,31 @@
-
-
-
- 增加行
-
-
- 删除行
-
+
+ handleSelectionChange(e, '核查项')"
+ @add-row="addRow"
+ @del-row="delRow"
+ @change-load-situationa="changeLoadSituationa"
+ >
+
+ 核查项
-
-
-
-
-
- *{{ item.text }}
-
-
-
-
+
+
+
+
+
+ 选择
+
+
+
+
+
+
item.params === '上升下降时间')) {
- addRow([], '上升下降时间', '4', null)
- addRow([], '上升下降时间', '4', null)
- }
form1.value.frequency = !res.data ? 1 : listFrequency.value.length ? 1 : 0
form1.value.acVoltage = !res.data ? 1 : listAcVoltage.value.length ? 1 : 0
form1.value.dcVoltage = !res.data ? 1 : listDcVoltage.value.length ? 1 : 0
@@ -500,7 +496,10 @@
form1.value.flatness = !res.data ? 1 : listFlatness.value.length ? 1 : 0
// form1.value.distortionHK = !res.data ? 1 : listDistortionHK.value.length ? 1 : 0
form1.value.distortionXC = !res.data ? 1 : listDistortionXC.value.length ? 1 : 0
-
+ if (!data.some((item: { params: string }) => item.params === '上升下降时间')) {
+ addRow([], '上升下降时间', '4', null)
+ addRow([], '上升下降时间', '4', null)
+ }
loading.close()
})
}
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index fbb4f7c..b6ec3f2 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -294,9 +294,10 @@
+
{{ scope.row[item.value] }}
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index d84c838..a09cc0d 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -115,7 +115,7 @@
props.precision, (newVal) => {
+ console.log(newVal, 'precision')
+}, {
+ immediate: true,
+ deep: true,
+})
// 输入框失焦
const handler = () => {
+ console.log(props.precision, 'props.precision')
const inputValue = value.value
console.log(inputValue, '输入框的值')
if (value.value === '' || value.value === null || value.value === undefined || isNaN(value.value)) {
@@ -117,6 +123,7 @@
// 输入框获取焦点
const focus = () => {
console.log('输入框获取焦点')
+ console.log(props.precision, 'props.precision')
isFirst.value = false
emit('focus', value.value)
}
diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
index e1c443f..b03eadc 100644
--- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
@@ -589,6 +589,11 @@
if (title === '输入频响') {
list = list.map((item: any) => ({ ...item, averageValue: ((Number(item.oneValue) + Number(item.twoValue) + Number(item.threeValue)) / 3).toFixed(2) }))
}
+ if (title === '谐波失真') {
+ list = list.map((item: any) => ({
+ ...item,
+ }))
+ }
const res = await calculateFun(list.map((item: any) => ({ ...item, technicalIndex: String(item.technicalIndex) ? (clearSymbol(item.technicalIndex) || '/') : '/' })))
return res.map(item => ({ ...item, params: title }))
}
diff --git a/src/views/equipement/standard/book/components/config/seventh/config.vue b/src/views/equipement/standard/book/components/config/seventh/config.vue
index 8661bdc..b192fdc 100644
--- a/src/views/equipement/standard/book/components/config/seventh/config.vue
+++ b/src/views/equipement/standard/book/components/config/seventh/config.vue
@@ -2,13 +2,16 @@
+
+
@@ -297,37 +343,31 @@
-
-
-
- 增加行
-
-
- 删除行
-
+
+ handleSelectionChange(e, '核查项')"
+ @add-row="addRow"
+ @del-row="delRow"
+ @change-load-situationa="changeLoadSituationa"
+ >
+
+ 核查项
-
-
-
-
-
- *{{ item.text }}
-
-
-
-
+
+
+
+
+
+ 选择
+
+
+
+
+
+
item.params === '上升下降时间')) {
- addRow([], '上升下降时间', '4', null)
- addRow([], '上升下降时间', '4', null)
- }
form1.value.frequency = !res.data ? 1 : listFrequency.value.length ? 1 : 0
form1.value.acVoltage = !res.data ? 1 : listAcVoltage.value.length ? 1 : 0
form1.value.dcVoltage = !res.data ? 1 : listDcVoltage.value.length ? 1 : 0
@@ -500,7 +496,10 @@
form1.value.flatness = !res.data ? 1 : listFlatness.value.length ? 1 : 0
// form1.value.distortionHK = !res.data ? 1 : listDistortionHK.value.length ? 1 : 0
form1.value.distortionXC = !res.data ? 1 : listDistortionXC.value.length ? 1 : 0
-
+ if (!data.some((item: { params: string }) => item.params === '上升下降时间')) {
+ addRow([], '上升下降时间', '4', null)
+ addRow([], '上升下降时间', '4', null)
+ }
loading.close()
})
}
diff --git a/src/views/equipement/standard/checkData/components/seventh/checkDataCom.vue b/src/views/equipement/standard/checkData/components/seventh/checkDataCom.vue
index 2212f5b..f748120 100644
--- a/src/views/equipement/standard/checkData/components/seventh/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/seventh/checkDataCom.vue
@@ -143,11 +143,11 @@
required: true,
width: '160',
children: [
- { text: '2022-12-12', value: '2022-12-12', align: 'center', required: true, type: 'text' },
- { text: '2022-12-13', value: '2022-12-13', align: 'center', required: true, type: 'text' },
- { text: '2022-12-14', value: '2022-12-14', align: 'center', required: true, type: 'text' },
- { text: '2022-12-15', value: '2022-12-15', align: 'center', required: true, type: 'text' },
- { text: '2022-12-16', value: '2022-12-16', align: 'center', required: true, type: 'text' },
+ { text: '', value: '2022-12-12', align: 'center', required: false, type: 'text' },
+ { text: '', value: '2022-12-13', align: 'center', required: false, type: 'text' },
+ { text: '', value: '2022-12-14', align: 'center', required: false, type: 'text' },
+ { text: '', value: '2022-12-15', align: 'center', required: false, type: 'text' },
+ { text: '', value: '2022-12-16', align: 'center', required: false, type: 'text' },
{ text: '本次核查时间', value: '2022-12-17', align: 'center', required: true, type: 'text' },
],
},
@@ -164,16 +164,16 @@
belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
itemCategoryId.value = itemCategoryIdParam // 核查分类id
itemCategoryName.value = itemCategoryNameParam // 核查分类名称
- const loading = ElLoading.service({
- lock: true,
- background: 'rgba(255, 255, 255, 0.8)',
- })
- const params = {
- equipmentId, // 设备id
- belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
- itemCategoryId: itemCategoryId.value, // 核查项分类id
- itemCategoryName: itemCategoryName.value, // 核查项分类名称
- }
+ // const loading = ElLoading.service({
+ // lock: true,
+ // background: 'rgba(255, 255, 255, 0.8)',
+ // })
+ // const params = {
+ // equipmentId, // 设备id
+ // belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
+ // itemCategoryId: itemCategoryId.value, // 核查项分类id
+ // itemCategoryName: itemCategoryName.value, // 核查项分类名称
+ // }
// getCheckItemDetail(params).then((res) => {
// loading.close()
// handleData(res.data.checkItemDataCalibratorList)
diff --git a/src/components/MultiHeaderTable/index.vue b/src/components/MultiHeaderTable/index.vue
index fbb4f7c..b6ec3f2 100644
--- a/src/components/MultiHeaderTable/index.vue
+++ b/src/components/MultiHeaderTable/index.vue
@@ -294,9 +294,10 @@
+
{{ scope.row[item.value] }}
diff --git a/src/components/MultiHeaderTable/tableColumn.vue b/src/components/MultiHeaderTable/tableColumn.vue
index d84c838..a09cc0d 100644
--- a/src/components/MultiHeaderTable/tableColumn.vue
+++ b/src/components/MultiHeaderTable/tableColumn.vue
@@ -115,7 +115,7 @@
props.precision, (newVal) => {
+ console.log(newVal, 'precision')
+}, {
+ immediate: true,
+ deep: true,
+})
// 输入框失焦
const handler = () => {
+ console.log(props.precision, 'props.precision')
const inputValue = value.value
console.log(inputValue, '输入框的值')
if (value.value === '' || value.value === null || value.value === undefined || isNaN(value.value)) {
@@ -117,6 +123,7 @@
// 输入框获取焦点
const focus = () => {
console.log('输入框获取焦点')
+ console.log(props.precision, 'props.precision')
isFirst.value = false
emit('focus', value.value)
}
diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
index e1c443f..b03eadc 100644
--- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue
@@ -589,6 +589,11 @@
if (title === '输入频响') {
list = list.map((item: any) => ({ ...item, averageValue: ((Number(item.oneValue) + Number(item.twoValue) + Number(item.threeValue)) / 3).toFixed(2) }))
}
+ if (title === '谐波失真') {
+ list = list.map((item: any) => ({
+ ...item,
+ }))
+ }
const res = await calculateFun(list.map((item: any) => ({ ...item, technicalIndex: String(item.technicalIndex) ? (clearSymbol(item.technicalIndex) || '/') : '/' })))
return res.map(item => ({ ...item, params: title }))
}
diff --git a/src/views/equipement/standard/book/components/config/seventh/config.vue b/src/views/equipement/standard/book/components/config/seventh/config.vue
index 8661bdc..b192fdc 100644
--- a/src/views/equipement/standard/book/components/config/seventh/config.vue
+++ b/src/views/equipement/standard/book/components/config/seventh/config.vue
@@ -2,13 +2,16 @@
+
+
@@ -297,37 +343,31 @@
-
-
-
- 增加行
-
-
- 删除行
-
+
+ handleSelectionChange(e, '核查项')"
+ @add-row="addRow"
+ @del-row="delRow"
+ @change-load-situationa="changeLoadSituationa"
+ >
+
+ 核查项
-
-
-
-
-
- *{{ item.text }}
-
-
-
-
+
+
+
+
+
+ 选择
+
+
+
+
+
+
item.params === '上升下降时间')) {
- addRow([], '上升下降时间', '4', null)
- addRow([], '上升下降时间', '4', null)
- }
form1.value.frequency = !res.data ? 1 : listFrequency.value.length ? 1 : 0
form1.value.acVoltage = !res.data ? 1 : listAcVoltage.value.length ? 1 : 0
form1.value.dcVoltage = !res.data ? 1 : listDcVoltage.value.length ? 1 : 0
@@ -500,7 +496,10 @@
form1.value.flatness = !res.data ? 1 : listFlatness.value.length ? 1 : 0
// form1.value.distortionHK = !res.data ? 1 : listDistortionHK.value.length ? 1 : 0
form1.value.distortionXC = !res.data ? 1 : listDistortionXC.value.length ? 1 : 0
-
+ if (!data.some((item: { params: string }) => item.params === '上升下降时间')) {
+ addRow([], '上升下降时间', '4', null)
+ addRow([], '上升下降时间', '4', null)
+ }
loading.close()
})
}
diff --git a/src/views/equipement/standard/checkData/components/seventh/checkDataCom.vue b/src/views/equipement/standard/checkData/components/seventh/checkDataCom.vue
index 2212f5b..f748120 100644
--- a/src/views/equipement/standard/checkData/components/seventh/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/seventh/checkDataCom.vue
@@ -143,11 +143,11 @@
required: true,
width: '160',
children: [
- { text: '2022-12-12', value: '2022-12-12', align: 'center', required: true, type: 'text' },
- { text: '2022-12-13', value: '2022-12-13', align: 'center', required: true, type: 'text' },
- { text: '2022-12-14', value: '2022-12-14', align: 'center', required: true, type: 'text' },
- { text: '2022-12-15', value: '2022-12-15', align: 'center', required: true, type: 'text' },
- { text: '2022-12-16', value: '2022-12-16', align: 'center', required: true, type: 'text' },
+ { text: '', value: '2022-12-12', align: 'center', required: false, type: 'text' },
+ { text: '', value: '2022-12-13', align: 'center', required: false, type: 'text' },
+ { text: '', value: '2022-12-14', align: 'center', required: false, type: 'text' },
+ { text: '', value: '2022-12-15', align: 'center', required: false, type: 'text' },
+ { text: '', value: '2022-12-16', align: 'center', required: false, type: 'text' },
{ text: '本次核查时间', value: '2022-12-17', align: 'center', required: true, type: 'text' },
],
},
@@ -164,16 +164,16 @@
belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
itemCategoryId.value = itemCategoryIdParam // 核查分类id
itemCategoryName.value = itemCategoryNameParam // 核查分类名称
- const loading = ElLoading.service({
- lock: true,
- background: 'rgba(255, 255, 255, 0.8)',
- })
- const params = {
- equipmentId, // 设备id
- belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
- itemCategoryId: itemCategoryId.value, // 核查项分类id
- itemCategoryName: itemCategoryName.value, // 核查项分类名称
- }
+ // const loading = ElLoading.service({
+ // lock: true,
+ // background: 'rgba(255, 255, 255, 0.8)',
+ // })
+ // const params = {
+ // equipmentId, // 设备id
+ // belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
+ // itemCategoryId: itemCategoryId.value, // 核查项分类id
+ // itemCategoryName: itemCategoryName.value, // 核查项分类名称
+ // }
// getCheckItemDetail(params).then((res) => {
// loading.close()
// handleData(res.data.checkItemDataCalibratorList)
diff --git a/src/views/equipement/standard/checkData/components/sixteen/checkDataCom.vue b/src/views/equipement/standard/checkData/components/sixteen/checkDataCom.vue
index fe17bed..c9c83a6 100644
--- a/src/views/equipement/standard/checkData/components/sixteen/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/sixteen/checkDataCom.vue
@@ -65,16 +65,16 @@
required: false,
width: '180',
children: [
- { text: '第1次', value: 'testValueOne', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
- { text: '第2次', value: 'testValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
- { text: '第3次', value: 'testValueThree', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
- { text: '第4次', value: 'testValueFour', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
- { text: '第5次', value: 'testValueFive', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
- { text: '第6次', value: 'testValueSix', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
- { text: '第7次', value: 'testValueSeven', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
- { text: '第8次', value: 'testValueEight', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
- { text: '第9次', value: 'testValueNine', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
- { text: '第10次', value: 'testValueTen', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 2, showUnit: true },
+ { text: '第1次', value: 'testValueOne', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
+ { text: '第2次', value: 'testValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
+ { text: '第3次', value: 'testValueThree', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
+ { text: '第4次', value: 'testValueFour', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
+ { text: '第5次', value: 'testValueFive', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
+ { text: '第6次', value: 'testValueSix', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
+ { text: '第7次', value: 'testValueSeven', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
+ { text: '第8次', value: 'testValueEight', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
+ { text: '第9次', value: 'testValueNine', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
+ { text: '第10次', value: 'testValueTen', align: 'center', required: true, width: '180', type: 'inputNumber', showUnit: true },
],
},
{ text: '平均值', value: 'averageValue', align: 'center', required: false, type: 'text', unit: 'unit' },
@@ -159,11 +159,10 @@
{ text: '平均值', value: 'averageValue', align: 'center', required: false, type: 'text' },
{ text: '重复性S(x)/x', value: 'standardDeviation', align: 'center', required: false, type: 'text' },
])
-
const columns_repeatability_frequency_modulation_deviation = ref([ // 重复性表头--平坦度
{ text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
{ text: '幅度', value: 'amplitude', align: 'center', required: true, type: 'text' },
- // { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+ { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'text' },
{
text: '测量值',
value: 'indicatingValue',
@@ -179,7 +178,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueOne', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueOne', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueOne', align: 'center', required: false, width: '180', type: 'text' },
],
},
{
@@ -190,7 +189,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueTwo', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueTwo', align: 'center', required: false, width: '180', type: 'text' },
],
},
{
@@ -201,7 +200,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueThree', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueThree', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueThree', align: 'center', required: false, width: '180', type: 'text' },
],
},
{
@@ -212,7 +211,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueFour', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueFour', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueFour', align: 'center', required: false, width: '180', type: 'text' },
],
},
{
@@ -223,7 +222,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueFive', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueFive', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueFive', align: 'center', required: false, width: '180', type: 'text' },
],
},
{
@@ -234,7 +233,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueSix', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueSix', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueSix', align: 'center', required: false, width: '180', type: 'text' },
],
},
{
@@ -245,7 +244,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueSeven', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueSeven', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueSeven', align: 'center', required: false, width: '180', type: 'text' },
],
},
{
@@ -256,7 +255,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueEight', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueEight', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueEight', align: 'center', required: false, width: '180', type: 'text' },
],
},
{
@@ -267,7 +266,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueNine', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueNine', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueNine', align: 'center', required: false, width: '180', type: 'text' },
],
},
{
@@ -278,7 +277,7 @@
width: '180',
children: [
{ text: '测量值', value: 'testValueTen', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
- { text: '平坦度', value: 'flatnessValueTen', align: 'center', required: true, width: '180', type: 'inputNumber', precision: 3, showUnit: true },
+ { text: '平坦度', value: 'flatnessValueTen', align: 'center', required: false, width: '180', type: 'text' },
],
},
],
@@ -545,7 +544,7 @@
const columns_stability_frequency_modulation_deviation = ref([ // 稳定性表头--平坦度
{ text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
{ text: '幅度', value: 'amplitude', align: 'center', required: true, type: 'text' },
- // { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+ { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'text' },
{
text: '测量值',
value: '-',
@@ -569,7 +568,7 @@
const columns_stability_frequency_modulation_deviation_checkDate = ref([ // 稳定性表头--平坦度
{ text: '核查项目', value: 'params', align: 'center', required: true, type: 'text' },
{ text: '幅度', value: 'amplitude', align: 'center', required: true, type: 'text' },
- // { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'text' },
+ { text: '标称值', value: 'nominalValue', align: 'center', required: true, type: 'text' },
{
text: '测量值',
value: '-',
@@ -738,7 +737,7 @@
const listfrequencyModulationDeviationStabilityLoading = ref(false) // 平坦度-稳定性
// const listPhaseStabilityLoading = ref(false) // 调相相偏-稳定性
const listFrequencySpectrumStabilityLoading = ref(false) // 失真-稳定性
-
+const frequencyList = ref([])
// 获取配置详情
function fetchCheckItemDetail(equipmentId: string, belongStandardEquipmentParam: string, itemCategoryIdParam: string, itemCategoryNameParam: string) {
belongStandardEquipment.value = belongStandardEquipmentParam // 检校标准装置
@@ -760,6 +759,7 @@
emits('isConfigCheck', false)
}
else {
+ frequencyList.value = res.data.checkItemDataLowFrequencySignalList.filter((item: { params: string }) => item.params === '频率')
handleData(res.data.checkItemDataLowFrequencySignalList)
fetchHistoryIndication() // 重新拉取稳定性
}
@@ -771,7 +771,7 @@
// 频率
listFrequencyRepeatability.value = list.filter((item: { params: string }) => item.params === '频率')
// 频率重复性
- listFrequencyRepeatability.value = listFrequencyRepeatability.value.map((e: any) => {
+ listFrequencyRepeatability.value = listFrequencyRepeatability.value.map((e: any, index: number) => {
return {
paramsName: '频率',
editable: type === 'edit',
@@ -785,7 +785,7 @@
averageValue: '', // 平均值
standardDeviation: '', // 重复性
urel: e.urel, // u(k=2)
-
+ validDigit: frequencyList.value[index].validDigit || 0,
testValueOne: 0, // 测量值1/测量值(上升时间)
testValueTwo: 0, // 测量值2(示值)
testValueThree: 0, // 测量值3(示值)
@@ -801,7 +801,7 @@
}
}) as any
// 频率稳定性
- listFrequencyStability.value = listFrequencyRepeatability.value.map((e: any) => {
+ listFrequencyStability.value = listFrequencyRepeatability.value.map((e: any, index: number) => {
return {
paramsName: '频率',
editable: props.pageType !== 'detail',
@@ -810,6 +810,7 @@
params: '频率', // 核查项目
dataType: '1',
checkType: '稳定性',
+ validDigit: frequencyList.value[index].validDigit || 0,
nominalValue: e.nominalValue,
urel: e.urel, // u(k=2)
averageValue: '', // 平均值
@@ -975,7 +976,7 @@
// 平坦度
listfrequencyModulationDeviationRepeatability.value = list.filter((item: { params: string }) => item.params === '平坦度')
// 平坦度重复性
- listfrequencyModulationDeviationRepeatability.value = listfrequencyModulationDeviationRepeatability.value.map((e: any) => {
+ listfrequencyModulationDeviationRepeatability.value = listfrequencyModulationDeviationRepeatability.value.map((e: any, index: number) => {
return {
paramsName: '平坦度',
editable: type === 'edit',
@@ -985,9 +986,8 @@
dataType: '5',
params: '平坦度', // 核查项目
amplitude: e.amplitude + e.amplitudeUnit,
- // nominalValue: e.nominalValue + e.unit,
+ nominalValue: e.frequency + e.frequencyUnit,
averageValue: '', // 平均值
- averageValueTwo: '', // 平均值
standardDeviation: '', // 重复性
urel: e.urel, // u(k=2)
@@ -1002,16 +1002,17 @@
testValueNine: 0, // 测量值9
testValueTen: 0, // 测量值10
- flatnessValueOne: 0, // 测量值1/测量值(上升时间)
- flatnessValueTwo: 0, // 测量值2(示值)
- flatnessValueThree: 0, // 测量值3(示值)
- flatnessValueFour: 0, // 测量值4(示值)
- flatnessValueFive: 0, // 测量值5(示值)
- flatnessValueSix: 0, // 测量值6(本次示值)
- flatnessValueSeven: 0, // 测量值7
- flatnessValueEight: 0, // 测量值8
- flatnessValueNine: 0, // 测量值9
- flatnessValueTen: 0, // 测量值10
+ flatnessValueOne: index === 0 ? '参考点' : '', // 测量值1/测量值(上升时间)
+ flatnessValueTwo: index === 0 ? '参考点' : '', // 测量值2(示值)
+ flatnessValueThree: index === 0 ? '参考点' : '', // 测量值3(示值)
+ flatnessValueFour: index === 0 ? '参考点' : '', // 测量值4(示值)
+ flatnessValueFive: index === 0 ? '参考点' : '', // 测量值5(示值)
+ flatnessValueSix: index === 0 ? '参考点' : '', // 测量值6(本次示值)
+ flatnessValueSeven: index === 0 ? '参考点' : '', // 测量值7
+ flatnessValueEight: index === 0 ? '参考点' : '', // 测量值8
+ flatnessValueNine: index === 0 ? '参考点' : '', // 测量值9
+ flatnessValueTen: index === 0 ? '参考点' : '', // 测量值10
+ averageValueTwo: index === 0 ? '参考点' : '',
}
}) as any
// 平坦度稳定性
@@ -1023,7 +1024,7 @@
id: '', // id,更新/删除使用参数
params: '平坦度', // 核查项目
dataType: '5',
- // amplitude: e.amplitude,
+ amplitude: e.amplitude,
nominalValue: e.nominalValue,
checkType: '稳定性',
urel: e.urel, // u(k=2)
@@ -1139,11 +1140,6 @@
}
}) as any
}
-watch(() => listFrequencyRepeatability.value, (newVal) => {
- console.log(newVal, 'newVal')
-}, {
- deep: true,
-})
// 点击计算结果
const createResult = (type: string) => {
let checkDataSignalGeneratorListParams: any // 要传的重复或者稳定性参数
@@ -1249,7 +1245,13 @@
if (current.value === 'repeatability') { // 重复性
switch (type) {
case '频率':
- listFrequencyRepeatability.value = result.map((item: any) => ({ ...item, showUnitData: item.unit }))
+ listFrequencyRepeatability.value = result.map((item: any, index: number) => ({
+ ...item,
+ showUnitData: item.unit,
+ validDigit: frequencyList.value[index].validDigit || 0,
+ averageValue: Number(item.averageValue || 0).toFixed(frequencyList.value[index].validDigit || 0),
+ standardDeviation: Number(item.standardDeviation || 0).toFixed(frequencyList.value[index].validDigit || 0),
+ }))
// 填充稳定性最后一列的日期和数值
listFrequencyStability.value = listFrequencyStability.value.map((item, index: number) => {
return {
@@ -1468,11 +1470,23 @@
}
// 获取详情
-function fetchInfo(id = '') {
+async function fetchInfo(id = '') {
const loading = ElLoading.service({
lock: true,
background: 'rgba(255, 255, 255, 0.8)',
})
+ const params = {
+ equipmentId: $route.query.equipmentId, // 设备id
+ belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置code
+ itemCategoryId: itemCategoryId.value, // 核查项分类id
+ itemCategoryName: itemCategoryName.value, // 核查项分类名称
+ }
+ const res = await getCheckItemDetail(params)
+ if (!res.data.checkItemDataLowFrequencySignalList || !res.data.checkItemDataLowFrequencySignalList.length) {
+ ElMessage.warning('请检查该设备的核查项配置')
+ loading.close()
+ }
+ frequencyList.value = res.data.checkItemDataLowFrequencySignalList.filter((item: { params: string }) => item.params === '频率')
getInfo({ id: id || infoId.value }).then((res) => {
form.value = { ...res.data }
equipmentId.value = res.data.equipmentId
@@ -1542,7 +1556,7 @@
columns_stability_power_level.value[3].children = [...tempColumn]
columns_stability_relative_level.value[2].children = [...tempColumn]
columns_stability_AM_depth.value[2].children = [...tempColumn]
- columns_stability_frequency_modulation_deviation.value[2].children = [...tempColumn]
+ columns_stability_frequency_modulation_deviation.value[3].children = [...tempColumn]
// columns_stability_phase.value[3].children = [...tempColumn]
columns_stability_frequency_spectrum.value[3].children = [...tempColumn]
@@ -1553,7 +1567,7 @@
columns_stability_power_level.value = handleDetailTableTableHead(columns_stability_power_level.value, listPowerLevelStability.value, 3)
columns_stability_relative_level.value = handleDetailTableTableHead(columns_stability_relative_level.value, listRelativeLevelStability.value, 2)
columns_stability_AM_depth.value = handleDetailTableTableHead(columns_stability_AM_depth.value, listAMDepthStability.value, 2)
- columns_stability_frequency_modulation_deviation.value = handleDetailTableTableHead(columns_stability_frequency_modulation_deviation.value, listfrequencyModulationDeviationStability.value, 2)
+ columns_stability_frequency_modulation_deviation.value = handleDetailTableTableHead(columns_stability_frequency_modulation_deviation.value, listfrequencyModulationDeviationStability.value, 3)
// columns_stability_phase.value = handleDetailTableTableHead(columns_stability_phase.value, listPhaseStability.value, 2)
columns_stability_frequency_spectrum.value = handleDetailTableTableHead(columns_stability_frequency_spectrum.value, listFrequencySpectrumStability.value, 3)
}
@@ -1627,11 +1641,11 @@
listAMDepthStability.value = handleSaveDateParams(columns_stability_AM_depth.value, listAMDepthStability.value, 2)
// '平坦度':
listfrequencyModulationDeviationStability.value = listfrequencyModulationDeviationStability.value.map((item) => {
- const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: { params: string }) => item.params === '平坦度'), item, columns_stability_frequency_modulation_deviation.value, num, 2, '16')
+ const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: { params: string }) => item.params === '平坦度'), item, columns_stability_frequency_modulation_deviation.value, num, 3, '16')
columns_stability_frequency_modulation_deviation.value = columnsData
return item = itemData
})
- listfrequencyModulationDeviationStability.value = handleSaveDateParams(columns_stability_frequency_modulation_deviation.value, listfrequencyModulationDeviationStability.value, 2)
+ listfrequencyModulationDeviationStability.value = handleSaveDateParams(columns_stability_frequency_modulation_deviation.value, listfrequencyModulationDeviationStability.value, 3)
// // '调相相偏':
// listPhaseStability.value = listPhaseStability.value.map((item) => {
// const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: { params: string }) => item.params === '调相相偏'), item, columns_stability_phase.value, num, 3, '10')
@@ -1685,11 +1699,11 @@
// '平坦度':
listfrequencyModulationDeviationStabilityCheckDate.value = listfrequencyModulationDeviationStabilityCheckDate.value.map((item) => {
clearDateValue(item)
- const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: { params: string }) => item.params === '平坦度'), item, columns_stability_frequency_modulation_deviation_checkDate.value, num, 2, '16')
+ const { itemData, columnsData } = solveHistoryIndicationTableData(res.data.data.filter((item: { params: string }) => item.params === '平坦度'), item, columns_stability_frequency_modulation_deviation_checkDate.value, num, 3, '16')
columns_stability_frequency_modulation_deviation_checkDate.value = columnsData
return item = itemData
})
- listfrequencyModulationDeviationStabilityCheckDate.value = handleSaveDateParams(columns_stability_frequency_modulation_deviation_checkDate.value, listfrequencyModulationDeviationStabilityCheckDate.value, 2)
+ listfrequencyModulationDeviationStabilityCheckDate.value = handleSaveDateParams(columns_stability_frequency_modulation_deviation_checkDate.value, listfrequencyModulationDeviationStabilityCheckDate.value, 3)
// // '调相相偏':
// listPhaseStabilityCheckDate.value = listPhaseStabilityCheckDate.value.map((item) => {
// clearDateValue(item)
@@ -1840,7 +1854,7 @@
columns_stability_power_level.value[3].children = [...tempColumn]
columns_stability_relative_level.value[2].children = [...tempColumn]
columns_stability_AM_depth.value[2].children = [...tempColumn]
- columns_stability_frequency_modulation_deviation.value[2].children = [...tempColumn]
+ columns_stability_frequency_modulation_deviation.value[3].children = [...tempColumn]
// columns_stability_phase.value[3].children = [...tempColumn]
columns_stability_frequency_spectrum.value[3].children = [...tempColumn]
@@ -1848,7 +1862,7 @@
columns_stability_power_level.value[3].children![5].text = props.checkDate! // 最后一列的表头日期
columns_stability_relative_level.value[2].children![5].text = props.checkDate!
columns_stability_AM_depth.value[2].children![5].text = props.checkDate!
- columns_stability_frequency_modulation_deviation.value[2].children![5].text = props.checkDate!
+ columns_stability_frequency_modulation_deviation.value[3].children![5].text = props.checkDate!
// columns_stability_phase.value[3].children![5].text = props.checkDate!
columns_stability_frequency_spectrum.value[3].children![5].text = props.checkDate!
}
@@ -1889,7 +1903,7 @@
{ width: '180', text: '-', value: 'testValueFive', align: 'center', required: false, type: 'text', customHeader: true },
{ width: '180', text: '-', value: 'testValueSix', align: 'center', required: false, type: 'text', customHeader: true },
]
- columns_stability_frequency_modulation_deviation_checkDate.value[2].children = [
+ columns_stability_frequency_modulation_deviation_checkDate.value[3].children = [
{ width: '180', text: '-', value: 'testValueOne', align: 'center', required: false, type: 'text', customHeader: true },
{ width: '180', text: '-', value: 'testValueTwo', align: 'center', required: false, type: 'text', customHeader: true },
{ width: '180', text: '-', value: 'testValueThree', align: 'center', required: false, type: 'text', customHeader: true },