From 114d555c22ccd75a921f17465f16d188eacde507 Mon Sep 17 00:00:00 2001 From: wxs <211789910@qq.com> Date: Mon, 2 Feb 2026 10:41:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD=E5=92=8C?= =?UTF-8?q?=E6=B3=A2=E5=BD=A2=E5=B1=95=E7=A4=BA=E5=9B=BE=E8=A1=A8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/Skyeye-sys-ui/src/App.Loader.js | 3 +- frontend/Skyeye-sys-ui/src/api/task.js | 2 +- .../home/components/task-manage/index.js | 42 +++++++++---------- .../home/components/task-manage/index.vue | 2 +- .../home/components/twin-situation/index.vue | 17 -------- 5 files changed, 25 insertions(+), 41 deletions(-) diff --git a/frontend/Skyeye-sys-ui/src/App.Loader.js b/frontend/Skyeye-sys-ui/src/App.Loader.js index 0a487df..4c54682 100644 --- a/frontend/Skyeye-sys-ui/src/App.Loader.js +++ b/frontend/Skyeye-sys-ui/src/App.Loader.js @@ -13,7 +13,7 @@ import Card from '@/components/card/index.vue' import Dialog from '@/components/dialog/index.vue' import Loading from '@/components/loading/index.vue' import Container from '@/components/container/index.vue' - +import DtChart from 'dt-chart' const hub = new Vue() @@ -26,6 +26,7 @@ class AppLoader { Vue.component('DtDialog', Dialog) Vue.component('DtContainer', Container) Vue.use(elementUI) + Vue.use(DtChart) Vue.use({ install(Vue) { Vue.prototype.$hub = hub diff --git a/frontend/Skyeye-sys-ui/src/api/task.js b/frontend/Skyeye-sys-ui/src/api/task.js index f9b0cc1..58e62e9 100644 --- a/frontend/Skyeye-sys-ui/src/api/task.js +++ b/frontend/Skyeye-sys-ui/src/api/task.js @@ -22,7 +22,7 @@ export const addTaskFast = params => req('post', '/sar/job/save', params) // 预览任务 export const previewTaskFast = params => - req('post', '/jm/plan/airline', params) + req('post', '/sar/job/preview', params) // 编辑任务 export const editTaskFast = params => req('post', '/sar/job/save', params) diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.js b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.js index aeec15b..f1ec75e 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.js +++ b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.js @@ -744,8 +744,6 @@ export default { }) }, toggleTaskSceneShow(info, index) { - console.log(5555555555); - if (info.check) { info.check = false; taskListResource[index].check = false @@ -832,7 +830,6 @@ export default { addUavToScene(info) { let arr = [] info.uavList.forEach(item => { - console.log(viewer, item, 8888); let uav = new UavTarget(viewer, item) arr.push(uav) }) @@ -1474,6 +1471,13 @@ export default { // 删除 form.provinceValue 中的项 this.$set(this.form, 'provinceValue', []) this.removePreviewLine() + // for (let key in taskUavCollection) { + // if (taskUavCollection[key]) { + // taskUavCollection[key].forEach(item => { + // item.destroy() + // }) + // } + // } // 清楚当前目标 if (this.form.reqType !== 3) { theViewerTools.removeByName(target.targetName) @@ -1979,8 +1983,6 @@ export default { pointList.push(item.boundaryLonLat) } }) - console.log('提交航线', params.airlineList) - let info = { id: params.id, name: params.name, @@ -1995,10 +1997,6 @@ export default { uavList: [ { uavId: params.uav, - // startLon: params.startPoint.lon, - // startLat: params.startPoint.lat, - // endLon: params.endPoint.lon, - // endLat: params.endPoint.lat, speed: params.initSpeed, height: params.flyHeight, resolution: params.ratio, @@ -2028,9 +2026,7 @@ export default { this.previewLoading = false if (res.data.code === 200) { let data = res.data.data - for (let key in data) { - this.addPreviewLine(data[key], key) - } + this.addPreviewLine(data.uavList) this.$message.success('获取航线成功！') } else { this.$message.error(res.data.message) @@ -2104,8 +2100,8 @@ export default { } }) }, - addPreviewLine(data, parentId) { - data.forEach((item, index) => { + addPreviewLine(data) { + data[0].airlineList.forEach((item, index) => { let startPosition = DT.Cesium.Cartesian3.fromDegrees(item.startLon, item.startLat, item.startHeight) let endPosition = DT.Cesium.Cartesian3.fromDegrees(item.endLon, item.endLat, item.endHeight) let entity = viewer.entities.add({ @@ -2113,19 +2109,23 @@ export default { label: { text: `航线${index + 1}起点`, font: '24px', - showBackground: true, - backgroundColor: DT.Cesium.Color.fromCssColorString('rgba(0,0,0,0.7)'), - fillColor: DT.Cesium.Color.WHITE, + fillColor: DT.Cesium.Color.RED, horizontalOrigin: DT.Cesium.HorizontalOrigin.LEFT, - pixelOffset: this.labelPixelOffset, - disableDepthTestDistance: 20000 + pixelOffset: new DT.Cesium.Cartesian2(10, -15), + showBackground: true, + scaleByDistance: new DT.Cesium.NearFarScalar(0, 1, 1, 0.8), + distanceDisplayCondition: new DT.Cesium.DistanceDisplayCondition(0, 10000), + backgroundColor: DT.Cesium.Color.fromCssColorString('rgba(255,255,255,0.6)') }, polyline: { //使用cesium的peoperty positions: [startPosition, endPosition], show: true, - material: DT.Cesium.Color.LIMEGREEN, - width: 4, + width: 2, + zIndex: 0, + material: DT.Cesium.Color.RED, + depthFailMaterial: DT.Cesium.Color.RED, + arcType: DT.Cesium.ArcType.NONE } }) previewEntities.push(entity) diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue index ff36d2a..ed89a87 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue +++ b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue @@ -83,7 +83,7 @@ > - - - - - - - - - - - - - - - - -