From c7a16ca1b6fbcb0b82a4a09c2e75014624082e37 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期四, 27 三月 2025 22:45:48 +0800
Subject: [PATCH] 修复走航融合功能bug
---
src/utils/factor/data.js | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/utils/factor/data.js b/src/utils/factor/data.js
index 74d13c9..80f5e14 100644
--- a/src/utils/factor/data.js
+++ b/src/utils/factor/data.js
@@ -159,24 +159,25 @@
/**
* 鑾峰彇鍘嗗彶鏁版嵁
*/
-function fetchHistoryData(params) {
- // if (import.meta.env.VITE_DATA_MODE == 'jingan') {
- // const _params = {
- // compUser: 'user1',
- // compPassword: 'User1@jingan',
- // mn: params.deviceCode,
- // dtFrom: params.startTime
- // ? params.startTime
- // : moment().subtract(6, 'm').format('YYYY-MM-DD HH:mm:ss'),
- // dtTo: params.endTime
- // ? params.endTime
- // : moment().format('YYYY-MM-DD HH:mm:ss')
- // };
- // return fetchThirdPartyData(_params);
- // } else {
- // return fetchOriginHistoryData(params);
- // }
- return fetchOriginHistoryData(params);
+function fetchHistoryData(params, origin = true) {
+ if (origin) {
+ return fetchOriginHistoryData(params);
+ } else if (import.meta.env.VITE_DATA_MODE == 'jingan') {
+ const _params = {
+ compUser: 'user1',
+ compPassword: 'User1@jingan',
+ mn: params.deviceCode,
+ dtFrom: params.startTime
+ ? params.startTime
+ : moment().subtract(6, 'm').format('YYYY-MM-DD HH:mm:ss'),
+ dtTo: params.endTime
+ ? params.endTime
+ : moment().format('YYYY-MM-DD HH:mm:ss')
+ };
+ return fetchThirdPartyData(_params);
+ } else {
+ return fetchOriginHistoryData(params);
+ }
}
var fetchingTask;
--
Gitblit v1.9.3