diff --git a/components.d.ts b/components.d.ts index 09ae240..8122bea 100644 --- a/components.d.ts +++ b/components.d.ts @@ -28,6 +28,7 @@ declare module 'vue' { CustomEchartPieGauge: typeof import('./src/components/custom-echart-pie-gauge/index.vue')['default'] CustomEchartRadar: typeof import('./src/components/custom-echart-radar/index.vue')['default'] CustomEchartScatterBlister: typeof import('./src/components/custom-echart-scatter-blister/index.vue')['default'] + CustomEchartTriangle: typeof import('./src/components/custom-echart-triangle/index.vue')['default'] CustomEchartWaterDroplet: typeof import('./src/components/custom-echart-water-droplet/index.vue')['default'] CustomEchartWordCloud: typeof import('./src/components/custom-echart-word-cloud/index.vue')['default'] CustomIframe: typeof import('./src/components/custom-iframe/index.vue')['default'] diff --git a/src/components/custom-echart-triangle/index.vue b/src/components/custom-echart-triangle/index.vue new file mode 100644 index 0000000..aaa1600 --- /dev/null +++ b/src/components/custom-echart-triangle/index.vue @@ -0,0 +1,125 @@ + + diff --git a/src/components/custom-scroll-title/index.vue b/src/components/custom-scroll-title/index.vue index 7578c81..9f0c6df 100644 --- a/src/components/custom-scroll-title/index.vue +++ b/src/components/custom-scroll-title/index.vue @@ -57,7 +57,7 @@ const props = defineProps({ { label: '首页', value: 'home' }, { label: '土地资源', value: 'land' }, { label: '投入品监管', value: 'inputs' }, - { label: '生产经营主体', value: 'entities' }, + { label: '产出品管理', value: 'entities' }, // { label: '智慧种植监测', value: 'plant' }, // { label: '智慧养殖监测', value: 'breed' }, { label: '全流程溯源', value: 'trace' }, diff --git a/src/components/index.js b/src/components/index.js index e4aebe7..4b993d1 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -22,7 +22,7 @@ import customEchartMaps from './custom-echart-maps'; import customScrollTitle from './custom-scroll-title'; import customEchartHyalineCake from './custom-echart-hyaline-cake'; import customEchartColumnLine from './custom-echart-column-line'; - +import customEchartTriangle from './custom-echart-triangle'; export { SvgIcon, CustomIframe, @@ -48,4 +48,5 @@ export { customScrollTitle, customEchartHyalineCake, customEchartColumnLine, + customEchartTriangle, }; diff --git a/src/router/modules/v2.js b/src/router/modules/v2.js index b1acaee..45e66a5 100644 --- a/src/router/modules/v2.js +++ b/src/router/modules/v2.js @@ -29,7 +29,7 @@ export default { path: 'entities', name: 'entities', component: () => import('@/views/entities/index.vue'), - meta: { title: '生产经营主体', icon: '' }, + meta: { title: '产出品管理', icon: '' }, }, // { // path: 'breed', diff --git a/src/views/entities/components/categoryCharts.vue b/src/views/entities/components/categoryCharts.vue index 9cc086c..2b48f00 100644 --- a/src/views/entities/components/categoryCharts.vue +++ b/src/views/entities/components/categoryCharts.vue @@ -29,12 +29,27 @@ const option = reactive({ k: 0.2, opacity: 0.6, itemGap: 0, - autoItemHeight: 10, + autoItemHeight: 3, legend: { orient: 'horizontal', bottom: 10, left: 'center', }, + title: { + text: '23亿元', + textStyle: { + color: '#fff', + fontSize: '26px', + fontWeight: 'bold', + }, + subtext: '22.2%', + subtextStyle: { + color: '#07f7c4', + fontSize: '18px', + }, + top: 'center', + left: 'center', + }, grid3D: { show: false, boxHeight: 5, diff --git a/src/views/entities/components/entitiesCategoryCharts.vue b/src/views/entities/components/entitiesCategoryCharts.vue index 63adaf7..b5150b8 100644 --- a/src/views/entities/components/entitiesCategoryCharts.vue +++ b/src/views/entities/components/entitiesCategoryCharts.vue @@ -44,12 +44,14 @@ const state = reactive({ axisPointer: { type: 'shadow', }, + backgroundColor: 'rgba(18, 55, 85, 0.8);', + borderColor: '#35d0c0', formatter: (data) => { const params = data[0]; let str = `
- ${params.name}
- ${params.marker} ${params.data} 万元 -
`; + ${params.name}
+ ${params.marker} ${params.data} 万元 + `; return str; }, }, diff --git a/src/views/entities/components/hotCharts.vue b/src/views/entities/components/hotCharts.vue index 290eec9..87c210d 100644 --- a/src/views/entities/components/hotCharts.vue +++ b/src/views/entities/components/hotCharts.vue @@ -1,84 +1,18 @@