From af4881a149e1c8db16529539c76f5f56c7005c13 Mon Sep 17 00:00:00 2001 From: H <30830569@qq.com> Date: Thu, 10 Nov 2022 17:38:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sys/user.ts | 76 +++ src/utils/index.ts | 33 +- src/views/device/management/index.vue | 3 +- .../meteorological/components/AirHumidity.vue | 106 +++-- .../components/AirTemperature.vue | 144 +++--- .../main/meteorological/components/CO2.vue | 101 ++++ .../components/LightIntensity.vue | 139 +++--- .../main/meteorological/components/Noise.vue | 118 +++-- .../main/meteorological/components/PM10.vue | 118 +++-- .../main/meteorological/components/PM25.vue | 120 ++--- .../meteorological/components/Pressure.vue | 120 ++--- .../meteorological/components/Rainfall.vue | 139 +++--- .../components/WindDirection.vue | 139 +++--- .../meteorological/components/WindSpeed.vue | 144 +++--- src/views/main/meteorological/index.vue | 166 ++++++- .../soil-monitoring/components/FormDrawer.vue | 124 +++-- .../soil-monitoring/components/LineCharts.vue | 147 +++--- src/views/main/soil-monitoring/index.vue | 442 ++++++++++-------- 18 files changed, 1461 insertions(+), 918 deletions(-) create mode 100644 src/views/main/meteorological/components/CO2.vue diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts index f960508f..b767b59c 100644 --- a/src/api/sys/user.ts +++ b/src/api/sys/user.ts @@ -679,6 +679,22 @@ export function editCropYields(id: string, data, mode: ErrorMessageMode = 'modal ) } +/** + * @description:设备列表 + */ +export function getDevices(params, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: '/api/devices', + params, + }, + { + errorMessageMode: mode, + isTransformResponse: false, + }, + ) +} + /** * @description:删除农作物产量 */ @@ -721,3 +737,63 @@ export function getaGriculturalDevicePoint(params, mode: ErrorMessageMode = 'mod }, ) } + +/** + * @description:监测数据 + */ +export function getAmonitoringData(params, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: `/api/monitoring-data`, + params, + }, + { + errorMessageMode: mode, + }, + ) +} + +/** + * @description:预警数量 + */ +export function getDeviceWarningNums(params, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: `/api/device-warning-nums`, + params, + }, + { + errorMessageMode: mode, + }, + ) +} + +/** + * @description:预警规则 + */ +export function getDeviceWarningRules(params, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: `/api/device-warning-rules`, + params, + }, + { + errorMessageMode: mode, + }, + ) +} + +/** + * @description:更新规则 + */ +export function editDeviceWarningRules(params, mode: ErrorMessageMode = 'modal') { + return defHttp.put( + { + url: `/api/device-warning-rules`, + params, + }, + { + errorMessageMode: mode, + }, + ) +} diff --git a/src/utils/index.ts b/src/utils/index.ts index 9a743a9c..65ab7ebc 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -3,6 +3,7 @@ import type { App, Plugin } from 'vue' import { unref } from 'vue' import { isObject } from '/@/utils/is' +import dayjs from 'dayjs' export const noop = () => {} @@ -90,7 +91,7 @@ export const withInstall = (component: T, alias?: string) => { } return component as T & Plugin } -export function formatDataByObject(obj) { +export function formatDataByObject(obj: any) { const arr: any[] = [] Object.keys(obj).forEach((e) => { arr.push({ @@ -133,3 +134,33 @@ export function getTreeData( return arr } + +// 获取近一周的时间 +export function getWeek() { + const date = new Date() + const year = date.getFullYear() + const month = date.getMonth() + const day = date.getDate() + const week = date.getDay() + //开始时间 + let WeekStartDate = dayjs(new Date(year, month, day - week + 1)).format('YYYY-MM-DD') + // 结束时间 + let WeekEndDate = dayjs(new Date()).format('YYYY-MM-DD') + return { + WeekStartDate, + WeekEndDate, + } +} + +// 获取近一月的数据 +export function getMonth() { + const date = new Date() + const year = date.getFullYear() + const month = date.getMonth() + let MonthStartDate = dayjs(new Date(year, month, 1)).format('YYYY-MM-DD') + let MonthEndDate = dayjs(new Date()).format('YYYY-MM-DD') + return { + MonthStartDate, + MonthEndDate, + } +} diff --git a/src/views/device/management/index.vue b/src/views/device/management/index.vue index 743946bb..23b92664 100644 --- a/src/views/device/management/index.vue +++ b/src/views/device/management/index.vue @@ -29,7 +29,8 @@ diff --git a/src/views/main/meteorological/components/CO2.vue b/src/views/main/meteorological/components/CO2.vue new file mode 100644 index 00000000..e8b523f8 --- /dev/null +++ b/src/views/main/meteorological/components/CO2.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/views/main/meteorological/components/LightIntensity.vue b/src/views/main/meteorological/components/LightIntensity.vue index c722825f..03b7c0e2 100644 --- a/src/views/main/meteorological/components/LightIntensity.vue +++ b/src/views/main/meteorological/components/LightIntensity.vue @@ -3,15 +3,16 @@ - +
diff --git a/src/views/main/meteorological/components/Noise.vue b/src/views/main/meteorological/components/Noise.vue index 5da41b45..8e52d72f 100644 --- a/src/views/main/meteorological/components/Noise.vue +++ b/src/views/main/meteorological/components/Noise.vue @@ -3,15 +3,16 @@ - +
diff --git a/src/views/main/meteorological/components/PM10.vue b/src/views/main/meteorological/components/PM10.vue index 5f10dcc2..3356be37 100644 --- a/src/views/main/meteorological/components/PM10.vue +++ b/src/views/main/meteorological/components/PM10.vue @@ -3,15 +3,16 @@ - +
diff --git a/src/views/main/meteorological/components/PM25.vue b/src/views/main/meteorological/components/PM25.vue index c278fb15..159314e4 100644 --- a/src/views/main/meteorological/components/PM25.vue +++ b/src/views/main/meteorological/components/PM25.vue @@ -1,17 +1,18 @@ diff --git a/src/views/main/meteorological/components/Pressure.vue b/src/views/main/meteorological/components/Pressure.vue index c278fb15..82315fa6 100644 --- a/src/views/main/meteorological/components/Pressure.vue +++ b/src/views/main/meteorological/components/Pressure.vue @@ -1,17 +1,18 @@ diff --git a/src/views/main/meteorological/components/Rainfall.vue b/src/views/main/meteorological/components/Rainfall.vue index a6798adb..2cce907e 100644 --- a/src/views/main/meteorological/components/Rainfall.vue +++ b/src/views/main/meteorological/components/Rainfall.vue @@ -3,15 +3,16 @@ - +
diff --git a/src/views/main/meteorological/components/WindDirection.vue b/src/views/main/meteorological/components/WindDirection.vue index 3bb8c670..9241663c 100644 --- a/src/views/main/meteorological/components/WindDirection.vue +++ b/src/views/main/meteorological/components/WindDirection.vue @@ -3,15 +3,16 @@ - +
diff --git a/src/views/main/meteorological/components/WindSpeed.vue b/src/views/main/meteorological/components/WindSpeed.vue index 6546f3a0..b0a7396d 100644 --- a/src/views/main/meteorological/components/WindSpeed.vue +++ b/src/views/main/meteorological/components/WindSpeed.vue @@ -3,16 +3,17 @@ - +
diff --git a/src/views/main/meteorological/index.vue b/src/views/main/meteorological/index.vue index 49ab7655..1db029c3 100644 --- a/src/views/main/meteorological/index.vue +++ b/src/views/main/meteorological/index.vue @@ -13,6 +13,7 @@ > + - + - - 今天 - 近一周 - 近一个月 + + 今天 + 近一周 + 近一个月 @@ -70,24 +80,93 @@ :showActionButtonGroup="false" /> -->
- - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/views/main/soil-monitoring/components/LineCharts.vue b/src/views/main/soil-monitoring/components/LineCharts.vue index 1a392f76..59828f37 100644 --- a/src/views/main/soil-monitoring/components/LineCharts.vue +++ b/src/views/main/soil-monitoring/components/LineCharts.vue @@ -3,16 +3,17 @@ - +
diff --git a/src/views/main/soil-monitoring/index.vue b/src/views/main/soil-monitoring/index.vue index eaa8e738..50a2a199 100644 --- a/src/views/main/soil-monitoring/index.vue +++ b/src/views/main/soil-monitoring/index.vue @@ -1,16 +1,81 @@ -