From 0b4b0228a367a04665820f3b91f46920f5e0308f Mon Sep 17 00:00:00 2001 From: lzc Date: Wed, 19 Mar 2025 14:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/custom-echart-bar/index.vue | 6 +- .../components/custom-echart-bubble/index.vue | 103 +++++ .../components/custom-echart-mixin/index.vue | 8 +- .../components/custom-echart-pie-3d/index.vue | 90 +++++ main/src/components/index.js | 4 + main/src/utils/echarts.js | 3 +- sub-government-screen-service/components.d.ts | 1 + sub-government-screen-service/src/App.vue | 12 +- .../images/{ => vsualized}/bottombj.jpg | Bin .../assets/images/{ => vsualized}/gmmap.png | Bin .../assets/images/vsualized/home/Increase.png | Bin 0 -> 7582 bytes .../assets/images/vsualized/home/animalm.png | Bin 0 -> 8362 bytes .../src/assets/images/vsualized/home/area.png | Bin 0 -> 8910 bytes .../assets/images/vsualized/home/farmers.png | Bin 0 -> 7314 bytes .../assets/images/vsualized/home/farmuse.png | Bin 0 -> 7579 bytes .../assets/images/vsualized/home/feeduse.png | Bin 0 -> 6252 bytes .../images/vsualized/home/fertilizer.png | Bin 0 -> 6875 bytes .../images/vsualized/home/hometopbg.png | Bin 0 -> 48306 bytes .../assets/images/vsualized/home/nav-on.png | Bin 0 -> 2273 bytes .../src/assets/images/vsualized/home/nav.png | Bin 0 -> 1385 bytes .../images/vsualized/home/outputVal.png | Bin 0 -> 5592 bytes .../assets/images/vsualized/home/partbg.png | Bin 0 -> 16236 bytes .../assets/images/vsualized/home/partbg1.png | Bin 0 -> 3222 bytes .../assets/images/vsualized/home/partbg2.png | Bin 0 -> 7615 bytes .../assets/images/vsualized/home/partbg3.png | Bin 0 -> 1785 bytes .../images/vsualized/home/pesticide.png | Bin 0 -> 5346 bytes .../images/vsualized/home/provenance.png | Bin 0 -> 7620 bytes .../assets/images/vsualized/home/titlebg.png | Bin 0 -> 13444 bytes .../src/assets/images/vsualized/hraderbg.png | Bin 0 -> 70906 bytes .../images/{ => vsualized}/screenbg.png | Bin .../src/components/baseBg.vue | 24 +- .../src/components/centerMap.vue | 2 +- .../src/components/customBack.vue | 39 ++ .../src/components/subTop.vue | 51 ++- .../src/views/breed/index.vue | 9 +- .../src/views/early/index.vue | 8 +- .../entities/components/benefitCharts.vue | 194 ++++++++++ .../entities/components/categoryCharts.vue | 70 ++++ .../components/entitiesCategoryCharts.vue | 354 ++++++++++++++++++ .../components/entitiesStatistics.vue | 79 ++++ .../entities/components/entitieslist.vue | 119 ++++++ .../views/entities/components/hotCharts.vue | 87 +++++ .../src/views/entities/index.vue | 64 +++- .../views/home/components/comprehensive.vue | 102 +++-- .../views/home/components/entitiesCharts.vue | 4 +- .../src/views/home/components/inputs.vue | 109 ++++-- .../src/views/home/components/traceCharts.vue | 9 +- .../src/views/home/index.vue | 51 ++- .../components/dealerDistributionCharts.vue | 65 ++++ .../src/views/inputs/components/inputsGmp.vue | 74 ++++ .../inputs/components/landbreedCharts.vue | 119 ++++++ .../inputs/components/monthlyuseCharts.vue | 99 +++++ .../src/views/inputs/index.vue | 58 ++- .../land/components/distributionCharts.vue | 2 +- .../views/land/components/landCirculation.vue | 158 +++++--- .../src/views/land/components/landPatrol.vue | 121 ++++++ .../src/views/land/components/landPlan.vue | 114 ++++++ .../views/land/components/landareaCharts.vue | 2 +- .../src/views/land/index.vue | 44 ++- .../src/views/plant/index.vue | 8 +- .../src/views/trace/index.vue | 8 +- 61 files changed, 2268 insertions(+), 206 deletions(-) create mode 100644 main/src/components/custom-echart-bubble/index.vue create mode 100644 main/src/components/custom-echart-pie-3d/index.vue rename sub-government-screen-service/src/assets/images/{ => vsualized}/bottombj.jpg (100%) rename sub-government-screen-service/src/assets/images/{ => vsualized}/gmmap.png (100%) create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/Increase.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/animalm.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/area.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/farmers.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/farmuse.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/feeduse.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/fertilizer.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/hometopbg.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/nav-on.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/nav.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/outputVal.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/partbg.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/partbg1.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/partbg2.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/partbg3.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/pesticide.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/provenance.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/home/titlebg.png create mode 100644 sub-government-screen-service/src/assets/images/vsualized/hraderbg.png rename sub-government-screen-service/src/assets/images/{ => vsualized}/screenbg.png (100%) create mode 100644 sub-government-screen-service/src/components/customBack.vue create mode 100644 sub-government-screen-service/src/views/entities/components/benefitCharts.vue create mode 100644 sub-government-screen-service/src/views/entities/components/categoryCharts.vue create mode 100644 sub-government-screen-service/src/views/entities/components/entitiesCategoryCharts.vue create mode 100644 sub-government-screen-service/src/views/entities/components/entitiesStatistics.vue create mode 100644 sub-government-screen-service/src/views/entities/components/entitieslist.vue create mode 100644 sub-government-screen-service/src/views/entities/components/hotCharts.vue create mode 100644 sub-government-screen-service/src/views/inputs/components/dealerDistributionCharts.vue create mode 100644 sub-government-screen-service/src/views/inputs/components/inputsGmp.vue create mode 100644 sub-government-screen-service/src/views/inputs/components/landbreedCharts.vue create mode 100644 sub-government-screen-service/src/views/inputs/components/monthlyuseCharts.vue create mode 100644 sub-government-screen-service/src/views/land/components/landPatrol.vue create mode 100644 sub-government-screen-service/src/views/land/components/landPlan.vue diff --git a/main/src/components/custom-echart-bar/index.vue b/main/src/components/custom-echart-bar/index.vue index 8592346..9c8f82a 100644 --- a/main/src/components/custom-echart-bar/index.vue +++ b/main/src/components/custom-echart-bar/index.vue @@ -29,6 +29,10 @@ export default { type: String, default: 'calc(100vh - 78px)', }, + isSeries: { + type: Boolean, + default: false, + }, }, emits: ['click'], setup(props, { emit }) { @@ -90,7 +94,7 @@ export default { } seriesData.push(obj); }); - option.series = seriesData; + option.series = props.isSeries && option.series.length > 0 ? option.series : seriesData; option.xAxis.data = xAxisData; setOptions(option); getInstance()?.off('click', onClick); diff --git a/main/src/components/custom-echart-bubble/index.vue b/main/src/components/custom-echart-bubble/index.vue new file mode 100644 index 0000000..3a96834 --- /dev/null +++ b/main/src/components/custom-echart-bubble/index.vue @@ -0,0 +1,103 @@ + + diff --git a/main/src/components/custom-echart-mixin/index.vue b/main/src/components/custom-echart-mixin/index.vue index 1d00039..3660351 100644 --- a/main/src/components/custom-echart-mixin/index.vue +++ b/main/src/components/custom-echart-mixin/index.vue @@ -53,6 +53,9 @@ export default { name: 'bar', type: 'bar', data: [], + itemStyle: { + barWidth: 10, + }, }, ], }); @@ -69,10 +72,13 @@ export default { let xAxisData = Array.from(new Set(props.chartData.map((item) => item.name))); let seriesData = []; typeArr.forEach((type, index) => { - let obj = { name: type }; + const barStyle = props.option?.barStyle ?? {}; + let obj = { name: type, ...barStyle }; let chartArr = props.chartData.filter((item) => type === item.type); obj['data'] = chartArr.map((item) => item.value); obj['type'] = chartArr[0].seriesType; + obj['stack'] = chartArr[0].stack; + obj['itemStyle'] = chartArr[0].itemStyle; seriesData.push(obj); }); option.series = seriesData; diff --git a/main/src/components/custom-echart-pie-3d/index.vue b/main/src/components/custom-echart-pie-3d/index.vue new file mode 100644 index 0000000..08b5f3f --- /dev/null +++ b/main/src/components/custom-echart-pie-3d/index.vue @@ -0,0 +1,90 @@ + + diff --git a/main/src/components/index.js b/main/src/components/index.js index 1d73a28..9f5408d 100644 --- a/main/src/components/index.js +++ b/main/src/components/index.js @@ -11,6 +11,8 @@ 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'; +import CustomEchartBubble from './custom-echart-bubble'; +import CustomEchartPie3d from './custom-echart-pie-3d'; export { SvgIcon, @@ -26,4 +28,6 @@ export { CustomEchartBarLine, customEchartPictorialBar, CustomEchartLineLine, + CustomEchartBubble, + CustomEchartPie3d, }; diff --git a/main/src/utils/echarts.js b/main/src/utils/echarts.js index 72ceb57..7806107 100644 --- a/main/src/utils/echarts.js +++ b/main/src/utils/echarts.js @@ -1,6 +1,6 @@ import * as echarts from 'echarts/core'; -import { BarChart, LineChart, PieChart, MapChart, PictorialBarChart, RadarChart } from 'echarts/charts'; +import { BarChart, LineChart, PieChart, MapChart, PictorialBarChart, RadarChart, GraphChart } from 'echarts/charts'; import { TitleComponent, @@ -43,6 +43,7 @@ echarts.use([ TimelineComponent, CalendarComponent, GraphicComponent, + GraphChart, ]); export default echarts; diff --git a/sub-government-screen-service/components.d.ts b/sub-government-screen-service/components.d.ts index 3634602..e6bffc0 100644 --- a/sub-government-screen-service/components.d.ts +++ b/sub-government-screen-service/components.d.ts @@ -11,6 +11,7 @@ declare module 'vue' { 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'] + CustomBack: typeof import('./src/components/customBack.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 c6e0e25..acc815e 100644 --- a/sub-government-screen-service/src/App.vue +++ b/sub-government-screen-service/src/App.vue @@ -25,13 +25,13 @@ const size = computed(() => SettingStore.themeConfig.globalComSize); let apptime = ref(null); -onMounted(() => { - apptime.value && apptime.value.startTime(); -}); +// onMounted(() => { +// apptime.value && apptime.value.startTime(); +// }); -onUnmounted(() => { - apptime.value && apptime.value.chearTime(); -}); +// onUnmounted(() => { +// apptime.value && apptime.value.chearTime(); +// }); diff --git a/sub-government-screen-service/src/components/subTop.vue b/sub-government-screen-service/src/components/subTop.vue index 263bd72..d6b236d 100644 --- a/sub-government-screen-service/src/components/subTop.vue +++ b/sub-government-screen-service/src/components/subTop.vue @@ -1,5 +1,14 @@ diff --git a/sub-government-screen-service/src/views/breed/index.vue b/sub-government-screen-service/src/views/breed/index.vue index 33cc2ac..ed1cc85 100644 --- a/sub-government-screen-service/src/views/breed/index.vue +++ b/sub-government-screen-service/src/views/breed/index.vue @@ -1,6 +1,6 @@