From 5f11301d71a65ecdef658618aeba6c7a2207263a Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 15:58:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
/dev/null | 33 ----------------
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 21 ++++------
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 28 ++++++++++++--
src/components/LayerController/logic/WasteWater.js | 3 +
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 12 ++++++
src/components/BaseNav/PublicBounced/PublicBounced.vue | 6 +-
6 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
similarity index 84%
rename from src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index c2366b0..614e424 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -1,10 +1,18 @@
<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>
export default {
- name: 'GasECharts',
+ name: 'ECharts',
methods: {
drawChart: function () {
const myChart = this.$echarts.init(this.$refs.main)
@@ -88,7 +96,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,
@@ -174,10 +182,22 @@
</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;
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/EchartsTab.vue
deleted file mode 100644
index 1ab150f..0000000
--- a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.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: 'EchartsTab',
- 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/GasTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
similarity index 68%
rename from src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 23814fc..002bd92 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,30 +5,27 @@
<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">
+ <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'
export default {
- name: 'GasTabs',
+ name: 'PublicChart',
components: {
- GasECharts,
- EchartsTab
+ ECharts
},
data () {
return {
- activeName: 'first'
+ activeName: 'second'
}
},
methods: {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index e3ae48f..8135a3e 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -32,6 +32,18 @@
<el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
</el-row>
</div>
+ <div else-if="value == 'feishui'">
+ <el-row type="flex" class="row-bg row-item-one" justify="space-around">
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>
+ </el-row>
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
+ </el-row>
+ </div>
</div>
</div>
</div>
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 7324412..a12a1f0 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -9,7 +9,7 @@
<PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
<div class="public-bounced-content-left-bottom">
<PublicTable v-if="value === 'gufei'"></PublicTable>
- <GasTabs v-else></GasTabs>
+ <PublicChart v-else></PublicChart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -25,14 +25,14 @@
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
+import PublicChart from './GasComponents/PublicChart'
export default {
name: 'PublicBounced',
components: {
- GasTabs,
PublicTabs,
PublicTable,
+ PublicChart,
PublicVideo
},
data () {
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 5a568e9..0be9e1a 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -56,9 +56,10 @@
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
const result = await mapApi.getWasteWater(dataValue)
+ // console.log(result)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(result)
+ instance.setGasData(result, 'feishui')
instance.$mount()
document.body.appendChild(instance.$el)
}
--
Gitblit v1.8.0