diff --git a/main/package.json b/main/package.json index ba77e38..a21b5b8 100644 --- a/main/package.json +++ b/main/package.json @@ -23,6 +23,7 @@ "axios": "^1.6.5", "dayjs": "^1.11.11", "echarts": "^5.6.0", + "echarts-gl": "^2.0.9", "element-plus": "^2.7.3", "file-saver": "^2.0.5", "js-base64": "^3.7.7", diff --git a/main/src/components/custom-echart-pie-3d/index.vue b/main/src/components/custom-echart-pie-3d/index.vue index 08b5f3f..556524f 100644 --- a/main/src/components/custom-echart-pie-3d/index.vue +++ b/main/src/components/custom-echart-pie-3d/index.vue @@ -35,23 +35,7 @@ export default { const chartRef = ref(null); const { setOptions, getInstance, resize } = useEcharts(chartRef); const option = reactive({ - tooltip: { - formatter: '{b} ({c})', - }, - series: [ - { - type: 'pie', - radius: '72%', - center: ['50%', '55%'], - data: [], - labelLine: { show: true }, - label: { - show: true, - formatter: '{b} \n ({d}%)', - color: '#B1B9D3', - }, - }, - ], + series: [], }); watchEffect(() => { @@ -72,8 +56,7 @@ export default { if (props.option) { Object.assign(option, cloneDeep(props.option)); } - // option.series[0].data = props.chartData; - option.series[0].data = props.chartData; + option.series = props.chartData; setOptions(option); resize(); getInstance()?.off('click', onClick); diff --git a/main/src/utils/echarts.js b/main/src/utils/echarts.js index 7806107..646042f 100644 --- a/main/src/utils/echarts.js +++ b/main/src/utils/echarts.js @@ -1,7 +1,7 @@ import * as echarts from 'echarts/core'; import { BarChart, LineChart, PieChart, MapChart, PictorialBarChart, RadarChart, GraphChart } from 'echarts/charts'; - +import 'echarts-gl'; import { TitleComponent, TooltipComponent, diff --git a/main/yarn.lock b/main/yarn.lock index c6e9f15..e7a3967 100644 --- a/main/yarn.lock +++ b/main/yarn.lock @@ -1628,6 +1628,11 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" +claygl@^1.2.1: + version "1.3.0" + resolved "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz#7a6e2903210519ac358848f5d78070ed211685f3" + integrity sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ== + clean-css@^5.2.2: version "5.3.3" resolved "https://registry.npmmirror.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd" @@ -2177,6 +2182,14 @@ dunder-proto@^1.0.0, dunder-proto@^1.0.1: es-errors "^1.3.0" gopd "^1.2.0" +echarts-gl@^2.0.9: + version "2.0.9" + resolved "https://registry.npmmirror.com/echarts-gl/-/echarts-gl-2.0.9.tgz#ee228a6c7520a6fb7bbb71ea94394f3637ade033" + integrity sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA== + dependencies: + claygl "^1.2.1" + zrender "^5.1.1" + echarts@^5.6.0: version "5.6.0" resolved "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz#2377874dca9fb50f104051c3553544752da3c9d6" @@ -7095,7 +7108,7 @@ yocto-queue@^0.1.0: resolved "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -zrender@5.6.1: +zrender@5.6.1, zrender@^5.1.1: version "5.6.1" resolved "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz#e08d57ecf4acac708c4fcb7481eb201df7f10a6b" integrity sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag== diff --git a/sub-government-screen-service/package.json b/sub-government-screen-service/package.json index 7642c62..d64ba32 100644 --- a/sub-government-screen-service/package.json +++ b/sub-government-screen-service/package.json @@ -21,6 +21,7 @@ "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.6.5", "echarts": "^5.6.0", + "echarts-gl": "^2.0.9", "element-plus": "^2.7.2", "js-base64": "^3.7.6", "lodash": "^4.17.21", diff --git a/sub-government-screen-service/src/assets/images/inputs/partbg1.png b/sub-government-screen-service/src/assets/images/inputs/partbg1.png new file mode 100644 index 0000000..98ea6bd Binary files /dev/null and b/sub-government-screen-service/src/assets/images/inputs/partbg1.png differ diff --git a/sub-government-screen-service/src/assets/images/inputs/partbg2.png b/sub-government-screen-service/src/assets/images/inputs/partbg2.png new file mode 100644 index 0000000..2ef3ba7 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/inputs/partbg2.png differ diff --git a/sub-government-screen-service/src/assets/images/inputs/partbg3.png b/sub-government-screen-service/src/assets/images/inputs/partbg3.png new file mode 100644 index 0000000..9361746 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/inputs/partbg3.png differ diff --git a/sub-government-screen-service/src/views/entities/components/benefitCharts.vue b/sub-government-screen-service/src/views/entities/components/benefitCharts.vue index cbe0d8d..68fd3f8 100644 --- a/sub-government-screen-service/src/views/entities/components/benefitCharts.vue +++ b/sub-government-screen-service/src/views/entities/components/benefitCharts.vue @@ -80,7 +80,7 @@ const chartsData = reactive({ }, //图表大小位置限制 grid: { - x: '10%', + x: '16%', x2: '5%', y: '15%', y2: '15%', diff --git a/sub-government-screen-service/src/views/entities/components/entitiesCategoryCharts.vue b/sub-government-screen-service/src/views/entities/components/entitiesCategoryCharts.vue index 4bf89c1..3781f4a 100644 --- a/sub-government-screen-service/src/views/entities/components/entitiesCategoryCharts.vue +++ b/sub-government-screen-service/src/views/entities/components/entitiesCategoryCharts.vue @@ -6,16 +6,17 @@ + diff --git a/sub-government-screen-service/src/views/inputs/components/inputsType.vue b/sub-government-screen-service/src/views/inputs/components/inputsType.vue new file mode 100644 index 0000000..68864b7 --- /dev/null +++ b/sub-government-screen-service/src/views/inputs/components/inputsType.vue @@ -0,0 +1,137 @@ + + + + + diff --git a/sub-government-screen-service/src/views/inputs/index.vue b/sub-government-screen-service/src/views/inputs/index.vue index 2b85311..4335076 100644 --- a/sub-government-screen-service/src/views/inputs/index.vue +++ b/sub-government-screen-service/src/views/inputs/index.vue @@ -6,7 +6,9 @@
- +
@@ -30,7 +32,9 @@
- +
@@ -61,6 +65,8 @@ import inputsGmp from './components/inputsGmp.vue'; import landbreedCharts from './components/landbreedCharts.vue'; import monthlyuseCharts from './components/monthlyuseCharts.vue'; import dealerDistributionCharts from './components/dealerDistributionCharts.vue'; +import casesAlerts from './components/casesAlerts.vue'; +import inputsType from './components/inputsType.vue';