Merge branch 'v4' of ssh://git.mmcuav.cn:8222/root/mmc-stl-vue2 into v4

src/components/MMCFlightControlCenter/components/hangar/index.vue

@@ -30,7 +30,7 @@ export default {
     'uavRealTimeData.isFlying'(newVal, oldVal){
       // 监听飞机降落然后进行任务结束的提示
       if(oldVal === true && newVal === false){
-        this.$alert('任务结束', '提示', {
+        this.$alert('当前任务已结束', '提示', {
           type: 'success ',
           confirmButtonText: '确定',
           callback: action => {

src/components/MMCFlightControlCenter/components/uavApplications/index.vue

@@ -39,7 +39,7 @@ export default {
     "uavRealTimeData.isFlying"(newVal, oldVal) {
       // 监听飞机降落然后进行任务结束的提示
       if (oldVal === true && newVal === false) {
-        this.$alert("任务结束", "提示", {
+        this.$alert("当前任务已结束", "提示", {
           type: "success ",
           confirmButtonText: "确定",
           callback: (action) => { },

src/components/MMCFlightControlCenter/store/uav.js

@@ -503,8 +503,12 @@ const actions = {
       } else {
         // const posData = UAVDataParser(state.uavRealTimeData);    // 这种写法在执行rollup混淆压缩后, posData对象会变成elementUI的对象,原因未知
         // 更新轨迹
+        let flag = positions.some(val=> val.x == UAVDataParser(state.uavRealTimeData).position.x && val.y == UAVDataParser(state.uavRealTimeData).position.y)
+        if (!flag) {
           positions.push(UAVDataParser(state.uavRealTimeData).position);
         }
+        // console.log(positions,"positions.x");
+      }
 
       if (
         state.uavRealTimeData.locationCoordinate3D.longitude !==