diff --git a/src/gis/ol/index.ts b/src/gis/ol/index.ts index 46e38abe..8a4064ac 100644 --- a/src/gis/ol/index.ts +++ b/src/gis/ol/index.ts @@ -204,7 +204,7 @@ const palyDateEvent: any = { // 添加天气运算接口 animationType: 0 回放 1预览 addyctqjsGis(map: any, eventOpt?: any) { // 清理UI - if (gisImgOpt.weatherType === 3) { + if (eventOpt.weatherType === 3) { removeWindLayer(map); addWindLayer(map, windDataHandle(eventOpt.data)); diff --git a/src/layout/Container/mapTimeSlider.vue b/src/layout/Container/mapTimeSlider.vue index 6d432075..20fc3abf 100644 --- a/src/layout/Container/mapTimeSlider.vue +++ b/src/layout/Container/mapTimeSlider.vue @@ -308,18 +308,20 @@ function updateTimeLabel(ctime: any) { EventBusTool.getEventBus().publish("playData", { key: "addyctqjsGis", data: res.result, + weatherType:params.weatherType }); }); - // 判定风场数据 + // // 判定风场数据 if (weathFlag[3] === true&&gisImgOpt.weatherType!=3) { - const params = { ...gisImgOpt, weatherType: 3, startTime: dataRequestOpt.value[currentHourDiff],hour:currentHourDiff }; - delete params.key; - delete params.endTime; - playbackSearchData(params, true, (res) => { + const params1 = { ...params, weatherType: 3 }; + delete params1.key; + delete params1.endTime; + playbackSearchData(params1, true, (res) => { // 往态势传递数据 EventBusTool.getEventBus().publish('playData', { key: 'addyctqjsGis', data: res.result, + weatherType:3 }); }); } diff --git a/src/layout/Container/meteorologyMenu.vue b/src/layout/Container/meteorologyMenu.vue index ca8d4617..efe2c27c 100644 --- a/src/layout/Container/meteorologyMenu.vue +++ b/src/layout/Container/meteorologyMenu.vue @@ -99,14 +99,19 @@ function handleIconClick(item: meteorologyItem) { key: "addyctqjsGis", data: res.result, animationType: 1, + weatherType:gisImgOpt.weatherType }); }); } else { - playbackSearchData(gisImgOpt, false, (res) => { + const params = { ...gisImgOpt }; + delete params.key; + delete params.endTime; + playbackSearchData(params, false, (res) => { // 往态势传递数据 EventBusTool.getEventBus().publish("playData", { key: "addyctqjsGis", data: res.result, + weatherType:gisImgOpt.weatherType }); }); } diff --git a/src/pages/tqybjs/index.vue b/src/pages/tqybjs/index.vue index e131a40f..850c6b2e 100644 --- a/src/pages/tqybjs/index.vue +++ b/src/pages/tqybjs/index.vue @@ -62,6 +62,7 @@ function weatherPreviewHandle(params: any) { key: 'addyctqjsGis', data: res.result, animationType: 1, + weatherType:gisImgOpt.weatherType }); dialogVisible.value = false; });