From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index 022fc87..d80b3ae 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -5,10 +5,6 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<ul class="tab">
-<!-- <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>-->
-<!-- <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>-->
-<!-- <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>-->
-<!-- <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>-->
<li :class="active==0?'hover':''" @click='tabTaggle("ECharts",0)'>瀹炴椂鏁版嵁</li>
<li :class="active==1?'hover':''" @click='tabTaggle("EChartsHour",1)'>灏忔椂鏁版嵁</li>
<li :class="active==2?'hover':''" @click='tabTaggle("EChartsDate",2)'>鏃ユ暟鎹�</li>
@@ -22,17 +18,15 @@
<span >瓒呮爣</span>
<i style=" background: orange;"></i>
</div>
- <component :is="currentTab" v-bind="$attrs" ref="Echatrs"></component>
+ <component :is="currentTab" v-bind="$attrs" ref="Echats"></component>
</div>
</template>
<script>
+import ECharts from './echarts/Echarts'
import EChartsHour from './echarts/EChartsHour'
import EChartsDate from './echarts/EChartsDate'
-import ECharts from './echarts/Echarts'
-// import EChartsDate from './EChartsDate'
-import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
-import EChartsTable from '@components/BaseNav/PublicBounced/common/echarts/EChartsTable'
+import EChartsTable from './echarts/EChartsTable'
export default {
name: 'PublicChart',
@@ -40,24 +34,29 @@
EChartsHour,
EChartsDate,
ECharts,
- // EChartsDate
- EChartsHourWasteWater,
EChartsTable
- },
- mounted () {
- this.$refs.Echatrs.CreateChart()
},
data () {
return {
- // currentTab: EChartsHour,
- active: '1'
+ currentTab: this.current(),
+ active: '0'
}
},
+ // updated () {
+ // this.$refs.Echats.DrawEXHRealTimeDateChart()
+ // },
methods: {
tabTaggle (taggleMenu, num) {
this.currentTab = taggleMenu
this.active = num
- // debugger
+ },
+ current (currentTab) {
+ if (this.$attrs.value === 'feishui') {
+ currentTab = 'EChartsRealWasteWater'
+ } else {
+ currentTab = 'ECharts'
+ }
+ return currentTab
}
}
}
@@ -67,10 +66,8 @@
<style scoped lang="less">
.win {
position: relative;
- /*margin-bottom: 13px;*/
background:@background-color;
border: 0.8px solid #396d83;
- /*height: 1.5rem;*/
}
.border_corner {
@@ -113,16 +110,17 @@
.tab {
display: flex;
border-bottom: 1px solid #396d83;
- padding:5px 10px
+ padding:0.02rem 0.04rem;
}
.tab li {
background-color: #243a55;
- line-height: 25px;
+ line-height:0.15rem;
+ height: 0.15rem;
text-align: center;
border-radius: 5px;
- margin-right: 10px;
- padding:0 15px
+ margin-right: 0.04rem;
+ padding:0 0.04rem;
}
.tab li.hover,
.tab li:hover {
@@ -132,20 +130,22 @@
}
.legend{
position: absolute;
- top:10px;
+ top:0.05rem;
right: 0;
display: flex;
justify-items: center;
}
.legend i {
display: block;
- width: 35px;
- height: 15px;
- margin:0 10px 0 3px;
- border-radius: 3px;
+ width: 0.2rem;
+ height: 0.09rem;
+ margin:0 0.1rem 0 0.05rem;
+ border-radius: 0.02rem;
}
.legend span{
- line-height: 15px;
+ line-height: 0.09rem;
+ height: 0.09rem;
+ font-size: 0.06rem;
}
</style>
--
Gitblit v1.8.0