diff --git a/components.d.ts b/components.d.ts index 4227fd9..09ae240 100644 --- a/components.d.ts +++ b/components.d.ts @@ -16,6 +16,7 @@ declare module 'vue' { CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] CustomEchartBar: typeof import('./src/components/custom-echart-bar/index.vue')['default'] CustomEchartBubble: typeof import('./src/components/custom-echart-bubble/index.vue')['default'] + CustomEchartColumnLine: typeof import('./src/components/custom-echart-column-line/index.vue')['default'] CustomEchartHyalineCake: typeof import('./src/components/custom-echart-hyaline-cake/index.vue')['default'] CustomEchartLine: typeof import('./src/components/custom-echart-line/index.vue')['default'] CustomEchartLineLine: typeof import('./src/components/custom-echart-line-line/index.vue')['default'] diff --git a/src/components/custom-echart-column-line/index.vue b/src/components/custom-echart-column-line/index.vue new file mode 100644 index 0000000..90107f7 --- /dev/null +++ b/src/components/custom-echart-column-line/index.vue @@ -0,0 +1,219 @@ + + diff --git a/src/components/index.js b/src/components/index.js index 5923fa1..e4aebe7 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -21,6 +21,7 @@ import customEchartScatterBlister from './custom-echart-scatter-blister'; 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'; export { SvgIcon, @@ -46,4 +47,5 @@ export { customEchartMaps, customScrollTitle, customEchartHyalineCake, + customEchartColumnLine, }; diff --git a/src/router/modules/v2.js b/src/router/modules/v2.js index dbc3920..fd114b8 100644 --- a/src/router/modules/v2.js +++ b/src/router/modules/v2.js @@ -25,12 +25,12 @@ export default { component: () => import('@/views/inputs/index.vue'), meta: { title: '投入品监管', icon: '' }, }, - // { - // path: 'entities', - // name: 'entities', - // component: () => import('@/views/entities/index.vue'), - // meta: { title: '', icon: '' }, - // }, + { + path: 'entities', + name: 'entities', + component: () => import('@/views/entities/index.vue'), + meta: { title: '生产经营主体', icon: '' }, + }, // { // path: 'breed', // name: 'breed', diff --git a/src/views/entities/components/entitiesCategoryCharts.vue b/src/views/entities/components/entitiesCategoryCharts.vue index 3781f4a..63adaf7 100644 --- a/src/views/entities/components/entitiesCategoryCharts.vue +++ b/src/views/entities/components/entitiesCategoryCharts.vue @@ -1,355 +1,113 @@ - diff --git a/src/views/entities/components/entitiesStatistics.vue b/src/views/entities/components/entitiesStatistics.vue index 0102615..e4828a0 100644 --- a/src/views/entities/components/entitiesStatistics.vue +++ b/src/views/entities/components/entitiesStatistics.vue @@ -1,79 +1,132 @@ - diff --git a/src/views/entities/index.vue b/src/views/entities/index.vue index 9b68ef8..3c6ec90 100644 --- a/src/views/entities/index.vue +++ b/src/views/entities/index.vue @@ -1,57 +1,55 @@