From bf4b6edcddd46309683a529db2a302592da94cd0 Mon Sep 17 00:00:00 2001
From: wangwei <707714829@qq.com>
Date: Mon, 28 Nov 2022 09:28:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/json/warning.json               | 25 +++++++++++++++++++
 .../areaMonitor/components/EarlyWarning.vue   |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/public/static/json/warning.json b/public/static/json/warning.json
index 50bbdb6..8d3e103 100644
--- a/public/static/json/warning.json
+++ b/public/static/json/warning.json
@@ -3,6 +3,7 @@
         {
             "name":"台东商圈",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -23,6 +24,7 @@
         {
             "name":"五四广场",
             "type":"数据智能监控",
+            "areaType":"公园广场",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -43,6 +45,7 @@
         {
             "name":"第一海水浴场",
             "type":"数据智能监控",
+            "areaType":"海水浴场",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -63,6 +66,7 @@
         {
             "name":"李村商圈",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -83,6 +87,7 @@
         {
             "name":"石老人海水浴场",
             "type":"数据智能监控",
+            "areaType":"海水浴场",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -103,6 +108,7 @@
         {
             "name":"第二海水浴场",
             "type":"数据智能监控",
+            "areaType":"海水浴场",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -123,6 +129,7 @@
         {
             "name":"五四广场7",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -143,6 +150,7 @@
         {
             "name":"五四广场8",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -163,6 +171,7 @@
         {
             "name":"五四广场9",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -183,6 +192,7 @@
         {
             "name":"五四广场10",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -203,6 +213,7 @@
         {
             "name":"五四广场",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -223,6 +234,7 @@
         {
             "name":"五四广场5",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -243,6 +255,7 @@
         {
             "name":"五四广场6",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -263,6 +276,7 @@
         {
             "name":"五四广场7",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -283,6 +297,7 @@
         {
             "name":"五四广场8",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -303,6 +318,7 @@
         {
             "name":"五四广场9",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -323,6 +339,7 @@
         {
             "name":"五四广场10",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -343,6 +360,7 @@
         {
             "name":"五四广场",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -363,6 +381,7 @@
         {
             "name":"五四广场5",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -383,6 +402,7 @@
         {
             "name":"五四广场6",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -403,6 +423,7 @@
         {
             "name":"五四广场7",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -423,6 +444,7 @@
         {
             "name":"五四广场8",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -443,6 +465,7 @@
         {
             "name":"五四广场9",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -463,6 +486,7 @@
         {
             "name":"五四广场10",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
@@ -483,6 +507,7 @@
         {
             "name":"五四广场",
             "type":"数据智能监控",
+            "areaType":"商业街区",
             "address":"城市广场",
             "type2":"已下发",
             "cameraName": "夏庄路李村公交站北行[177938]",
diff --git a/src/views/pages/areaMonitor/components/EarlyWarning.vue b/src/views/pages/areaMonitor/components/EarlyWarning.vue
index 268d63f..eb47037 100644
--- a/src/views/pages/areaMonitor/components/EarlyWarning.vue
+++ b/src/views/pages/areaMonitor/components/EarlyWarning.vue
@@ -68,7 +68,7 @@
                 <div class="event-details-title">
                     <p>{{item.value.name||''}}</p>
                     <span>{{item.value.type||''}}</span>
-                    <span>{{item.value.name||''}}</span>
+                    <span>{{item.value.areaType||''}}</span>
                     <span>{{item.value.type2||''}}</span>
                 </div>
                 <div class="event-details-des">