Эх сурвалжийг харах

修改URL地址配置方式

wukai 4 сар өмнө
parent
commit
60d9ca3cb2

+ 8 - 0
.env.development

@@ -0,0 +1,8 @@
+# 接口服务地址
+VUE_APP_API = "http://192.168.1.66:8080"
+
+# 模型服务地址
+VUE_APP_3D = 'ws://192.168.1.100:8082'
+
+# 管理后台SSO地址
+VUE_APP_SSO = 'http://192.168.66.133/twin/sso'

+ 8 - 0
.env.production

@@ -0,0 +1,8 @@
+# 接口服务地址
+VUE_APP_API = "http://192.168.66.133:8080"
+
+# 模型服务地址
+VUE_APP_3D = 'ws://192.168.66.133:8082'
+
+# 管理后台SSO地址
+VUE_APP_SSO = 'http://192.168.66.133/twin/sso'

+ 8 - 0
.env.test

@@ -0,0 +1,8 @@
+# 接口服务地址
+VUE_APP_API = "http://127.0.0.1:8080"
+
+# 模型服务地址
+VUE_APP_3D = 'ws://192.168.66.133:8082'
+
+# 管理后台SSO地址
+VUE_APP_SSO = 'http://127.0.0.1/twin/sso'

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 498 - 99
package-lock.json


+ 2 - 1
package.json

@@ -3,7 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "vue-cli-service serve --mode dev",
+    "test": "vue-cli-service serve --mode test",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },

+ 1 - 1
src/pages/components/In02.vue

@@ -1821,7 +1821,7 @@ export default {
         }
         //切换到数据消费后台
         function toAdmin(){
-            window.location.href= window.ADMIN_SSO_URL+'?role='+(showIndexData=='index'?"producer":"manager");
+            window.location.href= process.env.VUE_APP_SSO+'?role='+(showIndexData=='index'?"producer":"manager");
         }
         function switchIndex(){
             if(showIndexData.value=='index'){

+ 15 - 15
src/pages/main/dataindex.vue

@@ -27,7 +27,7 @@ import In02 from '../components/In02.vue';
 import In03 from '../components/In03.vue';
 import In04 from '../components/In04.vue';
 import In05 from '../components/In05.vue';
-export default {    
+export default {
     components:{
         Bottom,
         Fac,
@@ -61,8 +61,8 @@ export default {
         let reconntimer=null;
         let MarkerMapFac={};
         let AutoPlayer=ref(false);
-        let markerLClickObj=null;        
-        
+        let markerLClickObj=null;
+
         let  inPoints={
             "IN02":{"Text001_002":1,"x1":-28.07801,"y1":37.95126,"x2":-23.32394,"y2":31.16921},
             "IN03":{"Text001_006":1,"x1":46.86921,"y1":24.87041,"x2":51.91054,"y2":17.87417},
@@ -121,7 +121,7 @@ export default {
         function senceInit(){
             player = new RemotePlayer({
                 video: EngineContent.value, //绑定视频标签或图片标签
-                signalServer: window.PLAYER3D_URL, //云渲染服务器,发布时需要改为实际地址
+                signalServer: process.env.VUE_APP_3D, //云渲染服务器,发布时需要改为实际地址
                 engineId: "" + Date.now(), // 引擎会话id,如果已存在则连接,没有则创建,会话在断开连接后超时自动关闭
                 rtcIni: 'rtc.ini', // 可指定webrtc配置文件,默认为rtc.ini,相对目录为集群节点的enginePath目录
                 autoResize: true, // 引擎是否跟跟随标签尺寸
@@ -153,9 +153,9 @@ export default {
                 in05modelloadstate.value = false;
                 window.IN03Markers=null;
                 window.IN04Markers=null;
-                window.IN05Markers=null;      
-                AutoPlayer.value=false;     
-                EngineContent.value.pause();     
+                window.IN05Markers=null;
+                AutoPlayer.value=false;
+                EngineContent.value.pause();
                 if(e=='signal websocket error'){
                     //服务器网络不通
                 }
@@ -176,7 +176,7 @@ export default {
             //5. [推荐] 响应UserTimeOut消息,引擎接收用户鼠标触屏事件超时发出通知
             player.on("UserTimeOut", () => {
                 console.info('用户长时间没有操作三维视图,可调用player.resetTimer()取消退出');
-                //AutoPlayer.value = true;  //暂时取消自动漫游功能              
+                //AutoPlayer.value = true;  //暂时取消自动漫游功能
             });
             player.on('TimeOutExit',()=>{
                 console.info('长时间没有操作,已断开连接');
@@ -226,7 +226,7 @@ export default {
                     default:
                         loadFacModel(Native);
                         break;
-                }                
+                }
                 setTimeout(function(){
                     isLoaded.value=true
                 },2000);
@@ -342,7 +342,7 @@ export default {
             await player.Native.Model.setModelVisible("IN02",false);
             await player.Native.Model.setModelVisible("IN03",false);
             await player.Native.Model.setModelVisible("IN04",false);
-            
+
             if(modelLoadState[currentTargetType.value]==null){
                 var cf = "data://models/T_03.pr";
                 var errStr = await PlayerUtils.call(Native.Model.loadModel, 'IN03', cf);
@@ -362,7 +362,7 @@ export default {
             await player.Native.Model.setModelVisible("FAC",false);
             await player.Native.Model.setModelVisible("IN02",false);
             await player.Native.Model.setModelVisible("IN03",false);
-            await player.Native.Model.setModelVisible("IN05",false);            
+            await player.Native.Model.setModelVisible("IN05",false);
             if(modelLoadState[currentTargetType.value]==null){
                 var cf = "data://models/T_03.pr";
                 var errStr = await PlayerUtils.call(Native.Model.loadModel, 'IN03', cf);
@@ -383,7 +383,7 @@ export default {
             await player.Native.Model.setModelVisible("FAC",false);
             await player.Native.Model.setModelVisible("IN02",false);
             await player.Native.Model.setModelVisible("IN04",false);
-            await player.Native.Model.setModelVisible("IN05",false);            
+            await player.Native.Model.setModelVisible("IN05",false);
             if(modelLoadState[currentTargetType.value]==null){
                 var cf = "data://models/T_03.pr";
                 var errStr = await PlayerUtils.call(Native.Model.loadModel, 'IN03', cf);
@@ -405,7 +405,7 @@ export default {
             await player.Native.Model.setModelVisible("IN03",false);
             await player.Native.Model.setModelVisible("IN04",false);
             await player.Native.Model.setModelVisible("IN05",false);
-            
+
             if(modelLoadState[currentTargetType.value]==null){
                 var cf = "data://models/T_02.pr";
                 var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType.value, cf);
@@ -563,8 +563,8 @@ export default {
             markerLClickObj,
             loadNavModel,
         }
-    },    
+    },
 }
 </script>
 <style scoped>
-</style>
+</style>

+ 20 - 20
src/pages/main/index.vue

@@ -31,7 +31,7 @@ import In02 from '../components/In02.vue';
 import In03 from '../components/In03.vue';
 import In04 from '../components/In04.vue';
 import In05 from '../components/In05.vue';
-export default {    
+export default {
     components:{
         Bottom,
         Fac,
@@ -67,8 +67,8 @@ export default {
         let reconntimer=null;
         let MarkerMapFac={};
         let AutoPlayer=ref(false);
-        let markerLClickObj=null;        
-        
+        let markerLClickObj=null;
+
         let  inPoints={
             "IN02":{"Text001_002":1,"x1":-28.07801,"y1":37.95126,"x2":-23.32394,"y2":31.16921},
             "IN03":{"Text001_006":1,"x1":46.86921,"y1":24.87041,"x2":51.91054,"y2":17.87417},
@@ -139,7 +139,7 @@ export default {
         function senceInit(){
             player = new RemotePlayer({
                 video: EngineContent.value, //绑定视频标签或图片标签
-                signalServer: window.PLAYER3D_URL, //云渲染服务器,发布时需要改为实际地址
+                signalServer: process.env.VUE_APP_3D, //云渲染服务器,发布时需要改为实际地址
                 engineId: "" + Date.now(), // 引擎会话id,如果已存在则连接,没有则创建,会话在断开连接后超时自动关闭
                 rtcIni: 'rtc.ini', // 可指定webrtc配置文件,默认为rtc.ini,相对目录为集群节点的enginePath目录
                 autoResize: true, // 引擎是否跟跟随标签尺寸
@@ -171,9 +171,9 @@ export default {
                 in05modelloadstate.value = false;
                 window.IN03Markers=null;
                 window.IN04Markers=null;
-                window.IN05Markers=null;      
-                AutoPlayer.value=false;     
-                EngineContent.value.pause();     
+                window.IN05Markers=null;
+                AutoPlayer.value=false;
+                EngineContent.value.pause();
                 if(e=='signal websocket error'){
                     //服务器网络不通
                 }
@@ -202,7 +202,7 @@ export default {
             //5. [推荐] 响应UserTimeOut消息,引擎接收用户鼠标触屏事件超时发出通知
             player.on("UserTimeOut", () => {
                 console.info('用户长时间没有操作三维视图,可调用player.resetTimer()取消退出');
-                //AutoPlayer.value = true;  //暂时取消自动漫游功能              
+                //AutoPlayer.value = true;  //暂时取消自动漫游功能
             });
             player.on('TimeOutExit',()=>{
                 console.info('长时间没有操作,已断开连接');
@@ -253,7 +253,7 @@ export default {
                     default:
                         loadFacModel(Native);
                         break;
-                }                
+                }
                 //调整视角,使其达到最佳初始效果
                 //backMasterView();
                 //player.Native.Camera.moveToItem(lastPtr,1);
@@ -347,14 +347,14 @@ export default {
                 var cf = "data://models/T_ALL.pr";
                 var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType.value, cf);
                 modelLoadState[currentTargetType.value] = true;
-            }            
+            }
             await player.Native.Settings.set('ambientIndenty', 'float', 0.39);//初始化环境光补偿
             await player.Native.Settings.set('diffuseIntensity', 'float', 1.2);//初始化光线强度
             await player.Native.Settings.set('specularIntensity', 'float', 0.64);//初始化高光强度
             await player.Native.Model.setModelVisible(currentTargetType.value,true);
             facModelLoadState.value=true;//全厂模型加载完成
-            await player.Native.CameraAnimation.clearKeyFrame();            
-            setTimeout(async() => {                
+            await player.Native.CameraAnimation.clearKeyFrame();
+            setTimeout(async() => {
                 var cf = "data://models/T_02.pr";
                 await PlayerUtils.call(Native.Model.loadModel, 'IN02', cf);
                 modelLoadState['IN02']=true;
@@ -362,7 +362,7 @@ export default {
                 var cf = "data://models/T_03.pr";
                 await PlayerUtils.call(Native.Model.loadModel, 'IN03', cf);
                 modelLoadState['IN03']=true;
-                await player.Native.Model.setModelVisible('IN03',false);                
+                await player.Native.Model.setModelVisible('IN03',false);
                 isLoaded.value=true;//所有模型加载,通知导航菜单可以进行切换操作了
             }, 100);
         }
@@ -377,7 +377,7 @@ export default {
             await player.Native.Model.setModelVisible("IN02",false);
             await player.Native.Model.setModelVisible("IN03",false);
             await player.Native.Model.setModelVisible("IN04",false);
-            
+
             if(modelLoadState[currentTargetType.value]==null){
                 var cf = "data://models/T_03.pr";
                 var errStr = await PlayerUtils.call(Native.Model.loadModel, 'IN03', cf);
@@ -397,7 +397,7 @@ export default {
             await player.Native.Model.setModelVisible("FAC",false);
             await player.Native.Model.setModelVisible("IN02",false);
             await player.Native.Model.setModelVisible("IN03",false);
-            await player.Native.Model.setModelVisible("IN05",false);            
+            await player.Native.Model.setModelVisible("IN05",false);
             if(modelLoadState[currentTargetType.value]==null){
                 var cf = "data://models/T_03.pr";
                 var errStr = await PlayerUtils.call(Native.Model.loadModel, 'IN03', cf);
@@ -419,8 +419,8 @@ export default {
             await player.Native.Model.setModelVisible("FAC",false);
             await player.Native.Model.setModelVisible("IN02",false);
             await player.Native.Model.setModelVisible("IN04",false);
-            await player.Native.Model.setModelVisible("IN05",false);  
-            var cf = "data://models/T_03.pr";          
+            await player.Native.Model.setModelVisible("IN05",false);
+            var cf = "data://models/T_03.pr";
             if(modelLoadState[currentTargetType.value]!=null){
                 await player.Native.Model.unloadModel('IN03');
                 console.log('IN03模型卸载完成')
@@ -445,7 +445,7 @@ export default {
             await player.Native.Model.setModelVisible("IN03",false);
             await player.Native.Model.setModelVisible("IN04",false);
             await player.Native.Model.setModelVisible("IN05",false);
-            
+
             if(modelLoadState[currentTargetType.value]==null){
                 var cf = "data://models/T_02.pr";
                 var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType.value, cf);
@@ -608,8 +608,8 @@ export default {
             markerLClickObj,
             loadNavModel,
         }
-    },    
+    },
 }
 </script>
 <style scoped>
-</style>
+</style>

+ 7 - 8
src/utils/request.js

@@ -1,15 +1,14 @@
 import axios from 'axios'
 import md5 from 'js-md5'
-import { ElMessage } from 'element-plus'
-import vue from "vue"
+import {ElMessage} from 'element-plus'
 import router from '@/router';
 // 请求url
 const service = axios.create({
     // baseURL: window.STATIC_CONFIG.proxyUrl, // url = base url + request url
-    baseURL: ApiServer,
+    baseURL: process.env.VUE_APP_API,
     timeout: 1500000000, // request timeout
-    headers:{
-        "Content-Type":"application/x-www-form-urlencoded"
+    headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
     }
 })
 
@@ -76,8 +75,8 @@ service.interceptors.response.use(
         return res
     },
     error => {
-        console.log(error,'响应拦截器error');
-        if (error.response!=null && error.response.status == 401) {
+        console.log(error, '响应拦截器error');
+        if (error.response != null && error.response.status == 401) {
             ElMessage({
                 message: "登陆已过期,请重新登录",
                 type: "error"
@@ -86,7 +85,7 @@ service.interceptors.response.use(
             sessionStorage.removeItem('userInfo')
             sessionStorage.removeItem('userToken')
             return
-        }else{
+        } else {
             //return Promise.reject(error)
             console.log('网络访问失败!')
         }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно