From 96da92e9056c9c02e77867998424d623261daab0 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 25 七月 2024 15:09:32 +0800
Subject: [PATCH] 1. 添加地图罗盘的显隐 2. 修复数据表格中O3数据列实际显示NO2的值的问题 3. 优化风向的中文描述
---
src/views/historymode/HistoryMode.vue | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/views/historymode/HistoryMode.vue b/src/views/historymode/HistoryMode.vue
index e7b2ca9..9421a94 100644
--- a/src/views/historymode/HistoryMode.vue
+++ b/src/views/historymode/HistoryMode.vue
@@ -4,6 +4,7 @@
<SearchBar
v-show="status == 0"
:search-time="searchTime"
+ :loading="loading"
@search="fetchHistroyData"
></SearchBar>
<TrajectoryState v-show="status != 0" :status="status"></TrajectoryState>
@@ -49,6 +50,7 @@
import Layer from '@/utils/map/3dLayer';
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';
@@ -57,6 +59,7 @@
import { FactorDatas } from '@/model/FactorDatas';
import TrendAnalysis from './component/TrendAnalysis.vue';
import DataSheet from './component/DataSheet.vue';
+import { ElMessageBox, ElNotification, ElMessage } from 'element-plus';
export default {
components: { TrendAnalysis, DataSheet },
@@ -93,14 +96,31 @@
}
},
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);
+ }
},
draw() {
- // todo 鍒锋柊鍥句緥
+ // 鍒锋柊鍥句緥
const factor = this.factorDatas.factor[this.factorType];
+ sector.clearSector();
this.drawRoadMap(factor);
this.drawMassMarks(factor);
},
@@ -115,17 +135,22 @@
marks.drawMassMarks(this.factorDatas, e, (index) => {
// 鏌ヨ鑼冨洿鍐呯殑鐩戞祴绔欑偣
// SceneUtil.searchByCoordinate(lnglat[0], lnglat[1], distance);
- this.drawSector(index);
- this.locateIndex = index;
+ if (this.checkDataIsValid(index)) {
+ this.drawSector(index);
+ }
});
+ // 璋冩暣鍦板浘瑙嗚
+ mapUtil.setBound(this.factorDatas.lnglats_GD);
},
drawSector(index) {
// 1. 缁樺埗鏂版墖褰㈠尯鍩�
- sector.drawSector(this.factorDatas, index);
+ const pr = sector.drawSector(this.factorDatas, index);
+ // 璋冩暣瑙嗚灞呬腑鏄剧ず
+ mapUtil.setFitSector(pr);
// 2. 缁樺埗瀵硅瘽妗�
DialogUtil.openNewWindow(this.factorDatas, index, () => {
// 绉婚櫎鎵囧舰鍖哄煙
- // clearSector3();
+ sector.clearSector();
});
},
onFetchData(type, data) {
@@ -180,6 +205,9 @@
},
mounted() {
this.fetchRealTimeData();
+ },
+ unmounted() {
+ mapUtil.clearMap();
}
};
</script>
--
Gitblit v1.9.3