From 1b1ff6fe2cef434d7ae0a2bae409ddc053763078 Mon Sep 17 00:00:00 2001 From: fuguobin Date: Tue, 14 Nov 2023 15:30:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/types.ts | 2 ++ src/types/auto-imports.d.ts | 2 ++ src/views/dataScreen/screen/index.scss | 2 +- src/views/details/index.vue | 3 +++ src/views/monitoring/screen/index.scss | 2 +- vite.config.ts | 2 +- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/api/device/types.ts b/src/api/device/types.ts index 6c6fc9d..470d4b8 100644 --- a/src/api/device/types.ts +++ b/src/api/device/types.ts @@ -90,6 +90,8 @@ export interface seriesVo { symbol: string; paramUnit: string; unit: string; + unitMax: number; + unitMin: number; data: Array; } export interface mainInfoVo { diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index 67e581d..5742656 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -2,6 +2,7 @@ export {} declare global { const EffectScope: typeof import('vue')['EffectScope'] + const ElForm: typeof import('element-plus/es')['ElForm'] const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] const ElNotification: typeof import('element-plus/es')['ElNotification'] @@ -272,6 +273,7 @@ import { UnwrapRef } from 'vue' declare module 'vue' { interface ComponentCustomProperties { readonly EffectScope: UnwrapRef + readonly ElForm: UnwrapRef readonly ElMessage: UnwrapRef readonly ElMessageBox: UnwrapRef readonly ElNotification: UnwrapRef diff --git a/src/views/dataScreen/screen/index.scss b/src/views/dataScreen/screen/index.scss index eda40b8..a2f1733 100644 --- a/src/views/dataScreen/screen/index.scss +++ b/src/views/dataScreen/screen/index.scss @@ -376,7 +376,7 @@ align-items: center; .warning { - font-size: 15px; + font-size: 18px; font-weight: bold; color: red; } diff --git a/src/views/details/index.vue b/src/views/details/index.vue index a8fc210..b56c551 100644 --- a/src/views/details/index.vue +++ b/src/views/details/index.vue @@ -836,6 +836,9 @@ function init(data: any) { offset: offsetData, scale: true, //自适应 // minInterval: 1, //最小间距 + min: item.unitMin, //最小值 + max: item.unitMax, //最大值 + // interval: 10, //刻度间隔 nameTextStyle: { fontSize: 12, padding: [0, 0, 0, 0] //name文字位置 对应 上右下左 diff --git a/src/views/monitoring/screen/index.scss b/src/views/monitoring/screen/index.scss index 694730c..e4154d2 100644 --- a/src/views/monitoring/screen/index.scss +++ b/src/views/monitoring/screen/index.scss @@ -398,7 +398,7 @@ align-items: center; .warning { - font-size: 15px; + font-size: 18px; font-weight: bold; color: red; } diff --git a/vite.config.ts b/vite.config.ts index bd2bea7..d830e45 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -46,7 +46,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { proxy: { '/dev-api': { // target: 'http://172.1.2.132:9010/', //本地接口地址 - // target: 'http://172.1.2.57:9010/', //本地接口地址 + // target: 'http://172.1.2.90:9010/', //本地接口地址 target: 'http://10.10.10.56:9010/', //线上测试接口地址 changeOrigin: true, rewrite: path => path.replace(/^\/dev-api/, '')