From 0cbf795f21d787db7d6b29a59d81579a7a736ab8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 14:40:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 473 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 240 insertions(+), 233 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index b5c38fb..2be904a 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -5,7 +5,7 @@
<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>
+ <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">5.23</i></span>
</div>
</div>
<div class="form-echrts">
@@ -36,9 +36,7 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div style="width:5rem;height:1.5rem;" >
- <div style="width:100%;height:100%;" ref="echarts"> </div>
- </div>
+ <div style="width:5rem;height:1.5rem;" ref="echarts"> </div>
</div>
</div>
</template>
@@ -104,87 +102,87 @@
name: '姘哀鍖栫墿',
data: [{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 39.51431]
+ value: ['2021/04/13 09:18:19', 39.51431]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 38.76508]
+ value: ['2021/04/13 09:18:34', 38.76508]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.57471]
+ value: ['2021/04/13 09:18:49', 37.57471]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.3796]
+ value: ['2021/04/13 09:19:04', 36.3796]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.10718]
+ value: ['2021/04/13 09:19:19', 36.10718]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.81126]
+ value: ['2021/04/13 09:19:34', 35.81126]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.9184]
+ value: ['2021/04/13 09:19:49', 35.9184]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.08839]
+ value: ['2021/04/13 09:20:04', 36.08839]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.3718]
+ value: ['2021/04/13 09:20:19', 36.3718]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.8966]
+ value: ['2021/04/13 09:20:34', 36.8966]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.3998]
+ value: ['2021/04/13 09:20:49', 37.3998]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.11937]
+ value: ['2021/04/13 09:21:04', 37.11937]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.12424]
+ value: ['2021/04/13 09:21:19', 36.12424]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.99567]
+ value: ['2021/04/13 09:21:34', 34.99567]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.48063]
+ value: ['2021/04/13 09:21:49', 34.48063]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.62222]
+ value: ['2021/04/13 09:22:04', 34.62222]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.84583]
+ value: ['2021/04/13 09:22:19', 34.84583]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.80923]
+ value: ['2021/04/13 09:22:34', 35.80923]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.93465]
+ value: ['2021/04/13 09:22:49', 35.93465]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.78891]
+ value: ['2021/04/13 09:23:04', 35.78891]
},
{
name: '姘哀鍖栫墿',
- value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.54268]
+ value: ['2021/04/13 09:23:19', 35.54268]
}],
zdcbcolor: 'red',
zxcolor: '#00B0F0',
@@ -194,87 +192,87 @@
name: '浜屾哀鍖栫～',
data: [{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.112573]
+ value: ['2021/04/13 09:18:19', 5.112573]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.578955]
+ value: ['2021/04/13 09:18:34', 4.578955]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.869465]
+ value: ['2021/04/13 09:18:49', 4.869465]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.270735]
+ value: ['2021/04/13 09:19:04', 5.270735]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.355475]
+ value: ['2021/04/13 09:19:19', 5.355475]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.242907]
+ value: ['2021/04/13 09:19:34', 5.242907]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.230558]
+ value: ['2021/04/13 09:19:49', 5.230558]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.262951]
+ value: ['2021/04/13 09:20:04', 5.262951]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.268744]
+ value: ['2021/04/13 09:20:19', 5.268744]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.159671]
+ value: ['2021/04/13 09:20:34', 5.159671]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.955352]
+ value: ['2021/04/13 09:20:49', 4.955352]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.110546]
+ value: ['2021/04/13 09:21:04', 5.110546]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.235723]
+ value: ['2021/04/13 09:21:19', 5.235723]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.443502]
+ value: ['2021/04/13 09:21:34', 5.443502]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.708939]
+ value: ['2021/04/13 09:21:49', 5.708939]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.882327]
+ value: ['2021/04/13 09:22:04', 5.882327]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 6.017494]
+ value: ['2021/04/13 09:22:19', 6.017494]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.410021]
+ value: ['2021/04/13 09:22:34', 5.410021]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.379694]
+ value: ['2021/04/13 09:22:49', 5.379694]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.551433]
+ value: ['2021/04/13 09:23:04', 5.551433]
},
{
name: '浜屾哀鍖栫～',
- value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.819743]
+ value: ['2021/04/13 09:23:19', 5.819743]
}],
zdcbcolor: 'red',
zxcolor: '#fff21c',
@@ -284,87 +282,87 @@
name: '搴熸皵娴侀噺',
data: [{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.012617]
+ value: ['2021/04/13 09:18:19', 5.012617]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.992213]
+ value: ['2021/04/13 09:18:34', 4.992213]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.026886]
+ value: ['2021/04/13 09:18:49', 5.026886]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.052861]
+ value: ['2021/04/13 09:19:04', 5.052861]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.038826]
+ value: ['2021/04/13 09:19:19', 5.038826]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.062339]
+ value: ['2021/04/13 09:19:34', 5.062339]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.071915]
+ value: ['2021/04/13 09:19:49', 5.071915]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.053693]
+ value: ['2021/04/13 09:20:04', 5.053693]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.03562]
+ value: ['2021/04/13 09:20:19', 5.03562]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.043983]
+ value: ['2021/04/13 09:20:34', 5.043983]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.059231]
+ value: ['2021/04/13 09:20:49', 5.059231]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.042176]
+ value: ['2021/04/13 09:21:04', 5.042176]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.028253]
+ value: ['2021/04/13 09:21:19', 5.028253]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.024891]
+ value: ['2021/04/13 09:21:34', 5.024891]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.01542]
+ value: ['2021/04/13 09:21:49', 5.01542]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.025787]
+ value: ['2021/04/13 09:22:04', 5.025787]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.038269]
+ value: ['2021/04/13 09:22:19', 5.038269]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.01441]
+ value: ['2021/04/13 09:22:34', 5.01441]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.010105]
+ value: ['2021/04/13 09:22:49', 5.010105]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.012341]
+ value: ['2021/04/13 09:23:04', 5.012341]
},
{
name: '搴熸皵娴侀噺',
- value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.996146]
+ value: ['2021/04/13 09:23:19', 4.996146]
}],
zdcbcolor: 'red',
zxcolor: '#9ACD32',
@@ -374,87 +372,87 @@
name: '鐑熷皹',
data: [{
name: '鐑熷皹',
- value: [['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8297127]]
+ value: [['2021/04/13 09:18:19', 0.8297127]]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8347292]
+ value: ['2021/04/13 09:18:34', 0.8347292]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9218481]
+ value: ['2021/04/13 09:18:49', 0.9218481]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.913429]
+ value: ['2021/04/13 09:19:04', 0.913429]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9026684]
+ value: ['2021/04/13 09:19:19', 0.9026684]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8060119]
+ value: ['2021/04/13 09:19:34', 0.8060119]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.781314]
+ value: ['2021/04/13 09:19:49', 0.781314]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8958074]
+ value: ['2021/04/13 09:20:04', 0.8958074]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9093901]
+ value: ['2021/04/13 09:20:19', 0.9093901]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8743498]
+ value: ['2021/04/13 09:20:34', 0.8743498]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9024854]
+ value: ['2021/04/13 09:20:49', 0.9024854]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9456897]
+ value: ['2021/04/13 09:21:04', 0.9456897]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9747347]
+ value: ['2021/04/13 09:21:19', 0.9747347]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9200308]
+ value: ['2021/04/13 09:21:34', 0.9200308]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8987293]
+ value: ['2021/04/13 09:21:49', 0.8987293]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8613345]
+ value: ['2021/04/13 09:22:04', 0.8613345]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8747463]
+ value: ['2021/04/13 09:22:19', 0.8747463]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8883187]
+ value: ['2021/04/13 09:22:34', 0.8883187]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.881333]
+ value: ['2021/04/13 09:22:49', 0.881333]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9142911]
+ value: ['2021/04/13 09:23:04', 0.9142911]
},
{
name: '鐑熷皹',
- value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9569058]
+ value: ['2021/04/13 09:23:19', 0.9569058]
}],
zdcbcolor: 'red',
zxcolor: '#f48183',
@@ -561,15 +559,17 @@
step: ''
}
},
+ updated () {
+ this.DrawEXHRealTimeDateChart()
+ },
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')
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
// this.IntervalEXHRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.JSONTimeData.BBZMAPPING)
},
methods: {
onSubmit () {
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+ this.DrawEXHRealTimeDateChart()
},
/**
* RTDB 鏍煎紡杞崲
@@ -591,7 +591,12 @@
// return dataArray
// },
// 1.鍧愭爣杞村疄鐜�,鐢诲疄鏃舵暟鎹�
- DrawEXHRealTimeDateChart (id, title, legend, ydatas, yname) {
+ DrawEXHRealTimeDateChart () {
+ // var id = this.JsonTimeCtarts.id
+ // var title = this.JsonTimeCtarts.title
+ var legend = this.JsonTimeCtarts.legend
+ var ydatas = this.JsonTimeCtarts.ydatas
+ var yname = this.JsonTimeCtarts.yname
this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
// this.myChart.clear()
var serLists = []
@@ -703,7 +708,7 @@
var seriesName = params[i].seriesName
// 鍊�
var value = params[i].value[1]
- var valueFliter = this.formatter(value)
+ // var valueFliter = this.formatter(value)
var maker = params[i].marker
if (seriesName === '浜屾哀鍖栫～') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
@@ -716,7 +721,7 @@
} else {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
}
- s += maker + seriesName + ':' + valueFliter + '<br />'
+ s += maker + seriesName + ':' + value + '<br />'
}
return s
}
@@ -806,7 +811,7 @@
}
}, { // 娴侀噺杞�
type: 'value',
- name: '娴侀噺(m3/h)',
+ name: '搴熸皵娴侀噺(m3/h)',
axisLabel: {
formatter: '{value}',
textStyle: {
@@ -830,6 +835,7 @@
}
console.log(option)
this.RealTimeChart.setOption(option)
+ // this.IntervalEXHRealTimeDate()
// this.RealTimeChart.on('legendselectchanged', function (params) {
// var StdVal = null
@@ -855,153 +861,153 @@
// var nowDate = new Date().Format()
// })
},
- getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
- if (this.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(this.res.ReadTime)
- data = {
- name: name,
- value: [newdate, this.res.TagValue]
- }
-
- datalist = {
- name: name,
- data: [data]
- }
-
- this.EXHRealTimeDataList.push(datalist)
- } else if (nameList.indexOf(name) < 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.EXHRealTimeDataList.push(datalist)
- } else if (i === d.length - 1) {
- if (nameList.indexOf(name) < 0) {
- nameList.push(name)
-
- // var newdate = new Date(d[i].ReadTime)
-
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- datalist = {
- name: name,
- data: [data]
- }
- // EXHRealTimeDataList.push(datalist)
- } else {
- // var newdate = new Date(d[i].ReadTime)
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- for (var k = 0; k < this.EXHRealTimeDataList.length; k++) {
- if (this.EXHRealTimeDataList[k].name === name) {
- this.EXHRealTimeDataList[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.EXHRealTimeDataList.length; k++) {
- if (this.EXHRealTimeDataList[k].name === name) {
- this.EXHRealTimeDataList[k].data.push(data)
- }
- }
- }
- }
-
- // var divid = 'mychart_ss'
- // var title = name
- var lengList = []
- var objTemp
-
- for (var l = 0; l < nameList.length; l++) {
- var obj
- var iconurl
- if (nameList[l] === '浜屾哀鍖栫～') {
- 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/grn.png'
- } else if (nameList[l] === '娓╁害') {
- iconurl = 'image://../assets/imgs/legend/WenDu.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.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
- }
- },
+ // getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
+ // if (this.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(this.res.ReadTime)
+ // data = {
+ // name: name,
+ // value: [newdate, this.res.TagValue]
+ // }
+ //
+ // datalist = {
+ // name: name,
+ // data: [data]
+ // }
+ //
+ // this.EXHRealTimeDataList.push(datalist)
+ // } else if (nameList.indexOf(name) < 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.EXHRealTimeDataList.push(datalist)
+ // } else if (i === d.length - 1) {
+ // if (nameList.indexOf(name) < 0) {
+ // nameList.push(name)
+ //
+ // // var newdate = new Date(d[i].ReadTime)
+ //
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // datalist = {
+ // name: name,
+ // data: [data]
+ // }
+ // // EXHRealTimeDataList.push(datalist)
+ // } else {
+ // // var newdate = new Date(d[i].ReadTime)
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // for (var k = 0; k < this.EXHRealTimeDataList.length; k++) {
+ // if (this.EXHRealTimeDataList[k].name === name) {
+ // this.EXHRealTimeDataList[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.EXHRealTimeDataList.length; k++) {
+ // if (this.EXHRealTimeDataList[k].name === name) {
+ // this.EXHRealTimeDataList[k].data.push(data)
+ // }
+ // }
+ // }
+ // }
+ //
+ // // var divid = 'mychart_ss'
+ // // var title = name
+ // var lengList = []
+ // var objTemp
+ //
+ // for (var l = 0; l < nameList.length; l++) {
+ // var obj
+ // var iconurl
+ // if (nameList[l] === '浜屾哀鍖栫～') {
+ // 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/grn.png'
+ // } else if (nameList[l] === '娓╁害') {
+ // iconurl = 'image://../assets/imgs/legend/WenDu.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.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+ // }
+ // },
// 閽╁瓙璋冪敤瀹炴椂
- IntervalEXHRealTimeDate (id, unionTagCodeList, BBZMAPPING) {
+ IntervalEXHRealTimeDate () {
// 瀹氭椂鍣ㄥ嚱鏁�
- this.interValHander = setInterval(function () {
+ this.DrawEXHRealTimeDateChart()
+ 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.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
- this.IntervalEXHRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.BBZMAPPING)
+ this.IntervalEXHRealTimeDate()
}, 15000)
}
}
@@ -1062,6 +1068,7 @@
padding: 0;
border-color:#00fff6;
text-align: center;
+ z-index: 9999;
//padding-left:20px ;
//padding: 0!important;
}
--
Gitblit v1.8.0