diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts index 1ddab244..412d51b3 100644 --- a/src/api/sys/user.ts +++ b/src/api/sys/user.ts @@ -399,3 +399,17 @@ export function getShrimpPrices(params, mode: ErrorMessageMode = 'modal') { }, ) } +/** + * @description:getCropYields + */ +export function getCropYields(params, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: `/api/rice-shrimp-prices`, + params, + }, + { + errorMessageMode: mode, + }, + ) +} diff --git a/src/assets/images/img01.png b/src/assets/images/img01.png new file mode 100644 index 00000000..dc896273 Binary files /dev/null and b/src/assets/images/img01.png differ diff --git a/src/assets/images/img02.png b/src/assets/images/img02.png new file mode 100644 index 00000000..43e4a8aa Binary files /dev/null and b/src/assets/images/img02.png differ diff --git a/src/assets/images/img03.png b/src/assets/images/img03.png new file mode 100644 index 00000000..3d300e6e Binary files /dev/null and b/src/assets/images/img03.png differ diff --git a/src/assets/images/img04.png b/src/assets/images/img04.png new file mode 100644 index 00000000..61d9d6ac Binary files /dev/null and b/src/assets/images/img04.png differ diff --git a/src/assets/images/img05.png b/src/assets/images/img05.png new file mode 100644 index 00000000..7cefe8ee Binary files /dev/null and b/src/assets/images/img05.png differ diff --git a/src/views/visualization/components/Box.vue b/src/views/visualization/components/Box.vue index ea318f0b..85171f66 100644 --- a/src/views/visualization/components/Box.vue +++ b/src/views/visualization/components/Box.vue @@ -17,7 +17,7 @@ -
+
@@ -42,7 +42,7 @@ }, headHeight: { type: String as PropType, - default: '49px', + default: '34px', }, }) diff --git a/src/views/visualization/components/CModal.vue b/src/views/visualization/components/CModal.vue index 44b00728..96b5ca42 100644 --- a/src/views/visualization/components/CModal.vue +++ b/src/views/visualization/components/CModal.vue @@ -159,7 +159,7 @@ year: visualizationStore.getYear, base_id: visualizationStore.getAddresId, category_id: cropsId.value, - crop_id: props.parentId ?? currentTab.value?.id ?? null, + crop_id: currentTab.value?.id ?? props.parentId ?? null, }) const list: any[] = [] for (const key in resData) { diff --git a/src/views/visualization/components/Circle.vue b/src/views/visualization/components/Circle.vue new file mode 100644 index 00000000..6f435b58 --- /dev/null +++ b/src/views/visualization/components/Circle.vue @@ -0,0 +1,223 @@ + + + + + diff --git a/src/views/visualization/components/DXCY.vue b/src/views/visualization/components/DXCY.vue index 05c62ae8..2f836091 100644 --- a/src/views/visualization/components/DXCY.vue +++ b/src/views/visualization/components/DXCY.vue @@ -1,21 +1,27 @@