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 | 86 ++++++++++++++----------------------------
1 files changed, 29 insertions(+), 57 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index dc6ab00..2729caf 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -9,16 +9,15 @@
<li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
<li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
<li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
- <div id="title" >
- <span><strong> </strong></span>
- <span >姝e父</span>
- <span ></span>
- <span >棰勮</span>
- <span ></span>
- <span >瓒呮爣</span>
- <span ></span>
- </div>
</ul>
+ <div class="legend" >
+ <span >姝e父</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>
@@ -105,66 +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;
}
-#title{
- height: 30px;
- /* margin-top: 30px; */
- color: #ffffff;
- margin-top: 5px;
+.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;
}
-#title span:nth-child(1){
- /*margin-left: 478px*/
-}
-#title span:nth-child(2){
- /*margin-left: 177px*/
-}
-#title span:nth-child(3){
- display: inline-block;
- background-color: #4ec99c;
- height: 15px;
- width: 35px;
- margin-left: 10px;
- border-radius: 5px;
-}
-#title span:nth-child(6){
- /*margin-left: 21px*/
-}
-#title span:nth-child(7){
- display: inline-block;
- background-color: red;
- height: 15px;
- width: 35px;
- margin-left: 7px;
- border-radius: 5px;
-}
-#title span:nth-child(4){
- margin-left: 17px;
-}
-#title span:nth-child(5){
- display: inline-block;
- background-color: orange;
- height: 15px;
- width: 35px;
- margin-left: 9px;
- border-radius: 5px;
-}
</style>
--
Gitblit v1.8.0