diff --git a/main/src/components/custom-echart-line-line/index.vue b/main/src/components/custom-echart-line-line/index.vue new file mode 100644 index 0000000..cf0ae9e --- /dev/null +++ b/main/src/components/custom-echart-line-line/index.vue @@ -0,0 +1,70 @@ + + diff --git a/main/src/components/custom-echart-pictorial-bar/index.vue b/main/src/components/custom-echart-pictorial-bar/index.vue new file mode 100644 index 0000000..9684467 --- /dev/null +++ b/main/src/components/custom-echart-pictorial-bar/index.vue @@ -0,0 +1,120 @@ + + diff --git a/main/src/components/index.js b/main/src/components/index.js index d973647..81b34ae 100644 --- a/main/src/components/index.js +++ b/main/src/components/index.js @@ -8,6 +8,8 @@ import CustomEchartPie from './custom-echart-pie'; import CustomEchartLine from './custom-echart-line'; import CustomEchartMixin from './custom-echart-mixin'; import CustomEchartBarLine from './custom-echart-bar-line'; +import customEchartPictorialBar from './custom-echart-pictorial-bar'; +import CustomEchartLineLine from './custom-echart-line-line'; export { SvgIcon, @@ -20,4 +22,6 @@ export { CustomEchartLine, CustomEchartMixin, CustomEchartBarLine, + customEchartPictorialBar, + CustomEchartLineLine, }; diff --git a/sub-government-screen-service/components.d.ts b/sub-government-screen-service/components.d.ts index 9acd056..3634602 100644 --- a/sub-government-screen-service/components.d.ts +++ b/sub-government-screen-service/components.d.ts @@ -8,7 +8,9 @@ export {} declare module 'vue' { export interface GlobalComponents { BaseBg: typeof import('./src/components/baseBg.vue')['default'] + CenterMap: typeof import('./src/components/centerMap.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] + CurrentTime: typeof import('./src/components/currentTime.vue')['default'] CustomCard: typeof import('./src/components/CustomCard.vue')['default'] CustomSelect: typeof import('./src/components/CustomSelect.vue')['default'] GridSelect: typeof import('./src/components/GridSelect.vue')['default'] diff --git a/sub-government-screen-service/src/App.vue b/sub-government-screen-service/src/App.vue index 7a2b418..c6e0e25 100644 --- a/sub-government-screen-service/src/App.vue +++ b/sub-government-screen-service/src/App.vue @@ -8,18 +8,30 @@ diff --git a/sub-government-screen-service/src/components/currentTime.vue b/sub-government-screen-service/src/components/currentTime.vue new file mode 100644 index 0000000..98bfce9 --- /dev/null +++ b/sub-government-screen-service/src/components/currentTime.vue @@ -0,0 +1,57 @@ + + + diff --git a/sub-government-screen-service/src/views/home/components/entitiesCharts.vue b/sub-government-screen-service/src/views/home/components/entitiesCharts.vue index f5e981c..eb4b979 100644 --- a/sub-government-screen-service/src/views/home/components/entitiesCharts.vue +++ b/sub-government-screen-service/src/views/home/components/entitiesCharts.vue @@ -33,14 +33,14 @@ const plantBreed = reactive({ series: [ { type: 'pie', - radius: [60, 80], + radius: [20, 80], roseType: 'area', center: ['40%', '50%'], label: { show: false, }, itemStyle: { - borderRadius: 20, + borderRadius: 5, }, }, ], diff --git a/sub-government-screen-service/src/views/home/components/plantBreedCharts.vue b/sub-government-screen-service/src/views/home/components/plantBreedCharts.vue index bb6129a..1a4ae45 100644 --- a/sub-government-screen-service/src/views/home/components/plantBreedCharts.vue +++ b/sub-government-screen-service/src/views/home/components/plantBreedCharts.vue @@ -33,14 +33,14 @@ const plantBreed = ref({ series: [ { type: 'pie', - radius: [60, 80], + radius: [20, 80], roseType: 'area', center: ['40%', '50%'], label: { show: false, }, itemStyle: { - borderRadius: 20, + borderRadius: 2, }, }, ], diff --git a/sub-government-screen-service/src/views/home/components/rolllist.vue b/sub-government-screen-service/src/views/home/components/rolllist.vue index c7b4bc2..7f8194f 100644 --- a/sub-government-screen-service/src/views/home/components/rolllist.vue +++ b/sub-government-screen-service/src/views/home/components/rolllist.vue @@ -1,29 +1,15 @@