diff --git a/src/App.vue b/src/App.vue
index 8492bc7..72024a4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,3 +1,11 @@
+
diff --git a/src/components/earthMap/AISInfoWindow.vue b/src/components/earthMap/AISInfoWindow.vue
index 7edca67..d7cd641 100644
--- a/src/components/earthMap/AISInfoWindow.vue
+++ b/src/components/earthMap/AISInfoWindow.vue
@@ -2,7 +2,7 @@
* @Author: Fuyuu 1805498209@qq.com
* @Date: 2024-01-05 14:18:33
* @LastEditors: Fuyuu 1805498209@qq.com
- * @LastEditTime: 2024-01-24 11:20:17
+ * @LastEditTime: 2024-01-25 15:11:06
* @FilePath: \dt-admin-pc-v2\src\components\earthMap\AISInfoWindow.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -160,7 +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';
+ import { info } from 'console';
export default defineComponent({
name: 'AISInfoWindow',
@@ -188,7 +188,7 @@
const trackId: any = ref('');
// 船只数据来源的雷达id
const radarId: any = ref('');
- // 点击船只的AIS信息对象
+ // 点击船只的信息对象
const infoData: any = ref({});
// 点击船只的轨迹线数据
const trackData: any = ref({});
@@ -199,7 +199,7 @@
trackId.value = window.$earth.getObject(proxy.ship_guid).trackId;
// 根据trackId获取雷达id
radarId.value = store.radarShipList.filter((item) => item.trackId === trackId.value)[0].radarId;
- if (title.includes('AIS')) {
+ if (proxy.title.includes('AIS')) {
// 获取store中的ais船只数据列表
infoData.value = store.aisShipList.filter((item) => item.trackId === trackId.value)[0];
} else {
@@ -237,25 +237,12 @@
function tailAfter() {
// 打开光电跟踪窗口
proxy.$parent.TailAfterWindowShow = true;
- // 发送船只id(trackId)、雷达id(radarId)、跟踪状态(tracking)(0 取消跟踪 1 跟踪)
- // 使用API请求,提交数据到后端
- // defHttp
- // .post(
- // {
- // url: '/military/tracking/target',
- // params: {
- // trackId: trackId.value,
- // radarId: radarId.value,
- // tracking: 1,
- // },
- // },
- // { isTransformResponse: false }
- // )
- // .then((res) => {
- // console.log('跟踪结果:', res);
- // // 提交数据,后端进行分析计算后,将跟踪画面传回显示
- // });
- console.log('window', window);
+ // 通过mqtt发送跟踪船只的信息
+ let mqttClient = window.mqttClient;
+ // 设置跟踪状态 1-跟踪 0-停止跟踪
+ infoData.value.trackStatus = 1;
+ // 发布订阅
+ mqttClient.publish('/trackTarget', JSON.stringify(infoData.value));
}
// 监听轨迹线变化
$mitt.on('trackChange', (e: boolean) => {
@@ -270,6 +257,15 @@
checked.value = data.status;
}
});
+ // 实时监听船只信息变化(雷达)
+ $mitt.on('deviceCmd', (message: any) => {
+ let data = JSON.parse(message).radarTrack;
+ if (data.trackId == trackId.value) {
+ if (proxy.title.includes('雷达')) {
+ infoData.value = data;
+ }
+ }
+ });
// 监听船只guid变化,更新信息
watch(
() => proxy.ship_guid,
diff --git a/src/components/earthMap/ShowHideControl.vue b/src/components/earthMap/ShowHideControl.vue
index 95c0539..69d190a 100644
--- a/src/components/earthMap/ShowHideControl.vue
+++ b/src/components/earthMap/ShowHideControl.vue
@@ -146,6 +146,10 @@
// 控制显隐
item.show = e;
});
+ // 控制新船只是否显示模型(雷达)
+ $mitt.emit('shipAllChange', { status: e, type: 'radar' });
+ // 控制新船只是否显示轨迹(雷达)
+ $mitt.emit('trackAllChange', { status: e, type: 'radar' });
} else {
console.log('当前场景没有雷达船只');
}
@@ -167,6 +171,8 @@
// 控制显隐
item.show = e;
});
+ $mitt.emit('shipAllChange', { status: e, type: 'mix' });
+ $mitt.emit('trackAllChange', { status: e, type: 'mix' });
} else {
console.log('当前场景没有融合船只');
}
@@ -188,6 +194,8 @@
// 控制显隐
item.show = e;
});
+ $mitt.emit('shipAllChange', { status: e, type: 'ais' });
+ $mitt.emit('trackAllChange', { status: e, type: 'ais' });
} else {
console.log('当前场景没有AIS船只');
}
diff --git a/src/components/earthMap/TailAfterWindow.vue b/src/components/earthMap/TailAfterWindow.vue
index 6307718..fa45cd6 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-23 11:35:57
+ * @LastEditTime: 2024-01-25 16:16:00
* @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
-->
@@ -27,8 +27,9 @@