diff --git a/src/assets/icons/icon-sweep.svg b/src/assets/icons/icon-sweep.svg
new file mode 100644
index 0000000..19b2683
--- /dev/null
+++ b/src/assets/icons/icon-sweep.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-sweep.svg b/src/assets/icons/icon-sweep.svg
new file mode 100644
index 0000000..19b2683
--- /dev/null
+++ b/src/assets/icons/icon-sweep.svg
@@ -0,0 +1 @@
+
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index a010e2e..2ced226 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -142,12 +142,14 @@
* 获取详情
* @param isCopy 是否备份，判断基本信息是否变化
*/
+const loading = ref(false)
function fetchInfo() {
- const loading = ElLoading.service({
- lock: true,
- text: '下载中请稍后',
- background: 'rgba(255, 255, 255, 0.8)',
- })
+ // const loading = ElLoading.service({
+ // lock: true,
+ // text: '加载中请稍后',
+ // background: 'rgba(255, 255, 255, 0.8)',
+ // })
+ loading.value = true
getDetailBaseInfo({ equipmentId: props.equipmentId! }).then((res) => {
form.value = res.data
attachmentList.value = res.data.attachmentList // 主附件信息
@@ -163,9 +165,11 @@
else {
testTask.value = ['']
}
- loading.close()
+ // loading.close()
+ loading.value = false
}).catch(() => {
- loading.close()
+ // loading.close()
+ loading.value = false
})
}
// -------------------------------------------------------------------------------------------
@@ -178,384 +182,385 @@
await getDict() // 获取字典
fetchInfo()
})
-
-defineExpose({ fetchInfo })
+defineExpose({ fetchInfo, loading })
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
- *{{ item.text }}
-
-
- {{ scope.row[item.value] }}
-
-
-
-
-
+
+
+
+ *{{ item.text }}
+
+
+ {{ scope.row[item.value] }}
+
+
+
+
+
+
+
diff --git a/src/assets/icons/icon-sweep.svg b/src/assets/icons/icon-sweep.svg
new file mode 100644
index 0000000..19b2683
--- /dev/null
+++ b/src/assets/icons/icon-sweep.svg
@@ -0,0 +1 @@
+
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index a010e2e..2ced226 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -142,12 +142,14 @@
* 获取详情
* @param isCopy 是否备份，判断基本信息是否变化
*/
+const loading = ref(false)
function fetchInfo() {
- const loading = ElLoading.service({
- lock: true,
- text: '下载中请稍后',
- background: 'rgba(255, 255, 255, 0.8)',
- })
+ // const loading = ElLoading.service({
+ // lock: true,
+ // text: '加载中请稍后',
+ // background: 'rgba(255, 255, 255, 0.8)',
+ // })
+ loading.value = true
getDetailBaseInfo({ equipmentId: props.equipmentId! }).then((res) => {
form.value = res.data
attachmentList.value = res.data.attachmentList // 主附件信息
@@ -163,9 +165,11 @@
else {
testTask.value = ['']
}
- loading.close()
+ // loading.close()
+ loading.value = false
}).catch(() => {
- loading.close()
+ // loading.close()
+ loading.value = false
})
}
// -------------------------------------------------------------------------------------------
@@ -178,384 +182,385 @@
await getDict() // 获取字典
fetchInfo()
})
-
-defineExpose({ fetchInfo })
+defineExpose({ fetchInfo, loading })
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
- *{{ item.text }}
-
-
- {{ scope.row[item.value] }}
-
-
-
-
-
+
+
+
+ *{{ item.text }}
+
+
+ {{ scope.row[item.value] }}
+
+
+
+
+
+
+
diff --git a/src/views/business/manager/sendReceive/list.vue b/src/views/business/manager/sendReceive/list.vue
index 39ad29a..b03b291 100644
--- a/src/views/business/manager/sendReceive/list.vue
+++ b/src/views/business/manager/sendReceive/list.vue
@@ -7,6 +7,7 @@
import teminateDialog from './dialog/teminateDialog.vue'
import type { IList, IListQuery } from './sendReceive-interface'
import remindCreateEIRDialog from './dialog/remindCreateEIRDialog.vue'
+import eqptDeviceDialog from './components/eqptDeviceDialog.vue'
import type { TableColumn } from '@/components/NormalTable/table_interface'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
import { exportFile } from '@/utils/exportUtils'
@@ -502,6 +503,12 @@
// }
scanSampleRef.value.closeDialog()
}
+// 点击扫描信息
+const eqptDevice = ref()
+const scanDevice = () => {
+ // 扫描受检设备信息
+ eqptDevice.value.initDialog()
+}
// ----------------------------------钩子------------------------------------------------
// 时间变更
watch(timeRange, (val) => {
@@ -620,6 +627,7 @@
+
@@ -728,6 +736,8 @@
+
+
diff --git a/src/assets/icons/icon-sweep.svg b/src/assets/icons/icon-sweep.svg
new file mode 100644
index 0000000..19b2683
--- /dev/null
+++ b/src/assets/icons/icon-sweep.svg
@@ -0,0 +1 @@
+
diff --git a/src/views/business/manager/sendReceive/components/basic.vue b/src/views/business/manager/sendReceive/components/basic.vue
index a010e2e..2ced226 100644
--- a/src/views/business/manager/sendReceive/components/basic.vue
+++ b/src/views/business/manager/sendReceive/components/basic.vue
@@ -142,12 +142,14 @@
* 获取详情
* @param isCopy 是否备份，判断基本信息是否变化
*/
+const loading = ref(false)
function fetchInfo() {
- const loading = ElLoading.service({
- lock: true,
- text: '下载中请稍后',
- background: 'rgba(255, 255, 255, 0.8)',
- })
+ // const loading = ElLoading.service({
+ // lock: true,
+ // text: '加载中请稍后',
+ // background: 'rgba(255, 255, 255, 0.8)',
+ // })
+ loading.value = true
getDetailBaseInfo({ equipmentId: props.equipmentId! }).then((res) => {
form.value = res.data
attachmentList.value = res.data.attachmentList // 主附件信息
@@ -163,9 +165,11 @@
else {
testTask.value = ['']
}
- loading.close()
+ // loading.close()
+ loading.value = false
}).catch(() => {
- loading.close()
+ // loading.close()
+ loading.value = false
})
}
// -------------------------------------------------------------------------------------------
@@ -178,384 +182,385 @@
await getDict() // 获取字典
fetchInfo()
})
-
-defineExpose({ fetchInfo })
+defineExpose({ fetchInfo, loading })
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
- *{{ item.text }}
-
-
- {{ scope.row[item.value] }}
-
-
-
-
-
+
+
+
+ *{{ item.text }}
+
+
+ {{ scope.row[item.value] }}
+
+
+
+
+
+
+
diff --git a/src/views/business/manager/sendReceive/list.vue b/src/views/business/manager/sendReceive/list.vue
index 39ad29a..b03b291 100644
--- a/src/views/business/manager/sendReceive/list.vue
+++ b/src/views/business/manager/sendReceive/list.vue
@@ -7,6 +7,7 @@
import teminateDialog from './dialog/teminateDialog.vue'
import type { IList, IListQuery } from './sendReceive-interface'
import remindCreateEIRDialog from './dialog/remindCreateEIRDialog.vue'
+import eqptDeviceDialog from './components/eqptDeviceDialog.vue'
import type { TableColumn } from '@/components/NormalTable/table_interface'
import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
import { exportFile } from '@/utils/exportUtils'
@@ -502,6 +503,12 @@
// }
scanSampleRef.value.closeDialog()
}
+// 点击扫描信息
+const eqptDevice = ref()
+const scanDevice = () => {
+ // 扫描受检设备信息
+ eqptDevice.value.initDialog()
+}
// ----------------------------------钩子------------------------------------------------
// 时间变更
watch(timeRange, (val) => {
@@ -620,6 +627,7 @@
+
@@ -728,6 +736,8 @@
+
+
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index 2decd00..3deebf1 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -276,15 +276,15 @@
break
case '3':
// 电压示值误差
- voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 2) : transformDecimal(Number(item.maximumError) || 0, 2) })
+ voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', absoluteError: transformDecimal(item.absoluteError, 2), standardValue: transformDecimal(item.standardValue, 2), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 2) : transformDecimal(Number(item.maximumError) || 0, 2) })
break
case '4':
// 电流示值误差(直接测量)
- ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+ ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', absoluteError: transformDecimal(item.absoluteError, 3), standardValue: transformDecimal(item.standardValue, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
break
case '5':
// 电流示值误差(间接测量)
- ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
+ ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', standardVoltageValue: transformDecimal(item.standardVoltageValue, 6), standardValue: transformDecimal(item.standardValue, 3), absoluteError: transformDecimal(item.absoluteError, 3), maximumError: item.maximumError ? item.maximumError : !item.maximumError.includes('.') ? transformDecimal(calcMaxError(item), 3) : transformDecimal(Number(item.maximumError) || 0, 3) })
break
case '6':
// 纹波电压