From b9e11f18c961df43f632b85c04cd730bde21fc76 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 19 四月 2021 13:10:58 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/PublicDataStandard.vue | 45 +++++++++++
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 44 +++++------
src/components/BaseNav/WasteGas/RealTimeEcharts.vue | 6
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 43 +++++-----
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 41 ++++++----
src/components/BaseNav/WasteGas/DayData.vue | 2
src/components/LayerController/LayerController.vue | 2
src/components/BaseNav/PublicBounced/PublicBounced.vue | 2
src/components/LayerController/modules/LcServiceLayer.vue | 2
9 files changed, 116 insertions(+), 71 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 3665692..2ab8d04 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -132,7 +132,7 @@
}
.public-bounced-content {
- padding: 0.1rem;
+ padding: 0.05rem;
display: flex;
//align-items: center;
//justify-content: space-around;
diff --git a/src/components/BaseNav/PublicBounced/common/PublicDataStandard.vue b/src/components/BaseNav/PublicBounced/common/PublicDataStandard.vue
new file mode 100644
index 0000000..a1a6ef4
--- /dev/null
+++ b/src/components/BaseNav/PublicBounced/common/PublicDataStandard.vue
@@ -0,0 +1,45 @@
+<template>
+ <div class="animation">
+ <div class="information">
+<!-- <span class="grid-content">姘哀鍖栫墿 : <i style="color: #e8ee0b">29.93</i> 鏍囧噯 : <i style="color: #fff">100</i></span>-->
+<!-- <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : <i style="color: #fff">50</i></span>-->
+<!-- <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : <i style="color: #fff">30</i></span>-->
+<!-- <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>-->
+ <span class="grid-content" v-for="item in dataStandard" :key="item.current.name">{{ item.current.name }} :
+ <i style="color: #e8ee0b">{{ item.current.val }}</i> {{ item.standard.name ?item.standard.name+':':'' }} <i style="color: #fff">{{ item.standard.val }}</i></span>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'PublicDataStandard',
+ props: {
+ dataStandard: {
+ type: Array,
+ default: () => {
+ return []
+ }
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+.animation {
+ .information {
+ padding: 0.02rem 0.04rem;
+
+ .grid-content {
+ font-size: 0.08rem;
+ background-color: #2e4967;
+ text-align: center;
+ border-radius: 0.01rem;
+ height: 0.15rem;
+ line-height: 0.15rem;
+ margin-right: 0.04rem;
+ padding: 0 0.04rem
+ }
+ }
+}
+</style>
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index d22a3ce..8965122 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -1,14 +1,7 @@
<!-- 鏃ユ暟鎹� -->
<template>
<div id="Tab">
- <div class="animation">
- <div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>
- </div>
- </div>
+<public-data-standard :dataStandard = "dataStandard"></public-data-standard>
<div class="form-echrts">
<div class="from-search">
<div class="pickerMon">
@@ -60,10 +53,12 @@
import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
+import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
export default {
name: 'ECharts',
components: {
+ PublicDataStandard,
PublicDetailedList
},
data () {
@@ -78,6 +73,23 @@
timeEnd: ''
},
info: this.series,
+ dataStandard: [{
+ current: { name: '姘哀鍖栫墿1', val: 29.93 },
+ standard: { name: '鏍囧噯', val: 100 }
+ },
+ {
+ current: { name: '浜屾哀鍖栫～', val: 17.34 },
+ standard: { name: '鏍囧噯', val: 50 }
+ },
+ {
+ current: { name: '鐑熷皹', val: 6.93 },
+ standard: { name: '鏍囧噯', val: 30 }
+ },
+ {
+ current: { name: '搴熸皵娴侀噺', val: 120343.18 },
+ standard: { name: '', val: null }
+ }
+ ],
JsonDayCharts: {
id: 'mychartsDay',
title: '鍔犵儹鐐夌儫姘�',
@@ -695,22 +707,6 @@
</script>
<style scoped lang="less">
-
-.animation {
- .infomation {
- padding: 0.02rem 0.04rem;
- .grid-content {
- font-size: 0.08rem;
- background-color: #2e4967;
- text-align: center;
- border-radius: 0.01rem;
- height: 0.15rem;
- line-height: 0.15rem;
- margin-right: 0.04rem;
- padding:0 0.04rem
- }
- }
-}
.form-echrts {
width: 100%;
border-top: 1px solid #396d83;
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index c23fb93..927e8a3 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -1,14 +1,7 @@
<!-- 灏忔椂鏁版嵁 -->
<template>
<div id="Tab">
- <div class="infomation">
- <div>
- <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>
- </div>
- </div>
+ <public-data-standard :dataStandard = "dataStandard"></public-data-standard>
<div class="form-echrts">
<div class="from-search">
<div class="pickerMon">
@@ -48,9 +41,11 @@
// import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
+import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
export default {
name: 'ECharts',
components: {
+ PublicDataStandard,
PublicDetailedList
},
data () {
@@ -64,6 +59,23 @@
timeEnd: null
},
myChart: null,
+ dataStandard: [{
+ current: { name: '姘哀鍖栫墿1', val: 29.93 },
+ standard: { name: '鏍囧噯', val: 100 }
+ },
+ {
+ current: { name: '浜屾哀鍖栫～', val: 17.34 },
+ standard: { name: '鏍囧噯', val: 50 }
+ },
+ {
+ current: { name: '鐑熷皹', val: 6.93 },
+ standard: { name: '鏍囧噯', val: 30 }
+ },
+ {
+ current: { name: '搴熸皵娴侀噺', val: 120343.18 },
+ standard: { name: '', val: null }
+ }
+ ],
JsonCtarts: {
id: 'mychart',
title: '鍔犵儹鐐夌儫姘�',
@@ -926,21 +938,6 @@
</script>
<style scoped lang="less">
- .animation {
- .infomation {
- padding: 0.02rem 0.04rem;
- .grid-content {
- font-size: 0.08rem;
- background-color: #2e4967;
- text-align: center;
- border-radius: 0.01rem;
- height: 0.15rem;
- line-height: 0.15rem;
- margin-right: 0.04rem;
- padding:0 0.04rem
- }
- }
- }
.form-echrts {
width: 100%;
border-top: 1px solid #396d83;
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 2be904a..1cad629 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -1,13 +1,6 @@
<template>
<div id="Tab">
- <div class="animation">
- <div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">5.23</i></span>
- </div>
- </div>
+ <public-data-standard :dataStandard = "dataStandard"></public-data-standard>
<div class="form-echrts">
<div class="from-search">
<div class="pickerMon">
@@ -26,7 +19,7 @@
</div>
<div>
閲囨牱鐐规暟:
- <el-select v-model="formInline.region" placeholder="50">
+ <el-select v-model="formInline.region" placeholder="50" class="">
<el-option label="0" value="0"></el-option>
<el-option label="25" value="25"></el-option>
<el-option label="50" value="50"></el-option>
@@ -46,9 +39,13 @@
// import mapApi from '@/api/mapApi'
import 'dayjs/locale/es'
import dayjs from 'dayjs'
+import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
export default {
name: 'ECharts',
+ components: {
+ PublicDataStandard
+ },
data () {
return {
days: dayjs(new Date()).format('YYYYMMDDHHmmss'),
@@ -62,6 +59,23 @@
timeEnd: ''
},
RealTimeChart: null,
+ dataStandard: [{
+ current: { name: '姘哀鍖栫墿1', val: 29.93 },
+ standard: { name: '鏍囧噯', val: 100 }
+ },
+ {
+ current: { name: '浜屾哀鍖栫～', val: 17.34 },
+ standard: { name: '鏍囧噯', val: 50 }
+ },
+ {
+ current: { name: '鐑熷皹', val: 6.93 },
+ standard: { name: '鏍囧噯', val: 30 }
+ },
+ {
+ current: { name: '搴熸皵娴侀噺', val: 120343.18 },
+ standard: { name: '', val: null }
+ }
+ ],
JsonTimeCtarts: {
id: 'mychart_ss ',
title: '鐑熷皹',
@@ -1026,13 +1040,6 @@
color: #ffffff;
}
}
-.animation {
- //width: 600px;
- //height: 0.06rem;
- .infomation {
- padding: 5px 10px;
- }
-}
.form-echrts {
width: 100%;
border-top: 1px solid #396d83;
@@ -1060,7 +1067,7 @@
}
/deep/.el-input__inner{
position: relative;
- width:140px;
+ //width:140px;
background-color: #2e4967;
color: #fff;
font-size: 12px;
diff --git a/src/components/BaseNav/WasteGas/DayData.vue b/src/components/BaseNav/WasteGas/DayData.vue
index 88c0c2e..ee1def1 100644
--- a/src/components/BaseNav/WasteGas/DayData.vue
+++ b/src/components/BaseNav/WasteGas/DayData.vue
@@ -3,7 +3,7 @@
<div id="Tab">
<div class="animation">
<div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
+ <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : <i style="color: #e8ee0b">100</i> </span>
<span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
<span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
<span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>
diff --git a/src/components/BaseNav/WasteGas/RealTimeEcharts.vue b/src/components/BaseNav/WasteGas/RealTimeEcharts.vue
index 4bd9760..af14caa 100644
--- a/src/components/BaseNav/WasteGas/RealTimeEcharts.vue
+++ b/src/components/BaseNav/WasteGas/RealTimeEcharts.vue
@@ -2,9 +2,9 @@
<div id="Tab">
<div class="animation">
<div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">姘哀鍖栫墿 : <i style="color: #e8ee0b">29.93</i> 鏍囧噯 : <i style="color: #fff">100</i></span>
+ <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34s</i> 鏍囧噯 : <i style="color: #fff">50</i></span>
+ <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : <i style="color: #fff">30</i></span>
<span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">5.23</i></span>
</div>
</div>
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index 027798e..3a49054 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -283,7 +283,7 @@
color:@color;
}
.legend-content{
- width: 1.79167rem;
+ //width: 1.79167rem;
}
}
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 153db9d..961561c 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -95,7 +95,7 @@
.wms-panel-scrollbar{
height: 457px;
- width: 100%;
+ width: 2.5rem;
font-size: 14px;
}
.layerbox {
--
Gitblit v1.8.0