From 71c663091d05b11c41f78d8e75cb8b3db63b9cbc Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期六, 29 五月 2021 16:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue | 5 +++--
1 files changed, 3 insertions(+), 2 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 8d3d945..38c50ee 100644
--- a/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue
+++ b/src/components/base-page/enterprise-emergency/event-handling/DisposalProposed.vue
@@ -11,6 +11,7 @@
<!-- </div>-->
<div>
1銆佸叧闂榾闂˙銆侀榾闂–锛屽涓婃父绠￠亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠￠亾杩涜鎴祦
+
<div>
</div>
@@ -39,7 +40,7 @@
// 涓嬫父闃�闂�
xyfm: [{ name: '闃�闂‥', lng: 114, lat: 32 }, { name: '闃�闂‵', lng: 114, lat: 32 }]
}
- },{
+ }, {
no: 1,
name: '鍏抽棴闃�闂�',
content: '1銆佸叧闂榾闂˙銆侀榾闂–锛屽涓婃父绠￠亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠￠亾杩涜鎴祦',
@@ -50,7 +51,7 @@
// 涓嬫父闃�闂�
xyfm: [{ name: '闃�闂‥', lng: 114, lat: 32 }, { name: '闃�闂‵', lng: 114, lat: 32 }]
}
- },{
+ }, {
no: 1,
name: '鍏抽棴闃�闂�',
content: '1銆佸叧闂榾闂˙銆侀榾闂–锛屽涓婃父绠￠亾杩涜鎴祦锛涘叧闂榾闂―锛屽涓嬫父绠￠亾杩涜鎴祦',
--
Gitblit v1.8.0