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

zhangshuaibao

2021-04-01 9b4688d253fe2ab54868ba10ff5bd89051971d0c

 src/views/MapTemplate.vue

@@ -16,9 +16,9 @@
    <summary-sheets></summary-sheets>
    <enterprise></enterprise>
    <!--    <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
<!--    <el-button type="primary" @click="ChangeState" class="solid-waste">固废</el-button>-->
<!--    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">废水</el-button>-->
<!--    <el-button type="primary" @click="AddGasHelper" class="flue-gas">废气</el-button>-->
    <!--    <el-button type="primary" @click="ChangeState" class="solid-waste">固废</el-button>-->
    <!--    <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>
  </div>
</template>
@@ -133,6 +133,7 @@
    init () {
      const mapcontainer = this.$refs.rootmap
      this.map = Sgis.initMap(mapcontainer)
      this.$refs.toolBox.map = this.map

      window.popupComp = this.$refs.popup
      var layerFactory = new LayerFactory({
@@ -154,7 +155,7 @@

      // this.AddGasHelper()
      // this.ChangeWaterState()
      this.$refs.toolBox.init(this.map)

      this.saveMapStatus()
      // this.setMapObj(this.mapObj)
      // this.setBasemapHelper(this.basemapHelper)