AR模块修改

src/api/http.js

@@ -36,6 +36,7 @@ axios.interceptors.response.use((res) => {
     return Promise.resolve(res);
 }, (error) => {
     closeLoading();
+    alert(error)
     let httpMessage = '';
     if (error.response) {
         if (error.response.status == '401') {
@@ -327,4 +328,4 @@ ajax.post = function (url, param, success, errror) {
 ajax.get = function (url, param, success, errror) {
     ajax({ url: url, param: param, success: success, error: errror, type: 'get' })
 }
-export default { post, get, download, ajax, ipAddress, changeIP  }
+export default { post, get, download, ajax, ipAddress, changeIP  }
\ No newline at end of file

src/views/Gis/arDisplay.vue

@@ -2,25 +2,25 @@
   <div id="panel">
     <div id="ar-div" class="panel-child"></div>
     <div v-if="outTime" class="errorContent">
-      <h-empty>
-        <template #img>
-          <h-empty-error-control />
-        </template>
-        <template #description>
-          <p v-if="!connectError && outTime">
-            正在尝试第 {{ outTime }}次建立连接
-          </p>
-          <p v-else-if="connectError&&loginFailure">
-            {{ loginFailedText }}
-          </p>
-          <p v-else-if="connectError">
-            连接失败！ 请检查客户端是否安装并开启
-            <el-button type="link" @click="jumpTo">
-              去下载
-            </el-button>
-          </p>
-        </template>
-      </h-empty>
+<!--      <h-empty>-->
+<!--        <template #img>-->
+<!--          <h-empty-error-control />-->
+<!--        </template>-->
+<!--        <template #description>-->
+<!--          <p v-if="!connectError && outTime">-->
+<!--            正在尝试第 {{ outTime }}次建立连接-->
+<!--          </p>-->
+<!--          <p v-else-if="connectError&&loginFailure">-->
+<!--            {{ loginFailedText }}-->
+<!--          </p>-->
+<!--          <p v-else-if="connectError">-->
+<!--            连接失败！ 请检查客户端是否安装并开启-->
+<!--            <el-button type="link" @click="jumpTo">-->
+<!--              去下载-->
+<!--            </el-button>-->
+<!--          </p>-->
+<!--        </template>-->
+<!--      </h-empty>-->
       <p></p>
     </div>
   </div>
@@ -36,6 +36,7 @@ export default {
   props: {},
   data() {
     return {
+      raData: {},
       control: null,
       ip: "",
       port: "",
@@ -80,34 +81,34 @@ export default {
         this.control = null;
       }
       const loginType = 3;
-      const ip = this.ip;
-      const port = this.port;
-      const userName = this.userInfo.userId;
-      const credential = this.userInfo.tgc;
-      const indexCode = "";
-      const wsPort = "7789";
-      const domainId = this.domainId;
-      const protocolType = this.protocolType
+      const ip = '111.160.132.74';
+      const port = this.raData.port;
+      const userName = this.raData.username;
+      const loginKey = this.raData.tgc;
+      const left = '10';
+      const top = '100';
+      const width = '1900';
+      const height = '953';
+      // const protocolType = this.protocolType
+      const protocolType = 'https'
+      const domainId = 103
+      const title = 'AR车间'
       this.control = new ARWebControl(
           "ar-div",
           loginType,
           ip,
           port,
           userName,
-          credential,
-          indexCode,
-          wsPort,
+          loginKey,
+          left,
+          top,
+          width,
+          height,
+          protocolType,
           domainId,
-          protocolType
+          title,
       );
-      console.log("params--", {
-        loginType,
-        ip,
-        port,
-        userName,
-        credential,
-        domainId
-      });
+      console.log('this.control',this.control)
       window.addEventListener("ar_loaded", event => {
         if (event.detail.loadingStatus) {
           this.outTime = 0;
@@ -141,10 +142,13 @@ export default {
     },
     async getClientInfo() {
       try {
-        const { code, data } = await getLoginTgc();
-        if (code === "0") {
-          this.userInfo = data.currentUser || {};
-          this.domainId = data.domainId;
+        const { status, data } = await getLoginTgc();
+        console.log('data',JSON.parse(data))
+        if (status === 0) {
+        //   this.userInfo = data.currentUser || {};
+        //   this.domainId = data.domainId;
+          this.raData = JSON.parse(data).data
+          console.log('this.raData',this.raData)
           this.init();
         }
       } catch (error) {

src/views/Gis/arWebControl.debug.js

@@ -509,7 +509,11 @@ import store from "@/store/index.js";
        * @param ip{String} 平台ip
        * @param port{String} 平台端口
        * @param userName{String} 用户名
-       * @param credentials{String} 登录凭据（密码/SG/TGT）
+       * @param loginKey
+       * @param left
+       * @param top
+       * @param width
+       * @param height
        * @param arIndexCode{String} 默认显示场景IndexCode
        * @param webSocketPort{String} 默认显示场景IndexCode
        * @param domainId{String} 默认显示场景IndexCode
@@ -523,11 +527,15 @@ import store from "@/store/index.js";
         ip,
         port,
         userName,
-        credentials,
+        loginKey,
+        left,
+        top,
+        width,
+        height,
+        protocolType,
+        domainId,
         arIndexCode,
         webSocketPort,
-        domainId,
-        protocolType
       ) {
         // var arIndexCode =
         //   arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : ''
@@ -549,11 +557,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
@@ -567,15 +575,17 @@ import store from "@/store/index.js";
           // }
 
           if (loginType == 0 || loginType == 1) {
-            this.controlSetupDom.href = `PCCloudVideoLabel://UP --ip ${ip} --port ${port} --user-name ${userName} --login-key ${credentials} --start-plan-id ${arIndexCode} --left ${left} --top ${top} --width ${width} --height ${height} --login-method password --domain-id ${domainId} --protocolType ${protocolType} --title ${title}`
+            this.controlSetupDom.href = `PCCloudVideoLabel://UP --ip ${ip} --port ${port} --user-name ${userName} --login-key ${loginKey} --start-plan-id ${arIndexCode} --left ${left} --top ${top} --width ${width} --height ${height} --login-method password --domain-id ${domainId} --protocolType ${protocolType} --title ${title}`
           } else if (loginType == 2) {
-            this.controlSetupDom.href = `PCCloudVideoLabel://UP --ip ${ip} --port ${port} --user-name ${userName} --login-key ${credentials} --start-plan-id ${arIndexCode} --left ${left} --top ${top} --width ${width} --height ${height} --login-method sg --domain-id ${domainId} --protocolType ${protocolType} --title ${title}`
+            this.controlSetupDom.href = `PCCloudVideoLabel://UP --ip ${ip} --port ${port} --user-name ${userName} --login-key ${loginKey} --start-plan-id ${arIndexCode} --left ${left} --top ${top} --width ${width} --height ${height} --login-method sg --domain-id ${domainId} --protocolType ${protocolType} --title ${title}`
           } else if (loginType == 3) {
-            this.controlSetupDom.href = `PCCloudVideoLabel://UP --ip ${ip} --port ${port} --user-name ${userName} --login-key ${credentials} --start-plan-id ${arIndexCode} --left ${left} --top ${top} --width ${width} --height ${height} --login-method tgc --domain-id ${domainId} --protocolType ${protocolType} --title ${title}`
+            const href =  `PCCloudVideoLabel://UP --ip ${ip} --port ${port} --user-name ${userName} --login-key ${loginKey}  --left ${left} --top ${top} --width ${width} --height ${height} --login-method tgc --domain-id ${domainId} --protocolType ${protocolType} --title ${title}`
+            console.log('hrefaaaaaaaaaaaaaaaaaaaaaa',href)
+            this.controlSetupDom.href = encodeURI(href)
           }
           console.log('href------', this.controlSetupDom.href)
 
-          this.webSocketPort = webSocketPort
+          this.webSocketPort = '7789'
           this.lastPosition = {
             x: left,
             y: top,
@@ -612,10 +622,10 @@ import store from "@/store/index.js";
               canRun = false
               setTimeout(function() {
                 var _this$_getDomPosition2 = _this._getDomPosition(),
-                  left = _this$_getDomPosition2.left,
-                  top = _this$_getDomPosition2.top,
-                  width = _this$_getDomPosition2.width,
-                  height = _this$_getDomPosition2.height
+                  left = '103',
+                  top = '103',
+                  width = '1919',
+                  height = '937'
 
                 _this.setPosition(left, top, width, height)
 
@@ -728,10 +738,10 @@ import store from "@/store/index.js";
 
             this.timer = setInterval(function() {
               var _this$_getDomPosition3 = _this._getDomPosition(),
-                left = _this$_getDomPosition3.left,
-                top = _this$_getDomPosition3.top,
-                width = _this$_getDomPosition3.width,
-                height = _this$_getDomPosition3.height
+                  left = '103',
+                  top = '103',
+                  width = '1919',
+                  height = '937'
 
               if (
                 _this.lastPosition.x != left ||
@@ -798,6 +808,7 @@ import store from "@/store/index.js";
             if (this.arStartedFlag) {
               console.warn('已启动AR实例，请勿重复启动实例')
             } else {
+              console.log('11111111111111111111111111111111')
               this.controlSetupDom.click()
 
               this._initWebSocket()
@@ -861,7 +872,6 @@ import store from "@/store/index.js";
           key: '_initWebSocket',
           value: function _initWebSocket() {
             var _this2 = this
-
             this.ws = new WebSocket(ConstantConfig.WEBSOCKET_URL + ':' + this.webSocketPort)
 
             this.ws.onopen = function() {