From 5208bc41f03abb828987d9193be6a809a64e52ac Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 15 四月 2021 09:41:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue | 2
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue | 471 +++++++++++++++++++++++++++++---------
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 7
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue | 2
src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue | 103 ++++----
src/components/panel/topicSearch/SolidWasteSearch.vue | 60 ++--
src/components/table/components/SolidWaste.vue | 39 ++-
7 files changed, 465 insertions(+), 219 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
index 1ba24a5..325d981 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -319,7 +319,7 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%',
+ bottom: '11%',
right: '5%'
},
legend: {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index f771149..896d123 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -41,8 +41,7 @@
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
<div class="boxChart">
- <div style="width: 5rem;height:1.5rem;" id="popChart" ref="main">
- </div>
+ <div style="width: 5rem;height:1.5rem;" id="echarts" ref="main"></div>
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -71,8 +70,6 @@
},
data () {
return {
- value1: '',
- value2: '',
watchData: [],
dialogVisible: false,
myChar: null,
@@ -140,7 +137,7 @@
mounted () {
// this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
// this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
- // this.onSubmit()
+ this.onSubmit()
},
updated () {
this.onSubmit()
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
index be91bb6..aa37207 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
@@ -3,7 +3,7 @@
<div id="Tab">
<div class="animation">
<div class="infomation">
- <span class="grid-content">COD : <i style="color: #e8ee0b">11.24385</i> 鏍囧噯 : <i style="color: #fff">50</i>></span>
+ <span class="grid-content">COD : <i style="color: #e8ee0b">11.24385</i> 鏍囧噯 : <i style="color: #fff">50</i></span>
<span class="grid-content">姘哀 :<i style="color: #e8ee0b">0.1889014</i> 鏍囧噯 : <i style="color: #fff">30</i></span>
<span class="grid-content">鎬荤７ : <i style="color: #e8ee0b">0.03812287</i> 鏍囧噯 : <i style="color: #fff">5</i></span>
<span class="grid-content">搴熸按娴侀噺 : <i style="color: #e8ee0b">32.16287</i></span>
@@ -110,155 +110,247 @@
ydatas: [
{
name: '姘哀',
- data: [{ name: '姘哀', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1900156] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1902795] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1892689] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1882582] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1882284] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1886617] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1873395] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1866319] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1895212] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1898232] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1880916] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1883546] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1907846] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1887416] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1873472] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1886214] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1891896] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1891176] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1890455] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1889734] },
- { name: '姘哀', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.1889014] }],
+ data: [{ name: '姘哀', value: ['2021/04/13 12:47:18', 0.1900156] },
+ { name: '姘哀', value: ['2021/04/13 12:47:33', 0.1902795] },
+ { name: '姘哀', value: ['2021/04/13 12:47:48', 0.1892689] },
+ { name: '姘哀', value: ['2021/04/13 12:48:03', 0.1882582] },
+ { name: '姘哀', value: ['2021/04/13 12:48:18', 0.1882284] },
+ { name: '姘哀', value: ['2021/04/13 12:48:33', 0.1886617] },
+ { name: '姘哀', value: ['2021/04/13 12:48:48', 0.1873395] },
+ { name: '姘哀', value: ['2021/04/13 12:49:03', 0.1866319] },
+ { name: '姘哀', value: ['2021/04/13 12:49:18', 0.1895212] },
+ { name: '姘哀', value: ['2021/04/13 12:49:33', 0.1898232] },
+ { name: '姘哀', value: ['2021/04/13 12:49:48', 0.1880916] },
+ { name: '姘哀', value: ['2021/04/13 12:50:03', 0.1883546] },
+ { name: '姘哀', value: ['2021/04/13 12:50:18', 0.1907846] },
+ { name: '姘哀', value: ['2021/04/13 12:50:33', 0.1887416] },
+ { name: '姘哀', value: ['2021/04/13 12:50:48', 0.1873472] },
+ { name: '姘哀', value: ['2021/04/13 12:51:03', 0.1886214] },
+ { name: '姘哀', value: ['2021/04/13 12:51:18', 0.1891896] },
+ { name: '姘哀', value: ['2021/04/13 12:51:33', 0.1891176] },
+ { name: '姘哀', value: ['2021/04/13 12:51:48', 0.1890455] },
+ { name: '姘哀', value: ['2021/04/13 12:52:03', 0.1889734] },
+ { name: '姘哀', value: ['2021/04/13 12:52:18', 0.1889014] }],
zdcbcolor: 'red',
zxcolor: '#00B0F0',
bzz: 3
},
{
name: '鎬荤７',
- data: [{ name: '鎬荤７', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813388] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813333] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813278] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813223] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813168] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813113] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813057] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03813003] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812947] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812892] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812837] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812782] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812727] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812672] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812617] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812562] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812507] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812452] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812397] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812342] },
- { name: '鎬荤７', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.03812287] }],
+ data: [{ name: '鎬荤７', value: ['2021/04/13 12:47:18', 0.03813388] },
+ { name: '鎬荤７', value: ['2021/04/13 12:47:33', 0.03813333] },
+ { name: '鎬荤７', value: ['2021/04/13 12:47:48', 0.03813278] },
+ { name: '鎬荤７', value: ['2021/04/13 12:48:03', 0.03813223] },
+ { name: '鎬荤７', value: ['2021/04/13 12:48:18', 0.03813168] },
+ { name: '鎬荤７', value: ['2021/04/13 12:48:33', 0.03813113] },
+ { name: '鎬荤７', value: ['2021/04/13 12:48:48', 0.03813057] },
+ { name: '鎬荤７', value: ['2021/04/13 12:49:03', 0.03813003] },
+ { name: '鎬荤７', value: ['2021/04/13 12:49:18', 0.03812947] },
+ { name: '鎬荤７', value: ['2021/04/13 12:49:33', 0.03812892] },
+ { name: '鎬荤７', value: ['2021/04/13 12:49:48', 0.03812837] },
+ { name: '鎬荤７', value: ['2021/04/13 12:50:03', 0.03812782] },
+ { name: '鎬荤７', value: ['2021/04/13 12:50:18', 0.03812727] },
+ { name: '鎬荤７', value: ['2021/04/13 12:50:33', 0.03812672] },
+ { name: '鎬荤７', value: ['2021/04/13 12:50:48', 0.03812617] },
+ { name: '鎬荤７', value: ['2021/04/13 12:51:03', 0.03812562] },
+ { name: '鎬荤７', value: ['2021/04/13 12:51:18', 0.03812507] },
+ { name: '鎬荤７', value: ['2021/04/13 12:51:33', 0.03812452] },
+ { name: '鎬荤７', value: ['2021/04/13 12:51:48', 0.03812397] },
+ { name: '鎬荤７', value: ['2021/04/13 12:52:03', 0.03812342] },
+ { name: '鎬荤７', value: ['2021/04/13 12:52:18', 0.03812287] }],
zdcbcolor: 'red',
zxcolor: '#f48183',
bzz: 0.3
},
{
name: '鎬绘爱',
- data: [{ name: '鎬绘爱', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779342] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779337] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779331] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779823] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779321] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779344] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779452] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779224] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779133] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779445] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779743] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779332] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779562] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779560] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779534] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779412] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779673] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779452] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779397] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779342] },
- { name: '鎬绘爱', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 2.779287] }],
+ data: [{ name: '鎬绘爱', value: ['2021/04/13 12:47:18', 2.779342] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:47:33', 2.779337] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:47:48', 2.779331] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:48:03', 2.779823] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:48:18', 2.779321] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:48:33', 2.779344] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:48:48', 2.779452] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:49:03', 2.779224] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:49:18', 2.779133] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:49:33', 2.779445] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:49:48', 2.779743] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:50:03', 2.779332] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:50:18', 2.779562] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:50:33', 2.779560] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:50:48', 2.779534] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:51:03', 2.779412] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:51:18', 2.779673] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:51:33', 2.779452] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:51:48', 2.779397] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:52:03', 2.779342] },
+ { name: '鎬绘爱', value: ['2021/04/13 12:52:18', 2.779287] }],
zdcbcolor: 'red',
zxcolor: '#e0ffff',
bzz: 15
},
{
name: '搴熸按娴侀噺',
- data: [{ name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 31.63029] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 31.9791] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 31.92095] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.05784] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.01669] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.39344] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.66452] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.45224] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.42133] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.88445] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.36743] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.83332] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.15562] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.61560] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.89534] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.72412] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.48673] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.03452] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.93397] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.84342] },
- { name: '搴熸按娴侀噺', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 32.16287] }],
+ data: [{ name: '搴熸按娴侀噺', value: ['2021/04/13 12:47:18', 31.63029] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:47:33', 31.9791] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:47:48', 31.92095] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:48:03', 32.05784] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:48:18', 32.01669] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:48:33', 32.39344] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:48:48', 32.66452] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:49:03', 32.45224] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:49:18', 32.42133] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:49:33', 32.88445] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:49:48', 32.36743] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:50:03', 32.83332] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:50:18', 32.15562] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:50:33', 32.61560] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:50:48', 32.89534] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:51:03', 32.72412] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:51:18', 32.48673] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:51:33', 32.03452] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:51:48', 32.93397] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:52:03', 32.84342] },
+ { name: '搴熸按娴侀噺', value: ['2021/04/13 12:52:18', 32.16287] }],
zdcbcolor: 'red',
zxcolor: '#9ACD32',
bzz: null
},
{
name: 'COD',
- data: [{ name: 'COD', value: ['Tue Apr 13 2021 12:47:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:47:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:47:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:48:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:48:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:48:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:48:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:49:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:49:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:49:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:49:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:50:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:50:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:50:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:50:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:51:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:51:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:51:33 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:51:48 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:52:03 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] },
- { name: 'COD', value: ['Tue Apr 13 2021 12:52:18 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 11.24385] }],
+ data: [{ name: 'COD', value: ['2021/04/13 12:47:18', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:47:33', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:47:48', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:48:03', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:48:18', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:48:33', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:48:48', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:49:03', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:49:18', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:49:33', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:49:48', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:50:03', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:50:18', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:50:33', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:50:48', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:51:03', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:51:18', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:51:33', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:51:48', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:52:03', 11.24385] },
+ { name: 'COD', value: ['2021/04/13 12:52:18', 11.24385] }],
zdcbcolor: 'red',
zxcolor: '#fff21c',
bzz: 35
}
],
yname: ' 娴撳害(mg/l)'
- }
+ },
+ JSONTimeData: {
+ id: 21,
+ unionTagCodeList: ['TJIP45.rl3AT25035', 'TJIP45.rl3AT25033', 'TJIP45.rl3FT35032', 'TJIP45.rl3AT25034']
+ },
+ res: [{ UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 36.02153, ReadTime: '2021/04/14 03:59:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 35.7473, ReadTime: '2021/04/14 03:59:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 35.56014, ReadTime: '2021/04/14 04:00:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 35.59335, ReadTime: '2021/04/14 04:00:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 34.49617, ReadTime: '2021/04/14 04:00:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 34.33835, ReadTime: '2021/04/14 04:00:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 34.93116, ReadTime: '2021/04/14 04:01:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 35.831, ReadTime: '2021/04/14 04:01:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 36.67476, ReadTime: '2021/04/14 04:01:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 38.04687, ReadTime: '2021/04/14 04:01:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 37.78848, ReadTime: '2021/04/14 04:02:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 38.03456, ReadTime: '2021/04/14 04:02:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 37.81089, ReadTime: '2021/04/14 04:02:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 39.28693, ReadTime: '2021/04/14 04:02:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 39.79956, ReadTime: '2021/04/14 04:03:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 40.11547, ReadTime: '2021/04/14 04:03:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 40.72007, ReadTime: '2021/04/14 04:03:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 43.11903, ReadTime: '2021/04/14 04:03:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 44.28426, ReadTime: '2021/04/14 04:04:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 45.07601, ReadTime: '2021/04/14 04:04:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 43.81406, ReadTime: '2021/04/14 04:04:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.312585, ReadTime: '2021/04/14 03:59:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.507234, ReadTime: '2021/04/14 03:59:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.383248, ReadTime: '2021/04/14 04:00:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.385284, ReadTime: '2021/04/14 04:00:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.719143, ReadTime: '2021/04/14 04:00:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.730373, ReadTime: '2021/04/14 04:00:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.602137, ReadTime: '2021/04/14 04:01:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.459584, ReadTime: '2021/04/14 04:01:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.313675, ReadTime: '2021/04/14 04:01:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.305554, ReadTime: '2021/04/14 04:01:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.911544, ReadTime: '2021/04/14 04:02:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.744454, ReadTime: '2021/04/14 04:02:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.267665, ReadTime: '2021/04/14 04:02:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.606314, ReadTime: '2021/04/14 04:02:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.599967, ReadTime: '2021/04/14 04:03:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.939136, ReadTime: '2021/04/14 04:03:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.03244, ReadTime: '2021/04/14 04:03:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.183742, ReadTime: '2021/04/14 04:03:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.323384, ReadTime: '2021/04/14 04:04:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.403428, ReadTime: '2021/04/14 04:04:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.347282, ReadTime: '2021/04/14 04:04:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.018858, ReadTime: '2021/04/14 03:59:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.020605, ReadTime: '2021/04/14 03:59:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.047671, ReadTime: '2021/04/14 04:00:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.020306, ReadTime: '2021/04/14 04:00:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.054744, ReadTime: '2021/04/14 04:00:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.027292, ReadTime: '2021/04/14 04:00:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.026794, ReadTime: '2021/04/14 04:01:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.03381, ReadTime: '2021/04/14 04:01:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.041131, ReadTime: '2021/04/14 04:01:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.02754, ReadTime: '2021/04/14 04:01:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 4.998859, ReadTime: '2021/04/14 04:02:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.014368, ReadTime: '2021/04/14 04:02:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.019042, ReadTime: '2021/04/14 04:02:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.046045, ReadTime: '2021/04/14 04:02:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.024141, ReadTime: '2021/04/14 04:03:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.016951, ReadTime: '2021/04/14 04:03:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.01229, ReadTime: '2021/04/14 04:03:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.00666, ReadTime: '2021/04/14 04:03:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.005168, ReadTime: '2021/04/14 04:04:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 4.99309, ReadTime: '2021/04/14 04:04:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 4.983859, ReadTime: '2021/04/14 04:04:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.128864, ReadTime: '2021/04/14 03:59:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.096089, ReadTime: '2021/04/14 03:59:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.13711, ReadTime: '2021/04/14 04:00:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.191255, ReadTime: '2021/04/14 04:00:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.159299, ReadTime: '2021/04/14 04:00:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.089755, ReadTime: '2021/04/14 04:00:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.098142, ReadTime: '2021/04/14 04:01:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.084317, ReadTime: '2021/04/14 04:01:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.040828, ReadTime: '2021/04/14 04:01:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.066903, ReadTime: '2021/04/14 04:01:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.12027, ReadTime: '2021/04/14 04:02:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.075927, ReadTime: '2021/04/14 04:02:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.062984, ReadTime: '2021/04/14 04:02:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.190477, ReadTime: '2021/04/14 04:02:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.192902, ReadTime: '2021/04/14 04:03:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.061741, ReadTime: '2021/04/14 04:03:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 0.991724, ReadTime: '2021/04/14 04:03:30', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.006655, ReadTime: '2021/04/14 04:03:45', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.044971, ReadTime: '2021/04/14 04:04:00', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.077099, ReadTime: '2021/04/14 04:04:15', ErrorMessage: null },
+ { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.131417, ReadTime: '2021/04/14 04:04:30', ErrorMessage: null }],
+ startTime: '',
+ endTime: '',
+ step: ''
}
},
mounted () {
this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
// console.log(this.formInline.timeStart)
- console.log(this.JsonRealWasteWater.ydatas[0].data[0].value[0])
+ // console.log(this.JsonRealWasteWater.ydatas[0].data[0].value[0])
this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
methods: {
onSubmit () {
this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
+ // 鐢诲簾姘存姌绾垮浘--瀹炴椂鏁版嵁
DrawRealTimeDateChart (id, title, legend, ydatas, yname) {
this.RealTimeChart = this.$echarts.init(this.$refs.main)
var serLists = []
@@ -368,8 +460,8 @@
label: {
color: '#1a4245'
}
- }
- /* formatter: function (params) {
+ },
+ formatter: function (params) {
var s = params[0].name + '<br />'
for (var i = 0; i < params.length; i++) {
// var name = params[i].name
@@ -377,9 +469,7 @@
var seriesName = params[i].seriesName
// 鍊�
var value = params[i].value[1]
-
- var valueFliter = formatter(value)
-
+ // var valueFliter = this.formatter(value)
var maker = params[i].marker
var colo = ''
switch (seriesName) {
@@ -400,10 +490,10 @@
break
}
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:' + colo + ';"></span>'
- s += maker + seriesName + ':' + valueFliter + '<br />'
+ s += maker + seriesName + ':' + value + '<br />'
}
return s
- } */
+ }
},
toolbox: { // 鎵撳嵃绛夊伐鍏�
show: false,
@@ -414,7 +504,7 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%',
+ bottom: '15%',
right: '5%'
},
legend: {
@@ -594,6 +684,155 @@
}
RealTimeChart.setOption(op)
}) */
+ },
+ getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
+ if (res.length > 0) {
+ // 澶勭悊鏁版嵁寮�濮�
+ var d = res
+ var nameList = [] // 瀛樻斁鍥句緥
+
+ var data // 鏁版嵁绫诲瀷// var data={name:'',value:[now1.getFullYear(), now1.getMonth() + 1, now1.getDate().join('/'),value]}
+ var datalist // 瀛樻斁data鐨勬暟缁�
+ // var bzh = []
+ for (var i = 0; i < d.length; i++) {
+ if (d[i].ErrorMessage != null) {
+ continue
+ }
+
+ // var name = CFG.DATA_REALTIME_TAGCODETABLE[d[i].UnionTagCode].TagName
+
+ if (nameList.length === 0) {
+ nameList.push(name)
+ var newdate = new Date(d[i].ReadTime)
+ data = {
+ name: name,
+ value: [newdate, d[i].TagValue]
+ }
+
+ datalist = {
+ name: name,
+ data: [data]
+ }
+
+ this.RealTimeDataList.push(datalist)
+ } else if (nameList.indexOf(name) < 0) {
+ nameList.push(name)
+ // bzh.push(d[i].StdValue);
+
+ // var newdate = new Date(d[i].ReadTime)
+
+ data = {
+ name: name,
+ value: [newdate, d[i].TagValue]
+ }
+ datalist = {
+ name: name,
+ data: [data]
+ }
+ this.RealTimeDataList.push(datalist)
+ } else if (i === d.length - 1) {
+ if (nameList.indexOf(name) < 0) {
+ nameList.push(name)
+ // bzh.push(d[i].StdValue);
+
+ // var newdate = new Date(d[i].ReadTime)
+
+ data = {
+ name: name,
+ value: [newdate, d[i].TagValue]
+ }
+ datalist = {
+ name: name,
+ data: [data]
+ }
+ // RealTimeDataList.push(datalist)
+ } else {
+ // var newdate = new Date(d[i].ReadTime)
+ data = {
+ name: name,
+ value: [newdate, d[i].TagValue]
+ }
+ for (var k = 0; k < this.RealTimeDataList.length; k++) {
+ if (this.RealTimeDataList[k].name === name) {
+ this.RealTimeDataList[k].data.push(data)
+ }
+ }
+ }
+ } else {
+ const newdate = new Date(d[i].ReadTime)
+ data = {
+ name: name,
+ value: [newdate, d[i].TagValue]
+ }
+ for (let k = 0; k < this.RealTimeDataList.length; k++) {
+ if (this.RealTimeDataList[k].name === name) {
+ this.RealTimeDataList[k].data.push(data)
+ }
+ }
+ }
+ }
+
+ // var divid = 'mycharteff_second'
+ // var title = name
+ var lengList = []
+ var objTemp
+
+ for (var l = 0; l < nameList.length; l++) {
+ var obj
+ var iconurl
+ if (nameList[l] === 'COD') {
+ iconurl = 'image://../assets/imgs/legend/SO2.png'
+ } else if (nameList[l] === '姘ㄦ爱') {
+ iconurl = 'image://../assets/imgs/legend/NOX.png'
+ } else if (nameList[l] === '鎬荤７') {
+ iconurl = 'image://../assets/imgs/legend/YanChen.png'
+ } else if (nameList[l] === '鎬绘爱') {
+ iconurl = 'image://../assets/imgs/legend/zongdan.png'
+ } else {
+ iconurl = 'image://../assets/imgs/legend/VOCs.png'
+ }
+
+ if (nameList[l] === '搴熸按' || nameList[l] === '搴熸按娴侀噺') { // 灏嗗簾姘存祦閲忔帓鍒版暟缁勬渶鍚�
+ objTemp = {
+ name: nameList[l],
+ icon: iconurl,
+ textStyle: {
+ color: '#ccc'
+ },
+ itemWidth: 20,
+ itemHeight: 5
+ }
+ } else {
+ obj = {
+ name: nameList[l],
+ icon: iconurl,
+ textStyle: {
+ color: '#ccc'
+ },
+ itemWidth: 20,
+ itemHeight: 5
+ }
+ lengList.push(obj)
+ }
+ }
+ lengList.push(objTemp)
+
+ this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
+ }
+ },
+ // 瀹炴椂鏁版嵁璋冪敤閽╁瓙鍑芥暟
+ IntervalRealTimeDate (id, unionTagCodeList, BBZMAPPING) {
+ // 瀹氭椂鍣ㄥ嚱鏁�
+ this.interValHander = setInterval(function () {
+ // $('.RealTime').empty()
+ this.startTime = dayjs().subtract(5, 'minute').format('YYYY-MM-DD HH:mm:ss')
+ this.endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.step = '15'
+ // this.getRtdb15s(this.unionTagCodeList, this.startTime, this.endTime, this.step, this.res)
+ // PreQueryTime=endTime;
+ this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
+ this.IntervalRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.BBZMAPPING)
+ }, 15000)
}
}
}
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
index eb0006d..50f0622 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
@@ -126,168 +126,168 @@
return {
tableData: [{
date: '2016-05-03 12:00:00',
- codWatch: '1',
+ codWatch: '7.23',
codTime: '-',
- phWatch: '1',
- phTime: '2',
- bod5Watch: '1',
+ phWatch: '0.43',
+ phTime: '9.21',
+ bod5Watch: '7.12',
bod5Time: '-',
- adWatch: '1',
+ adWatch: '0.23',
adTime: '-'
},
{
date: '2016-05-03 12:00:15',
codWatch: '-',
- codTime: '2',
+ codTime: '5.32',
phWatch: '-',
- phTime: '2',
+ phTime: '0.23',
bod5Watch: '1',
- bod5Time: '2',
- adWatch: '1',
+ bod5Time: '9.88',
+ adWatch: '1.76',
adTime: '-'
},
{
date: '2016-05-03 12:00:30',
- codWatch: '1',
- codTime: '2',
+ codWatch: '-',
+ codTime: '0.92',
phWatch: '-',
- phTime: '2',
- bod5Watch: '1',
+ phTime: '8.71',
+ bod5Watch: '0.72',
bod5Time: '-',
- adWatch: '1',
- adTime: '2'
+ adWatch: '6.23',
+ adTime: '0.86'
},
{
date: '2016-05-03 12:01:15',
- codWatch: '1',
+ codWatch: '10.22',
codTime: '-',
phWatch: '-',
- phTime: '2',
- bod5Watch: '1',
+ phTime: '0.92',
+ bod5Watch: '0.82',
bod5Time: '-',
- adWatch: '1',
+ adWatch: '23.82',
adTime: '-'
},
{
date: '2016-05-03 12:01:30',
- codWatch: '1',
+ codWatch: '0.31',
codTime: '-',
phWatch: '-',
- phTime: '2',
- bod5Watch: '1',
+ phTime: '6.12',
+ bod5Watch: '0.31',
bod5Time: '-',
- adWatch: '1',
- adTime: '2'
+ adWatch: '0.21',
+ adTime: '-'
},
{
date: '2016-05-03 12:02:15',
- codWatch: '1',
+ codWatch: '9.22',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '0.72',
adWatch: '-',
- adTime: '2'
+ adTime: '17.23'
},
{
date: '2016-05-03 12:02:30',
codWatch: '-',
codTime: '-',
- phWatch: '2',
+ phWatch: '0.83',
phTime: '-',
- bod5Watch: '1',
+ bod5Watch: '23.22',
bod5Time: '-',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:03:15',
- codWatch: '1',
+ codWatch: '8.74',
codTime: '-',
phWatch: '-',
- phTime: '-',
+ phTime: '13.22',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '0.23',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:03:30',
- codWatch: '1',
+ codWatch: '0.82',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '32.42',
adWatch: '-',
- adTime: '1'
+ adTime: '0.88'
},
{
date: '2016-05-03 12:04:15',
codWatch: '-',
codTime: '-',
- phWatch: '1',
+ phWatch: '0.71',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '15.83',
adWatch: '-',
- adTime: '2'
+ adTime: '24.82'
},
{
date: '2016-05-03 12:04:30',
codWatch: '-',
- codTime: '1',
- phWatch: '2',
+ codTime: '19.65',
+ phWatch: '29.22',
phTime: '-',
- bod5Watch: '1',
+ bod5Watch: '0.98',
bod5Time: '-',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:05:15',
- codWatch: '1',
+ codWatch: '19.32',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '12.21',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:05:30',
- codWatch: '1',
+ codWatch: '10.53',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '23.71',
adWatch: '-',
- adTime: '1'
+ adTime: '10.55'
},
{
date: '2016-05-03 12:06:15',
- codWatch: '1',
+ codWatch: '31.63',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '0.56',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:06:30',
- codWatch: '1',
+ codWatch: '19.53',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '0.28',
adWatch: '-',
- adTime: '1'
+ adTime: '0.75'
}]
}
},
@@ -305,5 +305,4 @@
</script>
<style scoped>
-
</style>
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
index 2a3d35f..11f39fd 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
@@ -1,6 +1,6 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="500px" border>
+ <el-table :data="tableData" max-height="400px" border>
<el-scrollbar style="height: 50vh">
<el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
<el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 3457c1d..5da507e 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -29,7 +29,8 @@
<el-scrollbar style="height:286.22px">
<div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index"
@click="setBounced(item)">
- <i class="state"></i>
+ <!-- <i class="state"></i>-->
+ <img src="../../../../public/assets/images/map/solidwaste/gf_green2.png" alt="" class="state">
<div>
<h3>###鐐煎寲閮�</h3>
<p>鎵�灞為儴闂細<span>{{ item.Name }}</span></p>
@@ -52,6 +53,33 @@
data () {
return {
judgeVisible: true,
+ form: {
+ keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+ // 鏁版嵁鐨勪紶閫�
+ transferData: 1
+ },
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
+ // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
+ searchDataDisplay: [],
+ instance: null,
+ intervals: [],
+ layer: window.map,
+ L: window.L,
+ times: 5,
+ colors: ['#98FB98', '#ff0000'],
solidWasteTypeOptions: [{
value: '1',
label: '鍖哄煙',
@@ -116,34 +144,7 @@
label: '闀垮害(m)',
key: 'length'
}]
- }],
- form: {
- keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
- // 鏁版嵁鐨勪紶閫�
- transferData: 1
- },
- levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: 1
- },
- {
- name: '姝ｅ父',
- value: 2
- },
- {
- name: '棰勮',
- value: 3
- }
- ],
- // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
- searchDataDisplay: [],
- instance: null,
- intervals: [],
- layer: window.map,
- L: window.L,
- times: 5,
- colors: ['#98FB98', '#ff0000']
+ }]
}
},
methods: {
@@ -152,6 +153,7 @@
// console.log(this.form.keyword)
const result = await mapApi.getSolidWaste(data)
this.searchDataDisplay = result.Result.DataInfo
+ console.log(this.searchDataDisplay)
},
// 涓嶅悓绫诲瀷鍥剧墖灏佽
differentTypes (judgeValue) {
diff --git a/src/components/table/components/SolidWaste.vue b/src/components/table/components/SolidWaste.vue
index ae00c44..8d635dd 100644
--- a/src/components/table/components/SolidWaste.vue
+++ b/src/components/table/components/SolidWaste.vue
@@ -20,7 +20,8 @@
:disabled="!isShowIcon"
popper-class="popovers">
<ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
- <i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
+ <i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference"
+ @click="doIcon($index)"></i>
<!-- <i class="el-icon-caret-bottom" slot="reference" v-else @click="doIcon($index)"></i>-->
</el-popover>
</template>
@@ -29,9 +30,9 @@
</el-table-column>
<el-table-column prop="UserName" label="浼佷笟鍚嶇О" width="120px">
<template slot-scope="scope">
- <div v-if="scope.row.UserName==='闆嗗洟鍚嶇О'" style="color: #00ffff">{{scope.row.UserName}}</div>
- <div v-else-if="scope.row.UserName==='澶╂触鐭冲寲'" style="color: #00ffff">{{scope.row.UserName}}</div>
- <div v-else >{{scope.row.UserName}}</div>
+ <div v-if="scope.row.UserName==='闆嗗洟鍚嶇О'" style="color: #00ffff">{{ scope.row.UserName }}</div>
+ <div v-else-if="scope.row.UserName==='澶╂触鐭冲寲'" style="color: #00ffff">{{ scope.row.UserName }}</div>
+ <div v-else>{{ scope.row.UserName }}</div>
</template>
</el-table-column>
<el-table-column prop="WasteWaters" label="澶栨帓搴熸按閲忥紙m鲁锛�" width="100px"></el-table-column>
@@ -46,7 +47,7 @@
<el-table-column label="鎺掓斁鍙ｆ娴嬬粺璁＄姸鎬�">
<el-table-column prop="normal" label="姝ｅ父" width="60px">
<template slot-scope="{row,$index}">
- <u v-if="$index!=2" >{{row.normal}}</u>
+ <u v-if="$index!=2">{{ row.normal }}</u>
<el-popover v-else
placement="bottom-end"
width="200"
@@ -55,7 +56,7 @@
title="鐩戞祴鐐规槑缁嗚〃"
>
<refinery></refinery>
- <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
+ <u slot="reference" style="color: #00ffff">{{ row.normal }}</u>
<!-- <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
<!-- <i v-if="isShowIcon" class="el-icon-caret-bottom" slot="reference" @click="isbtn"></i>-->
<!-- <i v-else class="el-icon-caret-right" slot="reference" @click="isbtn"></i>-->
@@ -67,7 +68,7 @@
<el-table-column prop="StopProduction" label="鍋滀骇" width="60px"></el-table-column>
<el-table-column prop="deficiency" label="缂哄け" width="60px">
<template slot-scope="{row,$index}">
- <u v-if="$index!=1" >{{row.deficiency}}</u>
+ <u v-if="$index!=1">{{ row.deficiency }}</u>
<el-popover v-else
placement="bottom-end"
width="200"
@@ -76,7 +77,7 @@
popper-class="popovers"
>
<MissingAlarm></MissingAlarm>
- <u slot="reference" style="color: #00ffff">{{row.deficiency}}</u>
+ <u slot="reference" style="color: #00ffff">{{ row.deficiency }}</u>
</el-popover>
</template>
</el-table-column>
@@ -92,6 +93,7 @@
import ChemicalWastewater from './componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
import MissingAlarm from '@components/table/components/componented/MissingAlarm'
+
export default {
name: 'SolidWaste',
components: {
@@ -155,11 +157,16 @@
}
},
methods: {
- tableHeaderColor ({ row, column, owIndex, columnIndex }) {
+ tableHeaderColor ({
+ row,
+ column,
+ owIndex,
+ columnIndex
+ }) {
// return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
},
// 琛ㄥご鏍峰紡璁剧疆
- rowClass () {
+ rowClass () {
// return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
},
// 鑾峰彇鐐瑰嚮鐨勮〃鏍�
@@ -183,17 +190,19 @@
}
</script>
-<style scoped>
-.popovers{
+<style lang="less" scoped>
+.popovers {
width: auto !important;
background-color: gray !important;
}
-.popovers.el-popover{
- padding:0;
+
+.popovers.el-popover {
+ padding: 0;
}
+
.active {
/*color: red;*/
- transform:rotate(90deg);
+ transform: rotate(90deg);
}
</style>
--
Gitblit v1.8.0