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

徐旺旺

2021-04-18 e25ff993695e7a4b394a5d1aa102f113dbe5316b

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

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -4,49 +4,45 @@
      <span>{{ displayContentTitle }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
    </div>
<!--    <div class="public-bounced-content">-->
<!--      <div class="public-bounced-content-left">-->
<!--        <public-tabs :setSolidWaste="displayContentTab" :value="value"-->
<!--                     :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
<!--        <div class="public-bounced-content-left-bottom">-->
<!--          <public-table v-if="value === 'gufei'"-->
<!--                        :displayContentTable="displayContentTable"></public-table>-->
<!--          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
<!--                        :value="value"-->
<!--                        :getQueryOnlineMonData="getQueryOnlineMonData"-->
<!--                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'-->
<!--                        :ManualData="ManualData"-->
<!--                        ref="PublicChart"-->
<!--          >-->
<!--          </public-chart>-->
<!--        </div>-->
<!--      </div>-->
<!--      <div class="public-bounced-content-right">-->
<!--        <public-video></public-video>-->
<!--      </div>-->
<!--    </div>-->
    <PublicSector></PublicSector>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <public-tabs :setSolidWaste="displayContentTab" :value="value"
                     :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
        <div class="public-bounced-content-left-bottom">
          <public-table v-if="value === 'gufei'"
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                        :value="value"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
                        :ManualData="ManualData"
                        ref="PublicChart"
          >
          </public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <public-video></public-video>
      </div>
    </div>
  </div>
</template>

<script>

import '@/utils/dragBoxes'
// import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
// import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
// import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
// import PublicChart from './common/PublicChart'

import PublicSector from '@components/BaseNav/PublicSector'
import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
import PublicChart from './common/PublicChart'

export default {
  name: 'PublicBounced',
  components: {
    PublicSector
    // PublicTabs,
    // PublicTable,
    // PublicChart,
    // PublicVideo
    PublicTabs,
    PublicTable,
    PublicChart,
    PublicVideo
  },
  data () {
    return {

 src/components/BaseNav/WasteSolid/PublicTable.vue

@@ -14,6 +14,8 @@
</template>

<script>
import mapApi from '@/api/mapApi'

export default {
  name: 'PublicTable',
  props: ['displayContentTable'],
@@ -54,10 +56,18 @@
  },
  mounted () {
    this.$nextTick(() => {
      this.listData.push(this.displayContentTable[0], {}, {}, {}, {}, {}, {})
      this.listData.push({}, {}, {}, {}, {}, {})
    })
  },
  methods: {
    async refsDataTable (data) {
      const StoragePlaceId = {
        StoragePlaceId: data
      }
      const result = await mapApi.getSolidWasteDetail(StoragePlaceId)
      this.listData = result.Result.DataInfo[0]
      console.log(this.listData)
    },
    // 隔行颜色设置
    tableRowClassName ({
      row,

 src/components/BaseNav/WasteSolid/PublicTabs.vue

@@ -22,19 +22,27 @@
</template>

<script>
import mapApi from '@/api/mapApi'

export default {
  name: 'GasTable',
  data () {
    return {
      tabList: [],
      setSolidWaste: [{
        StoragePlaceId: 0,
        StoragePlaceName: '取水单元干泥暂存库',
        DesignFloorArea: 0.024,
        StorageQty: 0.016,
        SurplusFloorArea: 0.018,
        StorageDate: '2021-01-17'
      }]
      setSolidWaste: []
    }
  },
  mounted () {
    this.$nextTick(() => {
      this.refsDataTabs()
    })
  },
  methods: {
    async refsDataTabs (data) {
      const StoragePlaceId = {
        StoragePlaceId: data
      }
      const result = await mapApi.getSolidWasteBaseInfo(StoragePlaceId)
      this.setSolidWaste = result.Result.DataInfo
    }
  }
}

 src/components/BaseNav/WasteSolid/WasteSolidIndex.vue

@@ -1,11 +1,10 @@
<template>
  <public-sector>
    <div></div>
    <template v-slot:tabs>
      <public-tabs></public-tabs>
      <public-tabs ref='refsTabsData'></public-tabs>
    </template>
    <template v-slot:table>
      <public-table ref="table"></public-table>
      <public-table ref="refsTableData"></public-table>
    </template>
    <template v-slot:video>
      <public-video></public-video>
@@ -15,7 +14,6 @@

<script>

// import '@/utils/dragBoxes'
import PublicTabs from '@components/BaseNav/WasteSolid/PublicTabs'
import PublicTable from '@components/BaseNav/WasteSolid/PublicTable'
import PublicVideo from '@components/BaseNav/PublicVideo'
@@ -23,16 +21,17 @@

export default {
  name: 'WasteSolidIndex',
  props: ['title'],
  props: ['storagePlaceId'],
  components: {
    // WasteSolid,
    PublicSector,
    PublicTabs,
    PublicTable,
    PublicVideo
  },
  mounted () {
    console.log(this.title)
    this.$nextTick(() => {
      this.refsData()
    })
  },
  data () {
    return {
@@ -43,12 +42,15 @@
        StorageQty: 0.016,
        SurplusFloorArea: 0.018,
        StorageDate: '2021-01-17'
      }],
      displayContentTable: '',
      flag: false
      }]
    }
  },
  methods: {
    refsData () {
      const data = this.storagePlaceId
      this.$refs.refsTabsData.refsDataTabs(data)
      this.$refs.refsTableData.refsDataTable(data)
    },
    // 固废相关信息设置
    setData (title, dataBasic, dataDetailed, value) {
      this.flag = true

 src/components/LayerController/logic/WasteSolid.js

@@ -11,8 +11,6 @@
// 使用封装方法
const AnimalService = require('../service/AnimalService').default

// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default

module.exports = function () {
  /**
   * 返回marker对象数组
@@ -34,8 +32,7 @@
      // 定义类型 用来区分数据的不同 1.接口接口数据来进行数据的判断 2.根据数据类型的不同，进行不同类型的图片显示
      const judgeValue = getSolidWasteData[i].StorageQty
      var iconUrl = this.differentTypes(judgeValue)
      // console.log(getSolidWasteData[i].Latitude, getSolidWasteData[i].Longitude)
      // console.log(getSolidWasteData[i])

      const marker = L.marker([positionX, positionY], {
        totransferData: getSolidWasteData[i],
        icon: L.icon({
@@ -44,9 +41,6 @@
          iconAnchor: [15, 15]
        })
      })
      // console.log(L.icon)
      // console.log(iconUrl)
      // console.log(marker)
      layer.addLayer(marker)
    }
  }
@@ -75,33 +69,17 @@

  // 根据点击不同数据 进行接口的数据请求
  this.requestSolidWasteData = async (e) => {
    // 基本信息 和 详细信息 展示数据所需参数
    // const dataValue = {
    //   StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
    // }
    // console.log(e.layer.options.totransferData.Name)
    // 弹框标题
    const title = e.layer.options.totransferData.Name
    // 基本信息 tabs
    // const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
    // 详细信息展示 table
    // const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)

    // // 绑定弹框实例
    // const PublicBounced = window.Vue.extend(publicBounced)
    // const instance = new PublicBounced().$mount()
    // document.body.appendChild(instance.$el)
    // // document.body.removeChild(instance.$el)
    // // 通过方法 向绑定弹框传递数据
    // instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
    /* flyTo()弹出框平移事件 */
    this.setPanTo(e.latlng, 300)

    // console.log(e.layer.options.totransferData.StoragePlaceId)
    window.$layer.open({
      content: {
        content: WasteSolidIndex, // 组件
        parent: this, // 父组件
        data: { // 传递的参数
          info: this.info,
          storagePlaceId: e.layer.options.totransferData.StoragePlaceId
        }
      },