From b46e7810a95376b49f6be78dcf87b148e34b0109 Mon Sep 17 00:00:00 2001 From: ihzero Date: Mon, 15 May 2023 22:46:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sys/other.ts | 29 +++ src/views/visualization/LeftModal.vue | 3 + src/views/visualization/RightModal.vue | 207 ++++++++++++++++++ src/views/visualization/components/Box.vue | 2 +- src/views/visualization/components/DXJG.vue | 19 +- .../visualization/components/DXJGWEEK.vue | 172 +++++++++++++++ .../visualization/components/LineCharts.vue | 132 +++++++++++ src/views/visualization/components/SZJCSJ.vue | 26 ++- src/views/visualization/components/TRJCSJ.vue | 26 ++- src/views/visualization/index.vue | 18 +- 10 files changed, 627 insertions(+), 7 deletions(-) create mode 100644 src/views/visualization/RightModal.vue create mode 100644 src/views/visualization/components/DXJGWEEK.vue create mode 100644 src/views/visualization/components/LineCharts.vue diff --git a/src/api/sys/other.ts b/src/api/sys/other.ts index 188ced16..059cf551 100644 --- a/src/api/sys/other.ts +++ b/src/api/sys/other.ts @@ -160,6 +160,21 @@ export function getDeviceBaseDataStatics(params, mode: ErrorMessageMode = 'none' }, ) } +/** + * @description:设备数据-基地+设备类型V2 + * + */ +export function getDeviceBaseDataStaticsV2(params, mode: ErrorMessageMode = 'none') { + return defHttp.get( + { + url: '/api/device-base-data-statics-v2', + params, + }, + { + errorMessageMode: mode, + }, + ) +} /** * @description:获取指定设备下面的基地 *"1": "监控设备", @@ -264,6 +279,20 @@ export function getRiceShrimpPrice(params?, mode: ErrorMessageMode = 'none') { }, ) } +/** + * @description:重点产业报表 - 稻虾价格 - 周 + */ +export function getRiceShrimpWeekPrice(params?, mode: ErrorMessageMode = 'none') { + return defHttp.get( + { + url: '/api/charts/rice-shrimp-weekly-price', + params, + }, + { + errorMessageMode: mode, + }, + ) +} /** * @description:农作物产业分类 */ diff --git a/src/views/visualization/LeftModal.vue b/src/views/visualization/LeftModal.vue index 7e13b71e..14ceb95b 100644 --- a/src/views/visualization/LeftModal.vue +++ b/src/views/visualization/LeftModal.vue @@ -20,6 +20,7 @@ + @@ -31,12 +32,14 @@ import DXCY from './components/DXCY.vue' import DXLX from './components/DXLX.vue' import DZWZ from './components/DZWZ.vue' + import DXJGWEEK from './components/DXJGWEEK.vue' export default defineComponent({ components: { [Modal.name]: Modal, DXCY, DZWZ, DXLX, + DXJGWEEK, }, props: { visible: { diff --git a/src/views/visualization/RightModal.vue b/src/views/visualization/RightModal.vue new file mode 100644 index 00000000..7d8748ed --- /dev/null +++ b/src/views/visualization/RightModal.vue @@ -0,0 +1,207 @@ + + + + + diff --git a/src/views/visualization/components/Box.vue b/src/views/visualization/components/Box.vue index a349cf60..4cef6063 100644 --- a/src/views/visualization/components/Box.vue +++ b/src/views/visualization/components/Box.vue @@ -35,7 +35,7 @@ }, width: { type: String as PropType, - default: '200px', + default: '100%', }, height: { type: String as PropType, diff --git a/src/views/visualization/components/DXJG.vue b/src/views/visualization/components/DXJG.vue index 1f7b41ec..749f8001 100644 --- a/src/views/visualization/components/DXJG.vue +++ b/src/views/visualization/components/DXJG.vue @@ -7,7 +7,16 @@ + + diff --git a/src/views/visualization/components/LineCharts.vue b/src/views/visualization/components/LineCharts.vue new file mode 100644 index 00000000..812200a4 --- /dev/null +++ b/src/views/visualization/components/LineCharts.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/views/visualization/components/SZJCSJ.vue b/src/views/visualization/components/SZJCSJ.vue index 3173cec6..20961afc 100644 --- a/src/views/visualization/components/SZJCSJ.vue +++ b/src/views/visualization/components/SZJCSJ.vue @@ -49,7 +49,16 @@