diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/controller/SarControlController.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/controller/SarControlController.java index 8da12ee..0812a95 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/controller/SarControlController.java +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/controller/SarControlController.java @@ -29,4 +29,26 @@ public class SarControlController { controlInfoService.sendUdp(param); return Result.successData("发送成功"); } + + /** + * 发送开机控制指令 + * @param ip + * @return + */ + @RequestMapping("/turnon") + public Result turnOn(@RequestBody String ip) { + controlInfoService.turnOn(ip); + return Result.successData("发送成功"); + } + + /** + * 发送控制指令 + * @param ip + * @return + */ + @RequestMapping("/endall") + public Result endAll(@RequestBody String ip) { + controlInfoService.endAll(ip); + return Result.successData("发送成功"); + } } diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/ISarControlService.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/ISarControlService.java index 9ba19af..fb0caa3 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/ISarControlService.java +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/ISarControlService.java @@ -43,6 +43,13 @@ public interface ISarControlService { */ void connect(String ip); + /** + * turn on sar + * + * @param ip + */ + void turnOn(String ip); + /** * 结束所有任务 * diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarControlServiceImpl.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarControlServiceImpl.java index 1d9486c..1ed1ab1 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarControlServiceImpl.java +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarControlServiceImpl.java @@ -1,5 +1,6 @@ package com.zhangy.skyeye.sar.service.impl; +import com.zhangy.skyeye.common.extend.exception.ServiceException; import com.zhangy.skyeye.common.extend.util.JsonUtil; import com.zhangy.skyeye.jm.dto.JmJobDTO; import com.zhangy.skyeye.jm.dto.JmSarStatusDTO; @@ -93,8 +94,22 @@ public class SarControlServiceImpl implements ISarControlService { udpSendContext.execute(param); } + @Override + public void turnOn(String ip) { + if (!redisUtil.hHasKey(CacheKey.SAR_CONNECTED, ip) || !redisUtil.hasKey(CacheKey.getSarConnect(ip))) { + throw new ServiceException("请先加电并连接sar"); + } + + SarControlParamDTO param = new SarControlParamDTO(ip, SarControlTypeEnum.TURNON); + udpSendContext.execute(param); + } + @Override public void endAll(String ip) { + if (!redisUtil.hHasKey(CacheKey.SAR_CONNECTED, ip) || !redisUtil.hasKey(CacheKey.getSarConnect(ip))) { + throw new ServiceException("请先加电并连接sar"); + } + SarControlParamDTO param = new SarControlParamDTO(ip, SarControlTypeEnum.ENDALL); udpSendContext.execute(param); } diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/db.sql b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/db.sql index ae891c5..3ee4e88 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/db.sql +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/db.sql @@ -600,7 +600,7 @@ CREATE TABLE `sys_dict_data` ( LOCK TABLES `sys_dict_data` WRITE; -INSERT INTO `sys_dict_data` VALUES (10002,'imu_status','初始','99',1,'2025-06-30 19:24:40','2025-06-30 19:24:40'),(10003,'imu_status','准备','70',2,'2025-06-30 19:25:02','2025-06-30 19:25:02'),(10004,'imu_status','对准','60',3,'2025-06-30 19:25:12','2025-06-30 19:25:12'),(10005,'imu_status','纯惯性导航','1',4,'2025-06-30 19:26:43','2025-09-20 02:18:12'),(10006,'imu_status','位置组合','20',5,'2025-06-30 19:26:43','2025-06-30 19:26:50'),(10007,'imu_status','位置+速度组合','21',6,'2025-06-30 19:26:43','2025-06-30 19:26:50'),(10008,'imu_status','位置+速度+航向组合','22',7,'2025-06-30 19:26:43','2025-06-30 19:26:50'),(10009,'enable_status','有效','1',1,'2025-06-30 19:33:09','2025-06-30 19:33:09'),(10010,'enable_status','无效','0',2,'2025-06-30 19:33:09','2025-06-30 19:33:09'),(10011,'success_status','成功','1',1,'2025-06-30 19:34:26','2025-06-30 19:34:26'),(10012,'success_status','失败','0',2,'2025-06-30 19:34:26','2025-06-30 19:34:26'),(10013,'sar_work_status','开机','1',1,'2025-06-30 19:36:57','2025-06-30 19:36:57'),(10014,'sar_work_status','未开机','0',2,'2025-06-30 19:36:57','2025-06-30 19:36:57'),(10015,'job_mode','快速模式','1',1,'2025-07-02 01:30:59','2025-07-06 21:27:58'),(10017,'job_mode','航线创建','3',3,'2025-07-02 01:30:59','2025-07-06 21:27:58'),(10018,'job_status','执行中','1',2,'2025-07-03 00:34:59','2025-07-06 21:28:21'),(10019,'job_status','已完成','2',3,'2025-07-03 00:34:59','2025-07-06 21:28:21'),(10020,'job_status','未执行','0',1,'2025-07-06 21:28:21','2025-07-06 21:28:21'),(10021,'sar_polarization','H','0',1,'2025-07-06 21:32:53','2025-07-06 21:32:53'),(10022,'sar_polarization','V','1',2,'2025-07-06 21:32:53','2025-07-06 21:32:53'),(10023,'sar_polarization','全极化','4',3,'2025-07-06 21:32:53','2025-07-06 21:32:53'),(10024,'sar_direction','左','1',1,'2025-07-06 21:34:30','2025-07-06 21:34:30'),(10025,'sar_direction','右','-1 ',2,'2025-07-06 21:34:30','2025-07-06 21:34:30'),(10026,'sar_direction','左右交替 ','3',3,'2025-07-06 21:34:30','2025-07-06 21:34:30'),(10027,'sar_flight_type','直线轨迹','0',1,'2025-07-06 21:35:47','2025-07-06 21:35:47'),(10028,'sar_flight_type','圆迹轨迹','1',2,'2025-07-06 21:35:47','2025-07-06 21:35:47'),(10031,'payload_type','SAR','SAR',1,'2025-07-07 18:46:00','2025-07-07 18:46:00'),(10032,'sar_resolution','0.1m','0.1',1,'2025-07-07 19:05:07','2025-07-07 19:05:07'),(10033,'sar_resolution','0.2m','0.2',2,'2025-07-07 19:05:07','2025-07-07 19:05:07'),(10034,'sar_resolution','0.3m','0.3',3,'2025-07-07 19:05:07','2025-07-07 19:05:07'),(10035,'sar_resolution','10m','10',4,'2025-07-07 19:05:07','2026-01-09 06:26:30'),(10038,'py_detect_type','汽车','car',NULL,'2025-07-08 22:30:03','2025-07-08 22:30:03'),(10039,'rtk_status','0','无效',1,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10040,'rtk_status','1','初始化',2,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10041,'rtk_status','2','粗对准',3,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10042,'rtk_status','3','精对准',4,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10043,'rtk_status','4','单天线对准',5,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10044,'rtk_status','5','双天线对准',6,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10045,'rtk_status','6','纯惯性导航',7,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10046,'rtk_status','7','固定解粗对准',8,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10047,'rtk_status','8','固定解精对准',9,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10048,'rtk_status','9','RTK固定解',10,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10049,'rtk_status','10','RTK浮点解',11,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10050,'rtk_status','11','单点定位',12,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10051,'rtk_status','12','伪距差分或SBAS定位',13,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10052,'rtk_status','13','惯导定位',14,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10053,'rtk_status','14','用户设定位置',15,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10054,'rtk_status','99','错误',99,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10055,'job_status','准备中','3',2,'2025-09-03 03:29:49','2025-09-03 08:12:57'),(10056,'imu_status','无','0',0,'2025-06-30 19:26:43','2025-09-18 18:13:21'),(10057,'sar_image_mode','条带','0',1,'2025-06-30 11:26:43','2025-09-18 10:13:21'),(10058,'sar_image_mode','GMTI','4',4,'2025-06-30 11:26:43','2026-01-11 18:50:57'),(10059,'sar_image_mode','聚束','1',1,'2026-01-11 18:50:57','2026-01-11 18:50:57'),(10060,'job_target_type','点','1',1,'2026-01-11 18:50:57','2026-01-12 01:50:58'),(10061,'job_target_type','区域','2',2,'2026-01-11 18:50:57','2026-01-12 01:50:58'); +INSERT INTO `sys_dict_data` VALUES (10002,'imu_status','初始','99',1,'2025-06-30 19:24:40','2025-06-30 19:24:40'),(10003,'imu_status','准备','70',2,'2025-06-30 19:25:02','2025-06-30 19:25:02'),(10004,'imu_status','对准','60',3,'2025-06-30 19:25:12','2025-06-30 19:25:12'),(10005,'imu_status','纯惯性导航','1',4,'2025-06-30 19:26:43','2025-09-20 02:18:12'),(10006,'imu_status','位置组合','20',5,'2025-06-30 19:26:43','2025-06-30 19:26:50'),(10007,'imu_status','位置+速度组合','21',6,'2025-06-30 19:26:43','2025-06-30 19:26:50'),(10008,'imu_status','位置+速度+航向组合','22',7,'2025-06-30 19:26:43','2025-06-30 19:26:50'),(10009,'enable_status','有效','1',1,'2025-06-30 19:33:09','2025-06-30 19:33:09'),(10010,'enable_status','无效','0',2,'2025-06-30 19:33:09','2025-06-30 19:33:09'),(10011,'success_status','成功','1',1,'2025-06-30 19:34:26','2025-06-30 19:34:26'),(10012,'success_status','失败','0',2,'2025-06-30 19:34:26','2025-06-30 19:34:26'),(10013,'sar_work_status','开机','1',1,'2025-06-30 19:36:57','2025-06-30 19:36:57'),(10014,'sar_work_status','未开机','0',2,'2025-06-30 19:36:57','2025-06-30 19:36:57'),(10015,'job_mode','快速模式','1',1,'2025-07-02 01:30:59','2025-07-06 21:27:58'),(10016,'job_mode','巡航模式','2',2,'2025-07-02 01:30:59','2025-07-06 21:27:58'),(10017,'job_mode','航线创建','3',3,'2025-07-02 01:30:59','2025-07-06 21:27:58'),(10018,'job_status','执行中','1',2,'2025-07-03 00:34:59','2025-07-06 21:28:21'),(10019,'job_status','已完成','2',3,'2025-07-03 00:34:59','2025-07-06 21:28:21'),(10020,'job_status','未执行','0',1,'2025-07-06 21:28:21','2025-07-06 21:28:21'),(10021,'sar_polarization','H','0',1,'2025-07-06 21:32:53','2025-07-06 21:32:53'),(10022,'sar_polarization','V','1',2,'2025-07-06 21:32:53','2025-07-06 21:32:53'),(10023,'sar_polarization','全极化','4',3,'2025-07-06 21:32:53','2025-07-06 21:32:53'),(10024,'sar_direction','左','1',1,'2025-07-06 21:34:30','2025-07-06 21:34:30'),(10025,'sar_direction','右','-1 ',2,'2025-07-06 21:34:30','2025-07-06 21:34:30'),(10026,'sar_direction','左右交替 ','3',3,'2025-07-06 21:34:30','2025-07-06 21:34:30'),(10027,'sar_flight_type','直线轨迹','0',1,'2025-07-06 21:35:47','2025-07-06 21:35:47'),(10028,'sar_flight_type','圆迹轨迹','1',2,'2025-07-06 21:35:47','2025-07-06 21:35:47'),(10031,'payload_type','SAR','SAR',1,'2025-07-07 18:46:00','2025-07-07 18:46:00'),(10032,'sar_resolution','0.1m','0.1',1,'2025-07-07 19:05:07','2025-07-07 19:05:07'),(10033,'sar_resolution','0.2m','0.2',2,'2025-07-07 19:05:07','2025-07-07 19:05:07'),(10034,'sar_resolution','0.3m','0.3',3,'2025-07-07 19:05:07','2025-07-07 19:05:07'),(10035,'sar_resolution','10m','10',4,'2025-07-07 19:05:07','2026-01-09 06:26:30'),(10038,'py_detect_type','汽车','car',NULL,'2025-07-08 22:30:03','2025-07-08 22:30:03'),(10039,'rtk_status','0','无效',1,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10040,'rtk_status','1','初始化',2,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10041,'rtk_status','2','粗对准',3,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10042,'rtk_status','3','精对准',4,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10043,'rtk_status','4','单天线对准',5,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10044,'rtk_status','5','双天线对准',6,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10045,'rtk_status','6','纯惯性导航',7,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10046,'rtk_status','7','固定解粗对准',8,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10047,'rtk_status','8','固定解精对准',9,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10048,'rtk_status','9','RTK固定解',10,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10049,'rtk_status','10','RTK浮点解',11,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10050,'rtk_status','11','单点定位',12,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10051,'rtk_status','12','伪距差分或SBAS定位',13,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10052,'rtk_status','13','惯导定位',14,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10053,'rtk_status','14','用户设定位置',15,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10054,'rtk_status','99','错误',99,'2025-07-24 00:47:05','2025-07-24 00:47:05'),(10055,'job_status','准备中','3',2,'2025-09-03 03:29:49','2025-09-03 08:12:57'),(10056,'imu_status','无','0',0,'2025-06-30 19:26:43','2025-09-18 18:13:21'),(10057,'sar_image_mode','条带','0',1,'2025-06-30 11:26:43','2025-09-18 10:13:21'),(10058,'sar_image_mode','GMTI','4',4,'2025-06-30 11:26:43','2026-01-11 18:50:57'),(10059,'sar_image_mode','聚束','1',1,'2026-01-11 18:50:57','2026-01-11 18:50:57'),(10060,'job_target_type','点','1',1,'2026-01-11 18:50:57','2026-01-12 01:50:58'),(10061,'job_target_type','区域','2',2,'2026-01-11 18:50:57','2026-01-12 01:50:58'); UNLOCK TABLES; diff --git a/frontend/Skyeye-sys-ui/src/api/device.js b/frontend/Skyeye-sys-ui/src/api/device.js index fb9541c..c9fa317 100644 --- a/frontend/Skyeye-sys-ui/src/api/device.js +++ b/frontend/Skyeye-sys-ui/src/api/device.js @@ -41,3 +41,9 @@ export const uavUpdate = params => // #endregion export const getLastStatus = params => req('get', '/skyeye/payload/getLastStatus', params) +// 雷达开启 +export const deviceControlTurnon = params => + req('post', '/sar/control/turnon', params) +// 雷达关闭 +export const deviceControlEndall = params => + req('post', '/sar/control/endall', params) diff --git a/frontend/Skyeye-sys-ui/src/styles/element.scss b/frontend/Skyeye-sys-ui/src/styles/element.scss index 11e36cd..b6f0603 100644 --- a/frontend/Skyeye-sys-ui/src/styles/element.scss +++ b/frontend/Skyeye-sys-ui/src/styles/element.scss @@ -1062,3 +1062,9 @@ color: $--color-text-4; } } + +.el-tooltip__popper.is-light { + background: #fff !important; + border: 1px solid #c1c1c1 !important; + color: #333; +} diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js index 49e60f1..4eed9a7 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js +++ b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js @@ -17,7 +17,9 @@ import { uavList, getUavEnableList, uavSave, - uavUpdate + uavUpdate, + deviceControlTurnon, + deviceControlEndall, } from '@/api/device' let taskListResource = [] export default { @@ -123,6 +125,29 @@ export default { beforeDestroy() { }, methods: { + // 操作雷达 + async handleRadar(row, type) { + if (type === 1) { + deviceControlTurnon({ payloadId: row.id }).then(res => { + if (res.data.code === 200) { + this.$message.success('雷达开机成功') + } + }) + } else if (type === 2) { + const bool = await this.$confirm(`确认要关机吗?`, '提示', { + customClass: 'confirm-light', + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + if (!bool) return; + deviceControlEndall({ payloadId: row.id }).then(res => { + if (res.data.code === 200) { + this.$message.success('雷达关机成功') + } + }) + } + }, payloadPage() { payloadList().then(res => { if (res.data.code === 200) { diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.scss b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.scss index d0e3a3b..b4c2934 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.scss +++ b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.scss @@ -297,6 +297,15 @@ } } } + + ::v-deep .el-button.is-circle { + padding: 7px 8px !important; + + i { + position: relative; + top: 1px; + } + } } .resource-list__large { diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue index 726c2b9..4b11def 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue +++ b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue @@ -96,20 +96,64 @@ 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 6e3eb9b..67e885b 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 @@ -1290,31 +1290,80 @@ export default { pointList.push(item.boundaryLonLat) } }) + let airlineList = [ + { + direction: 0, + distance: 0, + endHeight: 0, + endLat: 0, + endLon: 0, + flightEndHeight: 0, + flightEndLat: 0, + flightEndLon: 0, + flightNo: 0, + flightNum: 0, + flightStartHeight: 0, + flightStartLat: 0, + flightStartLon: 0, + flightType: 0, + grazingAngle: 0, + groundStartHeight: 0, + groundStartLat: 0, + groundStartLon: 0, + height: 0, + id: 0, + jobId: 0, + polarization: 0, + speed: 0, + squintAngle: 0, + startHeight: 0, + startLat: 0, + startLon: 0, + status: 0, + targetCentroidHeight: 0, + targetCentroidLat: 0, + targetCentroidLon: 0, + targetHeading: 0, + targetLength: 0, + targetWidth: 0, + uavId: 0 + } + ] + if (this.form.mode === '2') { + pointList = [ + [ + { + longitude: 0, + latitude: 0 + } + ] + ] + } let info = { info1: JSON.stringify(this.form), id: params.id, name: params.name, mode: params.mode, pointList: pointList, - startAltitude: params.mode === '2' ? 0 : params.startAltitude, + startAltitude: params.startAltitude, imageLight: parseFloat(params.imageLight), - headingDiff: parseFloat(params.headingDiff), + headingDiff: this.form.mode === '2' ? 0 : parseFloat(params.headingDiff), imageBit: parseFloat(params.imageBit), targetType: params.targetChoose === '点' ? '1' : '2', imageMode: params.imageMode, uavList: [ { uavId: params.uav, - speed: params.mode === '2' ? 0 : params.initSpeed, - height: params.mode === '2' ? 0 : params.flyHeight, + speed: params.initSpeed, + height: params.flyHeight, resolution: params.ratio, - startAltitude: params.mode === '2' ? 0 : params.startAltitude, + startAltitude: this.form.mode === '2' ? 0 : params.startAltitude, payloadList: [{ payloadId: params.loader, resolution: params.ratio, width: params.width, length: this.form.imageMode === '4' ? this.ratioMap.gmti.length : this.ratioMap[params.ratio].length, - theta: params.mode === '2' ? 0 : params.theta, + theta: params.theta, reserved: this.form.imageMode === '4' ? this.ratioMap.gmti.reserved : this.ratioMap[params.ratio].reserved, direction: params.direction, polarization: params.polarization, @@ -1325,10 +1374,11 @@ export default { imageBit: parseFloat(params.imageBit), headingDiff: parseFloat(params.headingDiff), }], - airlineList: params.airlineList + airlineList: this.form.mode === '2' ? airlineList : params.airlineList } ] } + console.log(info, 22222222222); if (info.id) { addTaskFast(info).then(res => { diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.scss b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.scss index 9a56ae4..8d61e38 100644 --- a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.scss +++ b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.scss @@ -19,7 +19,7 @@ } .task-list__content { - height: calc(100vh - 120px); + height: calc(100vh - 155px); position: relative; width: 100%; overflow-y: auto; 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 b4ded30..70e8a7c 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 @@ -303,11 +303,7 @@ --> - +
--> - + @@ -442,7 +434,11 @@ > - + - + - + - + { + if (item.id === this.detailUav.id) { + item.check = true + this.toggleTaskSceneShow(item, index) + } + if (item.id === data.id) { + item.check = false + this.toggleTaskSceneShow(item, index) + } + }) this.detailUav.chart.data[0].data = [] this.detailUav.chart.data[1].data = [] this.detailUav.chart.data[2].data = [] 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 8ed9e02..0778be3 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 @@ -97,7 +97,7 @@ placement="top" >