From 6ace815c16170b0a7fc68bf280f63bffe96612e6 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 18:24:30 +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, 36 insertions(+), 22 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index e0e94a3..282bb30 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -24,20 +24,20 @@
<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'
-import EChartsHour from './EChartsHour'
-import EChartsDate from './EChartsDate'
-import EChartsTable from './EChartsTable'
+import ECharts from './echarts/Echarts'
+import EChartsHour from './echarts/EChartsHour'
+import EChartsDate from './echarts/EChartsDate'
+import EChartsTable from './echarts/EChartsTable'
-import EChartsRealWasteWater from './EChartsRealWasteWater'
-import EChartsHourWasteWater from './EChartsHourWasteWater'
-import EChartsDateWasteWater from './EChartsDateWasteWater'
-import EChartsWasteWaterTable from './EChartsWasteWaterTable'
+import EChartsRealWasteWater from './echarts/EChartsRealWasteWater'
+import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
+import EChartsDateWasteWater from './echarts/EChartsDateWasteWater'
+import EChartsWasteWaterTable from './echarts/EChartsWasteWaterTable'
export default {
name: 'PublicChart',
@@ -54,9 +54,12 @@
mounted () {
this.$refs.Echatrs.CreateChart()
},
+ updated () {
+ this.$refs.Echats.CreateChart()
+ },
data () {
return {
- currentTab: 'EChartsHour',
+ currentTab: this.current(),
active: '1'
}
},
@@ -65,6 +68,16 @@
this.currentTab = taggleMenu
this.active = num
// debugger
+ },
+ current (currentTab) {
+ if (this.$attrs.value === 'feishui') {
+ currentTab = 'EChartsHourWasteWater'
+ console.log(currentTab)
+ } else {
+ currentTab = 'EChartsHour'
+ console.log(currentTab)
+ }
+ return currentTab
}
}
}
@@ -74,10 +87,8 @@
<style scoped lang="less">
.win {
position: relative;
- /*margin-bottom: 13px;*/
background:@background-color;
border: 0.8px solid #396d83;
- /*height: 1.5rem;*/
}
.border_corner {
@@ -120,16 +131,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 {
@@ -139,20 +151,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