From 3b62b7eaa4f24da56353f56de8fe22240bfb7834 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 15:06:30 +0800
Subject: [PATCH] 修改命名规范
---
/dev/null | 33 ----------------
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 22 ++++++++++
src/components/BaseNav/PublicBounced/GasComponents/PublicSwitch.vue | 7 +--
src/components/BaseNav/PublicBounced/PublicBounced.vue | 15 +++----
4 files changed, 30 insertions(+), 47 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index cdad7bf..614e424 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -1,5 +1,13 @@
<template>
- <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
+ <div id="Tab">
+ <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>
+ </div>
+ <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
+ </div>
</template>
<script>
@@ -174,6 +182,18 @@
</script>
<style scoped lang="less">
+ .Infomation{
+ margin-left: 10px;
+ }
+ .el-tag{
+ height: 25px;
+ line-height: 25px;
+ margin-right: 10px;
+ font-size: 10px;
+ background-color: rgba(0, 255, 246, 0.14);
+ color: #00d0f9;
+ border: none;
+ }
#echarts{
margin: 0;
padding: 0;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EchartsInfo.vue b/src/components/BaseNav/PublicBounced/GasComponents/EchartsInfo.vue
deleted file mode 100644
index a61bdca..0000000
--- a/src/components/BaseNav/PublicBounced/GasComponents/EchartsInfo.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<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>
- </div>
-</template>
-
-<script>
-export default {
- name: 'EchartsInfo',
- props: ['displayContent'],
- data () {
- return {}
- }
-}
-</script>
-
-<style scoped lang="less">
- .Infomation{
- margin-left: 10px;
- }
- .el-tag{
- height: 25px;
- line-height: 25px;
- margin-right: 10px;
- font-size: 10px;
- background-color: rgba(0, 255, 246, 0.14);
- color: #00d0f9;
- border: none;
- }
-</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicSwitch.vue
similarity index 92%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicTab.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/PublicSwitch.vue
index 5579cc7..7106c16 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicSwitch.vue
@@ -7,7 +7,6 @@
<el-tabs type="card" v-model="activeName">
<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="third"></el-tab-pane>
@@ -18,13 +17,11 @@
<script>
import ECharts from './ECharts'
-import EchartsInfo from './EchartsInfo'
export default {
- name: 'PublicTab',
+ name: 'PublicSwitch',
components: {
- ECharts,
- EchartsInfo
+ ECharts
},
data () {
return {
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 5b88355..5d4b430 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -10,7 +10,7 @@
<div class="public-bounced-content-left-bottom">
<PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
<!-- <GasECharts v-else></GasECharts>-->
- <PublicTab v-else></PublicTab>
+ <PublicSwitch v-else></PublicSwitch>
</div>
</div>
<div class="public-bounced-content-right">
@@ -25,9 +25,8 @@
import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-// import GasTabs from './GasComponents/GasTabs'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
-import PublicTab from './GasComponents/PublicTab'
+import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicSwitch from './GasComponents/PublicSwitch'
export default {
name: 'PublicBounced',
@@ -35,7 +34,7 @@
GasTab,
PublicTable,
GasVideo,
- PublicTab
+ PublicSwitch
},
data () {
return {
@@ -47,9 +46,9 @@
},
methods: {
setData (dataBasic, dataDetailed, value) {
- dataBasic.forEach(item => {
- this.displayContentTitle = item.StoragePlaceName
- })
+ // dataBasic.forEach(item => {
+ // this.displayContentTitle = item.StoragePlaceName
+ // })
this.displayContentTab = dataBasic
this.displayContentTable = dataDetailed
this.flag = true
--
Gitblit v1.8.0