diff --git a/main/src/components/custom-echart-scatter-blister/index.vue b/main/src/components/custom-echart-scatter-blister/index.vue new file mode 100644 index 0000000..4b9069f --- /dev/null +++ b/main/src/components/custom-echart-scatter-blister/index.vue @@ -0,0 +1,73 @@ + + diff --git a/main/src/components/index.js b/main/src/components/index.js index db6c85e..c93f377 100644 --- a/main/src/components/index.js +++ b/main/src/components/index.js @@ -17,6 +17,7 @@ import CustomEchartPie3d from './custom-echart-pie-3d'; import CustomEchartWaterDroplet from './custom-echart-water-droplet'; import CustomEchartPieGauge from './custom-echart-pie-gauge'; import CustomEchartWordCloud from './custom-echart-word-cloud'; +import customEchartScatterBlister from './custom-echart-scatter-blister'; export { SvgIcon, @@ -38,4 +39,5 @@ export { CustomEchartWaterDroplet, CustomEchartPieGauge, CustomEchartWordCloud, + customEchartScatterBlister, }; diff --git a/main/src/utils/echarts.js b/main/src/utils/echarts.js index 589d852..766c0ba 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, GraphChart, GaugeChart } from 'echarts/charts'; +import { BarChart, LineChart, PieChart, MapChart, PictorialBarChart, RadarChart, GraphChart, GaugeChart, ScatterChart } from 'echarts/charts'; import 'echarts-gl'; import 'echarts-liquidfill'; import 'echarts-wordcloud'; @@ -48,6 +48,7 @@ echarts.use([ GraphicComponent, GraphChart, GaugeChart, + ScatterChart, ]); export default echarts; diff --git a/sub-government-screen-service/src/assets/images/early/arrowL.png b/sub-government-screen-service/src/assets/images/early/arrowL.png new file mode 100644 index 0000000..2584810 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/arrowL.png differ diff --git a/sub-government-screen-service/src/assets/images/early/arrowR.png b/sub-government-screen-service/src/assets/images/early/arrowR.png new file mode 100644 index 0000000..eb725bd Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/arrowR.png differ diff --git a/sub-government-screen-service/src/assets/images/early/back1.png b/sub-government-screen-service/src/assets/images/early/back1.png new file mode 100644 index 0000000..42cccf4 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/back1.png differ diff --git a/sub-government-screen-service/src/assets/images/early/back2.png b/sub-government-screen-service/src/assets/images/early/back2.png new file mode 100644 index 0000000..cd991e9 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/back2.png differ diff --git a/sub-government-screen-service/src/assets/images/early/back3.png b/sub-government-screen-service/src/assets/images/early/back3.png new file mode 100644 index 0000000..1d0f978 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/back3.png differ diff --git a/sub-government-screen-service/src/assets/images/early/bg5.png b/sub-government-screen-service/src/assets/images/early/bg5.png new file mode 100644 index 0000000..2334d5b Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/bg5.png differ diff --git a/sub-government-screen-service/src/assets/images/early/icon1.png b/sub-government-screen-service/src/assets/images/early/icon1.png new file mode 100644 index 0000000..fc58800 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/icon1.png differ diff --git a/sub-government-screen-service/src/assets/images/early/icon2.png b/sub-government-screen-service/src/assets/images/early/icon2.png new file mode 100644 index 0000000..fa0d3d7 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/icon2.png differ diff --git a/sub-government-screen-service/src/assets/images/early/icon3.png b/sub-government-screen-service/src/assets/images/early/icon3.png new file mode 100644 index 0000000..8b5d862 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/icon3.png differ diff --git a/sub-government-screen-service/src/assets/images/early/icon5.png b/sub-government-screen-service/src/assets/images/early/icon5.png new file mode 100644 index 0000000..4e29a79 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/icon5.png differ diff --git a/sub-government-screen-service/src/assets/images/early/icon6.png b/sub-government-screen-service/src/assets/images/early/icon6.png new file mode 100644 index 0000000..2105be5 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/icon6.png differ diff --git a/sub-government-screen-service/src/assets/images/early/icon7.png b/sub-government-screen-service/src/assets/images/early/icon7.png new file mode 100644 index 0000000..4e35206 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/early/icon7.png differ diff --git a/sub-government-screen-service/src/views/early/components/popularFeelings.vue b/sub-government-screen-service/src/views/early/components/popularFeelings.vue new file mode 100644 index 0000000..a95ac4e --- /dev/null +++ b/sub-government-screen-service/src/views/early/components/popularFeelings.vue @@ -0,0 +1,43 @@ + + + diff --git a/sub-government-screen-service/src/views/early/components/priceCharts.vue b/sub-government-screen-service/src/views/early/components/priceCharts.vue new file mode 100644 index 0000000..c2caad4 --- /dev/null +++ b/sub-government-screen-service/src/views/early/components/priceCharts.vue @@ -0,0 +1,161 @@ + + + diff --git a/sub-government-screen-service/src/views/early/components/productTypeWordClould.vue b/sub-government-screen-service/src/views/early/components/productTypeWordClould.vue index 66f83af..6236c09 100644 --- a/sub-government-screen-service/src/views/early/components/productTypeWordClould.vue +++ b/sub-government-screen-service/src/views/early/components/productTypeWordClould.vue @@ -25,7 +25,7 @@ const chartsData = reactive({ { type: 'wordCloud', // 网格大小,各项之间间距 - gridSize: 30, + gridSize: 22, // 形状 circle 圆,cardioid 心, diamond 菱形, // triangle-forward 、triangle 三角,star五角星 shape: 'circle', @@ -42,14 +42,14 @@ const chartsData = reactive({ right: null, bottom: null, // 画布宽 - width: '100%', + width: '90%', // 画布高 - height: '100%', + height: '90%', // 是否渲染超出画布的文字 drawOutOfBound: false, textStyle: { color: function () { - const colors = ['#165DFF', '#6aca37', '#05a4b6', '#f93920', '#f0b114']; + const colors = ['#165DFF', '#6aca37', '#05a4b6', '#f93920', '#f0b114', '#ab1489', '#149cab', '#ab1414', '#27b30f', '#7e11b3', '#11b32e']; return colors[parseInt(Math.random() * colors.length)]; }, emphasis: { diff --git a/sub-government-screen-service/src/views/early/components/realTimePrice.vue b/sub-government-screen-service/src/views/early/components/realTimePrice.vue new file mode 100644 index 0000000..b8ec787 --- /dev/null +++ b/sub-government-screen-service/src/views/early/components/realTimePrice.vue @@ -0,0 +1,223 @@ + + + diff --git a/sub-government-screen-service/src/views/early/index.vue b/sub-government-screen-service/src/views/early/index.vue index dacf341..a31f2f8 100644 --- a/sub-government-screen-service/src/views/early/index.vue +++ b/sub-government-screen-service/src/views/early/index.vue @@ -6,7 +6,9 @@
- +
@@ -28,9 +30,18 @@ -
+
- + + +
+
+ +
@@ -45,6 +56,9 @@ import customBack from '@/components/customBack.vue'; import centerMap from '@/components/centerMap.vue'; import backToCharts from './components/backToCharts.vue'; import productTypeWordClould from './components/productTypeWordClould.vue'; +import priceCharts from './components/priceCharts.vue'; +import realTimePrice from './components/realTimePrice.vue'; +import popularFeelings from './components/popularFeelings.vue';