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

zhangshuaibao

2021-03-29 17ba6febdaacf7563f7688bae473a4a89e914ff5

 src/views/MapTemplate.vue

@@ -19,10 +19,9 @@
    <el-button type="primary" @click="ChangeState" class="solid-waste">固废</el-button>
    <SolidContent ref="SolidWastePopup"></SolidContent>
    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">废水</el-button>
    <WasteWaterContent ref="WasteWaterPopup"></WasteWaterContent>
    <PublicBounced ref="PublicBounced"></PublicBounced>
<!--    <SolidContent ref="SolidWastePopup"></SolidContent>-->
    <el-button type="primary" @click="AddGasHelper" class="flue-gas">废气</el-button>
    <popup-gas ref="FlueGas"></popup-gas>
    <PublicBounced ref="PublicBounced"></PublicBounced>
  </div>
</template>
@@ -43,7 +42,7 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
import SolidContent from '@components/BaseNav/SolidWaste/SolidContent'
import WasteWaterContent from '@components/BaseNav/WasteWater/WasteWaterContent'
// import WasteWaterContent from '@components/BaseNav/WasteWater/WasteWaterContent'
// 底图业务js逻辑
import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
@@ -51,7 +50,7 @@
// import SolidContent from '@components/SolidWaste/SolidContent'
// 废气
import AddGasHelper from '@components/flueGas/flueGas'
import PopupGas from '@/components/flueGas/popup-gas'
// import PopupGas from '@/components/flueGas/popup-gas'
// // 公共展示数据
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
@@ -69,14 +68,13 @@
    Popup,
    summarySheets,
    SolidContent,
    WasteWaterContent
    // WasteWaterContent,
    // SolidContent,
    PopupGas,
    // PopupGas,
    PublicBounced
  },
  data () {
    return {
      show: true,
      // isShowBtn: false,
      map: null,
      lcServiceLayerVisible: false,
@@ -124,17 +122,27 @@
        longDayWarr: ''
      }
      const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
      AddSolidWaste.requestData()
      AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.SolidWastePopup)
    },
    ChangeWaterState () {
      if (this.show) {
        const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
        AddWasteWater.requestData()
        AddWasteWater.SetWasteWaterContent(this.config, this.$refs.WasteWaterPopup)
      }
      AddSolidWaste.requestData(data)
      AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
    },
    ChangeWaterState () {
      const data = {
        companyId: 3900100145,
        id: '',
        monType: 1,
        userCode: 'wenchun.deng',
        monDuration: '',
        epName: '',
        secdDeptId: '',
        contrLevel: '',
        dataStatus: '',
        dataFlag: '',
        runStatus: '',
        emissTypeId: ''
      }
      const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
      AddWasteWater.requestData(data)
      AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
    },
    // isShowHidden () {
    //   this.isShowBtn = !this.isShowBtn
@@ -165,7 +173,6 @@

      // this.ChangeState()
      // this.AddGasHelper()
      // this.ChangeState()
      // this.ChangeWaterState()

      this.saveMapStatus()
@@ -231,7 +238,7 @@
.Waste-water {
  position: absolute;
  top: 88px;
  left: 380px;
  left: 280px;
  z-index: 999;
}