From 02349238af964e19a46da93e20466a48d755a453 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 02 九月 2024 17:38:04 +0800
Subject: [PATCH] 正在实现设备管理模块
---
src/model/Factor.js | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/model/Factor.js b/src/model/Factor.js
index 47730e4..1aaa149 100644
--- a/src/model/Factor.js
+++ b/src/model/Factor.js
@@ -1,6 +1,7 @@
import { Legend } from './Legend';
const _hMap = {
+ 19: [0, 1000], //NO
1: [0, 1000], //NO2
2: [0, 2000], //CO
3: [0, 1000], //H2S
@@ -34,7 +35,6 @@
/**
* 鐩戞祴鍥犲瓙绫�
* 瀛樺偍鏌愪竴绫诲瀷鐨勭洃娴嬪洜瀛愭暟鎹紝鎻愪緵3d鍦板浘缁樺埗楂樺害鎹㈢畻锛岀粯鍥捐寖鍥磋瀹氱瓑鍔熻兘
- * 鐢ㄤ簬3d鍦板浘缁樺埗
*/
function Factor(options) {
/**
@@ -194,24 +194,49 @@
if (d1 == undefined || d2 == undefined) {
return;
}
+ let diffValue = d2.factorData - d1.factorData;
+ // 瀵逛簬椋庡悜鐭㈤噺鏉ヨ锛屽姩鐢荤殑鍙樺寲搴旇浠庝袱涓鍚戝す瑙掕緝灏忕殑閭ｄ竴渚ц繘琛屽彉鍖�
+ if (this.factorName == 'WIND_DIRECTION') {
+ // 椋庡悜瑙掑害宸�
+ if (diffValue > 180) {
+ diffValue -= 360;
+ } else if (diffValue < -180) {
+ diffValue += 360;
+ }
+ }
// 鍗曞抚鏁版嵁鍊肩殑宸��
- var dValue = {
- factorData: (d2.factorData - d1.factorData) / count,
- physicalQuantity: (d2.physicalQuantity - d2.physicalQuantity) / count
+ const dValue = {
+ factorData: diffValue / count
+ // physicalQuantity: (d2.physicalQuantity - d2.physicalQuantity) / count
+ };
+
+ // 椋庡悜鐭㈤噺淇
+ const correct = (v) => {
+ if (this.factorName == 'WIND_DIRECTION') {
+ if (v < 0) {
+ return 360 + v;
+ } else if (v > 360) {
+ return v - 360;
+ } else {
+ return v;
+ }
+ } else {
+ return v;
+ }
};
for (let i = 0; i < count - 1; i++) {
var _data = {
- factorData: d1.factorData + dValue.factorData * (i + 1),
+ factorData: correct(d1.factorData + dValue.factorData * (i + 1)),
factorId: d1.factorId,
factorName: d1.factorName,
- physicalQuantity:
- d1.physicalQuantity + dValue.physicalQuantity * (i + 1),
+ // physicalQuantity:
+ // d1.physicalQuantity + dValue.physicalQuantity * (i + 1),
sensorId: d1.sensorId,
statusList: d1.statusList
};
if (!isDraw) {
_data.factorData = -1;
- _data.physicalQuantity = -1;
+ // _data.physicalQuantity = -1;
}
this.datas.push(_data);
}
--
Gitblit v1.9.3