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

zhangshuaibao

2021-04-01 d54311dbd787d54876632026eec36497556ed57c

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


 Conflicts:

	src/components/BaseNav/PublicBounced/PublicBounced.vue

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

@@ -60,7 +60,7 @@

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

    video {
      width: 100%;

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

@@ -8,6 +8,18 @@
    <div class="border_corner border_corner_right_bottom"></div>
    <div class="main">
      <div class="main-matter">
        <div v-if="value == '废气'">
          <el-row type="flex" class="row-bg row-item-one" justify="space-around">
            <el-col :span="8">监测点名称:{{ displayContentTab2.Name }}</el-col>
            <el-col :span="8">生产单位:{{ displayContentTab2.porltName }}</el-col>
          </el-row>
          <el-row type="flex" class="row-bg" justify="space-around">
            <el-col :span="8">排放去向:{{ displayContent.EmissDirecti }}</el-col>
            <el-col :span="8">控制级别名称:{{ displayContent.ContrLevelShowName }}</el-col>
            <el-col :span="8">内/外排口:{{ displayContent.OrOutPortName }}</el-col>
          </el-row>
        </div>
       <div else-if>
        <el-row type="flex" class="row-bg row-item-one" justify="space-around">
          <el-col :span="8">监测点名称:{{ displayContentTab2.StoragePlaceName }}</el-col>
          <el-col :span="8">生产单位:{{ displayContentTab2.StoragePlaceName }}</el-col>
@@ -18,22 +30,7 @@
          <el-col :span="8">控制级别名称:{{ displayContentTab2.SurplusFloorArea }}</el-col>
          <el-col :span="8">内/外排口:{{ displayContentTab2.StorageDate }}</el-col>
        </el-row>
<!--        <el-row type="flex" class="row-bg row-item-one" justify="space-around">-->
<!--          <el-col :span="8">监测点名称:{{ displayContent.Name }}</el-col>-->
<!--          <el-col :span="8">生产单位:{{ displayContent.porltName }}</el-col>-->
<!--          <el-col :span="8">排放类型加载:{{ displayContent.MonTypeName }}</el-col>-->
<!--          &lt;!&ndash;          <el-col :span="8">监测点名称:{{ displayContentTab2.StoragePlaceName }}</el-col>&ndash;&gt;-->
<!--          &lt;!&ndash;          <el-col :span="8">生产单位:{{ displayContentTab2.StoragePlaceName }}</el-col>&ndash;&gt;-->
<!--          &lt;!&ndash;          <el-col :span="8">排放类型加载:{{ displayContentTab2.DesignFloorArea }}</el-col>&ndash;&gt;-->
<!--        </el-row>-->
<!--        <el-row type="flex" class="row-bg" justify="space-around">-->
<!--          <el-col :span="8">排放去向:{{ displayContent.EmissDirecti }}</el-col>-->
<!--          <el-col :span="8">控制级别名称:{{ displayContent.ContrLevelShowName }}</el-col>-->
<!--          <el-col :span="8">内/外排口:{{ displayContent.OrOutPortName }}</el-col>-->
<!--          &lt;!&ndash;          <el-col :span="8">排放去向:{{ displayContentTab2.StorageQty }}</el-col>&ndash;&gt;-->
<!--          &lt;!&ndash;          <el-col :span="8">控制级别名称:{{ displayContentTab2.SurplusFloorArea }}</el-col>&ndash;&gt;-->
<!--          &lt;!&ndash;          <el-col :span="8">内/外排口:{{ displayContentTab2.StorageDate }}</el-col>&ndash;&gt;-->
<!--        </el-row>-->
       </div>
      </div>
    </div>
  </div>
@@ -42,7 +39,7 @@
<script>
export default {
  name: 'GasTable',
  props: ['displayContentTab'],
  props: ['displayContentTab', 'value'],
  data () {
    return {
      displayContentTab2: []

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -6,15 +6,14 @@
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <GasTab :displayContentTab="displayContentTab"></GasTab>
        <PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
<!--          <GasECharts v-else></GasECharts>-->
          <PublicTable v-if="value === 'gufei'"></PublicTable>
          <PublicChart v-else></PublicChart>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>
        <PublicVideo></PublicVideo>
      </div>
    </div>
  </div>
@@ -23,18 +22,18 @@
<script>

import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
import PublicChart from './GasComponents/PublicChart'

export default {
  name: 'PublicBounced',
  components: {
    GasTab,
    PublicTabs,
    PublicTable,
    GasVideo,
    PublicChart
    PublicChart,
    PublicVideo
  },
  data () {
    return {
@@ -46,14 +45,20 @@
  },
  methods: {
    setData (dataBasic, dataDetailed, value) {
      // dataBasic.forEach(item => {
      //   this.displayContentTitle = item.StoragePlaceName
      // })
      dataBasic.forEach(item => {
        this.displayContentTitle = item.StoragePlaceName
      })
      this.displayContentTab = dataBasic
      this.displayContentTable = dataDetailed
      this.flag = true
      this.value = value
    },
    setGasData (data, value) {
      this.displayContentTitle = data.Name
      this.displayContentTab = data
      this.flag = true
      this.value = value
    },
    closePopup () {
      this.flag = false
    }

 src/components/LayerController/logic/WasteGas.js

@@ -56,7 +56,7 @@
    // const result = await mapApi.getWasteGas(dataValue)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setData(e.layer.options.test)
    instance.setGasData(e.layer.options.test, 'feiqi')
    instance.$mount()
    document.body.appendChild(instance.$el)
  }