diff --git a/main/package.json b/main/package.json index c302e24..3d5ed35 100644 --- a/main/package.json +++ b/main/package.json @@ -25,6 +25,7 @@ "echarts": "^5.6.0", "echarts-gl": "^2.0.9", "echarts-liquidfill": "^3.1.0", + "echarts-wordcloud": "^2.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-pie-gauge/index.vue b/main/src/components/custom-echart-pie-gauge/index.vue new file mode 100644 index 0000000..0e1a795 --- /dev/null +++ b/main/src/components/custom-echart-pie-gauge/index.vue @@ -0,0 +1,73 @@ + + diff --git a/main/src/components/custom-echart-word-cloud/index.vue b/main/src/components/custom-echart-word-cloud/index.vue new file mode 100644 index 0000000..0be4aa6 --- /dev/null +++ b/main/src/components/custom-echart-word-cloud/index.vue @@ -0,0 +1,73 @@ + + diff --git a/main/src/components/index.js b/main/src/components/index.js index 2657a8f..db6c85e 100644 --- a/main/src/components/index.js +++ b/main/src/components/index.js @@ -15,6 +15,8 @@ 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'; +import CustomEchartPieGauge from './custom-echart-pie-gauge'; +import CustomEchartWordCloud from './custom-echart-word-cloud'; export { SvgIcon, @@ -34,4 +36,6 @@ export { CustomEchartBubble, CustomEchartPie3d, CustomEchartWaterDroplet, + CustomEchartPieGauge, + CustomEchartWordCloud, }; diff --git a/main/src/utils/echarts.js b/main/src/utils/echarts.js index 5a60038..589d852 100644 --- a/main/src/utils/echarts.js +++ b/main/src/utils/echarts.js @@ -1,8 +1,9 @@ import * as echarts from 'echarts/core'; -import { BarChart, LineChart, PieChart, MapChart, PictorialBarChart, RadarChart, GraphChart } from 'echarts/charts'; +import { BarChart, LineChart, PieChart, MapChart, PictorialBarChart, RadarChart, GraphChart, GaugeChart } from 'echarts/charts'; import 'echarts-gl'; import 'echarts-liquidfill'; +import 'echarts-wordcloud'; import { TitleComponent, @@ -46,6 +47,7 @@ echarts.use([ CalendarComponent, GraphicComponent, GraphChart, + GaugeChart, ]); export default echarts; diff --git a/main/yarn.lock b/main/yarn.lock index 5053bde..c9b6302 100644 --- a/main/yarn.lock +++ b/main/yarn.lock @@ -2195,6 +2195,11 @@ echarts-liquidfill@^3.1.0: resolved "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-3.1.0.tgz#4ec70f3697382d0404c95fff9f3e8dd85c8377da" integrity sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw== +echarts-wordcloud@^2.1.0: + version "2.1.0" + resolved "https://registry.npmmirror.com/echarts-wordcloud/-/echarts-wordcloud-2.1.0.tgz#c3de6fe267044f6c3343e4ff0e05eedb01c05096" + integrity sha512-Kt1JmbcROgb+3IMI48KZECK2AP5lG6bSsOEs+AsuwaWJxQom31RTNd6NFYI01E/YaI1PFZeueaupjlmzSQasjQ== + 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/components.d.ts b/sub-government-screen-service/components.d.ts index e6bffc0..5782213 100644 --- a/sub-government-screen-service/components.d.ts +++ b/sub-government-screen-service/components.d.ts @@ -13,6 +13,7 @@ declare module 'vue' { CurrentTime: typeof import('./src/components/currentTime.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomCard: typeof import('./src/components/CustomCard.vue')['default'] + CustomProgress: typeof import('./src/components/customProgress.vue')['default'] CustomSelect: typeof import('./src/components/CustomSelect.vue')['default'] GridSelect: typeof import('./src/components/GridSelect.vue')['default'] LandClassificationType: typeof import('./src/components/LandClassificationType.vue')['default'] diff --git a/sub-government-screen-service/src/assets/images/trace/bg1.png b/sub-government-screen-service/src/assets/images/trace/bg1.png new file mode 100644 index 0000000..0e31a9e Binary files /dev/null and b/sub-government-screen-service/src/assets/images/trace/bg1.png differ diff --git a/sub-government-screen-service/src/assets/images/trace/bg2.png b/sub-government-screen-service/src/assets/images/trace/bg2.png new file mode 100644 index 0000000..8073506 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/trace/bg2.png differ diff --git a/sub-government-screen-service/src/assets/images/trace/search-1.png b/sub-government-screen-service/src/assets/images/trace/search-1.png deleted file mode 100644 index aa93d83..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/search-1.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/search-2.png b/sub-government-screen-service/src/assets/images/trace/search-2.png deleted file mode 100644 index 1dac7cd..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/search-2.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/search-3.png b/sub-government-screen-service/src/assets/images/trace/search-3.png deleted file mode 100644 index 2fecea6..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/search-3.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-card-bg1.png b/sub-government-screen-service/src/assets/images/trace/statistic-card-bg1.png deleted file mode 100644 index 33aad5c..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-card-bg1.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-card-bg2.png b/sub-government-screen-service/src/assets/images/trace/statistic-card-bg2.png deleted file mode 100644 index d63d1ff..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-card-bg2.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-card-bg3.png b/sub-government-screen-service/src/assets/images/trace/statistic-card-bg3.png deleted file mode 100644 index 41d0edc..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-card-bg3.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-card-bg4.png b/sub-government-screen-service/src/assets/images/trace/statistic-card-bg4.png deleted file mode 100644 index e527af4..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-card-bg4.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-card1.png b/sub-government-screen-service/src/assets/images/trace/statistic-card1.png deleted file mode 100644 index c8fac50..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-card1.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-card2.png b/sub-government-screen-service/src/assets/images/trace/statistic-card2.png deleted file mode 100644 index 561b373..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-card2.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-card3.png b/sub-government-screen-service/src/assets/images/trace/statistic-card3.png deleted file mode 100644 index a982402..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-card3.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-card4.png b/sub-government-screen-service/src/assets/images/trace/statistic-card4.png deleted file mode 100644 index 443d673..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-card4.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-traceability-1.png b/sub-government-screen-service/src/assets/images/trace/statistic-traceability-1.png deleted file mode 100644 index a4cd9bb..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-traceability-1.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-traceability-2.png b/sub-government-screen-service/src/assets/images/trace/statistic-traceability-2.png deleted file mode 100644 index 4424682..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-traceability-2.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-traceability-3.png b/sub-government-screen-service/src/assets/images/trace/statistic-traceability-3.png deleted file mode 100644 index 40a64e7..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-traceability-3.png and /dev/null differ diff --git a/sub-government-screen-service/src/assets/images/trace/statistic-traceability-4.png b/sub-government-screen-service/src/assets/images/trace/statistic-traceability-4.png deleted file mode 100644 index 9364571..0000000 Binary files a/sub-government-screen-service/src/assets/images/trace/statistic-traceability-4.png and /dev/null differ diff --git a/sub-government-screen-service/src/components/customProgress.vue b/sub-government-screen-service/src/components/customProgress.vue new file mode 100644 index 0000000..958eb20 --- /dev/null +++ b/sub-government-screen-service/src/components/customProgress.vue @@ -0,0 +1,67 @@ + + + diff --git a/sub-government-screen-service/src/views/breed/components/deviceCharts.vue b/sub-government-screen-service/src/views/breed/components/deviceCharts.vue index 524bac4..f3f5957 100644 --- a/sub-government-screen-service/src/views/breed/components/deviceCharts.vue +++ b/sub-government-screen-service/src/views/breed/components/deviceCharts.vue @@ -5,18 +5,24 @@
{{ listKeysHeader[h] }}
- -
+ +
@@ -30,6 +36,7 @@ diff --git a/sub-government-screen-service/src/views/early/components/productTypeWordClould.vue b/sub-government-screen-service/src/views/early/components/productTypeWordClould.vue new file mode 100644 index 0000000..66f83af --- /dev/null +++ b/sub-government-screen-service/src/views/early/components/productTypeWordClould.vue @@ -0,0 +1,91 @@ + + + diff --git a/sub-government-screen-service/src/views/early/index.vue b/sub-government-screen-service/src/views/early/index.vue index bad0b35..dacf341 100644 --- a/sub-government-screen-service/src/views/early/index.vue +++ b/sub-government-screen-service/src/views/early/index.vue @@ -4,15 +4,35 @@ @@ -21,6 +41,10 @@ diff --git a/sub-government-screen-service/src/views/trace/components/detectionCharts.vue b/sub-government-screen-service/src/views/trace/components/detectionCharts.vue new file mode 100644 index 0000000..f6f810e --- /dev/null +++ b/sub-government-screen-service/src/views/trace/components/detectionCharts.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/sub-government-screen-service/src/views/trace/components/mainPartCharts.vue b/sub-government-screen-service/src/views/trace/components/mainPartCharts.vue new file mode 100644 index 0000000..9804243 --- /dev/null +++ b/sub-government-screen-service/src/views/trace/components/mainPartCharts.vue @@ -0,0 +1,332 @@ + + + diff --git a/sub-government-screen-service/src/views/trace/components/principalTypeCharts.vue b/sub-government-screen-service/src/views/trace/components/principalTypeCharts.vue new file mode 100644 index 0000000..703768c --- /dev/null +++ b/sub-government-screen-service/src/views/trace/components/principalTypeCharts.vue @@ -0,0 +1,72 @@ + + + diff --git a/sub-government-screen-service/src/views/trace/components/productTypeCharts.vue b/sub-government-screen-service/src/views/trace/components/productTypeCharts.vue new file mode 100644 index 0000000..5a29113 --- /dev/null +++ b/sub-government-screen-service/src/views/trace/components/productTypeCharts.vue @@ -0,0 +1,74 @@ + + + diff --git a/sub-government-screen-service/src/views/trace/components/traceBarCharts.vue b/sub-government-screen-service/src/views/trace/components/traceBarCharts.vue new file mode 100644 index 0000000..24d5e6a --- /dev/null +++ b/sub-government-screen-service/src/views/trace/components/traceBarCharts.vue @@ -0,0 +1,131 @@ + + + diff --git a/sub-government-screen-service/src/views/trace/index.vue b/sub-government-screen-service/src/views/trace/index.vue index 730fc77..6eff5b0 100644 --- a/sub-government-screen-service/src/views/trace/index.vue +++ b/sub-government-screen-service/src/views/trace/index.vue @@ -4,15 +4,53 @@ @@ -21,6 +59,14 @@