diff --git a/src/api/dataManagement/data/verificationCertificate.ts b/src/api/dataManagement/data/verificationCertificate.ts new file mode 100644 index 0000000..9ba5ab9 --- /dev/null +++ b/src/api/dataManagement/data/verificationCertificate.ts @@ -0,0 +1,51 @@ +// 检定证书分析相关接口 +import request from '@/api/index' + +// 基本信息 +export function getBaseInfo(data: object) { + return request({ + url: '/data/certificate/amount', + method: 'post', + data + }) +} +// 部门检校证书分析 +export function getDeptAnalysis(data: object) { + return request({ + url: '/data/certificate/analysis', + method: 'post', + data + }) +} +// 检校类别分析 +export function getCategoryAnalysis(data: object) { + return request({ + url: '/data/certificate/category', + method: 'post', + data + }) +} +// 部门检校证书比例 +export function getDeptRate(data: object) { + return request({ + url: '/data/certificate/rate', + method: 'post', + data + }) +} +// 检定人员排行榜 +export function getStaffRank(data: object) { + return request({ + url: '/data/certificate/staff', + method: 'post', + data + }) +} +// 无需出证书tab页:展示没有证书只有原始记录的设备列表 +export function getOnlyRecord(data: object) { + return request({ + url: '/data/certificate/onlyRecord', + method: 'post', + data + }) +} diff --git a/src/api/dataManagement/data/verificationCertificate.ts b/src/api/dataManagement/data/verificationCertificate.ts new file mode 100644 index 0000000..9ba5ab9 --- /dev/null +++ b/src/api/dataManagement/data/verificationCertificate.ts @@ -0,0 +1,51 @@ +// 检定证书分析相关接口 +import request from '@/api/index' + +// 基本信息 +export function getBaseInfo(data: object) { + return request({ + url: '/data/certificate/amount', + method: 'post', + data + }) +} +// 部门检校证书分析 +export function getDeptAnalysis(data: object) { + return request({ + url: '/data/certificate/analysis', + method: 'post', + data + }) +} +// 检校类别分析 +export function getCategoryAnalysis(data: object) { + return request({ + url: '/data/certificate/category', + method: 'post', + data + }) +} +// 部门检校证书比例 +export function getDeptRate(data: object) { + return request({ + url: '/data/certificate/rate', + method: 'post', + data + }) +} +// 检定人员排行榜 +export function getStaffRank(data: object) { + return request({ + url: '/data/certificate/staff', + method: 'post', + data + }) +} +// 无需出证书tab页:展示没有证书只有原始记录的设备列表 +export function getOnlyRecord(data: object) { + return request({ + url: '/data/certificate/onlyRecord', + method: 'post', + data + }) +} diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" new file mode 100644 index 0000000..25e6710 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" Binary files differ diff --git a/src/api/dataManagement/data/verificationCertificate.ts b/src/api/dataManagement/data/verificationCertificate.ts new file mode 100644 index 0000000..9ba5ab9 --- /dev/null +++ b/src/api/dataManagement/data/verificationCertificate.ts @@ -0,0 +1,51 @@ +// 检定证书分析相关接口 +import request from '@/api/index' + +// 基本信息 +export function getBaseInfo(data: object) { + return request({ + url: '/data/certificate/amount', + method: 'post', + data + }) +} +// 部门检校证书分析 +export function getDeptAnalysis(data: object) { + return request({ + url: '/data/certificate/analysis', + method: 'post', + data + }) +} +// 检校类别分析 +export function getCategoryAnalysis(data: object) { + return request({ + url: '/data/certificate/category', + method: 'post', + data + }) +} +// 部门检校证书比例 +export function getDeptRate(data: object) { + return request({ + url: '/data/certificate/rate', + method: 'post', + data + }) +} +// 检定人员排行榜 +export function getStaffRank(data: object) { + return request({ + url: '/data/certificate/staff', + method: 'post', + data + }) +} +// 无需出证书tab页:展示没有证书只有原始记录的设备列表 +export function getOnlyRecord(data: object) { + return request({ + url: '/data/certificate/onlyRecord', + method: 'post', + data + }) +} diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" new file mode 100644 index 0000000..25e6710 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" new file mode 100644 index 0000000..b600260 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" Binary files differ diff --git a/src/api/dataManagement/data/verificationCertificate.ts b/src/api/dataManagement/data/verificationCertificate.ts new file mode 100644 index 0000000..9ba5ab9 --- /dev/null +++ b/src/api/dataManagement/data/verificationCertificate.ts @@ -0,0 +1,51 @@ +// 检定证书分析相关接口 +import request from '@/api/index' + +// 基本信息 +export function getBaseInfo(data: object) { + return request({ + url: '/data/certificate/amount', + method: 'post', + data + }) +} +// 部门检校证书分析 +export function getDeptAnalysis(data: object) { + return request({ + url: '/data/certificate/analysis', + method: 'post', + data + }) +} +// 检校类别分析 +export function getCategoryAnalysis(data: object) { + return request({ + url: '/data/certificate/category', + method: 'post', + data + }) +} +// 部门检校证书比例 +export function getDeptRate(data: object) { + return request({ + url: '/data/certificate/rate', + method: 'post', + data + }) +} +// 检定人员排行榜 +export function getStaffRank(data: object) { + return request({ + url: '/data/certificate/staff', + method: 'post', + data + }) +} +// 无需出证书tab页:展示没有证书只有原始记录的设备列表 +export function getOnlyRecord(data: object) { + return request({ + url: '/data/certificate/onlyRecord', + method: 'post', + data + }) +} diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" new file mode 100644 index 0000000..25e6710 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" new file mode 100644 index 0000000..b600260 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" new file mode 100644 index 0000000..cde39e6 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" Binary files differ diff --git a/src/api/dataManagement/data/verificationCertificate.ts b/src/api/dataManagement/data/verificationCertificate.ts new file mode 100644 index 0000000..9ba5ab9 --- /dev/null +++ b/src/api/dataManagement/data/verificationCertificate.ts @@ -0,0 +1,51 @@ +// 检定证书分析相关接口 +import request from '@/api/index' + +// 基本信息 +export function getBaseInfo(data: object) { + return request({ + url: '/data/certificate/amount', + method: 'post', + data + }) +} +// 部门检校证书分析 +export function getDeptAnalysis(data: object) { + return request({ + url: '/data/certificate/analysis', + method: 'post', + data + }) +} +// 检校类别分析 +export function getCategoryAnalysis(data: object) { + return request({ + url: '/data/certificate/category', + method: 'post', + data + }) +} +// 部门检校证书比例 +export function getDeptRate(data: object) { + return request({ + url: '/data/certificate/rate', + method: 'post', + data + }) +} +// 检定人员排行榜 +export function getStaffRank(data: object) { + return request({ + url: '/data/certificate/staff', + method: 'post', + data + }) +} +// 无需出证书tab页:展示没有证书只有原始记录的设备列表 +export function getOnlyRecord(data: object) { + return request({ + url: '/data/certificate/onlyRecord', + method: 'post', + data + }) +} diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" new file mode 100644 index 0000000..25e6710 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" new file mode 100644 index 0000000..b600260 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" new file mode 100644 index 0000000..cde39e6 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" new file mode 100644 index 0000000..fe44ad9 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" Binary files differ diff --git a/src/api/dataManagement/data/verificationCertificate.ts b/src/api/dataManagement/data/verificationCertificate.ts new file mode 100644 index 0000000..9ba5ab9 --- /dev/null +++ b/src/api/dataManagement/data/verificationCertificate.ts @@ -0,0 +1,51 @@ +// 检定证书分析相关接口 +import request from '@/api/index' + +// 基本信息 +export function getBaseInfo(data: object) { + return request({ + url: '/data/certificate/amount', + method: 'post', + data + }) +} +// 部门检校证书分析 +export function getDeptAnalysis(data: object) { + return request({ + url: '/data/certificate/analysis', + method: 'post', + data + }) +} +// 检校类别分析 +export function getCategoryAnalysis(data: object) { + return request({ + url: '/data/certificate/category', + method: 'post', + data + }) +} +// 部门检校证书比例 +export function getDeptRate(data: object) { + return request({ + url: '/data/certificate/rate', + method: 'post', + data + }) +} +// 检定人员排行榜 +export function getStaffRank(data: object) { + return request({ + url: '/data/certificate/staff', + method: 'post', + data + }) +} +// 无需出证书tab页:展示没有证书只有原始记录的设备列表 +export function getOnlyRecord(data: object) { + return request({ + url: '/data/certificate/onlyRecord', + method: 'post', + data + }) +} diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" new file mode 100644 index 0000000..25e6710 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" new file mode 100644 index 0000000..b600260 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" new file mode 100644 index 0000000..cde39e6 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" new file mode 100644 index 0000000..fe44ad9 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" Binary files differ diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue index 6b785ab..038d800 100644 --- a/src/components/Echart/BarChartHorizontal.vue +++ b/src/components/Echart/BarChartHorizontal.vue @@ -381,7 +381,7 @@ borderRadius: Array.isArray(props.barConer) ? props.barConer as number[] : props.barConer, }, itemStyle: { - color: props.color, + color: item.color || props.color, borderRadius: Array.isArray(props.barConer) ? props.barConer as number[] : props.barConer, }, data: item.data, diff --git a/src/api/dataManagement/data/verificationCertificate.ts b/src/api/dataManagement/data/verificationCertificate.ts new file mode 100644 index 0000000..9ba5ab9 --- /dev/null +++ b/src/api/dataManagement/data/verificationCertificate.ts @@ -0,0 +1,51 @@ +// 检定证书分析相关接口 +import request from '@/api/index' + +// 基本信息 +export function getBaseInfo(data: object) { + return request({ + url: '/data/certificate/amount', + method: 'post', + data + }) +} +// 部门检校证书分析 +export function getDeptAnalysis(data: object) { + return request({ + url: '/data/certificate/analysis', + method: 'post', + data + }) +} +// 检校类别分析 +export function getCategoryAnalysis(data: object) { + return request({ + url: '/data/certificate/category', + method: 'post', + data + }) +} +// 部门检校证书比例 +export function getDeptRate(data: object) { + return request({ + url: '/data/certificate/rate', + method: 'post', + data + }) +} +// 检定人员排行榜 +export function getStaffRank(data: object) { + return request({ + url: '/data/certificate/staff', + method: 'post', + data + }) +} +// 无需出证书tab页:展示没有证书只有原始记录的设备列表 +export function getOnlyRecord(data: object) { + return request({ + url: '/data/certificate/onlyRecord', + method: 'post', + data + }) +} diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" new file mode 100644 index 0000000..25e6710 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" new file mode 100644 index 0000000..b600260 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" new file mode 100644 index 0000000..cde39e6 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" new file mode 100644 index 0000000..fe44ad9 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" Binary files differ diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue index 6b785ab..038d800 100644 --- a/src/components/Echart/BarChartHorizontal.vue +++ b/src/components/Echart/BarChartHorizontal.vue @@ -381,7 +381,7 @@ borderRadius: Array.isArray(props.barConer) ? props.barConer as number[] : props.barConer, }, itemStyle: { - color: props.color, + color: item.color || props.color, borderRadius: Array.isArray(props.barConer) ? props.barConer as number[] : props.barConer, }, data: item.data, diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue index 6f963b1..1f1d01c 100644 --- a/src/views/dataManagement/components/data/eqptDevice.vue +++ b/src/views/dataManagement/components/data/eqptDevice.vue @@ -464,15 +464,15 @@ searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59` } else { searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00` - searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59` + searchQueryResult.value.timeEnd = `${timeDate.value[timeDate.value.length - 1]} 23:59:59` } } else { searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00` searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59` console.log(selectCurrentTime.value, 'selectCurrentTime.value') } - searchQueryResult.value.timeStart = `2024-01-01 00:00:00` - searchQueryResult.value.timeEnd = `2024-12-31 23:59:59` + // searchQueryResult.value.timeStart = `2024-01-01 00:00:00` + // searchQueryResult.value.timeEnd = `2024-12-31 23:59:59` // 获取基础数据 getBaseInfo(searchQueryResult.value).then(res => { baseInfo.value.forEach(item => { @@ -529,9 +529,7 @@ limit: 9999 }).then(res => { console.log(res.data, '受检设备性能趋势') - const current = showChart.value.filter( - item => item.name === '受检设备性能趋势' - )[0] + const current = showChart.value.filter(item => item.name === '受检设备性能趋势')[0] current.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 @@ -731,8 +729,7 @@
+ format="YYYY-MM-DD" value-format="YYYY-MM-DD" @focus="handlerFocus" @blur="handlerBlur" />
diff --git a/src/api/dataManagement/data/verificationCertificate.ts b/src/api/dataManagement/data/verificationCertificate.ts new file mode 100644 index 0000000..9ba5ab9 --- /dev/null +++ b/src/api/dataManagement/data/verificationCertificate.ts @@ -0,0 +1,51 @@ +// 检定证书分析相关接口 +import request from '@/api/index' + +// 基本信息 +export function getBaseInfo(data: object) { + return request({ + url: '/data/certificate/amount', + method: 'post', + data + }) +} +// 部门检校证书分析 +export function getDeptAnalysis(data: object) { + return request({ + url: '/data/certificate/analysis', + method: 'post', + data + }) +} +// 检校类别分析 +export function getCategoryAnalysis(data: object) { + return request({ + url: '/data/certificate/category', + method: 'post', + data + }) +} +// 部门检校证书比例 +export function getDeptRate(data: object) { + return request({ + url: '/data/certificate/rate', + method: 'post', + data + }) +} +// 检定人员排行榜 +export function getStaffRank(data: object) { + return request({ + url: '/data/certificate/staff', + method: 'post', + data + }) +} +// 无需出证书tab页:展示没有证书只有原始记录的设备列表 +export function getOnlyRecord(data: object) { + return request({ + url: '/data/certificate/onlyRecord', + method: 'post', + data + }) +} diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" new file mode 100644 index 0000000..25e6710 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" new file mode 100644 index 0000000..b600260 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" new file mode 100644 index 0000000..cde39e6 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" new file mode 100644 index 0000000..fe44ad9 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" Binary files differ diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue index 6b785ab..038d800 100644 --- a/src/components/Echart/BarChartHorizontal.vue +++ b/src/components/Echart/BarChartHorizontal.vue @@ -381,7 +381,7 @@ borderRadius: Array.isArray(props.barConer) ? props.barConer as number[] : props.barConer, }, itemStyle: { - color: props.color, + color: item.color || props.color, borderRadius: Array.isArray(props.barConer) ? props.barConer as number[] : props.barConer, }, data: item.data, diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue index 6f963b1..1f1d01c 100644 --- a/src/views/dataManagement/components/data/eqptDevice.vue +++ b/src/views/dataManagement/components/data/eqptDevice.vue @@ -464,15 +464,15 @@ searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59` } else { searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00` - searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59` + searchQueryResult.value.timeEnd = `${timeDate.value[timeDate.value.length - 1]} 23:59:59` } } else { searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00` searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59` console.log(selectCurrentTime.value, 'selectCurrentTime.value') } - searchQueryResult.value.timeStart = `2024-01-01 00:00:00` - searchQueryResult.value.timeEnd = `2024-12-31 23:59:59` + // searchQueryResult.value.timeStart = `2024-01-01 00:00:00` + // searchQueryResult.value.timeEnd = `2024-12-31 23:59:59` // 获取基础数据 getBaseInfo(searchQueryResult.value).then(res => { baseInfo.value.forEach(item => { @@ -529,9 +529,7 @@ limit: 9999 }).then(res => { console.log(res.data, '受检设备性能趋势') - const current = showChart.value.filter( - item => item.name === '受检设备性能趋势' - )[0] + const current = showChart.value.filter(item => item.name === '受检设备性能趋势')[0] current.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 @@ -731,8 +729,7 @@
+ format="YYYY-MM-DD" value-format="YYYY-MM-DD" @focus="handlerFocus" @blur="handlerBlur" />
diff --git a/src/views/dataManagement/components/data/img.ts b/src/views/dataManagement/components/data/img.ts index bceb2f7..8fba081 100644 --- a/src/views/dataManagement/components/data/img.ts +++ b/src/views/dataManagement/components/data/img.ts @@ -30,6 +30,10 @@ import recordAmount from '@/assets/images/dataManagement/standardDevice/标准装置分析-核查记录总数.png' import yearRecordAmount from '@/assets/images/dataManagement/standardDevice/标准装置分析-核查记录总数本年度.png' import quarterRecordAmount from '@/assets/images/dataManagement/standardDevice/标准装置分析-核查记录总数本季度.png' +import certificateAmount from '@/assets/images/dataManagement/verificationCertificate/检定证书分析-检定证书总量.png' +import outCertificateAmount from '@/assets/images/dataManagement/verificationCertificate/检定证书分析-检定证书总量分包方.png' +import timelyRate from '@/assets/images/dataManagement/verificationCertificate/检定证书分析-检定及时率.png' +import errorRate from '@/assets/images/dataManagement/verificationCertificate/检定证书分析-证书差错率.png' export const resourceManage = { 人员总数: staffAmount, 体系文件总数: systemFileAmount, @@ -80,3 +84,10 @@ '核查记录总数(本年度)': yearRecordAmount, '核查记录总数(本季度)': quarterRecordAmount, } + +export const verificationCertificate = { + 检定证书总量: certificateAmount, + '检定证书总量(分包方)': outCertificateAmount, + 检定及时率: timelyRate, + 证书差错率: errorRate, +} diff --git a/src/api/dataManagement/data/verificationCertificate.ts b/src/api/dataManagement/data/verificationCertificate.ts new file mode 100644 index 0000000..9ba5ab9 --- /dev/null +++ b/src/api/dataManagement/data/verificationCertificate.ts @@ -0,0 +1,51 @@ +// 检定证书分析相关接口 +import request from '@/api/index' + +// 基本信息 +export function getBaseInfo(data: object) { + return request({ + url: '/data/certificate/amount', + method: 'post', + data + }) +} +// 部门检校证书分析 +export function getDeptAnalysis(data: object) { + return request({ + url: '/data/certificate/analysis', + method: 'post', + data + }) +} +// 检校类别分析 +export function getCategoryAnalysis(data: object) { + return request({ + url: '/data/certificate/category', + method: 'post', + data + }) +} +// 部门检校证书比例 +export function getDeptRate(data: object) { + return request({ + url: '/data/certificate/rate', + method: 'post', + data + }) +} +// 检定人员排行榜 +export function getStaffRank(data: object) { + return request({ + url: '/data/certificate/staff', + method: 'post', + data + }) +} +// 无需出证书tab页:展示没有证书只有原始记录的设备列表 +export function getOnlyRecord(data: object) { + return request({ + url: '/data/certificate/onlyRecord', + method: 'post', + data + }) +} diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" new file mode 100644 index 0000000..25e6710 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\345\217\212\346\227\266\347\216\207.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" new file mode 100644 index 0000000..b600260 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" new file mode 100644 index 0000000..cde39e6 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\346\243\200\345\256\232\350\257\201\344\271\246\346\200\273\351\207\217\345\210\206\345\214\205\346\226\271.png" Binary files differ diff --git "a/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" new file mode 100644 index 0000000..fe44ad9 --- /dev/null +++ "b/src/assets/images/dataManagement/verificationCertificate/\346\243\200\345\256\232\350\257\201\344\271\246\345\210\206\346\236\220-\350\257\201\344\271\246\345\267\256\351\224\231\347\216\207.png" Binary files differ diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue index 6b785ab..038d800 100644 --- a/src/components/Echart/BarChartHorizontal.vue +++ b/src/components/Echart/BarChartHorizontal.vue @@ -381,7 +381,7 @@ borderRadius: Array.isArray(props.barConer) ? props.barConer as number[] : props.barConer, }, itemStyle: { - color: props.color, + color: item.color || props.color, borderRadius: Array.isArray(props.barConer) ? props.barConer as number[] : props.barConer, }, data: item.data, diff --git a/src/views/dataManagement/components/data/eqptDevice.vue b/src/views/dataManagement/components/data/eqptDevice.vue index 6f963b1..1f1d01c 100644 --- a/src/views/dataManagement/components/data/eqptDevice.vue +++ b/src/views/dataManagement/components/data/eqptDevice.vue @@ -464,15 +464,15 @@ searchQueryResult.value.timeEnd = `${timeDate.value[0]} 23:59:59` } else { searchQueryResult.value.timeStart = `${timeDate.value[0]} 00:00:00` - searchQueryResult.value.timeEnd = `${timeDate.value[1]} 23:59:59` + searchQueryResult.value.timeEnd = `${timeDate.value[timeDate.value.length - 1]} 23:59:59` } } else { searchQueryResult.value.timeStart = `${selectCurrentTime.value[0]} 00:00:00` searchQueryResult.value.timeEnd = `${selectCurrentTime.value[1]} 23:59:59` console.log(selectCurrentTime.value, 'selectCurrentTime.value') } - searchQueryResult.value.timeStart = `2024-01-01 00:00:00` - searchQueryResult.value.timeEnd = `2024-12-31 23:59:59` + // searchQueryResult.value.timeStart = `2024-01-01 00:00:00` + // searchQueryResult.value.timeEnd = `2024-12-31 23:59:59` // 获取基础数据 getBaseInfo(searchQueryResult.value).then(res => { baseInfo.value.forEach(item => { @@ -529,9 +529,7 @@ limit: 9999 }).then(res => { console.log(res.data, '受检设备性能趋势') - const current = showChart.value.filter( - item => item.name === '受检设备性能趋势' - )[0] + const current = showChart.value.filter(item => item.name === '受检设备性能趋势')[0] current.data = res.data.rows.map((item: any, index: number) => ({ ...item, index: index + 1 @@ -731,8 +729,7 @@
+ format="YYYY-MM-DD" value-format="YYYY-MM-DD" @focus="handlerFocus" @blur="handlerBlur" />
diff --git a/src/views/dataManagement/components/data/img.ts b/src/views/dataManagement/components/data/img.ts index bceb2f7..8fba081 100644 --- a/src/views/dataManagement/components/data/img.ts +++ b/src/views/dataManagement/components/data/img.ts @@ -30,6 +30,10 @@ import recordAmount from '@/assets/images/dataManagement/standardDevice/标准装置分析-核查记录总数.png' import yearRecordAmount from '@/assets/images/dataManagement/standardDevice/标准装置分析-核查记录总数本年度.png' import quarterRecordAmount from '@/assets/images/dataManagement/standardDevice/标准装置分析-核查记录总数本季度.png' +import certificateAmount from '@/assets/images/dataManagement/verificationCertificate/检定证书分析-检定证书总量.png' +import outCertificateAmount from '@/assets/images/dataManagement/verificationCertificate/检定证书分析-检定证书总量分包方.png' +import timelyRate from '@/assets/images/dataManagement/verificationCertificate/检定证书分析-检定及时率.png' +import errorRate from '@/assets/images/dataManagement/verificationCertificate/检定证书分析-证书差错率.png' export const resourceManage = { 人员总数: staffAmount, 体系文件总数: systemFileAmount, @@ -80,3 +84,10 @@ '核查记录总数(本年度)': yearRecordAmount, '核查记录总数(本季度)': quarterRecordAmount, } + +export const verificationCertificate = { + 检定证书总量: certificateAmount, + '检定证书总量(分包方)': outCertificateAmount, + 检定及时率: timelyRate, + 证书差错率: errorRate, +} diff --git a/src/views/dataManagement/components/data/standardDevice.vue b/src/views/dataManagement/components/data/standardDevice.vue index c0c4c1f..62b94ed 100644 --- a/src/views/dataManagement/components/data/standardDevice.vue +++ b/src/views/dataManagement/components/data/standardDevice.vue @@ -324,13 +324,7 @@ ghost-class="ghostClass" chosen-class="chosenClass" @end="onEnd">