diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/views/business/certManage/cert/components/preview.vue b/src/views/business/certManage/cert/components/preview.vue deleted file mode 100644 index da9e247..0000000 --- a/src/views/business/certManage/cert/components/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/views/business/certManage/cert/components/preview.vue b/src/views/business/certManage/cert/components/preview.vue deleted file mode 100644 index da9e247..0000000 --- a/src/views/business/certManage/cert/components/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/views/business/certManage/cert/components/printRecord.vue b/src/views/business/certManage/cert/components/printRecord.vue deleted file mode 100644 index 66e9c29..0000000 --- a/src/views/business/certManage/cert/components/printRecord.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/views/business/certManage/cert/components/preview.vue b/src/views/business/certManage/cert/components/preview.vue deleted file mode 100644 index da9e247..0000000 --- a/src/views/business/certManage/cert/components/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/views/business/certManage/cert/components/printRecord.vue b/src/views/business/certManage/cert/components/printRecord.vue deleted file mode 100644 index 66e9c29..0000000 --- a/src/views/business/certManage/cert/components/printRecord.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/detail.vue b/src/views/business/certManage/cert/detail.vue deleted file mode 100644 index 9538697..0000000 --- a/src/views/business/certManage/cert/detail.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/views/business/certManage/cert/components/preview.vue b/src/views/business/certManage/cert/components/preview.vue deleted file mode 100644 index da9e247..0000000 --- a/src/views/business/certManage/cert/components/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/views/business/certManage/cert/components/printRecord.vue b/src/views/business/certManage/cert/components/printRecord.vue deleted file mode 100644 index 66e9c29..0000000 --- a/src/views/business/certManage/cert/components/printRecord.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/detail.vue b/src/views/business/certManage/cert/detail.vue deleted file mode 100644 index 9538697..0000000 --- a/src/views/business/certManage/cert/detail.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue deleted file mode 100644 index 9da0fb9..0000000 --- a/src/views/business/certManage/cert/list.vue +++ /dev/null @@ -1,657 +0,0 @@ - - - - - - - diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/views/business/certManage/cert/components/preview.vue b/src/views/business/certManage/cert/components/preview.vue deleted file mode 100644 index da9e247..0000000 --- a/src/views/business/certManage/cert/components/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/views/business/certManage/cert/components/printRecord.vue b/src/views/business/certManage/cert/components/printRecord.vue deleted file mode 100644 index 66e9c29..0000000 --- a/src/views/business/certManage/cert/components/printRecord.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/detail.vue b/src/views/business/certManage/cert/detail.vue deleted file mode 100644 index 9538697..0000000 --- a/src/views/business/certManage/cert/detail.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue deleted file mode 100644 index 9da0fb9..0000000 --- a/src/views/business/certManage/cert/list.vue +++ /dev/null @@ -1,657 +0,0 @@ - - - - - - - diff --git a/src/views/certManage/cert-interface.ts b/src/views/certManage/cert-interface.ts index 7589e06..5da34cd 100644 --- a/src/views/certManage/cert-interface.ts +++ b/src/views/certManage/cert-interface.ts @@ -54,7 +54,7 @@ staffName: string // 检定员 conclusion: string // 结论 traceDate: string // 检定日期 - measureValidDate: string // 检定有效期 + expirationDate: string // 检定有效期 deptId: string // 实验室id deptName: string // 实验室/使用部门 measureCategory: string // 业务类型 diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/views/business/certManage/cert/components/preview.vue b/src/views/business/certManage/cert/components/preview.vue deleted file mode 100644 index da9e247..0000000 --- a/src/views/business/certManage/cert/components/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/views/business/certManage/cert/components/printRecord.vue b/src/views/business/certManage/cert/components/printRecord.vue deleted file mode 100644 index 66e9c29..0000000 --- a/src/views/business/certManage/cert/components/printRecord.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/detail.vue b/src/views/business/certManage/cert/detail.vue deleted file mode 100644 index 9538697..0000000 --- a/src/views/business/certManage/cert/detail.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue deleted file mode 100644 index 9da0fb9..0000000 --- a/src/views/business/certManage/cert/list.vue +++ /dev/null @@ -1,657 +0,0 @@ - - - - - - - diff --git a/src/views/certManage/cert-interface.ts b/src/views/certManage/cert-interface.ts index 7589e06..5da34cd 100644 --- a/src/views/certManage/cert-interface.ts +++ b/src/views/certManage/cert-interface.ts @@ -54,7 +54,7 @@ staffName: string // 检定员 conclusion: string // 结论 traceDate: string // 检定日期 - measureValidDate: string // 检定有效期 + expirationDate: string // 检定有效期 deptId: string // 实验室id deptName: string // 实验室/使用部门 measureCategory: string // 业务类型 diff --git a/src/views/certManage/components/basic.vue b/src/views/certManage/components/basic.vue index c94de7e..328798f 100644 --- a/src/views/certManage/components/basic.vue +++ b/src/views/certManage/components/basic.vue @@ -46,7 +46,7 @@ staffName: '', // 检定员 conclusion: '', // 结论 traceDate: '', // 检定日期 - measureValidDate: '', // 检定有效期 + expirationDate: '', // 检定有效期 deptId: '', // 实验室 deptName: '', // 实验室/使用部门 measureCategory: '', // 业务类型 @@ -71,7 +71,7 @@ staffName: [{ required: true, message: '检定员不能为空', trigger: ['change', 'blur'] }], conclusion: [{ required: true, message: '检定结论不能为空', trigger: ['change', 'blur'] }], traceDate: [{ required: true, message: '检定日期不能为空', trigger: ['change', 'blur'] }], - measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['change', 'blur'] }], + expirationDate: [{ required: true, message: '检定有效期不能为空', trigger: ['change', 'blur'] }], deptId: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }], measureCategory: [{ required: true, message: '业务类型不能为空', trigger: ['change', 'blur'] }], certificateFile: [{ required: true, message: '证书报告不能为空', trigger: ['change', 'blur'] }], @@ -162,9 +162,9 @@ } // 获取证书详情 -const fetchInfo = () => { +const fetchInfo = (receiveMajor: string) => { if (!infoId.value) { return } - getCertDetail({ id: infoId.value }).then((res) => { + getCertDetail({ id: infoId.value, receiveMajor }).then((res) => { form.value = res.data // 处理实验室id @@ -209,8 +209,9 @@ addCert(params).then((res) => { loading.close() form.value.certificateNo = res.data.certificateNo // 证书编号 - infoId.value = res.data.id // id + infoId.value = res.data // id emits('addSuccess', infoId.value) + fetchInfo() ElMessage.success('已保存') }).catch(() => { loading.close() @@ -222,6 +223,7 @@ draftUpdateCert(params).then((res) => { loading.close() emits('addSuccess', infoId.value) + // fetchInfo() ElMessage.success('已保存') }).catch(() => { loading.close() @@ -435,9 +437,9 @@ - + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/views/business/certManage/cert/components/preview.vue b/src/views/business/certManage/cert/components/preview.vue deleted file mode 100644 index da9e247..0000000 --- a/src/views/business/certManage/cert/components/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/views/business/certManage/cert/components/printRecord.vue b/src/views/business/certManage/cert/components/printRecord.vue deleted file mode 100644 index 66e9c29..0000000 --- a/src/views/business/certManage/cert/components/printRecord.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/detail.vue b/src/views/business/certManage/cert/detail.vue deleted file mode 100644 index 9538697..0000000 --- a/src/views/business/certManage/cert/detail.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue deleted file mode 100644 index 9da0fb9..0000000 --- a/src/views/business/certManage/cert/list.vue +++ /dev/null @@ -1,657 +0,0 @@ - - - - - - - diff --git a/src/views/certManage/cert-interface.ts b/src/views/certManage/cert-interface.ts index 7589e06..5da34cd 100644 --- a/src/views/certManage/cert-interface.ts +++ b/src/views/certManage/cert-interface.ts @@ -54,7 +54,7 @@ staffName: string // 检定员 conclusion: string // 结论 traceDate: string // 检定日期 - measureValidDate: string // 检定有效期 + expirationDate: string // 检定有效期 deptId: string // 实验室id deptName: string // 实验室/使用部门 measureCategory: string // 业务类型 diff --git a/src/views/certManage/components/basic.vue b/src/views/certManage/components/basic.vue index c94de7e..328798f 100644 --- a/src/views/certManage/components/basic.vue +++ b/src/views/certManage/components/basic.vue @@ -46,7 +46,7 @@ staffName: '', // 检定员 conclusion: '', // 结论 traceDate: '', // 检定日期 - measureValidDate: '', // 检定有效期 + expirationDate: '', // 检定有效期 deptId: '', // 实验室 deptName: '', // 实验室/使用部门 measureCategory: '', // 业务类型 @@ -71,7 +71,7 @@ staffName: [{ required: true, message: '检定员不能为空', trigger: ['change', 'blur'] }], conclusion: [{ required: true, message: '检定结论不能为空', trigger: ['change', 'blur'] }], traceDate: [{ required: true, message: '检定日期不能为空', trigger: ['change', 'blur'] }], - measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['change', 'blur'] }], + expirationDate: [{ required: true, message: '检定有效期不能为空', trigger: ['change', 'blur'] }], deptId: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }], measureCategory: [{ required: true, message: '业务类型不能为空', trigger: ['change', 'blur'] }], certificateFile: [{ required: true, message: '证书报告不能为空', trigger: ['change', 'blur'] }], @@ -162,9 +162,9 @@ } // 获取证书详情 -const fetchInfo = () => { +const fetchInfo = (receiveMajor: string) => { if (!infoId.value) { return } - getCertDetail({ id: infoId.value }).then((res) => { + getCertDetail({ id: infoId.value, receiveMajor }).then((res) => { form.value = res.data // 处理实验室id @@ -209,8 +209,9 @@ addCert(params).then((res) => { loading.close() form.value.certificateNo = res.data.certificateNo // 证书编号 - infoId.value = res.data.id // id + infoId.value = res.data // id emits('addSuccess', infoId.value) + fetchInfo() ElMessage.success('已保存') }).catch(() => { loading.close() @@ -222,6 +223,7 @@ draftUpdateCert(params).then((res) => { loading.close() emits('addSuccess', infoId.value) + // fetchInfo() ElMessage.success('已保存') }).catch(() => { loading.close() @@ -435,9 +437,9 @@ - + (['', ''])// 筛选时间段数据 -const measureValidDateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 +const expirationDateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 // 查询条件 const listQuery = ref({ @@ -57,7 +57,7 @@ { text: '业务类型', value: 'measureCategory', align: 'center' }, { text: '检定日期', value: 'traceDate', align: 'center', width: '120' }, { text: '检定结论', value: 'conclusion', align: 'center' }, - // { text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' }, + // { text: '检定有效期', value: 'expirationDate', align: 'center', width: '120' }, { text: '实验室', value: 'deptName', align: 'center', width: '100' }, // { text: '部门', value: 'groupCodeName', align: 'center', width: '120' }, // { text: '检定员', value: 'createUserName', align: 'center' }, @@ -133,11 +133,11 @@ listQuery.value.offset = 1 } getCertList(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: { traceDate: string; measureValidDate: string; labCodeName: string }) => { + list.value = response.data.rows.map((item: { traceDate: string; expirationDate: string; labCodeName: string }) => { return { ...item, traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate, // 检定日期 - measureValidDate: item.measureValidDate ? dayjs(item.measureValidDate).format('YYYY-MM-DD') : item.measureValidDate, // 检定有效期 + expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate, // 检定有效期 } }) total.value = parseInt(response.data.total) @@ -178,7 +178,7 @@ limit: 20, } dateRange.value = ['', ''] // 清空时间 - measureValidDateRange.value = ['', ''] + expirationDateRange.value = ['', ''] fetchData(true) } @@ -309,8 +309,6 @@ query: { ...row, approvalStatusName: row.approvalStatusName, // 审批状态名称 - printFileName: row.certificateFile, - printStatusName: row.printStatusName, // 证书打印状态 processId: row.processId, // 流程实例 taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批 decisionItem: row.decisionItem, diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/views/business/certManage/cert/components/preview.vue b/src/views/business/certManage/cert/components/preview.vue deleted file mode 100644 index da9e247..0000000 --- a/src/views/business/certManage/cert/components/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/views/business/certManage/cert/components/printRecord.vue b/src/views/business/certManage/cert/components/printRecord.vue deleted file mode 100644 index 66e9c29..0000000 --- a/src/views/business/certManage/cert/components/printRecord.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/detail.vue b/src/views/business/certManage/cert/detail.vue deleted file mode 100644 index 9538697..0000000 --- a/src/views/business/certManage/cert/detail.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue deleted file mode 100644 index 9da0fb9..0000000 --- a/src/views/business/certManage/cert/list.vue +++ /dev/null @@ -1,657 +0,0 @@ - - - - - - - diff --git a/src/views/certManage/cert-interface.ts b/src/views/certManage/cert-interface.ts index 7589e06..5da34cd 100644 --- a/src/views/certManage/cert-interface.ts +++ b/src/views/certManage/cert-interface.ts @@ -54,7 +54,7 @@ staffName: string // 检定员 conclusion: string // 结论 traceDate: string // 检定日期 - measureValidDate: string // 检定有效期 + expirationDate: string // 检定有效期 deptId: string // 实验室id deptName: string // 实验室/使用部门 measureCategory: string // 业务类型 diff --git a/src/views/certManage/components/basic.vue b/src/views/certManage/components/basic.vue index c94de7e..328798f 100644 --- a/src/views/certManage/components/basic.vue +++ b/src/views/certManage/components/basic.vue @@ -46,7 +46,7 @@ staffName: '', // 检定员 conclusion: '', // 结论 traceDate: '', // 检定日期 - measureValidDate: '', // 检定有效期 + expirationDate: '', // 检定有效期 deptId: '', // 实验室 deptName: '', // 实验室/使用部门 measureCategory: '', // 业务类型 @@ -71,7 +71,7 @@ staffName: [{ required: true, message: '检定员不能为空', trigger: ['change', 'blur'] }], conclusion: [{ required: true, message: '检定结论不能为空', trigger: ['change', 'blur'] }], traceDate: [{ required: true, message: '检定日期不能为空', trigger: ['change', 'blur'] }], - measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['change', 'blur'] }], + expirationDate: [{ required: true, message: '检定有效期不能为空', trigger: ['change', 'blur'] }], deptId: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }], measureCategory: [{ required: true, message: '业务类型不能为空', trigger: ['change', 'blur'] }], certificateFile: [{ required: true, message: '证书报告不能为空', trigger: ['change', 'blur'] }], @@ -162,9 +162,9 @@ } // 获取证书详情 -const fetchInfo = () => { +const fetchInfo = (receiveMajor: string) => { if (!infoId.value) { return } - getCertDetail({ id: infoId.value }).then((res) => { + getCertDetail({ id: infoId.value, receiveMajor }).then((res) => { form.value = res.data // 处理实验室id @@ -209,8 +209,9 @@ addCert(params).then((res) => { loading.close() form.value.certificateNo = res.data.certificateNo // 证书编号 - infoId.value = res.data.id // id + infoId.value = res.data // id emits('addSuccess', infoId.value) + fetchInfo() ElMessage.success('已保存') }).catch(() => { loading.close() @@ -222,6 +223,7 @@ draftUpdateCert(params).then((res) => { loading.close() emits('addSuccess', infoId.value) + // fetchInfo() ElMessage.success('已保存') }).catch(() => { loading.close() @@ -435,9 +437,9 @@ - + (['', ''])// 筛选时间段数据 -const measureValidDateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 +const expirationDateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 // 查询条件 const listQuery = ref({ @@ -57,7 +57,7 @@ { text: '业务类型', value: 'measureCategory', align: 'center' }, { text: '检定日期', value: 'traceDate', align: 'center', width: '120' }, { text: '检定结论', value: 'conclusion', align: 'center' }, - // { text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' }, + // { text: '检定有效期', value: 'expirationDate', align: 'center', width: '120' }, { text: '实验室', value: 'deptName', align: 'center', width: '100' }, // { text: '部门', value: 'groupCodeName', align: 'center', width: '120' }, // { text: '检定员', value: 'createUserName', align: 'center' }, @@ -133,11 +133,11 @@ listQuery.value.offset = 1 } getCertList(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: { traceDate: string; measureValidDate: string; labCodeName: string }) => { + list.value = response.data.rows.map((item: { traceDate: string; expirationDate: string; labCodeName: string }) => { return { ...item, traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate, // 检定日期 - measureValidDate: item.measureValidDate ? dayjs(item.measureValidDate).format('YYYY-MM-DD') : item.measureValidDate, // 检定有效期 + expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate, // 检定有效期 } }) total.value = parseInt(response.data.total) @@ -178,7 +178,7 @@ limit: 20, } dateRange.value = ['', ''] // 清空时间 - measureValidDateRange.value = ['', ''] + expirationDateRange.value = ['', ''] fetchData(true) } @@ -309,8 +309,6 @@ query: { ...row, approvalStatusName: row.approvalStatusName, // 审批状态名称 - printFileName: row.certificateFile, - printStatusName: row.printStatusName, // 证书打印状态 processId: row.processId, // 流程实例 taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批 decisionItem: row.decisionItem, diff --git a/src/views/workbench/index-bak.vue b/src/views/workbench/index-bak.vue new file mode 100644 index 0000000..57e53f8 --- /dev/null +++ b/src/views/workbench/index-bak.vue @@ -0,0 +1,412 @@ + + + + + + diff --git a/src/api/business/certManage/cert.ts b/src/api/business/certManage/cert.ts index d7b564c..232f397 100644 --- a/src/api/business/certManage/cert.ts +++ b/src/api/business/certManage/cert.ts @@ -15,7 +15,7 @@ } // 获取证书详情 -export function getCertDetail(data: { id: string }) { +export function getCertDetail(data: { id: string; receiveMajor: string }) { return request({ url: `${prefix}/detail`, method: 'post', diff --git a/src/api/workBench/workBench.ts b/src/api/workBench/workBench.ts new file mode 100644 index 0000000..5550d8e --- /dev/null +++ b/src/api/workBench/workBench.ts @@ -0,0 +1,85 @@ +/** + * 数据管理 + */ +import request from '../index' + +// 受检设备数量分析 +export function getTestEquipmentAmount(data: any) { + return request({ + url: '/data/sample/amount', + method: 'post', + data, + }) +} + +// 实验室设备分析 +export function getEquipmentAmount(data: any) { + return request({ + url: '/data/equipment/amount', + method: 'post', + data, + }) +} + +// 受检设备已检设备趋势 +export function getTestEquipmentMeasuredTrend(data: any) { + return request({ + url: '/data/sample/measured/amount', + method: 'post', + data, + }) +} + +// 受检设备应检数量趋势 +export function getTestEquipmentShouldMeasuredTrend(data: any) { + return request({ + url: '/data/sample/shouldMeasure/amount', + method: 'post', + data, + }) +} + +// 受检设备未检设备分析 +export function getTestEquipmentNoMeasureAmount(data: any) { + return request({ + url: '/data/sample/noMeasure/amount', + method: 'post', + data, + }) +} + +// 设备类型分析 +export function getEquipmentType(data: any) { + return request({ + url: '/data/equipment/category', + method: 'post', + data, + }) +} + +// 设备状态分析 +export function getEquipmentStatus(data: any) { + return request({ + url: '/data/equipment/status', + method: 'post', + data, + }) +} + +// 近一年部门设备到期趋势 +export function getDeptExpireTrend(data: object) { + return request({ + url: '/data/equipment/expire/trendList', + method: 'post', + data, + }) +} + +// 标准设备种类分析 +export function getStandardDeviceType(data: object) { + return request({ + url: '/data/equipment/name/category', + method: 'post', + data, + }) +} diff --git a/src/assets/icons/icon-bar.svg b/src/assets/icons/icon-bar.svg new file mode 100644 index 0000000..bd84db6 --- /dev/null +++ b/src/assets/icons/icon-bar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-customer.svg b/src/assets/icons/icon-customer.svg new file mode 100644 index 0000000..04d8d71 --- /dev/null +++ b/src/assets/icons/icon-customer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-line1.svg b/src/assets/icons/icon-line1.svg new file mode 100644 index 0000000..2f829d0 --- /dev/null +++ b/src/assets/icons/icon-line1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-pie.svg b/src/assets/icons/icon-pie.svg index 5ba1903..5c2b847 100644 --- a/src/assets/icons/icon-pie.svg +++ b/src/assets/icons/icon-pie.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/icon-resource1.svg b/src/assets/icons/icon-resource1.svg new file mode 100644 index 0000000..ed2f631 --- /dev/null +++ b/src/assets/icons/icon-resource1.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-standard.svg b/src/assets/icons/icon-standard.svg new file mode 100644 index 0000000..77720d9 --- /dev/null +++ b/src/assets/icons/icon-standard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-table.svg b/src/assets/icons/icon-table.svg new file mode 100644 index 0000000..755d8a6 --- /dev/null +++ b/src/assets/icons/icon-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/icon-testEquipment.svg b/src/assets/icons/icon-testEquipment.svg new file mode 100644 index 0000000..c6df86c --- /dev/null +++ b/src/assets/icons/icon-testEquipment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/workBench/checked.png b/src/assets/images/workBench/checked.png new file mode 100644 index 0000000..064199d --- /dev/null +++ b/src/assets/images/workBench/checked.png Binary files differ diff --git a/src/assets/images/workBench/equipment.png b/src/assets/images/workBench/equipment.png new file mode 100644 index 0000000..270189c --- /dev/null +++ b/src/assets/images/workBench/equipment.png Binary files differ diff --git a/src/assets/images/workBench/not-check.png b/src/assets/images/workBench/not-check.png new file mode 100644 index 0000000..5ba67c0 --- /dev/null +++ b/src/assets/images/workBench/not-check.png Binary files differ diff --git a/src/assets/images/workBench/order.png b/src/assets/images/workBench/order.png new file mode 100644 index 0000000..657d6a1 --- /dev/null +++ b/src/assets/images/workBench/order.png Binary files differ diff --git a/src/assets/images/workBench/standard.png b/src/assets/images/workBench/standard.png new file mode 100644 index 0000000..f0425e8 --- /dev/null +++ b/src/assets/images/workBench/standard.png Binary files differ diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index e847fcb..00a9d8f 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -334,6 +334,7 @@ // 线段颜色 if (item.color || props.colors.length > 0) { series.itemStyle = { + // color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), color: item.color ? formatColor(item.color) : formatColor(props.colors[itemIndex] as string), } diff --git a/src/router/modules/workbench.ts b/src/router/modules/workbench.ts index b24fdcb..2e4202b 100644 --- a/src/router/modules/workbench.ts +++ b/src/router/modules/workbench.ts @@ -24,7 +24,7 @@ name: 'WorkbenchIndex', component: () => import('@/views/workbench/index.vue'), meta: { - title: '工作台', + title: '数据管理', auth: '/workbench/index', icon: 'ep:key', sidebar: false, diff --git a/src/router/routes.ts b/src/router/routes.ts index be4448d..3fb3620 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -105,7 +105,7 @@ const asyncRoutes: Route.recordMainRaw[] = [ { meta: { - title: '工作台', + title: '数据管理', icon: '', auth: '/workbench', }, diff --git "a/src/views/\133...all\135.vue" "b/src/views/\133...all\135.vue" index f767c09..b6137cc 100644 --- "a/src/views/\133...all\135.vue" +++ "b/src/views/\133...all\135.vue" @@ -42,7 +42,7 @@ 抱歉，你访问的页面不存在 - {{ data.countdown }} 秒后，返回工作台 + {{ data.countdown }} 秒后，返回数据管理 diff --git a/src/views/business/certManage/cert/cert-interface.ts b/src/views/business/certManage/cert/cert-interface.ts deleted file mode 100644 index e2ddd67..0000000 --- a/src/views/business/certManage/cert/cert-interface.ts +++ /dev/null @@ -1,49 +0,0 @@ -// 证书打印查询 -export interface IListQuery { - approvalStatus: string // 审批状态类型code，导出接口不用传 - certificateReportNo: string // 证书报告编号 - certificateReportName: string // 证书报告名称 - customerId: string // 委托方id - customerName: string // 委托方 - deptName: string // 使用部门 - sampleNo: string // 受检设备编号 - sampleName: string // 受检设备名称 - model: string // 规格型号 - manufactureNo: string // 出厂编号 - measureCategory: string // 检校类别(字典code) - traceDateStart: string // 测试、校准或检定日期开始 - traceDateEnd: string // 测试、校准或检定日期结束 - conclusion: string // 结论(所检项目合格/不合格/除*外其余所检项目合格,用户手选) - measureValidDateStart: string // 检定有效期开始 - measureValidDateEnd: string // 检定有效期结束 - labCode: string // 实验室(字典code) - groupCode: string // 部门(字典code) - createUserName: string // 检定员 - formId: string // 表单id - printStatus: string // 打印状态(未打印传1,其他状态不传) - offset: number - limit: number -} - -export interface IListQueryCert extends IListQuery { - customerId: string -} - -// 证书打印列表 -export interface IList { - id: string // 主键 - certificateName: string // 证书报告名称 - certificateNo: string // 证书报告编号 - orderNo: string // 任务单编号 - customerName: string // 委托方 - sampleNo: string // 被检设备统一编号 - sampleName: string // 被检设备名称 - createTime: string // 创建时间 - printStatusName: string // 打印状态 - taskId: string - printFileName: string // 证书文件名称 - certificateFile: string // 证书文件 - processId: string - approvalStatusName: string // 审批状态名称 - decisionItem?: string -} diff --git a/src/views/business/certManage/cert/components/approvalRecord.vue b/src/views/business/certManage/cert/components/approvalRecord.vue deleted file mode 100644 index 5786fbd..0000000 --- a/src/views/business/certManage/cert/components/approvalRecord.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/components/basic.vue b/src/views/business/certManage/cert/components/basic.vue deleted file mode 100644 index e74f911..0000000 --- a/src/views/business/certManage/cert/components/basic.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - diff --git a/src/views/business/certManage/cert/components/preview.vue b/src/views/business/certManage/cert/components/preview.vue deleted file mode 100644 index da9e247..0000000 --- a/src/views/business/certManage/cert/components/preview.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/views/business/certManage/cert/components/printRecord.vue b/src/views/business/certManage/cert/components/printRecord.vue deleted file mode 100644 index 66e9c29..0000000 --- a/src/views/business/certManage/cert/components/printRecord.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/detail.vue b/src/views/business/certManage/cert/detail.vue deleted file mode 100644 index 9538697..0000000 --- a/src/views/business/certManage/cert/detail.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - diff --git a/src/views/business/certManage/cert/list.vue b/src/views/business/certManage/cert/list.vue deleted file mode 100644 index 9da0fb9..0000000 --- a/src/views/business/certManage/cert/list.vue +++ /dev/null @@ -1,657 +0,0 @@ - - - - - - - diff --git a/src/views/certManage/cert-interface.ts b/src/views/certManage/cert-interface.ts index 7589e06..5da34cd 100644 --- a/src/views/certManage/cert-interface.ts +++ b/src/views/certManage/cert-interface.ts @@ -54,7 +54,7 @@ staffName: string // 检定员 conclusion: string // 结论 traceDate: string // 检定日期 - measureValidDate: string // 检定有效期 + expirationDate: string // 检定有效期 deptId: string // 实验室id deptName: string // 实验室/使用部门 measureCategory: string // 业务类型 diff --git a/src/views/certManage/components/basic.vue b/src/views/certManage/components/basic.vue index c94de7e..328798f 100644 --- a/src/views/certManage/components/basic.vue +++ b/src/views/certManage/components/basic.vue @@ -46,7 +46,7 @@ staffName: '', // 检定员 conclusion: '', // 结论 traceDate: '', // 检定日期 - measureValidDate: '', // 检定有效期 + expirationDate: '', // 检定有效期 deptId: '', // 实验室 deptName: '', // 实验室/使用部门 measureCategory: '', // 业务类型 @@ -71,7 +71,7 @@ staffName: [{ required: true, message: '检定员不能为空', trigger: ['change', 'blur'] }], conclusion: [{ required: true, message: '检定结论不能为空', trigger: ['change', 'blur'] }], traceDate: [{ required: true, message: '检定日期不能为空', trigger: ['change', 'blur'] }], - measureValidDate: [{ required: true, message: '检定有效期不能为空', trigger: ['change', 'blur'] }], + expirationDate: [{ required: true, message: '检定有效期不能为空', trigger: ['change', 'blur'] }], deptId: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }], measureCategory: [{ required: true, message: '业务类型不能为空', trigger: ['change', 'blur'] }], certificateFile: [{ required: true, message: '证书报告不能为空', trigger: ['change', 'blur'] }], @@ -162,9 +162,9 @@ } // 获取证书详情 -const fetchInfo = () => { +const fetchInfo = (receiveMajor: string) => { if (!infoId.value) { return } - getCertDetail({ id: infoId.value }).then((res) => { + getCertDetail({ id: infoId.value, receiveMajor }).then((res) => { form.value = res.data // 处理实验室id @@ -209,8 +209,9 @@ addCert(params).then((res) => { loading.close() form.value.certificateNo = res.data.certificateNo // 证书编号 - infoId.value = res.data.id // id + infoId.value = res.data // id emits('addSuccess', infoId.value) + fetchInfo() ElMessage.success('已保存') }).catch(() => { loading.close() @@ -222,6 +223,7 @@ draftUpdateCert(params).then((res) => { loading.close() emits('addSuccess', infoId.value) + // fetchInfo() ElMessage.success('已保存') }).catch(() => { loading.close() @@ -435,9 +437,9 @@ - + (['', ''])// 筛选时间段数据 -const measureValidDateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 +const expirationDateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据 // 查询条件 const listQuery = ref({ @@ -57,7 +57,7 @@ { text: '业务类型', value: 'measureCategory', align: 'center' }, { text: '检定日期', value: 'traceDate', align: 'center', width: '120' }, { text: '检定结论', value: 'conclusion', align: 'center' }, - // { text: '检定有效期', value: 'measureValidDate', align: 'center', width: '120' }, + // { text: '检定有效期', value: 'expirationDate', align: 'center', width: '120' }, { text: '实验室', value: 'deptName', align: 'center', width: '100' }, // { text: '部门', value: 'groupCodeName', align: 'center', width: '120' }, // { text: '检定员', value: 'createUserName', align: 'center' }, @@ -133,11 +133,11 @@ listQuery.value.offset = 1 } getCertList(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: { traceDate: string; measureValidDate: string; labCodeName: string }) => { + list.value = response.data.rows.map((item: { traceDate: string; expirationDate: string; labCodeName: string }) => { return { ...item, traceDate: item.traceDate ? dayjs(item.traceDate).format('YYYY-MM-DD') : item.traceDate, // 检定日期 - measureValidDate: item.measureValidDate ? dayjs(item.measureValidDate).format('YYYY-MM-DD') : item.measureValidDate, // 检定有效期 + expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate, // 检定有效期 } }) total.value = parseInt(response.data.total) @@ -178,7 +178,7 @@ limit: 20, } dateRange.value = ['', ''] // 清空时间 - measureValidDateRange.value = ['', ''] + expirationDateRange.value = ['', ''] fetchData(true) } @@ -309,8 +309,6 @@ query: { ...row, approvalStatusName: row.approvalStatusName, // 审批状态名称 - printFileName: row.certificateFile, - printStatusName: row.printStatusName, // 证书打印状态 processId: row.processId, // 流程实例 taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批 decisionItem: row.decisionItem, diff --git a/src/views/workbench/index-bak.vue b/src/views/workbench/index-bak.vue new file mode 100644 index 0000000..57e53f8 --- /dev/null +++ b/src/views/workbench/index-bak.vue @@ -0,0 +1,412 @@ + + + + + + diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue index 57e53f8..c728561 100644 --- a/src/views/workbench/index.vue +++ b/src/views/workbench/index.vue @@ -1,313 +1,718 @@ - - + +