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

chenyabin

2021-04-19 b765df07d1b732dad563712a49d0c0d810d940c9

 src/components/table/components/tabHandover.vue

@@ -23,6 +23,8 @@

<script>
import WasteWater from '@components/table/components/WasteWater'
import ReportTable from '../../../components/BaseNav/SoilGroundwater/ReportTable'

// import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/WasteSolid'
import AirQuality from '@components/table/components/AirQuality'
@@ -64,7 +66,7 @@
          this.gcComp = AirQuality
          break
        case '土壤及地下水':
          this.gcComp = AirQuality
          this.gcComp = ReportTable
          break
        case '管线':
          this.gcComp = AirQuality