From ca8852c31155c7af2ca5a80964874141fc12ccb2 Mon Sep 17 00:00:00 2001 From: wxs <211789910@qq.com> Date: Mon, 2 Feb 2026 17:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=A7=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=9D=A2=E6=9D=BF=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/components/twin-situation/index.js | 13 +- .../home/components/twin-situation/index.scss | 16 +- .../home/components/twin-situation/index.vue | 149 +++++++++--------- .../Skyeye-sys-ui/src/views/home/index.js | 7 +- .../Skyeye-sys-ui/src/views/home/index.scss | 12 ++ .../Skyeye-sys-ui/src/views/home/index.vue | 6 +- 6 files changed, 119 insertions(+), 84 deletions(-) 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 bbd8651..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 @@ -475,6 +475,12 @@ export default { historyPictureList = [] } } + }, + 'detailUav.visible': { + handler: function (nv) { + this.$emit('sar-change', nv) + }, + immediate: true, } }, created() { @@ -1110,8 +1116,8 @@ export default { // 测试 // this.addUavToScene(item) }) - this.detailUav.id = data[0].id - this.detailUav.visible = true + 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) { @@ -1557,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) @@ -2738,7 +2744,6 @@ 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 && this.detailUav.id === data.jobId) { let channel1False = [] let channel1Real = [] 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 a8752eb..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 @@ -77,10 +77,7 @@ >
-
+
- -
-
- - - - -
- {{ item.name }}: - {{ item.value }}{{ item.unit }} -
-
- -
- {{ item.name }}: - {{ item.value }}{{ item.unit }} -
-
- -
- {{ item.name }}: - {{ item.value }}{{ item.unit }} -
-
-
-
- -
- -
-
- -
+ +
-
- + + span { font-size: 14px; color: $--color-text-1; } + >i { font-size: 16px; color: $--color-text-1; cursor: pointer; } } + .message-body { //height: 50px; @@ -95,10 +99,12 @@ padding: 0 5px; position: relative; width: 100%; + .el-textarea { flex: 1; margin: 0 10px; } + >i { font-size: 14px; color: $--color-text-1; @@ -106,12 +112,14 @@ margin-top: 10px; } } + .message-send { width: 100%; display: flex; justify-content: center; align-items: center; margin-top: 10px; + .el-button { margin: 0 10px; } @@ -124,3 +132,7 @@ width: 100%; } } + +.info-bar-show { + right: 430px; +} diff --git a/frontend/Skyeye-sys-ui/src/views/home/index.vue b/frontend/Skyeye-sys-ui/src/views/home/index.vue index 7ef1f60..3eae45f 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/index.vue +++ b/frontend/Skyeye-sys-ui/src/views/home/index.vue @@ -37,6 +37,7 @@ ref="twinSituation" v-if="menus.situation.active" :visible.sync="menus.situation.active" + @sar-change="sarChange" > - +