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 39d74ba..6794e81 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 @@ -1145,6 +1145,13 @@ export default { theViewerTools.destroy() theViewerTools = null } + this.taskList.data.forEach(el => { + if (el.check) { + this.removeTaskTarget(el.id) + el.check = false + } + }) + theViewerTools = new AreaPlotManager(viewer) theViewerTools.initPlot(this.theCallback) console.log('船舰了吗', theViewerTools) @@ -1152,8 +1159,8 @@ export default { resetForm() { - this.taskForm.show = false - this.taskForm.visible = false + // this.taskForm.show = false + // this.taskForm.visible = false this.removeAllAirline() this.removePreviewLine() this.form = { @@ -1190,8 +1197,8 @@ export default { // TODO 临时 this.onLoaderTypeChange('SAR') this.$nextTick(() => { - this.taskForm.visible = true - this.taskForm.show = true + // this.taskForm.visible = true + // this.taskForm.show = true if (theViewerTools) { theViewerTools.destroy() theViewerTools = null 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 0405bfa..29c5dc9 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 @@ -54,15 +54,6 @@
{{ item.beginTime }}
- - - - - - - - - + + + { - // 测试 - if (item.status === 1) { - this.addUavToScene(item) - this.addTaskPlanArea(item.pointList, item.id) - } - }) + // uavName: '无人机1', + // airlineList: [ + // { + // startLon: 115.907609, + // startLat: 40.359843, + // startHeight: testHeight, + // endLon: 115.917609, + // endLat: 40.357843, + // endHeight: testHeight, + // id: 1 + // }, + // { + // startLon: 115.909609, + // startLat: 40.359843, + // startHeight: testHeight, + // endLon: 115.919609, + // endLat: 40.357843, + // endHeight: testHeight, + // id: 2 + // } + // ], + // trailList: [ + // { + // longitude: 115.907609, + // latitude: 40.359843, + // height: testHeight + // }, + // { + // longitude: 115.906609, + // latitude: 40.359843, + // height: testHeight + // }, + // { + // longitude: 115.905609, + // latitude: 40.357843, + // height: testHeight + // } + // ], + // startLon: 115.907609, + // startLat: 40.359843, + // startHeight: testHeight, + // payloadList: [ + // { + // payloadId: 1, + // payloadName: 'sar', + // imageList: [ + // { + // left1Lon: 115.907609, + // left1Lat: 40.359843, + // left2Lon: 115.907609, + // left2Lat: 40.358843, + // right2Lon: 115.908609, + // right2Lat: 40.358843, + // right1Lon: 115.908609, + // right1Lat: 40.359843, + // fileId: 1, + // relativePath: '1.png', + // itemList: [ + // { + // id: 1, + // left1Lon: 115.917609, + // left1Lat: 40.359843, + // left2Lon: 115.917609, + // left2Lat: 40.358843, + // right2Lon: 115.918609, + // right2Lat: 40.358843, + // right1Lon: 115.918609, + // right1Lat: 40.359843, + // type: 1, + // }, + // { + // id: 2, + // left1Lon: 115.916609, + // left1Lat: 40.359143, + // left2Lon: 115.916609, + // left2Lat: 40.358943, + // right2Lon: 115.918509, + // right2Lat: 40.358943, + // right1Lon: 115.918509, + // right1Lat: 40.359143, + // type: 1, + // } + // ] + // }, + // { + // left1Lon: 115.909609, + // left1Lat: 40.359843, + // left2Lon: 115.909609, + // left2Lat: 40.358843, + // right2Lon: 115.910609, + // right2Lat: 40.358843, + // right1Lon: 115.910609, + // right1Lat: 40.359843, + // fileId: 2, + // relativePath: '1.png', + // itemList: [ + // { + // id: 1, + // left1Lon: 115.909609, + // left1Lat: 40.359843, + // left2Lon: 115.909609, + // left2Lat: 40.358843, + // right2Lon: 115.910609, + // right2Lat: 40.358843, + // right1Lon: 115.910609, + // right1Lat: 40.359843, + // type: 1, + // }, + // { + // id: 2, + // left1Lon: 115.908609, + // left1Lat: 40.359143, + // left2Lon: 115.908609, + // left2Lat: 40.358943, + // right2Lon: 115.910509, + // right2Lat: 40.358943, + // right1Lon: 115.910509, + // right1Lat: 40.359143, + // type: 1, + // } + // ] + // } + // ], + // } + // ] + // } + // ] + // } + // ] + // this.taskList.data = task + // task.forEach(item => { + // // 测试 + // if (item.status === 1) { + // this.addUavToScene(item) + // this.addTaskPlanArea(item.pointList, item.id) + // } + // }) - let initPosition = [115.919609, 40.357843, testHeight] - // 测试推送 - setInterval(() => { - initPosition[0] += 0.001 - initPosition[1] += 0.001 - let body = [{ - jobId: 1, - uavId: 2, - longitude: initPosition[0], - latitude: initPosition[1], - height: initPosition[2], - payloadList: [ - { - longitude: initPosition[0], - latitude: initPosition[1], - altitude: initPosition[2], - } - ] - }] - this.handleWebsocketStatus({ body: JSON.stringify(body) }) + // let initPosition = [115.919609, 40.357843, testHeight] + // // 测试推送 + // setInterval(() => { + // initPosition[0] += 0.001 + // initPosition[1] += 0.001 + // let body = [{ + // jobId: 1, + // uavId: 2, + // longitude: initPosition[0], + // latitude: initPosition[1], + // height: initPosition[2], + // payloadList: [ + // { + // longitude: initPosition[0], + // latitude: initPosition[1], + // altitude: initPosition[2], + // } + // ] + // }] + // this.handleWebsocketStatus({ body: JSON.stringify(body) }) - }, 4000) + // }, 4000) - let initPic = { - left1Lon: 115.917609, - left1Lat: 40.359843, - left2Lon: 115.917609, - left2Lat: 40.358843, - right2Lon: 115.918609, - right2Lat: 40.358843, - right1Lon: 115.918609, - right1Lat: 40.359843, - fileId: 4, - id: 1, - jobId: 1, - payloadId: 1, - uavId: 2, - relativePath: '1.png', - itemList: [ - { - id: 9, - left1Lon: 115.917609, - left1Lat: 40.359843, - left2Lon: 115.917609, - left2Lat: 40.358843, - right2Lon: 115.918609, - right2Lat: 40.358843, - right1Lon: 115.918609, - right1Lat: 40.359843, - type: 1, - }, - ] - } - setInterval(() => { - initPic.left1Lon += 0.001 - initPic.left1Lat += 0.001 - initPic.left2Lon += 0.001 - initPic.left2Lat += 0.001 - initPic.right2Lon += 0.001 - initPic.right2Lat += 0.001 - initPic.right1Lon += 0.001 - initPic.right1Lat += 0.001 - initPic.fileId += 1 - initPic.itemList.forEach(item => { - item.left1Lon += 0.001 - item.left1Lat += 0.001 - item.left2Lon += 0.001 - item.left2Lat += 0.001 - item.right2Lon += 0.001 - item.right2Lat += 0.001 - item.right1Lon += 0.001 - item.right1Lat += 0.001 - item.id += 1 - }) - this.handleWebsocketImage({ body: JSON.stringify(initPic) }) - }, 6000) - }, + // let initPic = { + // left1Lon: 115.917609, + // left1Lat: 40.359843, + // left2Lon: 115.917609, + // left2Lat: 40.358843, + // right2Lon: 115.918609, + // right2Lat: 40.358843, + // right1Lon: 115.918609, + // right1Lat: 40.359843, + // fileId: 4, + // id: 1, + // jobId: 1, + // payloadId: 1, + // uavId: 2, + // relativePath: '1.png', + // itemList: [ + // { + // id: 9, + // left1Lon: 115.917609, + // left1Lat: 40.359843, + // left2Lon: 115.917609, + // left2Lat: 40.358843, + // right2Lon: 115.918609, + // right2Lat: 40.358843, + // right1Lon: 115.918609, + // right1Lat: 40.359843, + // type: 1, + // }, + // ] + // } + // setInterval(() => { + // initPic.left1Lon += 0.001 + // initPic.left1Lat += 0.001 + // initPic.left2Lon += 0.001 + // initPic.left2Lat += 0.001 + // initPic.right2Lon += 0.001 + // initPic.right2Lat += 0.001 + // initPic.right1Lon += 0.001 + // initPic.right1Lat += 0.001 + // initPic.fileId += 1 + // initPic.itemList.forEach(item => { + // item.left1Lon += 0.001 + // item.left1Lat += 0.001 + // item.left2Lon += 0.001 + // item.left2Lat += 0.001 + // item.right2Lon += 0.001 + // item.right2Lat += 0.001 + // item.right1Lon += 0.001 + // item.right1Lat += 0.001 + // item.id += 1 + // }) + // this.handleWebsocketImage({ body: JSON.stringify(initPic) }) + // }, 6000) + // }, // 工具栏操作 toggleTools(tool) { tool.active = !tool.active @@ -1078,7 +1078,8 @@ export default { let data = res.data.data let list = [] data.forEach(item => { - item.check = item.status === 1 || item.status === 3 + // item.check = item.status === 1 || item.status === 3 + item.check = false item.statusName = this.jobStatus[item.status + ''] // TODO 临时设置 item.uavList.forEach(child => { @@ -1101,8 +1102,8 @@ export default { // item.pointList = [item.pointList] if (item.status === 1 || item.status === 3) { // this.addJobLine(item, false) - this.addUavToScene(item) - this.addTaskPlanArea(item.pointList, item.id, item.name) + // this.addUavToScene(item) + // this.addTaskPlanArea(item.pointList, item.id, item.name) } // 测试 // this.addUavToScene(item) 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 45c93ba..72f9566 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 @@ -125,7 +125,7 @@ @click.stop="stopTask(item, index)" > - - + -->
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/uavTarget.js b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/uavTarget.js index d658089..5e5e93c 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/uavTarget.js +++ b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/uavTarget.js @@ -16,7 +16,10 @@ export default class UavTarget { this.startAltitude = options.startAltitude this.addPlanLine(options.airlineList) - // this.addUav(options.airlineList) + console.log(options, '飞机数据'); + if (options.startLon) { + this.addUav(options) + } this.addUavLoader(options.payloadList) } addUav(info) {