From 87e19b5a396ac8fed6a551828b87d263f6425c31 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 16 十月 2025 10:26:12 +0800
Subject: [PATCH] 2025.10.16 修改季度报告生成逻辑
---
src/utils/factor/data.js | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/src/utils/factor/data.js b/src/utils/factor/data.js
index 74d13c9..ab85787 100644
--- a/src/utils/factor/data.js
+++ b/src/utils/factor/data.js
@@ -159,33 +159,35 @@
/**
* 鑾峰彇鍘嗗彶鏁版嵁
*/
-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;
var isFetching;
+var pause = false;
/**
* 寮�鍚疄鏃舵暟鎹惊鐜幏鍙�
* @param {Object} params
*/
-function startLoopFetchRealTimeData(onParam, callback) {
+function startLoopFetchRealTimeData(onParam, callback, _interval) {
// 鏃堕棿闂撮殧
let interval;
// 鏁版嵁鑾峰彇鏂规硶
@@ -198,10 +200,13 @@
fetchFun = fetchOriginRealTimeData;
interval = 10 * 1000;
}
+ if (_interval) {
+ interval = _interval;
+ }
// 寮�濮嬪惊鐜换鍔�
clearFetchingTask();
fetchingTask = setInterval(() => {
- if (isFetching) {
+ if (isFetching || pause) {
return;
}
isFetching = true;
@@ -233,6 +238,11 @@
}, interval);
}
+function pauseTask() {
+ pause = !pause;
+ return pause;
+}
+
/**
* 娓呯悊鍘嗗彶瀹炴椂鏁版嵁鑾峰彇浠诲姟
*/
@@ -244,4 +254,9 @@
}
}
-export { fetchHistoryData, startLoopFetchRealTimeData, clearFetchingTask };
+export {
+ fetchHistoryData,
+ startLoopFetchRealTimeData,
+ clearFetchingTask,
+ pauseTask
+};
--
Gitblit v1.9.3