From fa8fee96d1ca9341d54c86c6c75cf578761d7b2f Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 14:43:34 +0800
Subject: [PATCH] 修改文件名称
---
/dev/null | 0
src/components/BaseNav/PublicBounced/GasComponents/EchartsInfo.vue | 10 +++++-----
src/components/BaseNav/PublicBounced/GasComponents/PublicTab.vue | 24 ++++++++++++------------
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 6 +++---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 12 +++++++-----
5 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
similarity index 96%
rename from src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index c2366b0..cdad7bf 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -4,7 +4,7 @@
<script>
export default {
- name: 'GasECharts',
+ name: 'ECharts',
methods: {
drawChart: function () {
const myChart = this.$echarts.init(this.$refs.main)
@@ -88,7 +88,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['12:00:01', '12:00:02', '12:00:03', '12:00:04', '12:00:05', '12:00:06', '12:00:07'],
+ data: ['2021.01.01', '2021.01.02', '2021.01.03', '2021.01.04', '2021.01.05', '2021.01.06', '2021.01.07'],
axisLabel: { // x杞村叏閮ㄦ樉绀�
rotate: 20,
interval: 0,
@@ -178,6 +178,6 @@
margin: 0;
padding: 0;
border: 1px solid #396d83;
- /*margin: 10px 10px 10px 10px;*/
+ margin: 10px 10px 10px 10px;
}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/EchartsInfo.vue
similarity index 64%
rename from src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/EchartsInfo.vue
index 1ab150f..a61bdca 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EchartsInfo.vue
@@ -1,15 +1,15 @@
<template>
<div class="Infomation">
- <el-tag>姘哀鍖栫墿: 29.93 鏍囧噯: 100</el-tag>
- <el-tag>浜屾哀鍖栫～: 17.34鏍囧噯: 50</el-tag>
- <el-tag>鐑熷皹: 6.93鏍囧噯: 30</el-tag>
- <el-tag>搴熸皵娴侀噺: 120343.18</el-tag>
+ <el-tag>姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</el-tag>
+ <el-tag>浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</el-tag>
+ <el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>
+ <el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>
</div>
</template>
<script>
export default {
- name: 'EchartsTab',
+ name: 'EchartsInfo',
props: ['displayContent'],
data () {
return {}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue
deleted file mode 100644
index e69de29..0000000
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue
+++ /dev/null
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTab.vue
similarity index 68%
rename from src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/PublicTab.vue
index 23814fc..5579cc7 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTab.vue
@@ -5,30 +5,30 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<el-tabs type="card" v-model="activeName">
- <el-tab-pane label="瀹炶瘯鏁版嵁" name="first">
- <EchartsTab></EchartsTab>
- <GasECharts></GasECharts>
+ <el-tab-pane label="瀹炶瘯鏁版嵁" name="first"></el-tab-pane>
+ <el-tab-pane label="鏃ユ暟鎹�" name="second">
+ <EchartsInfo></EchartsInfo>
+ <ECharts></ECharts>
</el-tab-pane>
- <el-tab-pane label="鏃ユ暟鎹�" name="second"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
- <el-tab-pane label="鏈堟暟鎹�" name="third"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
- <el-tab-pane label="浜哄伐鏁版嵁" name="fourth"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
+ <el-tab-pane label="鏈堟暟鎹�" name="third"></el-tab-pane>
+ <el-tab-pane label="浜哄伐鏁版嵁" name="fourth"></el-tab-pane>
</el-tabs>
</div>
</template>
<script>
-import GasECharts from './GasECharts'
-import EchartsTab from './EchartsTab'
+import ECharts from './ECharts'
+import EchartsInfo from './EchartsInfo'
export default {
- name: 'GasTabs',
+ name: 'PublicTab',
components: {
- GasECharts,
- EchartsTab
+ ECharts,
+ EchartsInfo
},
data () {
return {
- activeName: 'first'
+ activeName: 'second'
}
},
methods: {
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 892cbad..ba5ac37 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -9,7 +9,8 @@
<GasTab :displayContentTab="displayContentTab" ></GasTab>
<div class="public-bounced-content-left-bottom">
<PublicTable v-if="value === 'gufei'"></PublicTable>
- <GasECharts v-else></GasECharts>
+<!-- <GasECharts v-else></GasECharts>-->
+ <PublicTab v-else></PublicTab>
</div>
</div>
<div class="public-bounced-content-right">
@@ -24,17 +25,18 @@
import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
+// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
-// import GasTabs from './GasComponents/GasTabs'
+import PublicTab from './GasComponents/PublicTab'
export default {
name: 'PublicBounced',
components: {
GasTab,
PublicTable,
- GasECharts,
- GasVideo
+ // GasECharts,
+ GasVideo,
+ PublicTab
},
data () {
return {
--
Gitblit v1.8.0