From d7aa955893d5b68bc72489e7792a0419d8db3386 Mon Sep 17 00:00:00 2001
From: "peng.peng" <peng.peng@free-sun.com.cn>
Date: Fri, 18 Aug 2023 17:57:04 +0800
Subject: [PATCH] =?UTF-8?q?(*)=E6=B6=88=E9=98=B2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/0.0.12/fire_alarm.sql                 | 38 +++++++++++++++++++
 .../components/emergency-right-top.js         |  4 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 scripts/0.0.12/fire_alarm.sql

diff --git a/scripts/0.0.12/fire_alarm.sql b/scripts/0.0.12/fire_alarm.sql
new file mode 100644
index 0000000..4393595
--- /dev/null
+++ b/scripts/0.0.12/fire_alarm.sql
@@ -0,0 +1,38 @@
+create table fire_alarm
+(
+    id            serial
+        constraint fire_alarm_pk
+            primary key,
+    "createTime"  timestamp(6) with time zone,
+    location      text,
+    scene         varchar(255),
+    fire_material varchar(255),
+    level         varchar(255),
+    state         integer default 1,
+    longitude     varchar(50),
+    latitude      varchar(50),
+    type          varchar(50),
+    type_param    varchar(50)
+);
+
+comment on table fire_alarm is '智慧消防大屏 告警上报表';
+
+comment on column fire_alarm."createTime" is '创建时间';
+
+comment on column fire_alarm.location is '地点';
+
+comment on column fire_alarm.scene is '场所';
+
+comment on column fire_alarm.fire_material is '燃烧物质';
+
+comment on column fire_alarm.level is '危险等级';
+
+comment on column fire_alarm.state is '事件状态：1 进行中 2已结束';
+
+comment on column fire_alarm.type is '警情类型';
+
+comment on column fire_alarm.type_param is '警情类型对应的不同属性 ';
+
+create unique index fire_alarm_id_uindex
+    on fire_alarm (id);
+
diff --git a/super-screen/client/src/sections/water-prevention/components/emergency-right-top.js b/super-screen/client/src/sections/water-prevention/components/emergency-right-top.js
index d5e14d3..4973382 100644
--- a/super-screen/client/src/sections/water-prevention/components/emergency-right-top.js
+++ b/super-screen/client/src/sections/water-prevention/components/emergency-right-top.js
@@ -37,7 +37,9 @@ function CitySafty(props) {
                                     }
                                     return <div className='flex-row'>
                                         <div className='item_right_left'>{x.name}</div>
-                                        <div className='item_right_right'>{value}</div>
+                                        <div className='item_right_right'>{value}
+                                            {x.name.indexOf('人数') > -1 && <span style={{ marginLeft: 30 }}>人</span>}
+                                        </div>
                                     </div>
                                 })
                             }