ar模块调整

src/views/Gis/arDisplay.vue

@@ -56,7 +56,7 @@ export default {
     };
   },
   mounted() {
-    document.addEventListener('visibilitychange', this.handleVisibilityChange);
+    // document.addEventListener('visibilitychange', this.handleVisibilityChange);
     document.title = "AR车间";
     console.log("----state----", this.$store.state, document.title);
     this.ip = window.location.hostname;
@@ -69,7 +69,7 @@ export default {
     this.getClientInfo();
   },
   unmounted() {
-    document.removeEventListener('visibilitychange', this.handleVisibilityChange);
+    // document.removeEventListener('visibilitychange', this.handleVisibilityChange);
   },
   beforeDestroy() {
     console.log('销毁销毁销毁销毁销毁销毁销毁销毁销毁销毁销毁')
@@ -85,40 +85,28 @@ export default {
     next();
   },
   methods: {
-    handleVisibilityChange() {
-      if (document.hidden) {
-        console.log('隐藏隐藏隐藏隐藏隐藏隐藏隐藏隐藏隐藏隐藏隐藏')
-        if (this.control) {
-          this.control.setWindowStatus(2);
-          this.control = null;
-        }
-      } else {
-        // setTimeout(function () {
-          console.log('显示显示显示显示显示显示显示显示显示显示显示')
-          document.title = "AR车间";
-          this.ip = window.location.hostname;
-          this.protocolType = window.location.protocol.replace(':', '')
-          if (window.location.port) {
-            this.port = window.location.port;
-          } else {
-            this.port = this.protocolType === "https" ? "443" : "80";
-          }
-/*        // 获取浏览器窗口的宽高
-        const windowWidth = window.innerWidth;
-        // 获取屏幕的宽高
-        const screenWidth = screen.width;
-        // 比较窗口尺寸与屏幕尺寸
-        if (windowWidth === screenWidth) {
-
-        } else {
-
-        }
-        console.log('windowWidth', windowWidth)
-        console.log('screenWidth', screenWidth)*/
-          this.getClientInfo();
-        // }, 2000);
-      }
-    },
+    // handleVisibilityChange() {
+    //   if (document.hidden) {
+    //     console.log('隐藏隐藏隐藏隐藏隐藏隐藏隐藏隐藏隐藏隐藏隐藏')
+    //     if (this.control) {
+    //       this.control.setWindowStatus(2);
+    //       this.control = null;
+    //     }
+    //   } else {
+    //     // setTimeout(function () {
+    //       console.log('显示显示显示显示显示显示显示显示显示显示显示',document.webkitFullscreenElement)
+    //       document.title = "AR车间";
+    //       this.ip = window.location.hostname;
+    //       this.protocolType = window.location.protocol.replace(':', '')
+    //       if (window.location.port) {
+    //         this.port = window.location.port;
+    //       } else {
+    //         this.port = this.protocolType === "https" ? "443" : "80";
+    //       }
+    //       this.getClientInfo();
+    //     // }, 2000);
+    //   }
+    // },
     init() {
       // 初始化
       if (this.control) {
@@ -141,10 +129,10 @@ export default {
       const port = this.raData.port;
       const userName = this.raData.username;
       const loginKey = this.raData.tgc;
-      const left = '0';
-      const top = '100';
-      const width = window.innerWidth;
-      const height = window.innerHeight-25;
+      // const left = '0';
+      // const top = '100';
+      // const width = window.innerWidth;
+      // const height = window.innerHeight-25;
       // const protocolType = this.protocolType
       const protocolType = 'https'
       const domainId = 103
@@ -156,10 +144,6 @@ export default {
           port,
           userName,
           loginKey,
-          left,
-          top,
-          width,
-          height,
           protocolType,
           domainId,
           arIndexCode,
@@ -168,6 +152,22 @@ export default {
       // 程序挂载成功
       window.addEventListener("ar_start", event => {
         console.log('kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk')
+        // // 获取浏览器窗口的宽高
+        // const windowWidth = window.innerWidth;
+        // const windowHeight = window.innerHeight;
+        // // 获取屏幕的宽高
+        // const screenWidth = screen.width;
+        // const screenHeight = screen.height;
+        // // 比较窗口尺寸与屏幕尺寸
+        // if (windowWidth === screenWidth && windowHeight > screenHeight - 200) {
+        //   console.log('全屏')
+        // } else {
+        //    setTimeout(function () {
+        //
+        //      console.log('不全屏')
+        //   }, 2000);
+        //
+        // }
           this.videoLoading = false
       });
       window.addEventListener("ar_loaded", event => {
@@ -307,6 +307,9 @@ body {
   padding-top: 45px;
   width: 100vw;  /* 100% of the viewport width */
   height: 94vh; /* 100% of the viewport height */
+
+  //width: 100%;
+  //height: 100%;
 }
 .errorContent {
   position: fixed;

src/views/Gis/arWebControl.debug.js

@@ -528,10 +528,6 @@ import store from "@/store/index.js";
         port,
         userName,
         loginKey,
-        left,
-        top,
-        width,
-        height,
         protocolType,
         domainId,
         arIndexCode,
@@ -557,11 +553,11 @@ import store from "@/store/index.js";
           this.arControlVisibility = false
           this.arDivVisibility = true
 
-          // var _this$_getDomPosition = this._getDomPosition(),
-          //   left = _this$_getDomPosition.left,
-          //   top = _this$_getDomPosition.top,
-          //   width = _this$_getDomPosition.width,
-          //   height = _this$_getDomPosition.height
+          var _this$_getDomPosition = this._getDomPosition(),
+            left = _this$_getDomPosition.left,
+            top = _this$_getDomPosition.top,
+            width = _this$_getDomPosition.width,
+            height = _this$_getDomPosition.height
 
           this.controlSetupDom = document.createElement('a')
           var title = window.top.document.title
@@ -626,7 +622,6 @@ import store from "@/store/index.js";
                     top = _this$_getDomPosition2.top,
                     width = _this$_getDomPosition2.width,
                     height = _this$_getDomPosition2.height
-
                 _this.setPosition(left, top, width, height)
 
                 canRun = true