From 6b6eff08baa3d052b66fd2e68f1ac0d8495f6f8a Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 29 八月 2024 17:35:33 +0800
Subject: [PATCH] 修改历史数据获取逻辑
---
src/views/historymode/HistoryMode.vue | 83 +++++++++++++++++++++--------------------
1 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/src/views/historymode/HistoryMode.vue b/src/views/historymode/HistoryMode.vue
index 9421a94..d75c5b2 100644
--- a/src/views/historymode/HistoryMode.vue
+++ b/src/views/historymode/HistoryMode.vue
@@ -52,14 +52,15 @@
import sector from '@/utils/map/sector';
import mapUtil from '@/utils/map/util';
import { DialogUtil } from '@/utils/map/dialog';
-import monitorDataApi from '@/api/monitorDataApi';
import { useFetchData } from '@/composables/fetchData';
import moment from 'moment';
import { TYPE0 } from '@/constant/device-type';
+import { radioOptions } from '@/constant/radio-options';
import { FactorDatas } from '@/model/FactorDatas';
import TrendAnalysis from './component/TrendAnalysis.vue';
import DataSheet from './component/DataSheet.vue';
-import { ElMessageBox, ElNotification, ElMessage } from 'element-plus';
+import { ElMessage } from 'element-plus';
+import { fetchHistoryData } from '@/utils/factor/data';
export default {
components: { TrendAnalysis, DataSheet },
@@ -71,8 +72,10 @@
return {
// 鐩戞祴璁惧绫诲瀷
deviceType: TYPE0,
+ // 鐩戞祴璁惧缂栧彿
+ deviceCode: '',
// 鐩戞祴鍥犲瓙鐨勭被鍨嬬紪鍙�
- factorType: '1',
+ factorType: radioOptions(TYPE0)[0].value,
// 鐩戞祴鏁版嵁
factorDatas: new FactorDatas(),
// 鍐冲畾缁樺埗3D鍥惧舰鏃舵槸鍚︿笌鍘熷浘鍍忓悎骞�
@@ -146,65 +149,65 @@
// 1. 缁樺埗鏂版墖褰㈠尯鍩�
const pr = sector.drawSector(this.factorDatas, index);
// 璋冩暣瑙嗚灞呬腑鏄剧ず
- mapUtil.setFitSector(pr);
+ mapUtil.setCenter(pr.p);
+ // mapUtil.setFitSector(pr);
// 2. 缁樺埗瀵硅瘽妗�
- DialogUtil.openNewWindow(this.factorDatas, index, () => {
+ DialogUtil.openNewWindow(this.deviceCode, this.factorDatas, index, () => {
// 绉婚櫎鎵囧舰鍖哄煙
sector.clearSector();
});
},
- onFetchData(type, data) {
+ onFetchData(deviceType, data) {
// todo 鏍规嵁璁惧绫诲瀷鍒囨崲鍦板浘鐩戞祴鍥犲瓙灞曠ず鍗曢�夋銆佹姌绾垮浘澶嶉�夋銆佹暟鎹〃鏍煎閫夋鐨勫洜瀛愮被鍨�
- this.deviceType = type;
+ this.deviceType = deviceType;
this.factorDatas.setData(data, this.drawMode, () => {
this.factorDatas.refreshHeight(this.factorType);
this.draw();
});
},
fetchHistroyData(option) {
- const { deviceCode, type, timeArray } = option;
+ const { deviceType, deviceCode, timeArray } = option;
+ this.deviceType = deviceType;
+ this.deviceCode = deviceCode;
let startTime, endTime;
if (timeArray && timeArray.length == 2) {
startTime = moment(timeArray[0]).format('YYYY-MM-DD HH:mm:ss');
endTime = moment(timeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}
this.fetchData((page, pageSize) => {
- return monitorDataApi
- .fetchHistroyData({
- deviceCode,
- startTime,
- endTime,
- page,
- perPage: pageSize
- })
- .then((res) => this.onFetchData(type, res.data));
- });
- },
- fetchRealTimeData() {
- // fixme 2024.5.3 姝ゅ鍒濆鑾峰彇鐨勬暟鎹紝鍙傛暟搴旇鐢眘earchbar鍐冲畾锛屽悗缁慨鏀�
- this.fetchData((page) => {
- return monitorDataApi
- .fetchHistroyData({
- deviceCode: '0a0000000001',
- // type: TYPE0,
- page,
- perPage: 100
- })
- .then((res) => {
- if (res.data.length > 0) {
- const s = new Date(res.data[0].time.replace(' ', 'T'));
- const e = new Date(
- res.data[res.data.length - 1].time.replace(' ', 'T')
- );
- this.searchTime = [s, e];
- }
- this.onFetchData(TYPE0, res.data);
- });
+ return fetchHistoryData({
+ deviceType,
+ deviceCode,
+ startTime,
+ endTime,
+ page,
+ perPage: pageSize
+ }).then((res) => this.onFetchData(deviceType, res.data));
});
}
+ // fetchRealTimeData() {
+ // // fixme 2024.5.3 姝ゅ鍒濆鑾峰彇鐨勬暟鎹紝鍙傛暟搴旇鐢眘earchbar鍐冲畾锛屽悗缁慨鏀�
+ // this.fetchData((page) => {
+ // return fetchHistoryData({
+ // deviceCode: '0a0000000001',
+ // // type: TYPE0,
+ // page,
+ // perPage: 100
+ // }).then((res) => {
+ // if (res.data.length > 0) {
+ // const s = new Date(res.data[0].time.replace(' ', 'T'));
+ // const e = new Date(
+ // res.data[res.data.length - 1].time.replace(' ', 'T')
+ // );
+ // this.searchTime = [s, e];
+ // }
+ // this.onFetchData(TYPE0, res.data);
+ // });
+ // });
+ // }
},
mounted() {
- this.fetchRealTimeData();
+ // this.fetchRealTimeData();
},
unmounted() {
mapUtil.clearMap();
--
Gitblit v1.9.3