Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

徐旺旺

2021-05-20 ec4d5c1827487f4c901b69bd9eae58e111e82b32

 src/views/MapTemplate.vue

@@ -17,7 +17,7 @@
        <!--    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">废水</el-button>-->
        <!--    <el-button type="primary" @click="AddGasHelper" class="flue-gas">废气</el-button>-->
<!--        <PublicBounced ref="PublicBounced"></PublicBounced>-->
<!--            <ReportPopup></ReportPopup>-->
            <ReportPopup></ReportPopup>
        <Emergency ref="Emergency"></Emergency>
        <Message></Message>
    </div>
@@ -39,7 +39,7 @@
// // 公共展示数据
// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
// import ReportPopup from '../components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup'
import ReportPopup from '../components/panel/topicSearch/EnterpriseEmergency/ReportPopup'
import Emergency from '@components/emergency/index'
import MapManager from '../components/helpers/MapManager'
import Message from '@components/message/index'
@@ -58,8 +58,8 @@
    SummarySheet,
    // PublicBounced,
    Emergency,
    Message
    // ReportPopup
    Message,
    ReportPopup
  },
  data () {
    return {