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

chenyabin

2021-04-02 724f7ffe496cca442d73b5bd39d9949178974032

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

 src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue

@@ -9,7 +9,7 @@
      <div class="main-video">
        <el-table
            tooltip-effect="dark"
            :data="displayContentTable2"
            :data="displayContentTableData"
        >
          <el-table-column prop="StoragePlaceId" label="序号"></el-table-column>
          <el-table-column prop="StoragePlaceTypeName" label="类别"></el-table-column>
@@ -30,20 +30,16 @@
  props: ['displayContentTable'],
  data () {
    return {
      displayContentTable2: [
        {
          CompanyName: '中韩石化',
          StoragePlaceId: 3,
          StoragePlaceName: '灰渣场',
          StoragePlaceTypeName: '一般固废填埋场',
          StorageType: '粉煤灰、灰渣',
          StorageZCL: '38',
          StorageZCNL: '40.7',
          StorageZDMJ: '10.60798'
        }
      ],
      displayContentTable3: []
      displayContentTableData: []
    }
  },
  mounted () {
    this.$nextTick(() => {
      this.displayContentTable.forEach(item => {
        this.displayContentTableData = item
        // console.log(item[0])
      })
    })
  }
}
</script>
@@ -60,7 +56,7 @@

  .main-video {
    width: 100%;
    min-height: 164px;
    min-height: 195px;

    video {
      width: 100%;

 src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue

@@ -62,7 +62,7 @@
    this.$nextTick(() => {
      this.displayContentTab.forEach(item => {
        this.displayContentTab2 = item
        console.log(item)
        // console.log(item)
      })
    })
  }

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -6,9 +6,10 @@
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <PublicTabs :displayContentTab="displayContentTab" :value="value" :setWasteGasdata="setWasteGasdata"></PublicTabs>
        <PublicTabs :displayContentTab="displayContentTab" :value="value"
                    :setWasteGasdata="setWasteGasdata"></PublicTabs>
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'"></PublicTable>
          <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
          <PublicChart v-else></PublicChart>
        </div>
      </div>

 src/components/LayerController/logic/SolidWaste.js

@@ -89,7 +89,7 @@
    const instance = new PublicBounced()
    instance.$mount()
    document.body.appendChild(instance.$el)
    instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
    instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
    /* flyTo()弹出框平移事件 */
    this.setPanTo(e.latlng, 200)
  }