From 3eaa9c6be70cdf682e722c08ba5be8c80effa625 Mon Sep 17 00:00:00 2001 From: fuguobin Date: Thu, 28 Dec 2023 18:49:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E8=AF=A6=E6=83=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=A9=E6=B0=94=E6=95=B0=E6=8D=AE=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/index.ts | 13 + src/api/device/types.ts | 2 + src/assets/iconfont/demo_index.html | 1090 ++++++++++------- src/assets/iconfont/iconfont.css | 216 ++-- src/assets/iconfont/iconfont.js | 2 +- src/assets/iconfont/iconfont.json | 446 ++++--- src/assets/iconfont/iconfont.ttf | Bin 15956 -> 17696 bytes src/assets/iconfont/iconfont.woff | Bin 9876 -> 10788 bytes src/assets/iconfont/iconfont.woff2 | Bin 8412 -> 9192 bytes src/types/auto-imports.d.ts | 2 + src/views/details/index.scss | 10 + src/views/details/index.vue | 87 +- src/views/monitoring/components/header.vue | 50 +- .../monitoring/screen/components/main.vue | 4 +- vite.config.ts | 4 +- 15 files changed, 1128 insertions(+), 798 deletions(-) diff --git a/src/api/device/index.ts b/src/api/device/index.ts index 1aee09b..4d28998 100644 --- a/src/api/device/index.ts +++ b/src/api/device/index.ts @@ -116,3 +116,16 @@ export function getDeviceInfos(data: any) { data: data }); } + +/** + * 天气数据图表 + * + * @param data + */ +export function weatherHoursList(data: any) { + return request({ + url: '/dc/dcDeviceEcharts/weatherHoursList', + method: 'post', + data: data + }); +} diff --git a/src/api/device/types.ts b/src/api/device/types.ts index 470d4b8..fe23c1b 100644 --- a/src/api/device/types.ts +++ b/src/api/device/types.ts @@ -99,5 +99,7 @@ export interface mainInfoVo { paramUnit: string; index: number; average: number; + max?: number; + min?: number; data: []; } diff --git a/src/assets/iconfont/demo_index.html b/src/assets/iconfont/demo_index.html index 3c0627e..f3777d0 100644 --- a/src/assets/iconfont/demo_index.html +++ b/src/assets/iconfont/demo_index.html @@ -47,7 +47,7 @@
  • Symbol
    • - 查看项目 + 查看项目
    @@ -55,81 +55,63 @@ @@ -420,9 +456,9 @@ 
    @font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1699254830523') format('woff2'),
-       url('iconfont.woff?t=1699254830523') format('woff'),
-       url('iconfont.ttf?t=1699254830523') format('truetype');
+  src: url('iconfont.woff2?t=1703727917505') format('woff2'),
+       url('iconfont.woff?t=1703727917505') format('woff'),
+       url('iconfont.ttf?t=1703727917505') format('truetype');
 }

    第二步：定义使用 iconfont 的样式

    @@ -449,119 +485,92 @@
    {{ item.paramName }} - 确认 +
    @@ -143,7 +143,19 @@
    - + +