From aa75a9d46ee325f0a92e42f733aabb1f92103aeb Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 28 三月 2025 17:44:29 +0800
Subject: [PATCH] 走航融合模块完成
---
src/views/underwaymix/UnderwayMixMode.vue | 705 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 406 insertions(+), 299 deletions(-)
diff --git a/src/views/underwaymix/UnderwayMixMode.vue b/src/views/underwaymix/UnderwayMixMode.vue
index 460355c..8cfb488 100644
--- a/src/views/underwaymix/UnderwayMixMode.vue
+++ b/src/views/underwaymix/UnderwayMixMode.vue
@@ -1,153 +1,146 @@
<template>
<!-- <div class="p-events-none m-t-2"> -->
- <el-row justify="space-between">
+ <el-row class="m-t-2">
+ <FactorRadio @change="handleFactorTypeChange"></FactorRadio>
+ </el-row>
+ <el-row class="m-t-2" justify="space-between">
<el-row class="wrap">
<el-col span="2">
- <el-row>
- <BaseCard v-show="show" size="medium" direction="left">
- <template #content>
- <el-row>
+ <!-- <el-row> -->
+ <BaseCard v-show="show" size="medium" direction="left">
+ <template #content>
+ <!-- <el-row>
<el-form :inline="true">
- <!-- <el-form-item label="璧拌埅铻嶅悎">
- <el-select
- v-model="selectedfusionData"
- multiple
- clearable
- @change="handleChange"
- placeholder="閫夋嫨浠诲姟"
- size="small"
- style="width: 160px"
- :loading="fusionLoading"
- >
- <el-option
- v-for="(s, i) in fusionDataList"
- :key="i"
- :label="s.mixDataId"
- :value="i"
- />
- </el-select>
- </el-form-item> -->
- <!-- <el-form-item>
- <el-button
- type="primary"
- class="el-button-custom"
- size="small"
- :disabled="
- !gridCellList || selectedfusionData.length == 0
- "
- @click="handleFusionClick"
- >
- {{ '鍙犲姞璧拌埅' }}
- </el-button>
- </el-form-item> -->
+
</el-form>
- </el-row>
- <div class="m-t-8">绛涢�夎緟鍔�</div>
- <el-form :inline="false">
- <el-form-item label="鏃舵绛涢��">
- <el-select
- v-model="selectedTimeSection"
- multiple
- clearable
- placeholder="閫夋嫨鏃舵"
- size="small"
- style="width: 300px"
- >
- <el-option
- v-for="(v, i) in timeSectionList"
- :key="i"
- :label="v"
- :value="v"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鍖哄煙绛涢��">
- <el-select
- v-model="selectedZone"
- multiple
- clearable
- placeholder="閫夋嫨鍖哄煙"
- size="small"
- style="width: 300px"
- >
- <el-option
- v-for="(v, i) in zoneList"
- :key="i"
- :label="v"
- :value="v"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鑳屾櫙绛涢��">
- <el-select
- v-model="selectedPollutionDegree"
- multiple
- clearable
- placeholder="閫夋嫨鑳屾櫙"
- size="small"
- style="width: 300px"
- >
- <el-option
- v-for="(v, i) in pollutionDegreeList"
- :key="i"
- :label="v"
- :value="v"
- />
- </el-select>
- </el-form-item>
- </el-form>
-
- <el-table
- :data="showFusionDataList"
- table-layout="fixed"
- size="small"
- :show-overflow-tooltip="true"
- border
- height="50vh"
- row-class-name="t-row-normal"
- cell-class-name="t-cell"
- header-row-class-name="t-header-row"
- header-cell-class-name="t-header-cell"
- :highlight-current-row="false"
- @row-click="handleRowClick"
- @selection-change="handleSelectionChange"
+ </el-row> -->
+ <el-row justify="space-between">
+ <span>铻嶅悎鍒嗘瀽</span>
+ </el-row>
+ <el-form :inline="false">
+ <el-form-item label="鏃舵绛涢��">
+ <el-select
+ v-model="selectedTimeSection"
+ multiple
+ clearable
+ placeholder="閫夋嫨鏃舵"
+ size="small"
+ style="width: 300px"
+ >
+ <el-option
+ v-for="(v, i) in timeSectionList"
+ :key="i"
+ :label="v.label"
+ :value="v.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍖哄煙绛涢��">
+ <el-select
+ v-model="selectedZone"
+ multiple
+ clearable
+ placeholder="閫夋嫨鍖哄煙"
+ size="small"
+ style="width: 300px"
+ >
+ <el-option
+ v-for="(v, i) in zoneList"
+ :key="i"
+ :label="v.label"
+ :value="v.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鑳屾櫙绛涢��">
+ <el-select
+ v-model="selectedPollutionDegree"
+ multiple
+ clearable
+ placeholder="閫夋嫨鑳屾櫙"
+ size="small"
+ style="width: 300px"
+ >
+ <el-option
+ v-for="(v, i) in pollutionDegreeList"
+ :key="i"
+ :label="v.label"
+ :value="v.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <el-space v-if="!gridCellList">
+ <el-icon class="is-loading"><Loading /></el-icon>
+ <el-text type="info">缃戞牸淇℃伅鍔犺浇涓�...</el-text>
+ </el-space>
+ <el-table
+ ref="tableRef"
+ :data="showFusionDataList"
+ table-layout="fixed"
+ size="small"
+ :show-overflow-tooltip="true"
+ border
+ height="45vh"
+ row-class-name="t-row-normal"
+ cell-class-name="t-cell"
+ header-row-class-name="t-header-row"
+ header-cell-class-name="t-header-cell"
+ :highlight-current-row="false"
+ @row-click="handleRowClick"
+ @select="handleSelectionChange"
+ @select-all="handleSelectionChange"
+ >
+ <el-table-column width="40" v-if="!gridCellList">
+ <template #default>
+ <el-icon class="is-loading"><Loading /></el-icon>
+ </template>
+ </el-table-column>
+ <el-table-column
+ v-else
+ type="selection"
+ :selectable="selectable"
+ width="40"
>
- <el-table-column type="selection" width="40" />
- <!-- <el-table-column
+ <!-- <template #header>
+ <span>閫夋嫨</span>
+ </template> -->
+ </el-table-column>
+ <!-- <el-table-column
type="index"
label="搴忓彿"
width="30"
/> -->
- <el-table-column
- prop="dataTime"
- label="鏃堕棿"
- align="center"
- :formatter="timeFormatter"
- width="100"
- />
- <el-table-column
- prop="missionCode"
- label="浠诲姟缂栧彿"
- align="center"
- width="150"
- />
- <el-table-column
- prop="zone"
- label="鍖哄煙"
- align="center"
- width="50"
- />
- <el-table-column
- prop="pollutionDegree"
- label="姹℃煋鑳屾櫙"
- align="center"
- width="50"
- />
- </el-table>
+ <el-table-column
+ prop="dataTime"
+ label="鏃堕棿"
+ align="center"
+ :formatter="timeFormatter"
+ width="100"
+ />
+ <el-table-column
+ prop="missionCode"
+ label="浠诲姟缂栧彿"
+ align="center"
+ width="150"
+ />
+ <el-table-column
+ prop="zone"
+ label="鍖哄煙"
+ align="center"
+ width="50"
+ />
+ <el-table-column
+ prop="pollutionDegree"
+ label="姹℃煋鑳屾櫙"
+ align="center"
+ width="70"
+ />
+ </el-table>
- <div class="m-t-8">鎿嶄綔</div>
- <el-space class="m-t-8 m-b-8">
- <el-button
+ <div class="m-t-8">鎿嶄綔</div>
+ <el-space class="m-t-8 m-b-8">
+ <!-- <el-button
type="primary"
class="el-button-custom"
size="small"
@@ -155,45 +148,57 @@
@click="handleFusionClick"
>
{{ '鍙犲姞璧拌埅' }}
- </el-button>
- <CheckButton
- active-text="寮�鍚瀺鍚�"
- inactive-text="闅愯棌铻嶅悎"
- :default-value="false"
- @change="handleMixClick"
- >
- </CheckButton>
- </el-space>
- </template>
- <template #footer> </template>
- </BaseCard>
- </el-row>
+ </el-button> -->
+ <el-button
+ type="primary"
+ class="el-button-custom"
+ size="small"
+ @click="handleMixClick"
+ >
+ {{ '铻嶅悎鍒嗘瀽' }}
+ </el-button>
+ <!-- <CheckButton
+ active-text="铻嶅悎鍒嗘瀽"
+ :default-value="false"
+ @change="handleMixClick"
+ >
+ </CheckButton> -->
+ </el-space>
+ </template>
+ <template #footer> </template>
+ </BaseCard>
+ <!-- </el-row> -->
</el-col>
<el-col span="2">
- <el-row>
- <CardButton
- name="璧拌埅铻嶅悎"
- direction="right"
- @click="() => (show = !show)"
- ></CardButton>
- </el-row>
+ <!-- <el-row> -->
+ <CardButton
+ name="璧拌埅铻嶅悎"
+ direction="right"
+ @click="() => (show = !show)"
+ ></CardButton>
+ <!-- </el-row> -->
</el-col>
</el-row>
<GridStyleTool
:gridCtrls="gridCtrls"
@show-underway="handleUnderwayClick"
+ @on-delete="handleFusionDelete"
></GridStyleTool>
</el-row>
<!-- </div> -->
</template>
<script setup>
-import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
+import { ref, toRaw, onMounted, onUnmounted, watch, computed } from 'vue';
import moment from 'moment';
import gridApi from '@/api/gridApi';
import { SatelliteGrid } from '@/model/SatelliteGrid';
import GridStyleTool from './component/GridStyleTool.vue';
import { useGridStore } from '@/stores/grid-info';
+import { TYPE0 } from '@/constant/device-type';
+import { defaultOptions } from '@/constant/radio-options';
+import { useMessageBox } from '@/composables/messageBox';
+import { useCloned } from '@vueuse/core';
const gridStore = useGridStore();
@@ -209,6 +214,16 @@
});
const show = ref(true);
+// 鐩戞祴鍥犲瓙鐨勭被鍨嬬紪鍙�
+const factorType = ref(defaultOptions(TYPE0));
+satelliteGrid.setShowFactorType(toRaw(factorType.value));
+
+function handleFactorTypeChange(e, item) {
+ factorType.value = item;
+ console.log(toRaw(factorType.value));
+ satelliteGrid.setShowFactorType(toRaw(factorType.value));
+}
+
const mission = ref(undefined);
const gridCellList = ref(undefined);
@@ -217,6 +232,8 @@
const fusionLoading = ref(false);
const fusionDataList = ref([]);
const selectedfusionData = ref([]);
+const tableRef = ref();
+const selectable = (row) => gridCellList.value;
const gridDataDetailMap = new Map();
@@ -225,34 +242,95 @@
const selectedPollutionDegree = ref([]);
const timeSectionList = computed(() => {
- const res = [];
+ let res = [];
fusionDataList.value.forEach((e) => {
- const t = moment(e.dataTime).format('YYYY-MM-DD');
- if (res.indexOf(t) == -1) {
- res.push(t);
+ const hour = moment(e.dayTimePeriodStart).hour();
+ const t = e.dayTimePeriod;
+ const option = {
+ label: `${t} ${moment(e.dayTimePeriodStart).format('HH:mm')} - ${moment(e.dayTimePeriodEnd).format('HH:mm')}`,
+ value: t,
+ index: hour
+ };
+ if (!res.find((v) => v.label == option.label)) {
+ res.push(option);
}
+ });
+ res.sort((a, b) => {
+ return a.index - b.index;
+ });
+
+ const rMap = new Map();
+ showFusionDataList.value.forEach((d) => {
+ if (!rMap.has(d.dayTimePeriod)) {
+ rMap.set(d.dayTimePeriod, 0);
+ }
+ rMap.set(d.dayTimePeriod, rMap.get(d.dayTimePeriod) + 1);
+ });
+
+ res = res.map((v) => {
+ const count = rMap.get(v.value);
+ v.label = `${v.label} (${count ? count : 0})`;
+ return v;
});
return res;
});
const zoneList = computed(() => {
- const res = [];
+ let res = [];
fusionDataList.value.forEach((e) => {
const t = e.zone;
- if (res.indexOf(t) == -1) {
- res.push(t);
+ const option = {
+ label: t,
+ value: t
+ };
+ if (!res.find((v) => v.label == option.label)) {
+ res.push(option);
}
+ });
+ const rMap = new Map();
+ showFusionDataList.value.forEach((d) => {
+ if (!rMap.has(d.zone)) {
+ rMap.set(d.zone, 0);
+ }
+ rMap.set(d.zone, rMap.get(d.zone) + 1);
+ });
+
+ res = res.map((v) => {
+ const count = rMap.get(v.value);
+ v.label = `${v.label} (${count ? count : 0})`;
+ return v;
});
return res;
});
const pollutionDegreeList = computed(() => {
- const res = [];
+ let res = [];
fusionDataList.value.forEach((e) => {
const t = e.pollutionDegree;
- if (res.indexOf(t) == -1) {
- res.push(t);
+ const option = {
+ label: t,
+ value: t,
+ index: e.pollutionDegreeIndex
+ };
+ if (!res.find((v) => v.label == option.label)) {
+ res.push(option);
}
+ });
+ res.sort((a, b) => {
+ return a.index - b.index;
+ });
+ const rMap = new Map();
+ showFusionDataList.value.forEach((d) => {
+ if (!rMap.has(d.pollutionDegree)) {
+ rMap.set(d.pollutionDegree, 0);
+ }
+ rMap.set(d.pollutionDegree, rMap.get(d.pollutionDegree) + 1);
+ });
+
+ res = res.map((v) => {
+ const count = rMap.get(v.value);
+ v.label = `${v.label} (${count ? count : 0})`;
+ return v;
});
return res;
});
@@ -261,9 +339,7 @@
return fusionDataList.value.filter((v) => {
const b1 =
selectedTimeSection.value.length == 0 ||
- selectedTimeSection.value.indexOf(
- moment(v.dataTime).format('YYYY-MM-DD')
- ) != -1;
+ selectedTimeSection.value.indexOf(v.dayTimePeriod) != -1;
const b2 =
selectedZone.value.length == 0 ||
selectedZone.value.indexOf(v.zone) != -1;
@@ -327,45 +403,32 @@
// }
function prepareGrid(gridInfo) {
- satelliteGrid.gridPrepare(gridInfo, (polygon) => {
- //榧犳爣绉诲叆浜嬩欢
- polygon.on('mouseover', () => {
- polygon.setOptions({
- //淇敼澶氳竟褰㈠睘鎬х殑鏂规硶
- strokeWeight: 2,
- strokeColor: 'red'
- });
- });
- //榧犳爣绉诲嚭浜嬩欢
- polygon.on('mouseout', () => {
- polygon.setOptions({
- strokeWeight: 1,
- strokeColor: 'white'
- });
- });
+ satelliteGrid.gridPrepare(gridInfo, function (polygon) {
+ // const originOption = polygon.getOptions();
+ // //榧犳爣绉诲叆浜嬩欢
+ // polygon.on('mouseover', () => {
+ // polygon.setOptions({
+ // //淇敼澶氳竟褰㈠睘鎬х殑鏂规硶
+ // strokeWeight: 2,
+ // strokeColor: 'red'
+ // });
+ // });
+ // //榧犳爣绉诲嚭浜嬩欢
+ // polygon.on('mouseout', () => {
+ // // polygon.setOptions({
+ // // strokeWeight: originOption.strokeWeight,
+ // // strokeColor: originOption.strokeColor
+ // // });
+ // polygon.setOptions(originOption);
+ // });
});
- // satelliteGrid.setGridEvent('click', (gridCell, gridDataDetail) => {
- // // const polygon = e.target
- // // const { gridCell } = polygon.getExtData();
- // // const cellIndex = gridCell.cellIndex;
- // gridStore.selectedGridCellAndDataDetail = {
- // gridCell,
- // gridDataDetail
- // };
- // });
}
-
-// watch(mission, (nV, oV) => {
-// if (nV != oV) {
-// checkUnderwayFusionResult();
-// search(nV);
-// }
-// });
watch(
() => props.groupId,
(nV, oV) => {
if (nV != oV) {
+ satelliteGrid.gridGroupId = nV;
gridApi.fetchGridCell(nV).then((res) => {
gridCellList.value = res.data;
prepareGrid(gridCellList.value);
@@ -400,19 +463,18 @@
type: 0
}
});
- satelliteGrid.setGridEvent(
- [d.id],
- 'click',
- (gridCell, gridDataDetail) => {
- gridStore.selectedGridCellAndDataDetail = {
- gridCell,
- gridDataDetail
- };
- }
- );
+ satelliteGrid.setDefaultGridClickEvent([d.id]);
+ // satelliteGrid.setGridEvent(
+ // [d.id],
+ // 'click',
+ // (gridCell, gridDataDetail) => {
+ // gridStore.selectedGridCellAndDataDetail = {
+ // gridCell,
+ // gridDataDetail
+ // };
+ // }
+ // );
gridCtrls.value = [satelliteGrid];
- // gridCtrls.value = Array.from(satelliteGrid.mapViewsMap);
- // console.log(gridCtrls.value);
});
}
});
@@ -420,37 +482,37 @@
let mixTag;
function handleMixClick() {
- mixActive.value = !mixActive.value;
- const tags = fusionDataList.value
- .filter((v, i) => selectedfusionData.value.indexOf(i) != -1)
- .map((v) => v.id);
+ // mixActive.value = !mixActive.value;
+ const tags = selectedfusionData.value.map((v) => v.id);
satelliteGrid.changeVisibility({
showGridViews: false,
showDataTxt: false,
showRankTxt: false
});
- if (mixActive.value) {
- mixTag = satelliteGrid.mixGrid(tags);
- satelliteGrid.setGridEvent(
- [mixTag],
- 'click',
- (gridCell, gridDataDetail) => {
- gridStore.selectedGridCellAndDataDetail = {
- gridCell,
- gridDataDetail
- };
- }
- );
+ // if (mixActive.value) {
+ gridApi.mixUnderwayGridData(props.groupId, tags).then((res) => {
+ mixTag = satelliteGrid.mixGrid2({ tags, gridDataDetailList: res.data });
+ satelliteGrid.setDefaultGridClickEvent([mixTag]);
gridCtrls.value = [satelliteGrid];
- } else {
- satelliteGrid.changeVisibility({
- tags,
- showGridViews: true
- });
- }
+ });
+
+ // satelliteGrid.setGridEvent([mixTag], 'click', (gridCell, gridDataDetail) => {
+ // gridStore.selectedGridCellAndDataDetail = {
+ // gridCell,
+ // gridDataDetail
+ // };
+ // });
+ // gridCtrls.value = [satelliteGrid];
+ // } else {
+ // satelliteGrid.changeVisibility({
+ // tags,
+ // showGridViews: true
+ // });
+ // }
}
let heatTag;
+const heatMapSearchLength = 4;
function handleHeatMapClick() {
heatActive.value = !heatActive.value;
satelliteGrid.changeVisibility({
@@ -459,34 +521,14 @@
showRankTxt: false
});
if (heatActive.value) {
- // heatTag = satelliteGrid.drawHeatGrid(mixTag);
- // satelliteGrid.setGridEvent(
- // [heatTag],
- // 'click',
- // (gridCell, gridDataDetail) => {
- // gridStore.selectedGridCellAndDataDetail = {
- // gridCell,
- // gridDataDetail
- // };
- // }
- // );
- // gridCtrls.value = [satelliteGrid];
-
const data = satelliteGrid.gridDataDetailMap.get(mixTag);
- gridApi.buildUnderwayHeatmap(3, data, 10).then((res) => {
- heatTag = satelliteGrid.drawHeatGrid2(mixTag, res.data);
- satelliteGrid.setGridEvent(
- [heatTag],
- 'click',
- (gridCell, gridDataDetail) => {
- gridStore.selectedGridCellAndDataDetail = {
- gridCell,
- gridDataDetail
- };
- }
- );
- gridCtrls.value = [satelliteGrid];
- });
+ gridApi
+ .buildUnderwayHeatmap(props.groupId, data, heatMapSearchLength)
+ .then((res) => {
+ heatTag = satelliteGrid.drawHeatGrid2(mixTag, res.data);
+ satelliteGrid.setDefaultGridClickEvent([heatTag]);
+ gridCtrls.value = [satelliteGrid];
+ });
} else {
satelliteGrid.changeVisibility({
tags: [mixTag],
@@ -512,22 +554,111 @@
console.log(res);
}
-function handleUnderwayClick({ isShow, dataId }) {
+function handleUnderwayClick({ isShow, dataId, done }) {
underwayVisible.value = !underwayVisible.value;
if (isShow) {
- draw(dataId);
+ draw(dataId).finally(() => done());
} else {
const d = fusionDataList.value.find((v) => v.id == dataId);
const mission = missionStore.missionList.find((v) => {
return v.missionCode == d.mixDataId;
});
mapLine.hideLine(mission.missionCode);
+ done();
+ }
+}
+function handleFusionDelete(index, tag) {
+ const f = selectedfusionData.value.find((v) => v.id == tag);
+ if (f) {
+ // const i = selectedfusionData.value.indexOf(f);
+ // selectedfusionData.value.splice(i, 1);
+ tableRef.value.toggleRowSelection(f, false);
}
}
function handleSelectionChange(val) {
- selectedfusionData.value = val;
+ console.log(val);
+
+ const deleted = selectedfusionData.value.filter((v) => {
+ return !val.find((t) => t.id == v.id);
+ });
+ const deletedIdList = deleted.map((d) => d.id);
+ const added = val.filter((v) => {
+ return !selectedfusionData.value.find((t) => t.id == v.id);
+ });
+
+ if (val.length > 4) {
+ useMessageBox({
+ confirmMsg: '鏈�澶氬厑璁稿悓鏃跺睍绀�4娆¤蛋鑸褰�',
+ confirmTitle: '璧拌埅璁板綍閫夋嫨杩囧璀﹀憡'
+ });
+ added.forEach((a) => {
+ tableRef.value.toggleRowSelection(a, false);
+ });
+ return;
+ }
+ // const addedIdList = added.map(d=>d.id)
+
+ if (deletedIdList.length > 0) {
+ satelliteGrid.deleteTagGrid(deletedIdList);
+ gridCtrls.value = [satelliteGrid];
+ // satelliteGrid.changeVisibility({ tags: deletedIdList, showGridViews: false });
+ }
+
+ added.forEach((i) => {
+ const d = i;
+ if (gridDataDetailMap.has(d.id)) {
+ const gdd = gridDataDetailMap.get(d.id);
+ satelliteGrid.drawTagGrid({
+ tag: d.id,
+ data: gdd,
+ extData: {
+ name: `璧拌埅缃戞牸 - ${d.mixDataId}`,
+ type: 0
+ }
+ });
+ satelliteGrid.setDefaultGridClickEvent([d.id]);
+ // satelliteGrid.setGridEvent(
+ // [d.id],
+ // 'click',
+ // (gridCell, gridDataDetail) => {
+ // gridStore.selectedGridCellAndDataDetail = {
+ // gridCell,
+ // gridDataDetail
+ // };
+ // }
+ // );
+ gridCtrls.value = [satelliteGrid];
+ } else {
+ gridApi.fetchGridDataDetail(d.id, d.groupId).then((res) => {
+ gridDataDetailMap.set(d.id, res.data);
+ const gdd = res.data;
+ satelliteGrid.drawTagGrid({
+ tag: d.id,
+ data: gdd,
+ extData: {
+ name: `璧拌埅缃戞牸 - ${d.mixDataId}`,
+ type: 0
+ }
+ });
+ satelliteGrid.setDefaultGridClickEvent([d.id]);
+ // satelliteGrid.setGridEvent(
+ // [d.id],
+ // 'click',
+ // (gridCell, gridDataDetail) => {
+ // gridStore.selectedGridCellAndDataDetail = {
+ // gridCell,
+ // gridDataDetail
+ // };
+ // }
+ // );
+ gridCtrls.value = [satelliteGrid];
+ });
+ }
+ });
+
+ selectedfusionData.value = useCloned(val).cloned.value;
}
/**璧拌埅杞ㄨ抗*******************************************************************/
@@ -557,8 +688,6 @@
const drawMode = ref(0);
// 鐩戞祴鏁版嵁
const factorDataMap = new Map();
-// pm2.5
-const factorType = 6;
function fetchMission() {
missionLoading.value = true;
@@ -582,30 +711,7 @@
}
function draw(dataId) {
- if (isUnmounted.value) return;
-
- // selectedfusionData.value.forEach((i) => {
- // const d = fusionDataList.value[i];
-
- // const mission = missionStore.missionList.find((v) => {
- // return v.missionCode == d.mixDataId;
- // });
-
- // if (factorDataMap.has(mission.missionCode)) {
- // const fd = factorDataMap.get(mission.missionCode);
- // drawLine(mission.missionCode, fd);
- // } else {
- // search(mission).then((res) => {
- // const fd = new FactorDatas();
- // fd.setData(res.data, drawMode.value, () => {
- // fd.refreshHeight(factorType.value);
- // factorDataMap.set(mission.missionCode, fd);
- // drawLine(mission.missionCode, fd);
- // });
- // });
- // }
- // });
-
+ if (isUnmounted.value) return Promise.resolve();
const d = fusionDataList.value.find((v) => v.id == dataId);
const mission = missionStore.missionList.find((v) => {
return v.missionCode == d.mixDataId;
@@ -613,12 +719,13 @@
if (factorDataMap.has(mission.missionCode)) {
const fd = factorDataMap.get(mission.missionCode);
- drawLine(mission.missionCode, fd);
+ fd.refreshHeight(factorType.value.value);
+ return Promise.resolve(drawLine(mission.missionCode, fd));
} else {
- search(mission).then((res) => {
+ return search(mission).then((res) => {
const fd = new FactorDatas();
fd.setData(res.data, drawMode.value, () => {
- fd.refreshHeight(factorType.value);
+ fd.refreshHeight(factorType.value.value);
factorDataMap.set(mission.missionCode, fd);
drawLine(mission.missionCode, fd);
});
@@ -628,9 +735,9 @@
function drawLine(missionCode, fd) {
// 鍒锋柊鍥句緥
- const factor = fd.factor[factorType];
+ const factor = fd.factor[factorType.value.value];
sector.clearSector();
- fd.refreshHeight(factorType);
+ fd.refreshHeight(factorType.value.value);
mapLine.drawTagLine(missionCode, fd, factor);
}
</script>
--
Gitblit v1.9.3