From c7c09b5ca939881527855f7233a2c21d21acc4c7 Mon Sep 17 00:00:00 2001
From: guangyin <guangyin@hanbangtang.com>
Date: Thu, 18 May 2023 17:11:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=B3=E4=BE=A7=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/warningDetail.component.vue |  2 +-
 src/mock/index.ts                          | 46 +++++++++++-----------
 src/views/overview.component.html          | 38 +++++++++++-------
 src/views/overview.component.ts            |  3 +-
 4 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/src/components/warningDetail.component.vue b/src/components/warningDetail.component.vue
index d58d5ff..59b8d8a 100644
--- a/src/components/warningDetail.component.vue
+++ b/src/components/warningDetail.component.vue
@@ -54,7 +54,7 @@
         </el-table-column>
 
       </el-table>
-      <el-button class="pop-btn-style margin-top-30" @click="deal">处理</el-button>
+<!--      <el-button class="pop-btn-style margin-top-30" @click="deal">处理</el-button>-->
     </div>
   </div>
 
diff --git a/src/mock/index.ts b/src/mock/index.ts
index 9201219..9b9f1cb 100644
--- a/src/mock/index.ts
+++ b/src/mock/index.ts
@@ -649,12 +649,12 @@ export class MockData{
 
     public static getWaringList(){
        /* {
-                type:"fire",
+                type:"normal",
                 id:new Date().getTime()+"",
-                typeName:"火灾",
+                typeName:"泄露",
                 position:[13312990.72, 4098613.12, 0.51],
                 reporter:"张三",
-                content:"北京汉邦唐化工厂区发生火灾"
+                content:"北京汉邦唐化工厂区发生泄露"
 
             }*/
         const data = [
@@ -850,12 +850,12 @@ export class MockData{
 
     public static getEventList(){
         /* {
-                 type:"fire",
+                 type:"normal",
                  id:new Date().getTime()+"",
-                 typeName:"火灾",
+                 typeName:"泄露",
                  position:[13312990.72, 4098613.12, 0.51],
                  reporter:"张三",
-                 content:"北京汉邦唐化工厂区发生火灾"
+                 content:"北京汉邦唐化工厂区发生泄露"
 
              }*/
         const data = [
@@ -871,15 +871,15 @@ export class MockData{
                 content:"物体高空坠落"
             }
             , {
-                title: '火灾告警',
-                info: '北京汉邦唐化工厂区发生火灾',
+                title: '罐体破裂',
+                info: '北京汉邦唐化工厂区发生泄露',
                 time: '2023年1月20日  14:33:33',
                 level: '1',
-                type:"fire",
-                typeName:"火灾",
+                type:"normal",
+                typeName:"泄露",
                 reporter:"李四",
                 tel:"13985412541",
-                content:"北京汉邦唐化工厂区发生火灾"
+                content:"北京汉邦唐化工厂区发生泄露"
             }, {
                 title: '坍塌事故',
                 info: '建筑坍塌及时处理',
@@ -901,34 +901,32 @@ export class MockData{
                 tel:"13337542569",
                 content:"NO气体泄露"
             }, {
-                title: '火灾爆炸',
-                info: '富土康厂区火灾爆炸',
+                title: '罐体破裂',
+                info: '富土康厂区罐体破裂',
                 time: '2023年1月20日  14:33:33',
                 level: '2',
                 type:"normal",
-                typeName:"火灾爆炸",
+                typeName:"罐体破裂",
                 reporter:"张三",
                 tel:"13337542569",
-                content:"富土康厂区火灾爆炸"
+                content:"富土康厂区罐体破裂"
             }, {
-                title: '火灾爆炸',
-                info: '北京汉邦唐化工厂区发生火灾',
+                title: '罐体破裂',
+                info: '北京汉邦唐化工厂区发生泄露',
                 time: '2023年1月20日  14:33:33',
                 level: '1',
-                type:"fire",
-                typeName:"火灾",
+                type:"normal",
+                typeName:"泄露",
                 reporter:"李四",
                 tel:"13985412541",
-                content:"北京汉邦唐化工厂区发生火灾"
+                content:"北京汉邦唐化工厂区发生泄露"
             },
         ].map((item:any)=>{
             item.id = Mock.mock("@id");
             if (item.type === 'normal'){
                 item.position=turf.randomPosition([
-                    13312995.84,
-                    4098177.2800000003,
-                    13313096.96,
-                    4098754.88,
+                    11660757, 3692398.75,
+                    11661124, 3692643.5
                 ]);
             }else if(item.type === 'fire'){
                 item.position= [13312990.72, 4098613.12, 0.51]
diff --git a/src/views/overview.component.html b/src/views/overview.component.html
index d4afe20..45b0fa6 100644
--- a/src/views/overview.component.html
+++ b/src/views/overview.component.html
@@ -1,29 +1,38 @@
 <div class="overview-container">
 
-<!--<MapComponent id="map" @onLoaded="getMap" @onHandleChange="handleChange"></MapComponent>-->
+    <MapComponent id="map" @onLoaded="getMap" @onHandleChange="handleChange"></MapComponent>
 
     <div class="bg-box left animate__animated">
         <div class="panel-container">
-<!--            首页-->
-            <HomeLeftComponent @getItem="getItem" v-if="currentNav === 'home'" class="animate__animated animate__fadeInLeft"></HomeLeftComponent>
-<!--            导览-->
-            <ViewLeftComponent @showView="showView" @playView="playView" @showViewRight="showViewRight" v-if="currentNav === 'view'" class="animate__animated animate__fadeInLeft"></ViewLeftComponent>
+            <!-- 首页-->
+            <HomeLeftComponent @getItem="getItem" v-if="currentNav === 'home'"
+                               class="animate__animated animate__fadeInLeft"></HomeLeftComponent>
+            <!-- 导览-->
+            <ViewLeftComponent @showView="showView" @playView="playView" @showViewRight="showViewRight"
+                               v-if="currentNav === 'view'"
+                               class="animate__animated animate__fadeInLeft"></ViewLeftComponent>
 
-<!--            运营管理-->
-            <ManageLeftComponent v-if="currentNav === 'manage'" class="animate__animated animate__fadeInLeft"></ManageLeftComponent>
+            <!-- 运营管理-->
+            <ManageLeftComponent v-if="currentNav === 'manage'"
+                                 class="animate__animated animate__fadeInLeft"></ManageLeftComponent>
         </div>
     </div>
     <div class="bg-box right main animate__animated" :class="showBackGround">
         <div class="panel-container">
-<!--            首页-->
+            <!--  首页-->
             <HomeRightComponent v-if="currentNav === 'home' && !waringRightShow"
                                 class="animate__animated animate__fadeInRight"></HomeRightComponent>
             <!--            导览-->
-            <ViewRightComponent @closeRight="closeRight" :viewRightData="viewRightData" @showDetail="showDetail" v-if="currentNav === 'view' && viewRightShow" class="animate__animated animate__fadeInRight"></ViewRightComponent>
+            <ViewRightComponent @closeRight="closeRight" :viewRightData="viewRightData" @showDetail="showDetail"
+                                v-if="currentNav === 'view' && viewRightShow"
+                                class="animate__animated animate__fadeInRight"></ViewRightComponent>
             <!--            运营管理-->
-            <ManageRightComponent v-if="currentNav === 'manage'" class="animate__animated animate__fadeInRight"></ManageRightComponent>
+            <ManageRightComponent v-if="currentNav === 'manage'"
+                                  class="animate__animated animate__fadeInRight"></ManageRightComponent>
             <!--告警详情-->
-            <WarningDetailComponent @changeClose="changeClose" @changePoint="changePoint" :info="info" v-if="waringRightShow && currentNav === 'home'" class="animate__animated animate__fadeInRight"></WarningDetailComponent>
+            <WarningDetailComponent @changeClose="changeClose" @changePoint="changePoint" :info="info"
+                                    v-if="waringRightShow && currentNav === 'home'"
+                                    class="animate__animated animate__fadeInRight"></WarningDetailComponent>
         </div>
     </div>
 
@@ -33,7 +42,7 @@
     </div>
     <div class="layer-btn-box" :style="{height:openLayerDrawer?(currentLayers.length+1) * 50+'px':'50px'}">
         <div class="layer-btn" :class="{active:item.selected}" v-show="openLayerDrawer"
-            v-for="(item,index) in currentLayers" :key="index">
+             v-for="(item,index) in currentLayers" :key="index">
             <el-tooltip effect="dark" :content="item.name" placement="left">
                 <hbt-svg :name="item.value" @click="toggleLayer(item)"></hbt-svg>
             </el-tooltip>
@@ -44,11 +53,10 @@
     </div>
 
 
-
     <div class="top-bg" :style="{top:hideAllPanel?'-90px':0}">
         <HeaderComponent @onDrawer="drawerChange($event)" @onNavChanged="navChange($event)"></HeaderComponent>
     </div>
-    <div class="exitFullScreen" :style="{top:!hideAllPanel?'-90px':0}" >
+    <div class="exitFullScreen" :style="{top:!hideAllPanel?'-90px':0}">
         <div class="top-btn" @click="toggleAllPanel">
             <i class="el-icon-close">退出自由导览</i>
         </div>
@@ -57,7 +65,7 @@
 
     <!--    大号弹窗组件-->
     <PermitPopUpComponent :title="bigPopTitle" :dialogVisibleForBigPop.sync="dialogVisibleForBigPop"
-        @onClose="closeCarPersonPop">
+                          @onClose="closeCarPersonPop">
         <el-collapse v-if="bigPopTitle === '人员信息卡'" v-model="activeNames" accordion>
             <el-collapse-item title="人员信息" name="1">
                 <div class="d-flex item-content">
diff --git a/src/views/overview.component.ts b/src/views/overview.component.ts
index e2f77d7..1a5b3bf 100644
--- a/src/views/overview.component.ts
+++ b/src/views/overview.component.ts
@@ -213,7 +213,7 @@ export default class OverViewComponent extends BaseComponent {
 
     //获取点击的信息
     getItem(item) {
-        // this.addWarnning(item)
+        this.addWarnning(item)
         this.info = item
         this.waringRightShow = true
     }
@@ -224,6 +224,7 @@ export default class OverViewComponent extends BaseComponent {
     //关闭告警详情
     changeClose(){
         this.waringRightShow = false
+        this.player.api.customObject.delete(this.currentWanning.id)
     }
     //进入自由导览
     async showView (){