Merge branch 'v4' into v4_master

iframe/src/App.vue

@@ -35,6 +35,7 @@ export default {
         baseUrl: "/",
         wsUrl: "wss://tmj.mmcuav.cn/websocket",
         mqttUrl: "wss://fkzx.mmcuav.cn:8884/mqtt",
+        mqttToken: '',
       },
       scene: 0, // 场景类型 1: 无人机 2: 机库
       account: "mmctest@admin",

src/components/MMCFlightControlCenter/components/cesiumLayer/index.vue

@@ -100,9 +100,13 @@ export default {
       // 卫星图
       this.imageryLayers.satellite =
         this.viewer.imageryLayers.addImageryProvider(
-          new Cesium.UrlTemplateImageryProvider({
-            url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
-            maximumLevel: 17,
+          new Cesium.WebMapTileServiceImageryProvider({
+            url: "https://t0.tianditu.gov.cn/img_w/wmts?tk=ced06243e56f41f5b7180f08731026da",
+            layer: "img",
+            style: "default",
+            tileMatrixSetID: "w",
+            format: "tiles",
+            maximumLevel: 18,
           })
         );
       // 星图地球卫星影像 https://datacloud.geovisearth.com/
@@ -233,7 +237,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 .cpt-cesium_layer::v-deep {
   width: 100%;
   height: 100%;

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

@@ -19,40 +19,40 @@ export default {
     ControlPanel,
   },
   data() {
-
     return {};
   },
   computed: {
     ...mapState("MMCFlightControlCenter/hangar", ["showPanel", "hangar"]),
-    ...mapState("MMCFlightControlCenter/uav", ["uavRealTimeData"]),
+    ...mapState("MMCFlightControlCenter/uav", ["uav", "uavRealTimeData"]),
   },
   watch: {
-    'uavRealTimeData.isFlying'(newVal, oldVal){
+    "uavRealTimeData.isFlying"(newVal, oldVal) {
       // 监听飞机降落然后进行任务结束的提示
-      if(oldVal === true && newVal === false){
-        this.$alert('当前任务已结束', '提示', {
-          type: 'success ',
-          confirmButtonText: '确定',
-          callback: action => {
-          },
-        });
-        setTimeout(() => {
-          const dialog = document.querySelector('.el-message-box__wrapper');
-          if (dialog) {
-              const closeButton = dialog.querySelector('.el-button');
+      if (oldVal === true && newVal === false) {
+        if (!this.uav.deviceId.include("mock")) {
+          this.$alert("当前任务已结束", "提示", {
+            type: "success ",
+            confirmButtonText: "确定",
+            callback: (action) => {},
+          });
+          setTimeout(() => {
+            const dialog = document.querySelector(".el-message-box__wrapper");
+            if (dialog) {
+              const closeButton = dialog.querySelector(".el-button");
               if (closeButton) {
-                  closeButton.click();
+                closeButton.click();
               }
-          }
-      }, 3000); 
+            }
+          }, 3000);
+        }
       }
-    }
+    },
   },
   beforeDestroy() {
-    this.$store.commit('MMCFlightControlCenter/setState', {
-      key: 'listCollapse',
-      value: false
-    })
+    this.$store.commit("MMCFlightControlCenter/setState", {
+      key: "listCollapse",
+      value: false,
+    });
   },
 };
 </script>

src/components/MMCFlightControlCenter/components/hangar/mixins/linkFusion.js

@@ -5,7 +5,7 @@ export default {
   computed: {
     ...mapState("MMCFlightControlCenter/hangar", ["hangar"]),
     ...mapState("MMCFlightControlCenter/uav", ["uav"]),
-    ...mapState("MMCFlightControlCenter", ['mqttUrlHangar']),
+    ...mapState("MMCFlightControlCenter", ['mqttUrlHangar', 'mqttToken']),
     // mqtt实时数据
     mqttDataSetHangar() {
       return this.$store.state.MMCMQTT?.dataSet?.[this.hangar?.deviceId];
@@ -35,6 +35,7 @@ export default {
       this.$store
         .dispatch("MMCMQTT/init", {
           url: this.mqttUrlHangar,
+          password: this.mqttToken
         })
         .then(() => {
           console.log("mqtt连接成功");

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

@@ -39,20 +39,22 @@ export default {
     "uavRealTimeData.isFlying"(newVal, oldVal) {
       // 监听飞机降落然后进行任务结束的提示
       if (oldVal === true && newVal === false) {
-        this.$alert("当前任务已结束", "提示", {
-          type: "success ",
-          confirmButtonText: "确定",
-          callback: (action) => { },
-        });
-        setTimeout(() => {
-          const dialog = document.querySelector('.el-message-box__wrapper');
-          if (dialog) {
-              const closeButton = dialog.querySelector('.el-button');
+        if (!this.uav.deviceId.include("mock")) {
+          this.$alert("当前任务已结束", "提示", {
+            type: "success ",
+            confirmButtonText: "确定",
+            callback: (action) => {},
+          });
+          setTimeout(() => {
+            const dialog = document.querySelector(".el-message-box__wrapper");
+            if (dialog) {
+              const closeButton = dialog.querySelector(".el-button");
               if (closeButton) {
-                  closeButton.click();
+                closeButton.click();
               }
-          }
-        }, 3000);
+            }
+          }, 3000);
+        }
       }
     },
   },

src/components/MMCFlightControlCenter/components/uavApplications/mixins/linkFusion.js

@@ -12,6 +12,9 @@ export default {
     mqttUrl() {
       return this.$store.state.MMCFlightControlCenter.mqttUrl;
     },
+    mqttToken() {
+      return this.$store.state.MMCFlightControlCenter.mqttToken;
+    }
   },
   watch: {
     mqttDataSet(newVal) {
@@ -43,6 +46,7 @@ export default {
       this.$store
         .dispatch("MMCMQTT/init", {
           url: this.mqttUrl,
+          password: this.mqttToken
         })
         .then(() => {
           console.log("mqtt连接成功");

src/components/MMCFlightControlCenter/index.vue

@@ -138,6 +138,14 @@ export default {
           key: "mqttUrlHangar",
           value: newVal.mqttUrlHangar,
         });
+        this.$store.commit("MMCFlightControlCenter/setState", {
+          key: "mqttUrlHangar",
+          value: newVal.mqttUrlHangar,
+        });
+        this.$store.commit("MMCFlightControlCenter/setState", {
+          key: "mqttToken",
+          value: newVal.mqttToken,
+        });
       },
     },
     useSTLAirway: {

src/components/MMCFlightControlCenter/store/index.js

@@ -45,6 +45,7 @@ export default {
     wsUrl: '',  //websocket的url
     mqttUrl: '', //无人机的mqtt地址
     mqttUrlHangar: '',  //机库的mqtt地址
+    mqttToken: '',  //mqtt token
     showAirwayEdit: false,  //展开航线编辑
   },
   mutations: {

src/plugins/MMCMQTT/store.js

@@ -24,7 +24,6 @@ export default {
     },
     orders, //所有指令
     username: 'tmj',
-    password: 'Tmj@192D9'
   },
   mutations: {
     /**
@@ -60,8 +59,8 @@ export default {
     init({ commit, state }, data) {
       let clientId = Date.now();
       let client = mqtt.connect(data.url, {
-        username: state.username,  
-        password: state.password,  
+        username: data.username || state.username,  
+        password: data.password,  
         clientId,
       });