diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/SarWsAsyncService.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/SarWsAsyncService.java index 8969ec5..45d328f 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/SarWsAsyncService.java +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/SarWsAsyncService.java @@ -30,7 +30,7 @@ public class SarWsAsyncService { * @param datName * @param fileData */ - @Async("commonThreadPool") + // @Async("commonThreadPool") public void saveImageDat(Object dirName, String datName, byte[] fileData) { String imageSrcPath = sysFileTypeService.getAbsolutePath(FileTypeEnum.SAR_IMAGE_LOW_SRC, dirName, datName); FileUtil.createDir(imageSrcPath); @@ -48,7 +48,7 @@ public class SarWsAsyncService { * @param image 图像像素 * @param release 是否释放参数 image 资源 */ - @Async("commonThreadPool") + // @Async("commonThreadPool") public void write(String imagePath, Mat image, boolean release) { OpenCVUtil.write(imagePath, image, true); } diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js index b167b20..7dada03 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js +++ b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js @@ -195,7 +195,7 @@ export default { ] }, detailUav: { - visible: true, + visible: false, id: 1, baseInfo: { url: require('@/assets/img/uav.png'), @@ -475,6 +475,12 @@ export default { historyPictureList = [] } } + }, + 'detailUav.visible': { + handler: function (nv) { + this.$emit('sar-change', nv) + }, + immediate: true, } }, created() { @@ -1110,6 +1116,8 @@ export default { // 测试 // this.addUavToScene(item) }) + this.detailUav.id = data.length ? data[0].id : 1 + this.detailUav.visible = data.length ? true : false taskListResource = data this.taskList.data = list if (this.taskList.data.length) { @@ -1555,7 +1563,7 @@ export default { }).then(res => { stopTaskFly({ id: info.id }).then(res => { if (res.data.code === 200) { - info.status = 2 + // info.status = 2 this.getTaskList() this.$message.success('任务已结束!') this.removeTaskTarget(info.id) @@ -2736,8 +2744,7 @@ export default { console.log('SAR波形', JSON.parse(info.body)) let data = JSON.parse(info.body) console.log('id对比', this.detailUav.id, data.payloadId); - // && this.detailUav.id === data.payloadId - if (this.detailUav.visible) { + if (this.detailUav.visible && this.detailUav.id === data.jobId) { let channel1False = [] let channel1Real = [] let channel2False = [] @@ -2984,7 +2991,7 @@ export default { this.taskList.data[findIndex].statusName = this.jobStatus[data.jobStatus + ''] taskListResource[findIndex].statusName = this.jobStatus[data.jobStatus + ''] } - if (data.jobStatus === 1) { + if (data.jobStatus === 1 && this.detailUav.id === data.jobId) { this.updateUavInfo(data.sarStatus) } this.taskList.data[findIndex].status = data.jobStatus @@ -3043,7 +3050,11 @@ export default { } }, //#endregion - + // 打开状态和波形信息展示 + openSarStatusDetail(data) { + this.detailUav.id = data.id + this.detailUav.visible = true + }, //#region handleUavDetailCollapse(actives) { diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.scss b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.scss index 15c67e6..474342a 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.scss +++ b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.scss @@ -405,6 +405,14 @@ height: calc(100vh - 620px); } + .detail-uav-wrap { + width: 430px; + position: fixed; + bottom: 5px; + right: 10px; + height: calc(100vh - 60px); + } + .detail-info { width: 460px; //position: fixed; @@ -1174,8 +1182,8 @@ .detail-uav { - width: 460px; - position: fixed; + width: 410px; + // position: fixed; top: 60px; //bottom: 5px; right: 10px; @@ -1185,6 +1193,10 @@ transition: 0.2s ease-in-out; z-index: 2; + ::v-deep .dt-card__header { + display: none; + } + .detail-uav__content { padding-right: 8px; box-sizing: border-box; diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue index cd09c1a..6c0669e 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue +++ b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.vue @@ -73,10 +73,11 @@ v-for="(item, index) in taskList.data" :key="item.id" class="task-item" + @click="openSarStatusDetail(item)" >