diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts index f5a42770..a7c0dca6 100644 --- a/src/api/sys/user.ts +++ b/src/api/sys/user.ts @@ -1000,7 +1000,7 @@ export function citydataEdit(data, mode: ErrorMessageMode = 'modal') { ) } /** - * @description:更新基础数据统计 + * @description:虫情图片 */ export function getWormPhotos(device, params, mode: ErrorMessageMode = 'modal') { return defHttp.get( @@ -1014,3 +1014,17 @@ export function getWormPhotos(device, params, mode: ErrorMessageMode = 'modal') }, ) } +/** + * @description:虫情统计 + */ +export function getWormCount(device, params, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: `/api/devices/${device}/worm-statics`, + params, + }, + { + errorMessageMode: mode, + }, + ) +} diff --git a/src/router/routes/modules/main.ts b/src/router/routes/modules/main.ts index 21a1fa29..c2028f96 100644 --- a/src/router/routes/modules/main.ts +++ b/src/router/routes/modules/main.ts @@ -51,14 +51,14 @@ const main: AppRouteModule = { title: '昆虫性诱监测', }, }, - // { - // path: 'pests', - // name: 'MainPests', - // component: () => import('/@/views/main/pests/index.vue'), - // meta: { - // title: '虫情监测', - // }, - // }, + { + path: 'pests', + name: 'MainPests', + component: () => import('/@/views/main/pests/index.vue'), + meta: { + title: '虫情监测', + }, + }, { path: 'insecticidal-lamp', name: 'MainInsecticidalLamp', diff --git a/src/views/main/insect-monitors/index.vue b/src/views/main/insect-monitors/index.vue index 165837fa..aaf71aba 100644 --- a/src/views/main/insect-monitors/index.vue +++ b/src/views/main/insect-monitors/index.vue @@ -222,7 +222,6 @@ const { data, meta } = await getWormPhotos(params.device_id, params) pageTotal.value = meta.total list.value = data - console.log(data) } onMounted(() => { diff --git a/src/views/main/pests/components/CountChart.vue b/src/views/main/pests/components/CountChart.vue new file mode 100644 index 00000000..887fd609 --- /dev/null +++ b/src/views/main/pests/components/CountChart.vue @@ -0,0 +1,295 @@ + + diff --git a/src/views/main/pests/components/Images.vue b/src/views/main/pests/components/Images.vue new file mode 100644 index 00000000..3c9f607d --- /dev/null +++ b/src/views/main/pests/components/Images.vue @@ -0,0 +1,230 @@ + + diff --git a/src/views/main/pests/index.vue b/src/views/main/pests/index.vue index daa1ba06..337aede1 100644 --- a/src/views/main/pests/index.vue +++ b/src/views/main/pests/index.vue @@ -1,9 +1,45 @@ -