diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts index 24bde9e..705ca3a 100644 --- a/src/api/system/bench.ts +++ b/src/api/system/bench.ts @@ -14,3 +14,19 @@ method: 'post', }) } +// 培训考核统计 +export function getTrainLogSStatistic(data: object) { + return request({ + url: `${prefix}/meterTrainLogStatistic`, + method: 'post', + data, + }) +} +// 我的证书记录 +export function getCertificateStatistic(data: object) { + return request({ + url: `${prefix}/queryStaffCertificate`, + method: 'post', + data, + }) +} diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts index 24bde9e..705ca3a 100644 --- a/src/api/system/bench.ts +++ b/src/api/system/bench.ts @@ -14,3 +14,19 @@ method: 'post', }) } +// 培训考核统计 +export function getTrainLogSStatistic(data: object) { + return request({ + url: `${prefix}/meterTrainLogStatistic`, + method: 'post', + data, + }) +} +// 我的证书记录 +export function getCertificateStatistic(data: object) { + return request({ + url: `${prefix}/queryStaffCertificate`, + method: 'post', + data, + }) +} diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg new file mode 100644 index 0000000..34b76f5 --- /dev/null +++ b/src/assets/images/bench/1671087276259.jpg Binary files differ diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts index 24bde9e..705ca3a 100644 --- a/src/api/system/bench.ts +++ b/src/api/system/bench.ts @@ -14,3 +14,19 @@ method: 'post', }) } +// 培训考核统计 +export function getTrainLogSStatistic(data: object) { + return request({ + url: `${prefix}/meterTrainLogStatistic`, + method: 'post', + data, + }) +} +// 我的证书记录 +export function getCertificateStatistic(data: object) { + return request({ + url: `${prefix}/queryStaffCertificate`, + method: 'post', + data, + }) +} diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg new file mode 100644 index 0000000..34b76f5 --- /dev/null +++ b/src/assets/images/bench/1671087276259.jpg Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a188907..8b37b44 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -34,6 +34,7 @@ PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] + Pie: typeof import('./components/echarts/pie.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts index 24bde9e..705ca3a 100644 --- a/src/api/system/bench.ts +++ b/src/api/system/bench.ts @@ -14,3 +14,19 @@ method: 'post', }) } +// 培训考核统计 +export function getTrainLogSStatistic(data: object) { + return request({ + url: `${prefix}/meterTrainLogStatistic`, + method: 'post', + data, + }) +} +// 我的证书记录 +export function getCertificateStatistic(data: object) { + return request({ + url: `${prefix}/queryStaffCertificate`, + method: 'post', + data, + }) +} diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg new file mode 100644 index 0000000..34b76f5 --- /dev/null +++ b/src/assets/images/bench/1671087276259.jpg Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a188907..8b37b44 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -34,6 +34,7 @@ PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] + Pie: typeof import('./components/echarts/pie.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue index 02c4413..1f6f6aa 100644 --- a/src/components/echarts/index.vue +++ b/src/components/echarts/index.vue @@ -33,17 +33,18 @@ max: 400, }, ], - title: [ - { - top: '2%', - left: 'right', - text: props.title, - textStyle: { - color: '#000', - fontSize: 15, - }, + color: ['#000'], + legend: { + data: [props.title], + itemHeight: 10, // 圆点大小 + itemWidth: 0, // 线的长度 + x: 'right', // 居右显示 + y: -2, + textStyle: { // 图例文字的样式 + color: '#000', + fontSize: 12, }, - ], + }, tooltip: { trigger: 'axis', textStyle: { @@ -96,7 +97,9 @@ containLabel: true, }, series: [ + { + name: props.title, type: 'line', smooth: true, data: props.xAxisData, @@ -104,38 +107,32 @@ symbolSize: 2, // 拐点大小 // 折线条的样式 lineStyle: { - color: 'rgba(0,0,0,0)', + color: '#58abf0', }, // 折线拐点的样式 itemStyle: { normal: { // 静止时: - color: '#fff', - borderColor: '#fff', // 拐点的边框颜色 + color: 'rgb(40 184 228)', + borderColor: 'rgb(40 184 228)', // 拐点的边框颜色 borderWidth: 4, }, emphasis: { // 鼠标经过时: - color: '#fff', + color: 'rgb(40 184 228)', }, }, areaStyle: { - color: { - type: 'linear', - x: 1, - y: 1, - colorStops: [ - { - offset: 0, - color: '#00EAD1', // 0% 处的颜色 - }, - { - offset: 1, - color: '#0055CB', // 100% 处的颜色 - }, - ], - global: false, // 缺省为 false - }, + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#60b4f1', + }, + { + offset: 1, + color: '#fff', + }, + ]), }, }, ], diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts index 24bde9e..705ca3a 100644 --- a/src/api/system/bench.ts +++ b/src/api/system/bench.ts @@ -14,3 +14,19 @@ method: 'post', }) } +// 培训考核统计 +export function getTrainLogSStatistic(data: object) { + return request({ + url: `${prefix}/meterTrainLogStatistic`, + method: 'post', + data, + }) +} +// 我的证书记录 +export function getCertificateStatistic(data: object) { + return request({ + url: `${prefix}/queryStaffCertificate`, + method: 'post', + data, + }) +} diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg new file mode 100644 index 0000000..34b76f5 --- /dev/null +++ b/src/assets/images/bench/1671087276259.jpg Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a188907..8b37b44 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -34,6 +34,7 @@ PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] + Pie: typeof import('./components/echarts/pie.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue index 02c4413..1f6f6aa 100644 --- a/src/components/echarts/index.vue +++ b/src/components/echarts/index.vue @@ -33,17 +33,18 @@ max: 400, }, ], - title: [ - { - top: '2%', - left: 'right', - text: props.title, - textStyle: { - color: '#000', - fontSize: 15, - }, + color: ['#000'], + legend: { + data: [props.title], + itemHeight: 10, // 圆点大小 + itemWidth: 0, // 线的长度 + x: 'right', // 居右显示 + y: -2, + textStyle: { // 图例文字的样式 + color: '#000', + fontSize: 12, }, - ], + }, tooltip: { trigger: 'axis', textStyle: { @@ -96,7 +97,9 @@ containLabel: true, }, series: [ + { + name: props.title, type: 'line', smooth: true, data: props.xAxisData, @@ -104,38 +107,32 @@ symbolSize: 2, // 拐点大小 // 折线条的样式 lineStyle: { - color: 'rgba(0,0,0,0)', + color: '#58abf0', }, // 折线拐点的样式 itemStyle: { normal: { // 静止时: - color: '#fff', - borderColor: '#fff', // 拐点的边框颜色 + color: 'rgb(40 184 228)', + borderColor: 'rgb(40 184 228)', // 拐点的边框颜色 borderWidth: 4, }, emphasis: { // 鼠标经过时: - color: '#fff', + color: 'rgb(40 184 228)', }, }, areaStyle: { - color: { - type: 'linear', - x: 1, - y: 1, - colorStops: [ - { - offset: 0, - color: '#00EAD1', // 0% 处的颜色 - }, - { - offset: 1, - color: '#0055CB', // 100% 处的颜色 - }, - ], - global: false, // 缺省为 false - }, + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#60b4f1', + }, + { + offset: 1, + color: '#fff', + }, + ]), }, }, ], diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue new file mode 100644 index 0000000..3ad8db6 --- /dev/null +++ b/src/components/echarts/pie.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts index 24bde9e..705ca3a 100644 --- a/src/api/system/bench.ts +++ b/src/api/system/bench.ts @@ -14,3 +14,19 @@ method: 'post', }) } +// 培训考核统计 +export function getTrainLogSStatistic(data: object) { + return request({ + url: `${prefix}/meterTrainLogStatistic`, + method: 'post', + data, + }) +} +// 我的证书记录 +export function getCertificateStatistic(data: object) { + return request({ + url: `${prefix}/queryStaffCertificate`, + method: 'post', + data, + }) +} diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg new file mode 100644 index 0000000..34b76f5 --- /dev/null +++ b/src/assets/images/bench/1671087276259.jpg Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a188907..8b37b44 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -34,6 +34,7 @@ PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] + Pie: typeof import('./components/echarts/pie.vue')['default'] PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default'] RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue index 02c4413..1f6f6aa 100644 --- a/src/components/echarts/index.vue +++ b/src/components/echarts/index.vue @@ -33,17 +33,18 @@ max: 400, }, ], - title: [ - { - top: '2%', - left: 'right', - text: props.title, - textStyle: { - color: '#000', - fontSize: 15, - }, + color: ['#000'], + legend: { + data: [props.title], + itemHeight: 10, // 圆点大小 + itemWidth: 0, // 线的长度 + x: 'right', // 居右显示 + y: -2, + textStyle: { // 图例文字的样式 + color: '#000', + fontSize: 12, }, - ], + }, tooltip: { trigger: 'axis', textStyle: { @@ -96,7 +97,9 @@ containLabel: true, }, series: [ + { + name: props.title, type: 'line', smooth: true, data: props.xAxisData, @@ -104,38 +107,32 @@ symbolSize: 2, // 拐点大小 // 折线条的样式 lineStyle: { - color: 'rgba(0,0,0,0)', + color: '#58abf0', }, // 折线拐点的样式 itemStyle: { normal: { // 静止时: - color: '#fff', - borderColor: '#fff', // 拐点的边框颜色 + color: 'rgb(40 184 228)', + borderColor: 'rgb(40 184 228)', // 拐点的边框颜色 borderWidth: 4, }, emphasis: { // 鼠标经过时: - color: '#fff', + color: 'rgb(40 184 228)', }, }, areaStyle: { - color: { - type: 'linear', - x: 1, - y: 1, - colorStops: [ - { - offset: 0, - color: '#00EAD1', // 0% 处的颜色 - }, - { - offset: 1, - color: '#0055CB', // 100% 处的颜色 - }, - ], - global: false, // 缺省为 false - }, + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#60b4f1', + }, + { + offset: 1, + color: '#fff', + }, + ]), }, }, ], diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue new file mode 100644 index 0000000..3ad8db6 --- /dev/null +++ b/src/components/echarts/pie.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue index 7931f12..c8465cc 100644 --- a/src/views/measure/bench/bench.vue +++ b/src/views/measure/bench/bench.vue @@ -1,9 +1,10 @@