航行轨迹:
@@ -116,6 +160,7 @@
import $mitt from '@/utils/earthMap/mitt';
import { EyeOutlined } from '@ant-design/icons-vue';
import { defHttp } from '/@/utils/http/axios';
+ import { title } from 'process';
export default defineComponent({
name: 'AISInfoWindow',
@@ -144,7 +189,7 @@
// 船只数据来源的雷达id
const radarId: any = ref('');
// 点击船只的AIS信息对象
- const AISInfo: any = ref({});
+ const infoData: any = ref({});
// 点击船只的轨迹线数据
const trackData: any = ref({});
@@ -154,8 +199,14 @@
trackId.value = window.$earth.getObject(proxy.ship_guid).trackId;
// 根据trackId获取雷达id
radarId.value = store.radarShipList.filter((item) => item.trackId === trackId.value)[0].radarId;
- // 获取store中的ais船只数据列表
- AISInfo.value = store.aisShipList.filter((item) => item.trackId === trackId.value)[0];
+ if (title.includes('AIS')) {
+ // 获取store中的ais船只数据列表
+ infoData.value = store.aisShipList.filter((item) => item.trackId === trackId.value)[0];
+ } else {
+ // 获取store中的雷达船只数据列表
+ infoData.value = store.radarShipList.filter((item) => item.trackId === trackId.value)[0];
+ }
+
// 根据ship_guid判断点击船只累心后获取轨迹线信息
let shipName = window.$earth.getObject(proxy.ship_guid).name;
// ais类型
@@ -203,7 +254,6 @@
// .then((res) => {
// console.log('跟踪结果：', res);
// // 提交数据，后端进行分析计算后，将跟踪画面传回显示
-
// });
console.log('window', window);
}
@@ -232,7 +282,7 @@
return {
checked,
- AISInfo,
+ infoData,
cancel,
changeTrack,
tailAfter,
@@ -246,7 +296,9 @@
right: 25px;
}
- .ais_content {
+ .ais_content,
+ .radar_content,
+ .opera_content {
width: 95%;
margin: 0 auto;
display: flex;
diff --git a/src/components/earthMap/ShowHideControl.vue b/src/components/earthMap/ShowHideControl.vue
index 382a899..95c0539 100644
--- a/src/components/earthMap/ShowHideControl.vue
+++ b/src/components/earthMap/ShowHideControl.vue
@@ -1,26 +1,5 @@
-
-
-
(true);
- // 轨迹显隐
- // const trackShow = ref(true);
// 雷达类型数据显隐
const radarTypeShow = ref(true);
// 融合类型数据显隐
@@ -93,8 +68,6 @@
// 获取地图上融合船只信息
let earthMapMixShips = earthMapElements.filter((item) => item.name && item.name.includes('船_mix'));
if (earthMapShips.length > 0) {
- // 判断每个船只的显隐状态 初始化按钮状态
- // shipShow.value = earthMapShips.every((item) => item.show === true);
// 赋值船只列表
shipList.value = earthMapShips;
if (earthMapAisShips.length > 0) {
@@ -135,8 +108,6 @@
let earthMapAisTracks = earthMapElements.filter((item) => item.name && item.name.includes('轨迹线_ais'));
let earthMapMixTracks = earthMapElements.filter((item) => item.name && item.name.includes('轨迹线_mix'));
if (earthMapTracks.length > 0) {
- // 判断每条轨迹的显隐状态 初始化按钮状态
- // trackShow.value = earthMapTracks.every((item) => item.show === true);
// 赋值船只列表
trackList.value = earthMapTracks;
if (earthMapRadarTracks.length > 0) {
@@ -158,45 +129,6 @@
console.log('当前场景没有轨迹线');
}
}
- // 显隐所有船的模型
- function changeShipShow(e) {
- if (shipList.value.length > 0) {
- if (!e) {
- // 改变状态
- // trackShow.value = false;
- // 控制显隐
- trackList.value.forEach((item: any) => {
- item.show = false;
- });
- }
- // 改变状态
- // shipShow.value = e;
- shipList.value.forEach((item: any) => {
- // 控制显隐
- item.show = e;
- });
- } else {
- console.log('当前场景没有船只');
- }
- }
- // 显隐所有轨迹线
- function changeTrackShow(e) {
- if (trackList.value.length > 0) {
- // if (shipShow.value) {
- // // 改变状态
- // trackShow.value = e;
- // trackList.value.forEach((item: any) => {
- // // 控制显隐
- // item.show = e;
- // });
- // } else {
- // trackShow.value = false;
- // console.log('请先打开显示船只模型');
- // }
- } else {
- console.log('当前场景没有轨迹线');
- }
- }
// 显隐雷达船只
function changeRadarType(e) {
if (radarShipList.value.length > 0) {
@@ -292,13 +224,9 @@
});
return {
- // shipShow,
- // trackShow,
radarTypeShow,
mixTypeShow,
aisTypeShow,
- changeShipShow,
- changeTrackShow,
changeRadarType,
changeMixType,
changeAISType,
diff --git a/src/components/earthMap/TailAfterWindow.vue b/src/components/earthMap/TailAfterWindow.vue
index 57511a1..6307718 100644
--- a/src/components/earthMap/TailAfterWindow.vue
+++ b/src/components/earthMap/TailAfterWindow.vue
@@ -2,7 +2,7 @@
* @Author: Fuyuu 1805498209@qq.com
* @Date: 2024-01-18 16:42:29
* @LastEditors: Fuyuu 1805498209@qq.com
- * @LastEditTime: 2024-01-20 18:02:10
+ * @LastEditTime: 2024-01-23 11:35:57
* @FilePath: \dt-admin-pc-v2\src\components\earthMap\TailAfterWindow.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -12,9 +12,9 @@
:title="title"
:width="1280"
:minWidth="1280"
- :height="720"
+ :height="780"
:left="100"
- :top="100"
+ :top="60"
@cancel="cancel"
:floatright="false"
:showCancelButton="true"
@@ -22,52 +22,25 @@
:showcloseButton="true"
id="tailAfterWindow"
>
-
+