Merge branch 'v4' into v4_master

src/components/MMCFlightControlCenter/api/request.js

@@ -68,13 +68,13 @@ $axios.interceptors.response.use(
             // 2. 进行刷新访问令牌
             try {
               return new Promise((resolve, reject) => {
-                window.$mmc.app.$emit("refreshToken", {
+                window.$mmc_stl.app.$emit("refreshToken", {
                   callback(data) {
                     isRefreshToken = false;
                     if (data.code === 0) {
                       const token = data.token;
                       console.log('store', store);
-                      window.$mmc.app.$store.commit('MMCFlightControlCenter/setState', {
+                      window.$mmc_stl.app.$store.commit('MMCFlightControlCenter/setState', {
                         key: 'token',
                         value: token
                       })
@@ -157,7 +157,7 @@ function handleAuthorized() {
   MessageBox.alert("登录超时,请重新登录!", "提示", {
     confirmButtonText: "重新登录",
     callback: (action) => {
-      window.$mmc.app.$emit("tokenInvalid");
+      window.$mmc_stl.app.$emit("tokenInvalid");
     },
   });
 }

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

@@ -31,10 +31,10 @@ export default {
   },
   watch: {},
   mounted() {
-    if (!window.$mmc) {
-      window.$mmc = {};
+    if (!window.$mmc_stl) {
+      window.$mmc_stl = {};
     }
-    window.$mmc.viewer = {};
+    window.$mmc_stl.viewer = {};
     this.init_viewer();
   },
   methods: {
@@ -88,7 +88,7 @@ export default {
         selectionIndicator: false,
       };
 
-      window.$mmc.viewer = this.viewer = new Cesium.Viewer(
+      window.$mmc_stl.viewer = this.viewer = new Cesium.Viewer(
         `layer-container`,
         viewerOptions
       );
@@ -184,7 +184,7 @@ export default {
       });
 
       // 加载三维倾斜
-      window.$mmc._3d = [];
+      window.$mmc_stl._3d = [];
       /* const token =
         'r0G6d8tdvfgN_Aad1j28SGqj6ILgt1DNHpP9dK-FNVOVBPgcyaHiEs2z2qyv455bTHU8QaFTbt_Y_AdeAsPp-Q..'; */
       _3dList.forEach(async (item) => {
@@ -195,7 +195,7 @@ export default {
             // cullEnabled: false
           }
         );
-        window.$mmc._3d.push(obj);
+        window.$mmc_stl._3d.push(obj);
         if (item === "3D-ZQ-JLH") {
           // 肇庆九龙湖的模型需要修改海拔, 使其贴地
           obj.style3D.bottomAltitude = -20;
@@ -203,11 +203,11 @@ export default {
       });
       this.$store.commit("MMCFlightControlCenter/setState", {
         key: "cesium3DModels",
-        value: window.$mmc._3d,
+        value: window.$mmc_stl._3d,
       });
 
       // 二维影像缓存加载方式
-      window.$mmc._2d = [];
+      window.$mmc_stl._2d = [];
       ["3D-ZQ-DH", "3D-local3DCache-s3mb"].forEach((item) => {
         this.viewer.scene
           .open(
@@ -219,14 +219,14 @@ export default {
             }
           )
           .then((obj) => {
-            window.$mmc._2d.push(obj);
+            window.$mmc_stl._2d.push(obj);
           });
       });
 
       // 关闭地图深度检测
       this.viewer.scene.globe.depthTestAgainstTerrain = false;
       // 飞向指定的经纬度
-      window.$mmc.flyTo = function (lng, lat) {
+      window.$mmc_stl.flyTo = function (lng, lat) {
         this.viewer.camera.flyTo({
           destination: Cesium.Cartesian3.fromDegrees(lng, lat, 1000),
         });

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

@@ -762,7 +762,7 @@ export default {
       this.$store.dispatch("MMCFlightControlCenter/uav/videoTranscribe", {
         playerFormat: this.streamSelect,
         videoID: 1, // 视频通道ID（需保持唯一）
-        dbID: "929", // 历史记录id
+        // dbID: "929", // 历史记录id
         name: "z30Pro", // 挂载名称（如果知道挂载名称，将传名称即可，通道号可以不用传）
         taskID: "", // 任务ID，可传可不传
         recordControl: this.screenRecordingStatus, // 录制开关、true为开启

src/components/MMCFlightControlCenter/index.vue

@@ -181,12 +181,12 @@ export default {
       alert: this.$alert,
     });
     Vue.component("SymbolIcon", SymbolIcon);
-    if (!window.$mmc) {
-      window.$mmc = {};
+    if (!window.$mmc_stl) {
+      window.$mmc_stl = {};
     }
-    window.$mmc.app = this;
-    window.$mmc.$store = this.$store;
-    window.$mmc.state = () => {
+    window.$mmc_stl.app = this;
+    window.$mmc_stl.$store = this.$store;
+    window.$mmc_stl.state = () => {
       return this.$store.state;
     };
   },
@@ -196,7 +196,7 @@ export default {
         key: "cesiumViewer",
         value: this.cesiumViewer,
       });
-      window.$mmc.viewer = this.cesiumViewer;
+      window.$mmc_stl.viewer = this.cesiumViewer;
     }
   },
   methods: {},

src/components/MMCFlightControlCenter/main.js

@@ -31,14 +31,14 @@ export default function main(elementOrSelector, options = {}){
   if(!options.hasMMCSTLVue2){
     Vue.use(MMCSTL);
   }
-  if(!window.$mmc){
-    window.$mmc = {};
+  if(!window.$mmc_stl){
+    window.$mmc_stl = {};
   }
-  window.$mmc.$store = new Vuex.Store(store);
+  window.$mmc_stl.$store = new Vuex.Store(store);
   return new Vue({
     render: (h) => h(App),
     router,
-    store: window.$mmc.$store,
+    store: window.$mmc_stl.$store,
   }).$mount(elementOrSelector);
 }
 

src/components/MMCFlightControlCenter/store/hangar.js

@@ -119,14 +119,14 @@ const actions = {
    * @param {object} data
    */
   subscribe({ state, dispatch }) {
-    window.$mmc.$store.dispatch("MMCMQTT/subscribe", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/subscribe", {
       topic: "APRON/RECEIVE/" + state.hangar.deviceId,
       callback(ok) {
         ok &&
           console.log("mqtt订阅主题", "APRON/RECEIVE/" + state.hangar.deviceId);
       },
     });
-    window.$mmc.$store.dispatch("MMCMQTT/subscribe", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/subscribe", {
       topic: "PROCESS/RECEIVE/" + state.hangar.deviceId,
       callback(ok) {
         ok &&
@@ -142,7 +142,7 @@ const actions = {
    * @param {} param0
    */
   unsubscribe({ state, dispatch }) {
-    window.$mmc.$store.dispatch("MMCMQTT/unsubscribe", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/unsubscribe", {
       topic: "APRON/RECEIVE/" + state.hangar.deviceId,
       callback(ok) {
         ok &&
@@ -152,7 +152,7 @@ const actions = {
           );
       },
     });
-    window.$mmc.$store.dispatch("MMCMQTT/unsubscribe", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/unsubscribe", {
       topic: "PROCESS/RECEIVE/" + state.hangar.deviceId,
       callback(ok) {
         ok &&
@@ -184,7 +184,7 @@ const actions = {
    * @param {Function} data.callback
    */
   out({ state, commit, dispatch }, data) {
-    window.$mmc.$store.dispatch("MMCMQTT/publish", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
       topic: "PROCESS/OBTAIN/" + state.hangar.deviceId,
       data: {
         cmdControlType: 2059,
@@ -200,7 +200,7 @@ const actions = {
    * @param {*} data
    */
   in({ state, commit, dispatch }, data) {
-    window.$mmc.$store.dispatch("MMCMQTT/publish", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
       topic: "PROCESS/OBTAIN/" + state.hangar.deviceId,
       data: {
         cmdControlType: 2073,
@@ -216,7 +216,7 @@ const actions = {
    * @param {*} data
    */
   chargeStart({ state, commit, dispatch }, data) {
-    window.$mmc.$store.dispatch("MMCMQTT/publish", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
       topic: "PROCESS/OBTAIN/" + state.hangar.deviceId,
       data: {
         cmdControlType: 2060,
@@ -232,7 +232,7 @@ const actions = {
    * @param {*} data
    */
   chargeEnd({ state, commit, dispatch }, data) {
-    window.$mmc.$store.dispatch("MMCMQTT/publish", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
       topic: "PROCESS/OBTAIN/" + state.hangar.deviceId,
       data: {
         cmdControlType: 2071,
@@ -248,7 +248,7 @@ const actions = {
    * @param {*} data
    */
   warmUp({ state, commit, dispatch }, data) {
-    window.$mmc.$store.dispatch("MMCMQTT/publish", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
       topic: "PROCESS/OBTAIN/" + state.hangar.deviceId,
       data: {
         cmdControlType: 2072,
@@ -264,7 +264,7 @@ const actions = {
    * @param {*} data
    */
   dormancy({ state, commit, dispatch }, data) {
-    window.$mmc.$store.dispatch("MMCMQTT/publish", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
       topic: "PROCESS/OBTAIN/" + state.hangar.deviceId,
       data: {
         cmdControlType: 2061,
@@ -280,7 +280,7 @@ const actions = {
    * @param {*} data
    */
   processExit({ state, commit, dispatch }, data) {
-    window.$mmc.$store.dispatch("MMCMQTT/publish", {
+    window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
       topic: "PROCESS/OBTAIN/" + state.hangar.deviceId,
       data: {
         cmdControlType: 100001,
@@ -307,7 +307,7 @@ const actions = {
       } */
       // 上传航线指令
       const waypointList = state.airlineData?.content;
-      window.$mmc.$store.dispatch("MMCMQTT/publish", {
+      window.$mmc_stl.$store.dispatch("MMCMQTT/publish", {
         topic: "PROCESS/OBTAIN/" + state.hangar.deviceId,
         data: {
           cmdControlType: 100004,
@@ -341,7 +341,7 @@ const actions = {
     if (
       res.data.currentOperator &&
       res.data.currentOperator ===
-        window.$mmc.$store.state.MMCFlightControlCenter.userInfo.id
+        window.$mmc_stl.$store.state.MMCFlightControlCenter.userInfo.id
     ) {
       return true;
     }