diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index df481bd..cd46731 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -381,7 +381,13 @@
manufacturer: res.data.manufacturer, // 制造厂家(生产厂家)
categoryName: res.data.itemCategoryName, // 设备检定项分类
}]
- list.value = res.data.measureDataCalibratorList // 检定数据
+ list.value = res.data.measureDataCalibratorList.map((item: IDetailMeasureList) => {
+ return {
+ ...item,
+ resolution: Number(item.resolution),
+ redStar: Math.abs(Number(item.absoluteError)) <= Math.abs(Number(getDataNum(item.maximumError))) ? 'normal' : 'error',
+ }
+ }) // 检定数据
loading.close()
})
}
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index df481bd..cd46731 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -381,7 +381,13 @@
manufacturer: res.data.manufacturer, // 制造厂家(生产厂家)
categoryName: res.data.itemCategoryName, // 设备检定项分类
}]
- list.value = res.data.measureDataCalibratorList // 检定数据
+ list.value = res.data.measureDataCalibratorList.map((item: IDetailMeasureList) => {
+ return {
+ ...item,
+ resolution: Number(item.resolution),
+ redStar: Math.abs(Number(item.absoluteError)) <= Math.abs(Number(getDataNum(item.maximumError))) ? 'normal' : 'error',
+ }
+ }) // 检定数据
loading.close()
})
}
diff --git a/src/views/system/baseInfo/remind/detail.vue b/src/views/system/baseInfo/remind/detail.vue
deleted file mode 100644
index 4110f31..0000000
--- a/src/views/system/baseInfo/remind/detail.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- 到期提醒管理详情
-
-
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index df481bd..cd46731 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -381,7 +381,13 @@
manufacturer: res.data.manufacturer, // 制造厂家(生产厂家)
categoryName: res.data.itemCategoryName, // 设备检定项分类
}]
- list.value = res.data.measureDataCalibratorList // 检定数据
+ list.value = res.data.measureDataCalibratorList.map((item: IDetailMeasureList) => {
+ return {
+ ...item,
+ resolution: Number(item.resolution),
+ redStar: Math.abs(Number(item.absoluteError)) <= Math.abs(Number(getDataNum(item.maximumError))) ? 'normal' : 'error',
+ }
+ }) // 检定数据
loading.close()
})
}
diff --git a/src/views/system/baseInfo/remind/detail.vue b/src/views/system/baseInfo/remind/detail.vue
deleted file mode 100644
index 4110f31..0000000
--- a/src/views/system/baseInfo/remind/detail.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- 到期提醒管理详情
-
-
diff --git a/src/views/system/baseInfo/remind/detailDialog.vue b/src/views/system/baseInfo/remind/detailDialog.vue
new file mode 100644
index 0000000..a27e970
--- /dev/null
+++ b/src/views/system/baseInfo/remind/detailDialog.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index df481bd..cd46731 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -381,7 +381,13 @@
manufacturer: res.data.manufacturer, // 制造厂家(生产厂家)
categoryName: res.data.itemCategoryName, // 设备检定项分类
}]
- list.value = res.data.measureDataCalibratorList // 检定数据
+ list.value = res.data.measureDataCalibratorList.map((item: IDetailMeasureList) => {
+ return {
+ ...item,
+ resolution: Number(item.resolution),
+ redStar: Math.abs(Number(item.absoluteError)) <= Math.abs(Number(getDataNum(item.maximumError))) ? 'normal' : 'error',
+ }
+ }) // 检定数据
loading.close()
})
}
diff --git a/src/views/system/baseInfo/remind/detail.vue b/src/views/system/baseInfo/remind/detail.vue
deleted file mode 100644
index 4110f31..0000000
--- a/src/views/system/baseInfo/remind/detail.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- 到期提醒管理详情
-
-
diff --git a/src/views/system/baseInfo/remind/detailDialog.vue b/src/views/system/baseInfo/remind/detailDialog.vue
new file mode 100644
index 0000000..a27e970
--- /dev/null
+++ b/src/views/system/baseInfo/remind/detailDialog.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/baseInfo/remind/list.vue b/src/views/system/baseInfo/remind/list.vue
index a61bb83..c6dc549 100644
--- a/src/views/system/baseInfo/remind/list.vue
+++ b/src/views/system/baseInfo/remind/list.vue
@@ -1,10 +1,156 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+