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 | 186 +++++++++++++++++++++++++++++++++-------------
1 files changed, 134 insertions(+), 52 deletions(-)
diff --git a/src/views/historymode/HistoryMode.vue b/src/views/historymode/HistoryMode.vue
index fc56796..d75c5b2 100644
--- a/src/views/historymode/HistoryMode.vue
+++ b/src/views/historymode/HistoryMode.vue
@@ -1,10 +1,13 @@
<template>
<div class="p-events-none m-t-2">
- <el-row justify="center">
+ <el-row justify="center" align="middle" class="top-wrap">
<SearchBar
+ v-show="status == 0"
:search-time="searchTime"
+ :loading="loading"
@search="fetchHistroyData"
></SearchBar>
+ <TrajectoryState v-show="status != 0" :status="status"></TrajectoryState>
</el-row>
<el-row class="m-t-2">
<FactorRadio
@@ -18,25 +21,49 @@
:factor="factorDatas.factor[factorType]"
></FactorLegend>
</el-row>
+ <el-row class="historical" justify="center">
+ <HistoricalTrajectory
+ :factor-datas="factorDatas"
+ :factor-type="factorType"
+ @change="(e) => (status = e)"
+ @stop="draw"
+ ></HistoricalTrajectory>
+ </el-row>
<TrendAnalysis
class="trend-analysis"
+ :locate-index="locateIndex"
+ @chart-click="handelIndexChange"
:factor-datas="factorDatas"
+ :device-type="deviceType"
></TrendAnalysis>
+ <DataSheet
+ class="data-sheet"
+ :locate-index="locateIndex"
+ @table-click="handelIndexChange"
+ :factor-datas="factorDatas"
+ :device-type="deviceType"
+ ></DataSheet>
</div>
</template>
<script>
import Layer from '@/utils/map/3dLayer';
import marks from '@/utils/map/marks';
-import monitorDataApi from '@/api/monitorDataApi';
+import sector from '@/utils/map/sector';
+import mapUtil from '@/utils/map/util';
+import { DialogUtil } from '@/utils/map/dialog';
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 { ElMessage } from 'element-plus';
+import { fetchHistoryData } from '@/utils/factor/data';
export default {
- components: { TrendAnalysis },
+ components: { TrendAnalysis, DataSheet },
setup() {
const { loading, fetchData } = useFetchData(10000);
return { loading, fetchData };
@@ -45,8 +72,10 @@
return {
// 鐩戞祴璁惧绫诲瀷
deviceType: TYPE0,
+ // 鐩戞祴璁惧缂栧彿
+ deviceCode: '',
// 鐩戞祴鍥犲瓙鐨勭被鍨嬬紪鍙�
- factorType: '1',
+ factorType: radioOptions(TYPE0)[0].value,
// 鐩戞祴鏁版嵁
factorDatas: new FactorDatas(),
// 鍐冲畾缁樺埗3D鍥惧舰鏃舵槸鍚︿笌鍘熷浘鍍忓悎骞�
@@ -55,104 +84,157 @@
setCenter: true,
// 缁樺埗妯″紡锛�0锛氳嚜鍔ㄦā寮忥紝鑷姩璁＄畻褰撳墠鏁版嵁鐨勮寖鍥达紝缁樺埗鍚堥�傜殑姣斾緥锛�1锛氭墜鍔ㄦā寮忥紝鏍规嵁椤甸潰璁剧疆鐨勭粯鍥捐寖鍥磋繘琛岀粯鍒�
drawMode: 0,
- searchTime: []
+ searchTime: [],
+ // 褰撳墠閫変腑楂樹寒鐨勬暟鎹偣绱㈠紩
+ locateIndex: undefined,
+ // 杞ㄨ抗鍔ㄧ敾鐘舵��
+ status: 0
};
},
watch: {
factorType(nValue, oValue) {
- if (nValue != oValue) {
+ if (nValue != oValue && this.status == 0) {
this.draw();
}
}
},
methods: {
+ // 妫�鏌ユ暟鎹粡绾害鏄惁鍚堟硶
+ checkDataIsValid(index) {
+ const lnglats_GD = this.factorDatas.lnglats_GD[index];
+ const time = this.factorDatas.times[index];
+ if (lnglats_GD[0] == 0 && lnglats_GD[1] == 0) {
+ ElMessage({
+ message: `${time}鐨勬暟鎹粡绾害鏃犳晥`,
+ type: 'warning'
+ });
+ return false;
+ } else {
+ this.locateIndex = index;
+ return true;
+ }
+ },
+ // 鐩戝惉鎶樼嚎鍥惧拰琛ㄦ牸鐨勭偣鍑讳簨浠�
+ handelIndexChange(index) {
+ if (this.checkDataIsValid(index)) {
+ this.drawSector(index);
+ }
+ },
draw() {
- // todo 鍒锋柊鍥句緥
+ // 鍒锋柊鍥句緥
const factor = this.factorDatas.factor[this.factorType];
+ sector.clearSector();
this.drawRoadMap(factor);
this.drawMassMarks(factor);
},
// 缁樺埗3D璧拌璺嚎鍥�
drawRoadMap(e) {
- // this.factorMode = factorMode;
- // this.factorType = factorType;
- // this.factorName = factorName;
this.factorDatas.refreshHeight(this.factorType);
- // this.mapMaker.setFactorType(factorType);
- // if (!this.mapMaker.runStatus()) {
Layer.drawRoadMap(this.factorDatas, e, this.merge, this.setCenter);
// }
},
drawMassMarks(e) {
- marks.drawMassMarks(this.factorDatas, e, () => {
+ marks.drawMassMarks(this.factorDatas, e, (index) => {
// 鏌ヨ鑼冨洿鍐呯殑鐩戞祴绔欑偣
// SceneUtil.searchByCoordinate(lnglat[0], lnglat[1], distance);
- // 3. 瓒嬪娍鍥捐烦杞畾浣�
- // const progress = FChart.locate(lineChart.chart, lineChart.option, i, _factor.factorName);
- // 4. 琛ㄦ牸鏁版嵁璺宠浆瀹氫綅
- // Table.locate(i);
+ if (this.checkDataIsValid(index)) {
+ this.drawSector(index);
+ }
+ });
+ // 璋冩暣鍦板浘瑙嗚
+ mapUtil.setBound(this.factorDatas.lnglats_GD);
+ },
+ drawSector(index) {
+ // 1. 缁樺埗鏂版墖褰㈠尯鍩�
+ const pr = sector.drawSector(this.factorDatas, index);
+ // 璋冩暣瑙嗚灞呬腑鏄剧ず
+ mapUtil.setCenter(pr.p);
+ // mapUtil.setFitSector(pr);
+ // 2. 缁樺埗瀵硅瘽妗�
+ 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();
}
};
</script>
<style scoped>
+.top-wrap {
+ height: 40px;
+}
+
.trend-analysis {
position: absolute;
left: 0;
bottom: 2px;
}
+
+.data-sheet {
+ position: absolute;
+ right: 0;
+ top: 0;
+}
+
+.historical {
+ position: absolute;
+ bottom: 10px;
+ left: 0;
+ right: 0;
+}
</style>
--
Gitblit v1.9.3