From 4e53f9f57bac8b8a35c8099f3e31d9ff7724398c Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 16:30:57 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
similarity index 68%
rename from src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 23814fc..002bd92 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.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: {
--
Gitblit v1.8.0