From c2e36c45578e63ad17c5e258c92d62d9ae03dadb Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 30 五月 2025 11:55:52 +0800
Subject: [PATCH] Merge branch 'master' of ssh://114.215.109.124:29418/underway-vue
---
src/views/historymode/HistoryMode.vue | 237 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 169 insertions(+), 68 deletions(-)
diff --git a/src/views/historymode/HistoryMode.vue b/src/views/historymode/HistoryMode.vue
index f9b89f9..2ced9f5 100644
--- a/src/views/historymode/HistoryMode.vue
+++ b/src/views/historymode/HistoryMode.vue
@@ -1,10 +1,20 @@
<template>
<div class="p-events-none m-t-2">
- <el-row v-show="status == 0" justify="center">
+ <el-row justify="center" align="middle" class="top-wrap">
<SearchBar
+ v-show="status == 0"
:search-time="searchTime"
- @search="fetchHistroyData"
+ :loading="loading || thirdPartyLoading"
+ @search="onSearch"
></SearchBar>
+ <TrajectoryState v-show="status != 0" :status="status"></TrajectoryState>
+ <!-- <el-button
+ type="primary"
+ class="p-events-auto el-button-custom"
+ @click="handleClick"
+ >
+ 鍒嗘瀽
+ </el-button> -->
</el-row>
<el-row class="m-t-2">
<FactorRadio
@@ -16,7 +26,17 @@
<FactorLegend
class="m-t-2"
:factor="factorDatas.factor[factorType]"
+ @change="handleLegendTypeChange"
></FactorLegend>
+ <!-- <SourceTrace></SourceTrace> -->
+ </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"
@@ -31,31 +51,37 @@
@table-click="handelIndexChange"
:factor-datas="factorDatas"
:device-type="deviceType"
+ :device-code="deviceCode"
></DataSheet>
- <el-row class="historical" justify="center">
- <HistoricalTrajectory
- @change="(e) => (status = e)"
- ></HistoricalTrajectory>
- </el-row>
</div>
</template>
<script>
import Layer from '@/utils/map/3dLayer';
+import mapLine from '@/utils/map/line';
import marks from '@/utils/map/marks';
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 { defaultOptions } from '@/constant/radio-options';
import { FactorDatas } from '@/model/FactorDatas';
import TrendAnalysis from './component/TrendAnalysis.vue';
import DataSheet from './component/DataSheet.vue';
+import SourceTrace from '@/views/sourcetrace/SourceTrace.vue';
+import { ElMessage } from 'element-plus';
+import { fetchHistoryData } from '@/utils/factor/data';
+import dataAnalysisApi from '@/api/dataAnalysisApi';
+import thirdPartyDataApi from '@/api/thirdPartyDataApi';
+import { mapStores } from 'pinia';
+import { useSceneStore } from '@/stores/scene';
export default {
- components: { TrendAnalysis, DataSheet },
+ components: { TrendAnalysis, DataSheet, SourceTrace },
setup() {
+ // 闄愬畾鍒嗛〉鏁版嵁閲忎负10000
const { loading, fetchData } = useFetchData(10000);
return { loading, fetchData };
},
@@ -63,10 +89,14 @@
return {
// 鐩戞祴璁惧绫诲瀷
deviceType: TYPE0,
+ // 鐩戞祴璁惧缂栧彿
+ deviceCode: '',
// 鐩戞祴鍥犲瓙鐨勭被鍨嬬紪鍙�
- factorType: '1',
+ factorType: defaultOptions(TYPE0).value,
// 鐩戞祴鏁版嵁
factorDatas: new FactorDatas(),
+ // 姹℃煋婧簮缁撴灉
+ pollutionData: undefined,
// 鍐冲畾缁樺埗3D鍥惧舰鏃舵槸鍚︿笌鍘熷浘鍍忓悎骞�
merge: false,
// 鍐冲畾缁樺埗瀹�3D鍥惧舰鍚庡湴鍥捐瑙掓槸鍚﹁嚜鍔ㄥ洖涓�
@@ -77,117 +107,188 @@
// 褰撳墠閫変腑楂樹寒鐨勬暟鎹偣绱㈠紩
locateIndex: undefined,
// 杞ㄨ抗鍔ㄧ敾鐘舵��
- status: 0
+ status: 0,
+ // 鏄惁椤甸潰宸茶烦杞�
+ isUnmounted: false,
+ // 绗笁鏂规暟鎹幏鍙栨槸鍚﹀皾璇�
+ isFetchThirdParty: false,
+ thirdPartyLoading: false
};
},
watch: {
factorType(nValue, oValue) {
- if (nValue != oValue) {
+ if (nValue != oValue && this.status == 0) {
+ Layer.clear();
this.draw();
+ // this.drawHighlightPollution();
}
}
},
+ computed: {
+ ...mapStores(useSceneStore)
+ },
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) {
- this.locateIndex = index;
- this.drawSector(index);
+ if (this.checkDataIsValid(index)) {
+ // 缁樺埗婧簮鎵囧舰
+ this.drawSector(index);
+ // 鏌ヨ鑼冨洿鍐呯殑鐩戞祴绔欑偣
+ const [lng, lat] = this.factorDatas.lnglats_GD[index];
+ this.sceneStore.searchScene(lng, lat);
+ }
+ },
+ handleLegendTypeChange(value, done) {
+ if (value) {
+ this.factorDatas.resetRange();
+ } else {
+ this.factorDatas.standardRange();
+ }
+ done();
+ this.draw();
},
draw() {
- // todo 鍒锋柊鍥句緥
+ // 鍒锋柊鍥句緥
const factor = this.factorDatas.factor[this.factorType];
+ sector.clearSector();
+ // this.drawRoadLine(factor);
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);
- // }
+ },
+ drawRoadLine(e) {
+ this.factorDatas.refreshHeight(this.factorType);
+ mapLine.drawLine(this.factorDatas, e);
},
drawMassMarks(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);
- this.drawSector(index);
- this.locateIndex = index;
+ this.handelIndexChange(index);
});
+ // 璋冩暣鍦板浘瑙嗚
+ mapUtil.setBound(this.factorDatas.lnglats_GD);
},
drawSector(index) {
- // 1. 缁樺埗鎵囧舰鍖哄煙
- sector.drawSector(this.factorDatas, index);
+ // 1. 缁樺埗鏂版墖褰㈠尯鍩�
+ const pr = sector.drawSector(this.factorDatas, index);
+ // 璋冩暣瑙嗚灞呬腑鏄剧ず
+ mapUtil.setCenter(pr.p);
+ // mapUtil.setFitSector(pr);
// 2. 缁樺埗瀵硅瘽妗�
- DialogUtil.openNewWindow(this.factorDatas, index, () => {
- // 绉婚櫎鎵囧舰鍖哄煙
- // clearSector3();
+ DialogUtil.openNewWindow(
+ this.deviceType,
+ this.deviceCode,
+ this.factorDatas,
+ index,
+ () => {
+ // 绉婚櫎鎵囧舰鍖哄煙
+ sector.clearSector();
+ }
+ );
+ },
+ drawHighlightPollution() {
+ this.pollutionData.forEach((e) => {
+ if (this.factorType == e.factorId + '') {
+ const fDatas = this.factorDatas.getByDate(e.startDate, e.endDate);
+ Layer.drawHighLight3DLayer(fDatas, fDatas.factor[this.factorType]);
+ }
});
},
- onFetchData(type, data) {
+ onFetchData(deviceType, data) {
+ if (this.isUnmounted) return;
// todo 鏍规嵁璁惧绫诲瀷鍒囨崲鍦板浘鐩戞祴鍥犲瓙灞曠ず鍗曢�夋銆佹姌绾垮浘澶嶉�夋銆佹暟鎹〃鏍煎閫夋鐨勫洜瀛愮被鍨�
- this.deviceType = type;
+ this.deviceType = deviceType;
this.factorDatas.setData(data, this.drawMode, () => {
this.factorDatas.refreshHeight(this.factorType);
+ Layer.clear();
this.draw();
});
},
- fetchHistroyData(option) {
- const { deviceCode, type, timeArray } = option;
+ onSearch(option) {
+ const { deviceType, deviceCode, timeArray, mission } = option;
+ this.deviceType = deviceType;
+ this.deviceCode = deviceCode;
+ this.mission = mission;
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));
+ return fetchHistoryData({
+ deviceType,
+ deviceCode,
+ startTime,
+ endTime,
+ page,
+ perPage: pageSize
+ }).then((res) => {
+ this.onFetchData(deviceType, res.data);
+ if (
+ res.data.length == 0 &&
+ this.isFetchThirdParty != mission.missionCode
+ ) {
+ this.onThirdPartyFetch(option);
+ }
+ });
});
},
- fetchRealTimeData() {
- // fixme 2024.5.3 姝ゅ鍒濆鑾峰彇鐨勬暟鎹紝鍙傛暟搴旇鐢眘earchbar鍐冲畾锛屽悗缁慨鏀�
- this.fetchData((page) => {
- return monitorDataApi
- .fetchHistroyData({
- deviceCode: '0a0000000001',
- // type: TYPE0,
- page,
- perPage: 100
- })
+ onThirdPartyFetch(option) {
+ const { mission } = option;
+ if (import.meta.env.VITE_DATA_MODE == 'jingan') {
+ this.thirdPartyLoading = true;
+ this.isFetchThirdParty = mission.missionCode;
+ // 閫氱煡鏈嶅姟绔惎鍔ㄤ换鍔¤寖鍥村唴鐨勭涓夋柟鏁版嵁鑾峰彇浠诲姟
+ thirdPartyDataApi
+ .fetchMissionData(mission.missionCode)
.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];
+ if (res.data) {
+ this.onSearch(option);
}
- this.onFetchData(TYPE0, res.data);
- });
+ })
+ .finally(() => (this.thirdPartyLoading = false));
+ }
+ },
+ handleClick() {
+ const { missionCode } = this.mission;
+ dataAnalysisApi.pollutionTrace(missionCode).then((res) => {
+ this.pollutionData = res.data;
+ this.drawHighlightPollution();
});
}
},
mounted() {
- this.fetchRealTimeData();
+ this.isUnmounted = false;
+ },
+ unmounted() {
+ mapUtil.clearMap();
+ this.isUnmounted = true;
}
};
</script>
<style scoped>
+.top-wrap {
+ height: 40px;
+}
+
.trend-analysis {
position: absolute;
left: 0;
@@ -202,7 +303,7 @@
.historical {
position: absolute;
- bottom: 0;
+ bottom: 10px;
left: 0;
right: 0;
}
--
Gitblit v1.9.3