diff --git a/main/src/components/custom-echart-pictorial-bar/index.vue b/main/src/components/custom-echart-pictorial-bar/index.vue index 9684467..693ea50 100644 --- a/main/src/components/custom-echart-pictorial-bar/index.vue +++ b/main/src/components/custom-echart-pictorial-bar/index.vue @@ -103,7 +103,6 @@ export default { if (props.option) { Object.assign(option, cloneDeep(props.option)); } - option.series[0].data = props.chartData; setOptions(option); resize(); getInstance()?.off('click', onClick); diff --git a/sub-government-screen-service/src/assets/images/plant/bg1.png b/sub-government-screen-service/src/assets/images/plant/bg1.png new file mode 100644 index 0000000..32a646d Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/bg1.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/bg2.png b/sub-government-screen-service/src/assets/images/plant/bg2.png new file mode 100644 index 0000000..c2d47b3 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/bg2.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/bg3.png b/sub-government-screen-service/src/assets/images/plant/bg3.png new file mode 100644 index 0000000..98cdb1e Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/bg3.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/bg5.png b/sub-government-screen-service/src/assets/images/plant/bg5.png new file mode 100644 index 0000000..cd991e9 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/bg5.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/bg6.png b/sub-government-screen-service/src/assets/images/plant/bg6.png new file mode 100644 index 0000000..e8373e0 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/bg6.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/bg7.png b/sub-government-screen-service/src/assets/images/plant/bg7.png new file mode 100644 index 0000000..eaa7fb5 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/bg7.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/bg8.png b/sub-government-screen-service/src/assets/images/plant/bg8.png new file mode 100644 index 0000000..7e1c7a5 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/bg8.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/bg9.png b/sub-government-screen-service/src/assets/images/plant/bg9.png new file mode 100644 index 0000000..8285348 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/bg9.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/icon1.png b/sub-government-screen-service/src/assets/images/plant/icon1.png new file mode 100644 index 0000000..52f2bb6 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/icon1.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/icon2.png b/sub-government-screen-service/src/assets/images/plant/icon2.png new file mode 100644 index 0000000..fbe7b86 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/icon2.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/icon3.png b/sub-government-screen-service/src/assets/images/plant/icon3.png new file mode 100644 index 0000000..01efb1b Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/icon3.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/icon4.png b/sub-government-screen-service/src/assets/images/plant/icon4.png new file mode 100644 index 0000000..7860cb6 Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/icon4.png differ diff --git a/sub-government-screen-service/src/assets/images/plant/icon5.png b/sub-government-screen-service/src/assets/images/plant/icon5.png new file mode 100644 index 0000000..53a176f Binary files /dev/null and b/sub-government-screen-service/src/assets/images/plant/icon5.png differ diff --git a/sub-government-screen-service/src/views/breed/components/InventoryCharts.vue b/sub-government-screen-service/src/views/breed/components/InventoryCharts.vue new file mode 100644 index 0000000..46a25d0 --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/InventoryCharts.vue @@ -0,0 +1,177 @@ + + + diff --git a/sub-government-screen-service/src/views/breed/components/benefitCharts.vue b/sub-government-screen-service/src/views/breed/components/benefitCharts.vue new file mode 100644 index 0000000..7e15568 --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/benefitCharts.vue @@ -0,0 +1,121 @@ + + + diff --git a/sub-government-screen-service/src/views/breed/components/deviceCharts.vue b/sub-government-screen-service/src/views/breed/components/deviceCharts.vue new file mode 100644 index 0000000..524bac4 --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/deviceCharts.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/sub-government-screen-service/src/views/breed/components/environment.vue b/sub-government-screen-service/src/views/breed/components/environment.vue new file mode 100644 index 0000000..8b6714f --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/environment.vue @@ -0,0 +1,174 @@ + + + diff --git a/sub-government-screen-service/src/views/breed/components/growthIndexesCharts.vue b/sub-government-screen-service/src/views/breed/components/growthIndexesCharts.vue new file mode 100644 index 0000000..0213c38 --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/growthIndexesCharts.vue @@ -0,0 +1,117 @@ + + + diff --git a/sub-government-screen-service/src/views/breed/components/healthStatusCharts.vue b/sub-government-screen-service/src/views/breed/components/healthStatusCharts.vue new file mode 100644 index 0000000..a91ad91 --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/healthStatusCharts.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/sub-government-screen-service/src/views/breed/components/irrigationCharts.vue b/sub-government-screen-service/src/views/breed/components/irrigationCharts.vue new file mode 100644 index 0000000..a342cc1 --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/irrigationCharts.vue @@ -0,0 +1,179 @@ + + + diff --git a/sub-government-screen-service/src/views/breed/components/monitoringScreen.vue b/sub-government-screen-service/src/views/breed/components/monitoringScreen.vue new file mode 100644 index 0000000..503f484 --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/monitoringScreen.vue @@ -0,0 +1,25 @@ + + + diff --git a/sub-government-screen-service/src/views/breed/components/noticeBar.vue b/sub-government-screen-service/src/views/breed/components/noticeBar.vue new file mode 100644 index 0000000..fdd47d0 --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/noticeBar.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/sub-government-screen-service/src/views/breed/components/plantgs.vue b/sub-government-screen-service/src/views/breed/components/plantgs.vue new file mode 100644 index 0000000..79af3ef --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/plantgs.vue @@ -0,0 +1,22 @@ + + + diff --git a/sub-government-screen-service/src/views/breed/components/waterIntakeCharts.vue b/sub-government-screen-service/src/views/breed/components/waterIntakeCharts.vue new file mode 100644 index 0000000..db8395e --- /dev/null +++ b/sub-government-screen-service/src/views/breed/components/waterIntakeCharts.vue @@ -0,0 +1,113 @@ + + + diff --git a/sub-government-screen-service/src/views/breed/index.vue b/sub-government-screen-service/src/views/breed/index.vue index ed1cc85..97ede24 100644 --- a/sub-government-screen-service/src/views/breed/index.vue +++ b/sub-government-screen-service/src/views/breed/index.vue @@ -4,15 +4,79 @@ @@ -21,6 +85,17 @@ diff --git a/sub-government-screen-service/src/views/land/components/landuseCharts.vue b/sub-government-screen-service/src/views/land/components/landuseCharts.vue index c328e5d..cbc0a01 100644 --- a/sub-government-screen-service/src/views/land/components/landuseCharts.vue +++ b/sub-government-screen-service/src/views/land/components/landuseCharts.vue @@ -5,6 +5,17 @@ diff --git a/sub-government-screen-service/src/views/plant/components/irrigationCharts.vue b/sub-government-screen-service/src/views/plant/components/irrigationCharts.vue index 924f768..ff972a2 100644 --- a/sub-government-screen-service/src/views/plant/components/irrigationCharts.vue +++ b/sub-government-screen-service/src/views/plant/components/irrigationCharts.vue @@ -1,18 +1,41 @@ + diff --git a/sub-government-screen-service/src/views/plant/components/noticeBar.vue b/sub-government-screen-service/src/views/plant/components/noticeBar.vue new file mode 100644 index 0000000..fdd47d0 --- /dev/null +++ b/sub-government-screen-service/src/views/plant/components/noticeBar.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/sub-government-screen-service/src/views/plant/components/pathologyCharts.vue b/sub-government-screen-service/src/views/plant/components/pathologyCharts.vue index a3ce4fb..3ae3431 100644 --- a/sub-government-screen-service/src/views/plant/components/pathologyCharts.vue +++ b/sub-government-screen-service/src/views/plant/components/pathologyCharts.vue @@ -113,7 +113,7 @@ let handelData = computed(() => { list.map((m, indexm) => { return { ...m, value: Number(Number(m.value) + Math.random() + indexm).toFixed(0) }; }); - console.info('handelData', list); + // console.info('handelData', list); return list; }); diff --git a/sub-government-screen-service/src/views/plant/components/plantgs.vue b/sub-government-screen-service/src/views/plant/components/plantgs.vue new file mode 100644 index 0000000..79af3ef --- /dev/null +++ b/sub-government-screen-service/src/views/plant/components/plantgs.vue @@ -0,0 +1,22 @@ + + + diff --git a/sub-government-screen-service/src/views/plant/components/waterdetectionCharts.vue b/sub-government-screen-service/src/views/plant/components/waterdetectionCharts.vue new file mode 100644 index 0000000..b3d1270 --- /dev/null +++ b/sub-government-screen-service/src/views/plant/components/waterdetectionCharts.vue @@ -0,0 +1,274 @@ + + + diff --git a/sub-government-screen-service/src/views/plant/components/yieldCharts.vue b/sub-government-screen-service/src/views/plant/components/yieldCharts.vue new file mode 100644 index 0000000..85ddccd --- /dev/null +++ b/sub-government-screen-service/src/views/plant/components/yieldCharts.vue @@ -0,0 +1,290 @@ + + + diff --git a/sub-government-screen-service/src/views/plant/index.vue b/sub-government-screen-service/src/views/plant/index.vue index ee44dd3..a6ab626 100644 --- a/sub-government-screen-service/src/views/plant/index.vue +++ b/sub-government-screen-service/src/views/plant/index.vue @@ -1,5 +1,5 @@