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

chenzeping

2021-04-01 4e53f9f57bac8b8a35c8099f3e31d9ff7724398c

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

File was renamed from src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
@@ -5,30 +5,27 @@
        <div class="border_corner border_corner_left_bottom"></div>
        <div class="border_corner border_corner_right_bottom"></div>
        <el-tabs type="card" v-model="activeName">
            <el-tab-pane label="实试数据" name="first">
                <EchartsTab></EchartsTab>
                <GasECharts></GasECharts>
            <el-tab-pane label="实试数据" name="first"></el-tab-pane>
            <el-tab-pane label="日数据" name="second">
                <ECharts></ECharts>
            </el-tab-pane>
            <el-tab-pane label="日数据" name="second"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
            <el-tab-pane label="月数据" name="third"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
            <el-tab-pane label="人工数据" name="fourth"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
            <el-tab-pane label="月数据" name="third"></el-tab-pane>
            <el-tab-pane label="人工数据" name="fourth"></el-tab-pane>
        </el-tabs>
    </div>
</template>

<script>
import GasECharts from './GasECharts'
import EchartsTab from './EchartsTab'
import ECharts from './ECharts'

export default {
  name: 'GasTabs',
  name: 'PublicChart',
  components: {
    GasECharts,
    EchartsTab
    ECharts
  },
  data () {
    return {
      activeName: 'first'
      activeName: 'second'
    }
  },
  methods: {