From ac41da710d542993b9c9fd9c680cc310e8e61832 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 09 四月 2021 17:54:48 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 150 +++++++++++++++++++++++++++-----------------------
1 files changed, 81 insertions(+), 69 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 3f68e5d..b2788bb 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -6,8 +6,8 @@
<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("ECharts")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
+ <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
<li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
</ul>
<component :is="currentTab" v-bind="$attrs"></component>
@@ -15,22 +15,24 @@
</template>
<script>
-import ECharts from './ECharts'
+import EChartsHour from './EChartsHour'
+import EChartsDate from './EChartsDate'
export default {
name: 'PublicChart',
components: {
- ECharts
+ EChartsHour,
+ EChartsDate
},
data () {
return {
- currentTab: 'ECharts'
+ currentTab: 'EChartsHour'
}
},
methods: {
tabTaggle (taggleMenu) {
this.currentTab = taggleMenu
- debugger
+ // debugger
}
}
}
@@ -38,67 +40,77 @@
</script>
<style scoped>
- *{
- margin: 0;
- padding: 0;
- list-style: none;
- }
- .win {
- position: relative;
- margin-bottom: 13px;
- background-color: rgba(33, 41, 69,0.9);
- border: 0.8px solid #396d83;
- }
- .border_corner{
- z-index: 999;
- position: absolute;
- width: 10px;
- height: 10px;
- background: rgba(0,0,0,0);
- border: 1.5px solid #47d5ea;
- }
- .border_corner_left_top{
- top: 0;
- left: 0;
- border-right: none;
- border-bottom: none;
- }
- .border_corner_right_top{
- top: 0;
- right: 0;
- border-left: none;
- border-bottom: none;
- }
- .border_corner_left_bottom{
- bottom: 0;
- left: 0;
- border-right: none;
- border-top: none;
- }
- .border_corner_right_bottom{
- bottom: 0;
- right: 0;
- border-left: none;
- border-top: none;
- }
- .tab{
- display: flex;
- border-bottom: 1px solid #396d83;
- margin-bottom: 10px;
- }
- 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;
- }
- ul li:hover{
- background-color: #0e639e;
- color: #682000;
- cursor: pointer;
- }
+* {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.win {
+ position: relative;
+ /*margin-bottom: 13px;*/
+ background-color: rgba(33, 41, 69, 0.9);
+ border: 0.8px solid #396d83;
+ /*height: 1.5rem;*/
+}
+
+.border_corner {
+ z-index: 999;
+ position: absolute;
+ width: 10px;
+ height: 10px;
+ background: rgba(0, 0, 0, 0);
+ border: 1.5px solid #47d5ea;
+}
+
+.border_corner_left_top {
+ top: 0;
+ left: 0;
+ border-right: none;
+ border-bottom: none;
+}
+
+.border_corner_right_top {
+ top: 0;
+ right: 0;
+ border-left: none;
+ border-bottom: none;
+}
+
+.border_corner_left_bottom {
+ bottom: 0;
+ left: 0;
+ border-right: none;
+ border-top: none;
+}
+
+.border_corner_right_bottom {
+ bottom: 0;
+ right: 0;
+ border-left: none;
+ border-top: none;
+}
+
+.tab {
+ display: flex;
+ border-bottom: 1px solid #396d83;
+ margin-bottom: 10px;
+}
+
+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;
+}
+
+ul li:hover {
+ background-color: #0e639e;
+ color: #682000;
+ cursor: pointer;
+}
</style>
--
Gitblit v1.8.0