From 18da5b9d4849f071448ee59a0b57086c0ecd5310 Mon Sep 17 00:00:00 2001
From: zengmingjie <zengmingjie@qq.com>
Date: Sun, 24 Aug 2025 11:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=95=B0=E6=8D=AE=E5=8D=A1?=
 =?UTF-8?q?=E9=A1=BF=E9=97=AE=E9=A2=98=E3=80=81O4=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=85=A5=E4=BE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/myMars.vue          | 77 ++++++++++++++++++++----------
 src/views/menuData/AlertDialog.vue | 14 +++++-
 2 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/src/components/myMars.vue b/src/components/myMars.vue
index 13de268..187fca3 100644
--- a/src/components/myMars.vue
+++ b/src/components/myMars.vue
@@ -12,6 +12,7 @@
 
 <script>
 "use script";
+import moment from "moment";
 export default {
   name: "myMars",
   props: {
@@ -98,6 +99,18 @@ export default {
       }, 100);
     },
     onProcessTraceability(mapList) {
+      let newMapList = (mapList = mapList.filter(
+        (item) => Number(item.lon) !== 0 && Number(item.lat) !== 0
+      ));
+      console.log(newMapList, "newMapList");
+      if (newMapList.length === 0) {
+        this.clearDraw();
+        this.$message({
+          message: "暂无数据",
+          type: "warning"
+        });
+        return;
+      }
       // eslint-disable-next-line no-undef
       const property = new Cesium.SampledPositionProperty();
       // eslint-disable-next-line no-undef
@@ -109,43 +122,56 @@ export default {
 
       let start;
       let stop;
+
+      // 如果数据只有一条，复制并调整时间
+      if (newMapList.length === 1) {
+        const firstItem = newMapList[0];
+        const secondItem = { ...firstItem };
+
+        // 增加1秒到 createTime
+        const firstTime = moment(firstItem.createTime); // 使用 moment.js 来处理时间
+        secondItem.createTime = firstTime
+          .add(1, "seconds")
+          .format("YYYY-MM-DD HH:mm:ss");
+
+        newMapList.push(secondItem); // 将新的第二条数据加入到列表
+      }
+
       for (let i = 0, len = mapList.length; i < len; i++) {
         const item = mapList[i];
         const lng = Number(item.lon); // 经度
         const lat = Number(item.lat); // 纬度
+
         const app_lng = Number(item.app_lon); // 经度
         const app_lat = Number(item.app_lat); // 纬度
-        const height = item.alt || 5; // 高度5 是避免与geojson高度冲突
+        const height = item.alt || 5; // 高度5 是避免与 geojson 高度冲突
         const outputDate = item.createTime.replace(" ", "T");
 
         const time = outputDate; // 时间
         let position = null;
         let app_position = null;
-        if (lng !== 0 && lat !== 0) {
-          if (lng && lat) {
-            // eslint-disable-next-line no-undef
-            position = Cesium.Cartesian3.fromDegrees(lng, lat, height);
-            app_position = Cesium.Cartesian3.fromDegrees(app_lng, app_lat, 0);
-          }
-          let juliaDate = null;
-          if (time) {
-            // eslint-disable-next-line no-undef
-            juliaDate = Cesium.JulianDate.fromIso8601(time);
-          }
-          if (position && juliaDate) {
-            property.addSample(juliaDate, position);
-          }
-          if (app_position && juliaDate) {
-            app_property.addSample(juliaDate, app_position);
-          }
+        if (lng && lat) {
+          // eslint-disable-next-line no-undef
+          position = Cesium.Cartesian3.fromDegrees(lng, lat, height);
+          app_position = Cesium.Cartesian3.fromDegrees(app_lng, app_lat, 0);
+        }
 
-          if (i === 0) {
-            start = juliaDate;
-          } else if (i === len - 1) {
-            stop = juliaDate;
-          }
-        } else {
-          console.log("经纬度为0，忽略该数据");
+        let juliaDate = null;
+        if (time) {
+          // eslint-disable-next-line no-undef
+          juliaDate = Cesium.JulianDate.fromIso8601(time);
+        }
+        if (position && juliaDate) {
+          property.addSample(juliaDate, position);
+        }
+        if (app_position && juliaDate) {
+          app_property.addSample(juliaDate, app_position);
+        }
+
+        if (i === 0) {
+          start = juliaDate;
+        } else if (i === len - 1) {
+          stop = juliaDate;
         }
       }
       // 设置时钟属性
@@ -170,6 +196,7 @@ export default {
       // });
       this.clearDraw();
       // 创建无人机对象
+      console.log(property, "property");
       let pathEntity = this.graphicLayer.getGraphicById("pathIdsss");
       if (!pathEntity) {
         pathEntity = new mars3d.graphic.ModelEntity({
diff --git a/src/views/menuData/AlertDialog.vue b/src/views/menuData/AlertDialog.vue
index f8450ac..3400540 100644
--- a/src/views/menuData/AlertDialog.vue
+++ b/src/views/menuData/AlertDialog.vue
@@ -236,8 +236,14 @@ export default {
         alarmList(params).then((res) => {
           if (res.code === 0) {
             this.tableData = res.data.items.map((item) => {
-              const { isWhitelist, duration, frequency, alarmLevel, ...rest } =
-                item;
+              const {
+                isWhitelist,
+                duration,
+                frequency,
+                model,
+                alarmLevel,
+                ...rest
+              } = JSON.parse(JSON.stringify(item));
 
               let flyStatus = "";
               if (isWhitelist) {
@@ -245,8 +251,12 @@ export default {
               } else {
                 flyStatus = alarmLevel === 0 ? "防区外" : "入侵";
               }
+              if (model === "O4") {
+                flyStatus = "入侵";
+              }
               return {
                 ...rest,
+                model: model,
                 isattacked: item.isattacked ? "是" : "否", // 保留你原本的逻辑
                 duration: String(item.duration),
                 frequency: String(item.frequency),