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

chenzeping

2021-03-31 20fcd1d8d35824e8ffa81596e537957566e1fa0d

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

@@ -6,9 +6,8 @@
    <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"
        >
@@ -20,7 +19,7 @@
          <el-table-column prop="name" label="储存量"></el-table-column>
          <el-table-column prop="date" label="产生装置"></el-table-column>
        </el-table>
      </el-col>
      </div>
    </div>
  </div>
</template>
@@ -34,11 +33,11 @@
      data: [{
        date: '2016-05-03',
        name: '王小虎',
        address: '上海市普陀区金沙518区金沙江路'
        address: '上海市普陀区'
      }, {
        date: '2016-05-02',
        name: '王小虎',
        address: '上海市普陀区金沙江区金沙'
        address: '上海市普陀区'
      }]
    }
  },
@@ -65,11 +64,12 @@
.main {
  width: 100%;
  height: 100%;

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

    video {
      width: 100%;