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

wangqi

2021-04-06 272c1dc7490b70a50f245bd4965284f7baa15bdf

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

@@ -6,21 +6,21 @@
    <div class="border_corner border_corner_left_bottom"></div>
    <div class="border_corner border_corner_right_bottom"></div>
    <div class="main">
      <el-col class="main-video">
      <div class="main-video">
        <el-table
            border
            tooltip-effect="dark"
            :data="data"
            :data="displayContentTableData"
        >
          <el-table-column prop="name" label="序号"></el-table-column>
          <el-table-column prop="name" label="类别"></el-table-column>
          <el-table-column prop="date" label="固废名称"></el-table-column>
          <el-table-column prop="address" label="代码"></el-table-column>
          <el-table-column prop="address" label="产生量"></el-table-column>
          <el-table-column prop="name" label="储存量"></el-table-column>
          <el-table-column prop="date" label="产生装置"></el-table-column>
          <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>
      </el-col>
      </div>
    </div>
  </div>
</template>
@@ -28,30 +28,19 @@
<script>
export default {
  name: 'PublicTable',
  props: ['requestSolidWasteData'],
  props: ['displayContentTable'],
  data () {
    return {
      data: [{
        date: '2016-05-03',
        name: '王小虎',
        address: '上海市普陀区金沙江路 1518 弄'
      }, {
        date: '2016-05-02',
        name: '王小虎',
        address: '上海市普陀区金沙江路 1518 弄'
      }]
      displayContentTableData: []
    }
  },
  mounted () {
    this.$nextTick(() => {
      this.getSolidWasteData()
      this.displayContentTable.forEach(item => {
        this.displayContentTableData = item
        // console.log(item[0])
      })
    })
  },
  methods: {
    getSolidWasteData () {
      // const data = requestSolidWasteData
      // console.log(data)
    }
  }
}
</script>
@@ -67,9 +56,8 @@
  height: 100%;

  .main-video {
    //border: 1px solid #396d83;
    width: 100%;
    height: 100%;
    min-height: 195px;

    video {
      width: 100%;