From 20bac7bbc63788b14a40757da47a7f200d4155c1 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 22 四月 2021 09:00:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteGas/WasteGasIndex.vue | 229 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 162 insertions(+), 67 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/WasteGasIndex.vue b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
index cbf990a..7a82933 100644
--- a/src/components/BaseNav/WasteGas/WasteGasIndex.vue
+++ b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
@@ -1,10 +1,48 @@
<template>
<public-sector>
<template v-slot:tabs>
- <public-tabs ref='refsTabsData'></public-tabs>
+ <public-tabs :storagePlaceId="storagePlaceId"></public-tabs>
</template>
- <template v-slot:table>
- <public-echarts ref="refsTableData"></public-echarts>
+ <template v-slot:publicPart>
+ <div class="public-part">
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ <!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
+ <!-- <el-tab-pane label="瀹炴椂鏁版嵁" name="first">-->
+ <!-- <RealData></RealData>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="灏忔椂鏁板眳" name="second">-->
+ <!-- <HourData></HourData>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="鏃ユ暟鎹�" name="third">-->
+ <!-- <DayData></DayData>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="浜哄伐鐩戞祴鏁版嵁" name="fourth">-->
+ <!-- <Detail></Detail>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="ccc" name="five"></el-tab-pane>-->
+ <!-- </el-tabs>-->
+ <div class="legend">
+ <!-- <span>姝ｅ父</span>-->
+ <p>瓒呮爣</p>
+ <i style=" background: #4ec99c;"></i>
+ <!-- <span>棰勮</span>-->
+ <p>棰勮</p>
+ <i style=" background: orange;"></i>
+ <!-- <span>瓒呮爣</span>-->
+ <p>瓒呮爣</p>
+ <i style=" background: red;"></i>
+ </div>
+ <ul class="tab">
+ <li :class="active===0?'hover':''" @click='tabTaggle("RealData",0)'>瀹炴椂鏁版嵁</li>
+ <li :class="active===1?'hover':''" @click='tabTaggle("HourData",1)'>灏忔椂鏁版嵁</li>
+ <li :class="active===2?'hover':''" @click='tabTaggle("DayData",2)'>鏃ユ暟鎹�</li>
+ <li :class="active===3?'hover':''" @click='tabTaggle("Detail",3)'>浜哄伐鐩戞祴鏁版嵁</li>
+ </ul>
+ <component :is="currentTab" ref="RealData"></component>
+ </div>
</template>
<template v-slot:video>
<public-video></public-video>
@@ -14,86 +52,143 @@
<script>
-import PublicTabs from '@components/BaseNav/WasteGas/PublicTabs'
-import PublicEcharts from '@components/BaseNav/PublicBounced/common/PublicChart'
-import PublicVideo from '@components/BaseNav/PublicVideo'
-import PublicSector from '@components/BaseNav/PublicSector'
+import PublicTabs from './PublicTabs'
+import PublicVideo from '../PublicVideo'
+import PublicSector from '../PublicSector'
+// 鍥捐〃缁勪欢
+import RealData from './RealData'
+import HourData from './HourData'
+import DayData from './DayData'
+import Detail from './Detail'
export default {
- name: 'WasteGasIndex',
+ name: 'WasteWaterIndex',
props: ['storagePlaceId'],
components: {
PublicSector,
PublicTabs,
- PublicEcharts,
- PublicVideo
- },
- mounted () {
- this.$nextTick(() => {
- this.refsData()
- console.log(this.storagePlaceId)
- })
+ PublicVideo,
+ RealData,
+ HourData,
+ DayData,
+ Detail
},
data () {
- return {}
+ return {
+ activeName: 'first',
+ // currentTab: this.current(),
+ currentTab: RealData,
+ active: 0
+ }
},
methods: {
- refsData () {
- const data = this.storagePlaceId
- this.$refs.refsTabsData.refsDataTabs(data)
- this.$refs.refsTableData.refsDataTable(data)
+ tabTaggle (taggleMenu, num) {
+ this.currentTab = taggleMenu
+ this.active = num
+ },
+ current (currentTab) {
+ currentTab = RealData
}
}
}
</script>
<style lang="less" scoped>
-.public-bounced {
- z-index: 2000;
- position: absolute;
- top: 35%;
- left: 20%;
- .public-bounced-title {
- cursor: move;
- height: 0.1rem;
- padding: 10px 0;
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- span {
- color: #f4f7ff;
- margin: 0 15px;
- font-size: 14px;
- }
-
- i {
- color: #C0C4CC;
- margin: 0 15px;
- font-size: 22px;
- cursor: pointer;
- }
-
- i:hover {
- color: #00fff6;
- }
- }
-
- .public-bounced-content {
- //padding: 0.1rem;
- display: flex;
- //align-items: center;
- //justify-content: space-around;
-
- .public-bounced-content-left {
- //width: 4.8rem;
- }
-
- .public-bounced-content-right {
- //width: 3rem;
- margin-left: 0.1rem;
- }
- }
+.tab {
+ display: flex;
+ //border-bottom: 1px solid #396d83;
+ //padding: 0.02rem 0.04rem;
}
+
+.tab li {
+ background-color: #243a55;
+ line-height: 0.15rem;
+ height: 0.15rem;
+ text-align: center;
+ border-radius: 5px;
+ margin-right: 0.04rem;
+ padding: 0 0.04rem;
+}
+
+.tab li.hover,
+.tab li:hover {
+ background-color: #0e639e;
+ color: #fff;
+ cursor: pointer;
+}
+
+.legend {
+ position: absolute;
+ top: 0.05rem;
+ right: 0;
+ display: flex;
+ justify-items: center;
+ align-items: center;
+}
+
+.legend i {
+ display: block;
+ width: 0.2rem;
+ height: 0.09rem;
+ margin: 0 0.1rem 0 0.05rem;
+ border-radius: 0.02rem;
+}
+
+.legend span {
+ line-height: 0.09rem;
+ height: 0.09rem;
+ font-size: 0.06rem;
+}
+
+.public-part {
+ position: relative;
+ margin-bottom: 0.1rem;
+ background-color: @background-color;
+ font-size: 0.06rem;
+ font-weight: normal;
+ padding: 0.04rem 0;
+ border: 1px solid #396d83;
+}
+
+.public-part span:nth-child(1) {
+ position: absolute;
+ left: -2px;
+ top: -2px;
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
+ border-width: 2px 0 0 2px;
+}
+
+.public-part span:nth-child(2) {
+ position: absolute;
+ right: -2px;
+ top: -2px;
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
+ border-width: 2px 2px 0 0;
+}
+
+.public-part span:nth-child(3) {
+ position: absolute;
+ right: -2px;
+ bottom: -2px;
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
+ border-width: 0 2px 2px 0;
+}
+
+.public-part span:nth-child(4) {
+ position: absolute;
+ left: -2px;
+ bottom: -2px;
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
+ border-width: 0 0 2px 2px;
+}
+
</style>
--
Gitblit v1.8.0