From 93850b9aee34d3a66c2770a1eb0435ce104e772f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 15:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 656 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 343 insertions(+), 313 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index a1350f1..61a58f1 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>
@@ -64,7 +62,6 @@
timeEnd: ''
},
RealTimeChart: null,
- info: this.series,
JsonTimeCtarts: {
id: 'mychart_ss ',
title: '鐑熷皹',
@@ -105,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',
@@ -195,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',
@@ -285,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',
@@ -375,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',
@@ -473,27 +470,133 @@
// 鐑熷皹: 10
// }
},
- exhbzz: null,
- exhbzzList: [],
- EXHRealTimeDataList: [],
- interValHander: ''
+ 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: ''
}
+ },
+ 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.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()
},
- // formatter (value, index) {
- // return parseFloat(value).toFixed(2)
+ /**
+ * RTDB 鏍煎紡杞崲
+ * @param res
+ * @returns {[]}
+ */
+ // getRtdbFormat (res) {
+ // var data = res.collection.items
+ // var dataArray = []
+ // for (var i = 0; i < data.length; i++) {
+ // var dataFormat = {
+ // UnionTagCode: data[i].data[0].value,
+ // TagValue: parseFloat(data[i].data[1].value),
+ // ReadTime: data[i].data[3].value,
+ // ErrorMessage: data[i].data[5].value
+ // }
+ // dataArray.push(dataFormat)
+ // }
+ // return dataArray
// },
- // 鍧愭爣杞村疄鐜�
- DrawEXHRealTimeDateChart (id, title, legend, ydatas, yname) {
+ // 1.鍧愭爣杞村疄鐜�,鐢诲疄鏃舵暟鎹�
+ 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 = []
@@ -605,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>'
@@ -618,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
}
@@ -730,6 +833,7 @@
}],
series: serLists
}
+ console.log(option)
this.RealTimeChart.setOption(option)
// this.RealTimeChart.on('legendselectchanged', function (params) {
@@ -756,228 +860,153 @@
// var nowDate = new Date().Format()
// })
},
- // 瀹氭椂鍣ㄨ幏鍙栨暟鎹繑鍥�
- getRtdb15s (unionTagCodeList, startTime, endTime, step) {
- var conditionStr = '{"$tagCodeList":"' + unionTagCodeList + '","$startTime":"' + startTime + '","$endTime":"' + endTime + '","$step":"' + step + '"}'
- var condition = JSON.parse(conditionStr)
- return condition
- // console.log(condition)
- // var wsservice = new WsEPMapService()
- // wsservice.DataItems(condition, function (res) {
- // return c(getRtdbFormat(res))
- // })
- },
- // 閽╁瓙璋冪敤瀹炴椂
- IntervalEXHRealTimeDate (id, unionTagCodeList) {
- const _this = this
- this.interValHander = setInterval(function () {
- // $('.RealTime').empty()
- // 鑾峰彇褰撳墠鏃堕棿
- // var serverTime = GetSysTimeFromServer()
- // var dateUtil = new DateUtil()
- // 寰楀埌5鍒嗛挓鍓嶇殑鏄椂闂�
- // var datePkg = dateUtil.getTowDate(serverTime, 'b', '300000')
- var startTime = dayjs().subtract(5, 'minute').format('YYYY-MM-DD HH:mm:ss')
- var endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
+ if (this.res.length > 0) {
+ // 澶勭悊鏁版嵁寮�濮�
+ var d = res
+ var nameList = [] // 瀛樻斁鍥句緥
- var step = '15'
- // PreQueryTime=endTime;
+ 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
- _this.getRtdb15s(unionTagCodeList, startTime, endTime, step, function (res) {
- if (res.length > 0) {
- // 澶勭悊鏁版嵁寮�濮�
- var d = res
- var nameList = [] // 瀛樻斁鍥句緥
+ if (nameList.length === 0) {
+ nameList.push(name)
- 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 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]
}
- // 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.EXHRealTimeDataList.push(datalist)
- } else if (nameList.indexOf(name) < 0) {
- nameList.push(name)
-
- const 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)
-
- const newdate = new Date(d[i].ReadTime)
-
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- datalist = {
- name: name,
- data: [data]
- }
- this.EXHRealTimeDataList.push(datalist)
- } else {
- const 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)
- }
+ 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)
}
}
}
-
- // 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)
- }
+ } else {
+ const newdate = new Date(d[i].ReadTime)
+ data = {
+ name: name,
+ value: [newdate, d[i].TagValue]
}
- lengList.push(objTemp)
- // var legend = lengList
- var ydatas = []
-
- for (var j = 0; j < nameList.length; j++) {
- var zdcbcolor, zxcolor
- if (nameList[j] === '浜屾哀鍖栫～') {
- zdcbcolor = 'red'
- zxcolor = '#fff21c'
- } else if (nameList[j] === '姘哀鍖栫墿') {
- zdcbcolor = 'red'
- zxcolor = '#00B0F0'
- } else if (nameList[j] === '鐑熷皹') {
- zdcbcolor = 'red'
- zxcolor = '#f48183'
- } else if (nameList[j] === '娓╁害') {
- zdcbcolor = 'red'
- zxcolor = '#F206FF'
- } else {
- zdcbcolor = 'red'
- zxcolor = '#9ACD32'
- }
- var ydata
- for (var m = 0; m < this.EXHRealTimeDataList.length; m++) {
- var stdValue = null
- // if (this.EXHRealTimeDataList[m].name === nameList[j]) {
- // for (var p in BBZMAPPING) {
- // this.stdValue = BBZMAPPING[this.EXHRealTimeDataList[m].name]
- // }
-
- ydata = {
- name: nameList[j],
- data: this.EXHRealTimeDataList[m].data,
- zdcbcolor: zdcbcolor,
- zxcolor: zxcolor,
- bzz: stdValue
- }
- this.exhbzz = {
- name: nameList[j],
- bzhui: stdValue
- }
- this.exhbzzList.push(this.exhbzz)
- ydatas.push(ydata)
+ for (let k = 0; k < this.EXHRealTimeDataList.length; k++) {
+ if (this.EXHRealTimeDataList[k].name === name) {
+ this.EXHRealTimeDataList[k].data.push(data)
}
}
}
- // var yname = '娴撳害(mg/m鲁)'
- // let html = ''
- //
- // for (var n = 0; n < ydatas.length; n++) {
- // var VAL = ''
- // var BBZ = BBZMAPPING[ydatas[n].name]
- // for (let m = 0; m < ydatas[n].data.length; m++) {
- // VAL = ydatas[n].data[ydatas[n].data.length - 1].value[1]
- // }
- // if (ydatas[n].name === '搴熸皵' || ydatas[n].name === '搴熸皵娴侀噺' || ydatas[n].name === '娓╁害') {
- // html += '<span>' + ydatas[n].name + ':</span><span style="color: yellow">' + (VAL != null ? (VAL.toFixed(2)) : '--') + ' </span>'
- // } else {
- // html += '<span>' + ydatas[n].name + ':</span><span style="color: yellow">' + (VAL != null ? (VAL.toFixed(2)) : '--') + '</span> 鏍囧噯:<span style="color: #fff">' + (BBZ != null ? (BBZ) : '--') + ' </span>'
- // }
- // }
- // // $('.RealTime').append(html)
- // // this.DrawEXHRealTimeDateChart(divid, title, legend, ydatas, yname)
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
- })
+ }
+
+ // 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) {
+ // 瀹氭椂鍣ㄥ嚱鏁�
+ 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.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)
}, 15000)
}
}
@@ -1038,6 +1067,7 @@
padding: 0;
border-color:#00fff6;
text-align: center;
+ z-index: 9999;
//padding-left:20px ;
//padding: 0!important;
}
--
Gitblit v1.8.0