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

chenyabin

2021-04-02 724f7ffe496cca442d73b5bd39d9949178974032

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

@@ -7,19 +7,18 @@
    <div class="border_corner border_corner_right_bottom"></div>
    <div class="main">
      <div class="main-video">
<!--        <el-table-->
<!--            tooltip-effect="dark"-->
<!--            :data="displayContentTable2"-->
<!--        >-->
<!--          <el-table-column prop="StoragePlaceId" label="序号"></el-table-column>-->
<!--          <el-table-column prop="StoragePlaceTypeName" label="类别"></el-table-column>-->
<!--          <el-table-column prop="StoragePlaceName" label="固废名称"></el-table-column>-->
<!--          <el-table-column prop="StorageZDMJ" label="代码"></el-table-column>-->
<!--          <el-table-column prop="StorageZCNL" label="产生量"></el-table-column>-->
<!--          <el-table-column prop="StorageZCL" label="储存量"></el-table-column>-->
<!--          <el-table-column prop="StorageType" label="产生装置"></el-table-column>-->
<!--        </el-table>-->
        <span>{{ displayContentTable3.StoragePlaceTypeName }}</span>
        <el-table
            tooltip-effect="dark"
            :data="displayContentTableData"
        >
          <el-table-column prop="StoragePlaceId" label="序号"></el-table-column>
          <el-table-column prop="StoragePlaceTypeName" label="类别"></el-table-column>
          <el-table-column prop="StoragePlaceName" label="固废名称"></el-table-column>
          <el-table-column prop="StorageZDMJ" label="代码"></el-table-column>
          <el-table-column prop="StorageZCNL" label="产生量"></el-table-column>
          <el-table-column prop="StorageZCL" label="储存量"></el-table-column>
          <el-table-column prop="StorageType" label="产生装置"></el-table-column>
        </el-table>
      </div>
    </div>
  </div>
@@ -31,25 +30,14 @@
  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.displayContentTable3 = item
        this.displayContentTableData = item
        // console.log(item[0])
      })
    })
  }