Merge remote-tracking branch 'origin/develop' into develop

yangdelong

2021-05-29 71c663091d05b11c41f78d8e75cb8b3db63b9cbc

 src/views/MapTemplate.vue

@@ -41,7 +41,7 @@
// // 公共展示数据
// import PublicBounced from '@components/base-page/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
import ReportIncident from '../components/base-page/enterprise-emergency/ReportIncident'
import ReportIncident from '../components/base-page/enterprise-emergency/discard/ReportIncident'
import Emergency from '@components/emergency/index'
import MapManager from '../components/helpers/MapManager'
import Message from '@components/message/index'