From 3d987417414022bcef8dbee7b165e2c4a36ad6aa Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 12:34:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 2aeea82..2729caf 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,22 +5,34 @@
<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("Echarts")'>瀹炴椂鏁版嵁</li>
<li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
<li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
</ul>
+ <div class="legend" >
+ <span >姝ｅ父</span>
+ <i style=" background: #4ec99c;"></i>
+ <span >棰勮</span>
+ <i style=" background: red;"></i>
+ <span >瓒呮爣</span>
+ <i style=" background: orange;"></i>
+ </div>
<component :is="currentTab" v-bind="$attrs"></component>
</div>
</template>
<script>
import EChartsHour from './EChartsHour'
+import EChartsDate from './EChartsDate'
+import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
export default {
name: 'PublicChart',
components: {
- EChartsHour
+ EChartsHour,
+ EChartsDate,
+ Echarts
},
data () {
return {
@@ -92,23 +104,39 @@
.tab {
display: flex;
border-bottom: 1px solid #396d83;
- margin-bottom: 10px;
+ padding:5px 10px
}
-li {
+.tab li {
background-color: #243a55;
- margin: 10px 10px 2px 10px;
- /*padding: 5px 10px;*/
- width: 90px;
- height: 25px;
line-height: 25px;
text-align: center;
border-radius: 5px;
+ margin-right: 10px;
+ padding:0 15px
}
-ul li:hover {
+.tab li:hover {
background-color: #0e639e;
color: #682000;
cursor: pointer;
}
+.legend{
+ position: absolute;
+ top:10px;
+ right: 0;
+ display: flex;
+ justify-items: center;
+}
+.legend i {
+ display: block;
+ width: 35px;
+ height: 15px;
+ margin:0 10px 0 3px;
+ border-radius: 3px;
+}
+.legend span{
+ line-height: 15px;
+}
+
</style>
--
Gitblit v1.8.0