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

chenyabin

2021-04-07 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c

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

@@ -6,20 +6,22 @@
    <div class="border_corner border_corner_left_bottom"></div>
    <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>
      <div class="main-table">
        <el-table
            stripe='stripe'
            :height="300"
            tooltip-effect="dark"
            :data="displayContentTableData"
            :row-class-name="tableRowClassName"
        >
          <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="产生量(t)"></el-table-column>
          <el-table-column prop="StorageZCL" label="储存量(t)"></el-table-column>
          <el-table-column prop="StorageType" label="产生装置"></el-table-column>
        </el-table>
      </div>
    </div>
  </div>
@@ -31,44 +33,48 @@
  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
      })
    })
  },
  methods: {
    tableRowClassName ({
      row,
      rowIndex
    }) {
      if (rowIndex % 2 === 0) {
        return 'warning-row'
      } else if (rowIndex % 2 === 1) {
        return 'success-row'
      }
      return ''
    }
  }
}
</script>

<style lang="less" scoped>

.win {
  position: relative;
  background-color: rgba(33, 41, 69, 0.9);
  min-height: 300px;
}

.main {
  width: 100%;
  height: 100%;

  .main-video {
  .main-table {
    width: 100%;
    min-height: 195px;
    //border: 1px @color solid;

    video {
      width: 100%;
@@ -84,7 +90,7 @@
  width: 14px;
  height: 14px;
  background: rgba(0, 0, 0, 0);
  border: 1.5px solid #47d5ea;
  border: 1px solid #47d5ea;
}

.border_corner_left_top {