From f2f262b0dec77d2c1e909943e191fc84c902f3e3 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 16 May 2024 17:26:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DialogForm/index.vue                  |  1 +
 src/styles/var.scss                                  |  7 +++++++
 .../hz-enterprise/smartSite/alarmLedger/index.vue    | 12 ++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index 07b1547..38faa3d 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -38,6 +38,7 @@
 							:row="item.row"
 							:style="{ width: item.width + 'px' }"
 							:mapIcon="item.mapIcon"
+							@input="form[item.prop] = form[item.prop].replace(/\s+/g, '')"
 						>
 							<!-- 标记dialog -->
 							<template #suffix v-if="item.mapIcon">
diff --git a/src/styles/var.scss b/src/styles/var.scss
index 4886cb2..64ec66b 100644
--- a/src/styles/var.scss
+++ b/src/styles/var.scss
@@ -1,5 +1,12 @@
 /* 全局 css 变量 */
 $primary-color: var(--el-color-primary);
+//字体大小定义
+$font_size_12: 12px;
+$font_size_14: 14px;
+$font_size_16: 16px;
+$font_size_18: 18px;
+$font_size_20: 20px;
+$font_size_22: 22px;
 
 // light主题
 $primary-light-main-color: #087ba4;
diff --git a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue
index 188b918..29808d5 100644
--- a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue
+++ b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue
@@ -121,8 +121,8 @@ const columns: ColumnProps[] = [
 
 	// 多级 prop
 	{ prop: "name", label: "设备名称", isShow: false, search: { el: "input" } },
-	{ prop: "deviceName", label: "设备名称" },
-	{ prop: "type", label: "报警类型", search: { el: "input" } },
+	{ prop: "deviceName", label: "设备名称", width: 120 },
+	{ prop: "type", label: "报警类型", width: 120, search: { el: "input" } },
 	{
 		prop: "createTime",
 		label: "报警时间",
@@ -139,11 +139,11 @@ const columns: ColumnProps[] = [
 		}
 	},
 	{ prop: "thresholdValue", label: "阈值" },
-	{ prop: "alarmValue", label: "超标数据" },
+	{ prop: "alarmValue", label: "超标数据", width: 120 },
 	{ prop: "offsetValue", label: "超标量" },
-	{ prop: "cause", label: "原因", width: 200 },
-	{ prop: "solveTime", label: "恢复时间" },
-	{ prop: "solveValue", label: "恢复数据" },
+	{ prop: "cause", label: "原因" },
+	{ prop: "solveTime", label: "恢复时间", width: 120 },
+	{ prop: "solveValue", label: "恢复数据", width: 120 },
 	{ prop: "operation", label: "操作", fixed: "right", width: 100 }
 ];