From 4bd8c7222fd903f1450a5854c152d13c5ba74be3 Mon Sep 17 00:00:00 2001 From: lzc Date: Fri, 21 Mar 2025 17:33:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E6=BB=B4=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/package.json | 1 + .../custom-echart-water-droplet/index.vue | 88 +++++++++++++++++++ main/src/components/index.js | 2 + main/src/utils/echarts.js | 2 + main/yarn.lock | 5 ++ .../plant/components/irrigationCharts.vue | 83 +++++++++++++++++ .../src/views/plant/index.vue | 7 +- 7 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 main/src/components/custom-echart-water-droplet/index.vue create mode 100644 sub-government-screen-service/src/views/plant/components/irrigationCharts.vue diff --git a/main/package.json b/main/package.json index a21b5b8..c302e24 100644 --- a/main/package.json +++ b/main/package.json @@ -24,6 +24,7 @@ "dayjs": "^1.11.11", "echarts": "^5.6.0", "echarts-gl": "^2.0.9", + "echarts-liquidfill": "^3.1.0", "element-plus": "^2.7.3", "file-saver": "^2.0.5", "js-base64": "^3.7.7", diff --git a/main/src/components/custom-echart-water-droplet/index.vue b/main/src/components/custom-echart-water-droplet/index.vue new file mode 100644 index 0000000..07b0322 --- /dev/null +++ b/main/src/components/custom-echart-water-droplet/index.vue @@ -0,0 +1,88 @@ + + diff --git a/main/src/components/index.js b/main/src/components/index.js index ea6a9e3..828f07b 100644 --- a/main/src/components/index.js +++ b/main/src/components/index.js @@ -13,6 +13,7 @@ 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'; +import CustomEchartWaterDroplet from './custom-echart-water-droplet'; export { SvgIcon, @@ -30,4 +31,5 @@ export { CustomEchartLineLine, CustomEchartBubble, CustomEchartPie3d, + CustomEchartWaterDroplet, }; diff --git a/main/src/utils/echarts.js b/main/src/utils/echarts.js index 646042f..5a60038 100644 --- a/main/src/utils/echarts.js +++ b/main/src/utils/echarts.js @@ -2,6 +2,8 @@ import * as echarts from 'echarts/core'; import { BarChart, LineChart, PieChart, MapChart, PictorialBarChart, RadarChart, GraphChart } from 'echarts/charts'; import 'echarts-gl'; +import 'echarts-liquidfill'; + import { TitleComponent, TooltipComponent, diff --git a/main/yarn.lock b/main/yarn.lock index e7a3967..5053bde 100644 --- a/main/yarn.lock +++ b/main/yarn.lock @@ -2190,6 +2190,11 @@ echarts-gl@^2.0.9: claygl "^1.2.1" zrender "^5.1.1" +echarts-liquidfill@^3.1.0: + version "3.1.0" + resolved "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-3.1.0.tgz#4ec70f3697382d0404c95fff9f3e8dd85c8377da" + integrity sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw== + echarts@^5.6.0: version "5.6.0" resolved "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz#2377874dca9fb50f104051c3553544752da3c9d6" diff --git a/sub-government-screen-service/src/views/plant/components/irrigationCharts.vue b/sub-government-screen-service/src/views/plant/components/irrigationCharts.vue new file mode 100644 index 0000000..924f768 --- /dev/null +++ b/sub-government-screen-service/src/views/plant/components/irrigationCharts.vue @@ -0,0 +1,83 @@ + + + diff --git a/sub-government-screen-service/src/views/plant/index.vue b/sub-government-screen-service/src/views/plant/index.vue index ee61078..ee44dd3 100644 --- a/sub-government-screen-service/src/views/plant/index.vue +++ b/sub-government-screen-service/src/views/plant/index.vue @@ -39,7 +39,11 @@ - + + + @@ -72,6 +76,7 @@ import plantTypeCharts from './components/plantTypeCharts.vue'; import insectPestsCharts from './components/insectPestsCharts'; import pathologyCharts from './components/pathologyCharts.vue'; import waterfertilizerCharts from './components/waterfertilizerCharts.vue'; +import irrigationCharts from './components/irrigationCharts.vue';