From 2580545be3ba0b7070d1497c2711de7d435ed02b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期四, 27 五月 2021 09:28:14 +0800
Subject: [PATCH] 企业应急-事件处置

---
 src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue |   39 ++++++++++++++++++++++++++++++++++-----
 src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue              |   15 +++++++++++++--
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue b/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue
index d4a4e61..8d3d945 100644
--- a/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue
+++ b/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue
@@ -5,11 +5,17 @@
 <!--      <el-table-column type="selection" label="棰勮" width="55"></el-table-column>-->
 
 <!--    </el-table>-->
-    <el-card class="box-card">
-      <div v-for="o in tableData" :key="o" class="text item">
-        {{ o.content }}
+    <div class="" style="padding: 5px;">
+<!--      <div v-for="o in tableData" :key="o" class="text item">-->
+<!--        {{ o.content }}-->
+<!--      </div>-->
+      <div>
+        1銆佸叧闂榾闂˙銆侀榾闂–锛屽涓婃父绠¢亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠¢亾杩涜鎴祦
+        <div>
+
+        </div>
       </div>
-    </el-card>
+    </div>
     <div >
 </div>
 
@@ -23,8 +29,31 @@
     return {
       tableData: [
         {
+          no: 1,
           name: '鍏抽棴闃�闂�',
-          content: '鍏抽棴闃�闂˙銆侀榾闂–锛屽涓婃父绠¢亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠¢亾杩涜鎴祦',
+          content: '1銆佸叧闂榾闂˙銆侀榾闂–锛屽涓婃父绠¢亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠¢亾杩涜鎴祦',
+          type: 'closeFM',
+          fmGxList: {
+            // 涓婃父闃�闂�
+            syfm: [{ name: '闃�闂˙', lng: 114, lat: 32 }, { name: '闃�闂╝', lng: 114, lat: 32 }],
+            // 涓嬫父闃�闂�
+            xyfm: [{ name: '闃�闂‥', lng: 114, lat: 32 }, { name: '闃�闂‵', lng: 114, lat: 32 }]
+          }
+        },{
+          no: 1,
+          name: '鍏抽棴闃�闂�',
+          content: '1銆佸叧闂榾闂˙銆侀榾闂–锛屽涓婃父绠¢亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠¢亾杩涜鎴祦',
+          type: 'closeFM',
+          fmGxList: {
+            // 涓婃父闃�闂�
+            syfm: [{ name: '闃�闂˙', lng: 114, lat: 32 }, { name: '闃�闂╝', lng: 114, lat: 32 }],
+            // 涓嬫父闃�闂�
+            xyfm: [{ name: '闃�闂‥', lng: 114, lat: 32 }, { name: '闃�闂‵', lng: 114, lat: 32 }]
+          }
+        },{
+          no: 1,
+          name: '鍏抽棴闃�闂�',
+          content: '1銆佸叧闂榾闂˙銆侀榾闂–锛屽涓婃父绠¢亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠¢亾杩涜鎴祦',
           type: 'closeFM',
           fmGxList: {
             // 涓婃父闃�闂�
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index e76118d..c84fcda 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -84,7 +84,7 @@
                     <p>浜嬩欢绫诲瀷锛�<span>妯℃嫙绠$嚎浜嬩欢</span>
                         <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
                                    @click="accordPopup()">
-                            <span>浜嬩欢绠$悊</span>
+                            <span>浜嬩欢澶勭疆</span>
                         </el-button>
                     </p>
                 </div>
@@ -114,6 +114,7 @@
 // import AjaxUtils from '@utils/AjaxUtils'
 
 import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
+import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling'
 import eventBus from '../../../../eventBus'
 import EventsReported from '../../../../components/base-page/enterprise-emergency/EventsReported'
 
@@ -162,7 +163,17 @@
     },
     // 鐐瑰嚮浜嬩欢绠$悊
     accordPopup () {
-      eventBus.$emit('disposal-analysis', true)
+      // eventBus.$emit('disposal-analysis', true)
+      window.$layer.open({
+        content: {
+          comp: EventHandling, // 缁勪欢
+          parent: this, // 鐖剁粍浠�
+          data: { // 浼犻�掔殑鍙傛暟
+            // info: this.info
+          }
+        },
+        title: '浜嬩欢澶勭疆'
+      })
     },
     // 寮�濮嬪垎鏋�
     startAnalysis () {

--
Gitblit v1.8.0