人生啊人生 3 mēneši atpakaļ
vecāks
revīzija
d8aae673da

+ 4 - 1
user_web/.env.development

@@ -4,4 +4,7 @@ VITE_API_BASE_URL =https://api.3dyzt.com:444/eduTrain1/userApi
 # VITE_API_BASE_URL=http://192.168.50.21:8071/
 # VITE_API_BASE_URL =http://127.0.0.1:8071
 #发布的虚拟目录
-VITE_APP_Vitrural =./
+VITE_APP_Vitrural =./
+# 三维场景模型放置目录
+VITE_APP_THREE_WORLD_URL=http://localhost:5173/
+# VITE_APP_THREE_WORLD_URL=https://www.3dyzt.com/ShiZhengGuanWangZhiNengJianCeYuWeiHu/user_web/

+ 4 - 1
user_web/.env.production

@@ -1,4 +1,7 @@
 #Api的地址
 VITE_API_BASE_URL =https://api.3dyzt.com:444/eduTrain1/userApi
 #发布的虚拟目录
-VITE_APP_Vitrural =./
+VITE_APP_Vitrural =./
+# 三维场景模型放置目录
+VITE_APP_THREE_WORLD_URL=http://localhost:5173/
+# VITE_APP_THREE_WORLD_URL=https://www.3dyzt.com/ShiZhengGuanWangZhiNengJianCeYuWeiHu/user_web/

+ 14 - 5
user_web/src/components/CarSimulation/CarThreeWorldEvent/CarThreeWorldEventMain.vue

@@ -73,12 +73,12 @@ watch(
 // + '&commonconfig=http://localhost:5173/3dMain/model/'
 // + '&commonmodel=http://localhost:5173/3dMain/model/';
 
-let commonconfig = "http://localhost:5173/3dMain/model_car_1/";
-let commonmodel = "http://localhost:5173/3dMain/model_car_1/";
+// let commonconfig = "http://localhost:5173/3dMain/model_car_1/";
+// let commonmodel = "http://localhost:5173/3dMain/model_car_1/";
 
-let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
-+ '&commonconfig=' + commonconfig
-+ '&commonmodel=' + commonmodel;
+// let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
+// + '&commonconfig=' + commonconfig
+// + '&commonmodel=' + commonmodel;
 
 // let commonconfig = "https://www.3dyzt.com/ShiZhengGuanWangZhiNengJianCeYuWeiHu/user_web/3dMain/model_car_1/";
 // let commonmodel = "https://www.3dyzt.com/ShiZhengGuanWangZhiNengJianCeYuWeiHu/user_web/3dMain/model_car_1/";
@@ -87,6 +87,15 @@ let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
 // + '&commonconfig=' + commonconfig
 // + '&commonmodel=' + commonmodel;
 
+let threeWorldHost = import.meta.env.VITE_APP_THREE_WORLD_URL;
+
+let commonconfig = threeWorldHost + "3dMain/model_car_1/";
+let commonmodel = threeWorldHost + "3dMain/model_car_1/";
+
+let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
++ '&commonconfig=' + commonconfig
++ '&commonmodel=' + commonmodel;
+
 
 // 决定了,当前切换到哪个流程
 CarMyThreeWorldStore().obj.processConfig = ref(

+ 13 - 5
user_web/src/components/QvSimulation/QvThreeWorldEvent/QvThreeWorldEventMain.vue

@@ -47,12 +47,12 @@ import { QvComClipPlaneMeshEvent } from "./js/QvComClipPlaneMeshEvent.js";
 // + '&commonmodel=' + commonmodel;
 
 
-let commonconfig = "http://localhost:5173/3dMain/model_qv_2/";
-let commonmodel = "http://localhost:5173/3dMain/model_qv_2/";
+// let commonconfig = "http://localhost:5173/3dMain/model_qv_2/";
+// let commonmodel = "http://localhost:5173/3dMain/model_qv_2/";
 
-let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
-+ '&commonconfig=' + commonconfig
-+ '&commonmodel=' + commonmodel;
+// let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
+// + '&commonconfig=' + commonconfig
+// + '&commonmodel=' + commonmodel;
 
 
 // let commonconfig = "https://www.3dyzt.com/ShiZhengGuanWangZhiNengJianCeYuWeiHu/user_web/3dMain/model_qv_2/";
@@ -62,6 +62,14 @@ let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
 // + '&commonconfig=' + commonconfig
 // + '&commonmodel=' + commonmodel;
 
+let threeWorldHost = import.meta.env.VITE_APP_THREE_WORLD_URL;
+
+let commonconfig = threeWorldHost + "3dMain/model_qv_2/";
+let commonmodel = threeWorldHost + "3dMain/model_qv_2/";
+
+let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
++ '&commonconfig=' + commonconfig
++ '&commonmodel=' + commonmodel;
 
 /**
  * 回调加载百分比

+ 13 - 5
user_web/src/components/SonarSimulation/SonarThreeWorldEvent/SonarThreeWorldEventMain.vue

@@ -47,12 +47,12 @@ import { SonarComClipPlaneMeshEvent } from "./js/SonarComClipPlaneMeshEvent.js";
 // + '&commonmodel=' + commonmodel;
 
 
-let commonconfig = "http://localhost:5173/3dMain/model_qv_2/";
-let commonmodel = "http://localhost:5173/3dMain/model_qv_2/";
+// let commonconfig = "http://localhost:5173/3dMain/model_qv_2/";
+// let commonmodel = "http://localhost:5173/3dMain/model_qv_2/";
 
-let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
-+ '&commonconfig=' + commonconfig
-+ '&commonmodel=' + commonmodel;
+// let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
+// + '&commonconfig=' + commonconfig
+// + '&commonmodel=' + commonmodel;
 
 
 // let commonconfig = "https://www.3dyzt.com/ShiZhengGuanWangZhiNengJianCeYuWeiHu/user_web/3dMain/model_qv_2/";
@@ -62,6 +62,14 @@ let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
 // + '&commonconfig=' + commonconfig
 // + '&commonmodel=' + commonmodel;
 
+let threeWorldHost = import.meta.env.VITE_APP_THREE_WORLD_URL;
+
+let commonconfig = threeWorldHost + "3dMain/model_qv_2/";
+let commonmodel = threeWorldHost + "3dMain/model_qv_2/";
+
+let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
++ '&commonconfig=' + commonconfig
++ '&commonmodel=' + commonmodel;
 
 /**
  * 回调加载百分比

+ 11 - 9
user_web/src/components/student/CourseChapter3d.vue

@@ -50,12 +50,12 @@ let objRenderEvent = new RenderEvent();
 // babylon 对象
 let BABYLON : any = null;
 
-let commonconfig = "http://localhost:5173/3dMain/model2/";
-let commonmodel = "http://localhost:5173/3dMain/model2/";
+// let commonconfig = "http://localhost:5173/3dMain/model2/";
+// let commonmodel = "http://localhost:5173/3dMain/model2/";
 
-let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
-+ '&commonconfig=' + commonconfig
-+ '&commonmodel=' + commonmodel;
+// let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
+// + '&commonconfig=' + commonconfig
+// + '&commonmodel=' + commonmodel;
 
 // // 【发布的时候】3d场景,iframe地址
 // // 配置文件地址
@@ -71,12 +71,14 @@ let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
 // // 发布后的地址
 // let threeWorldUrl = "https://www.3dyzt.com/main/index.html#/main?id=zidingyi&user=zidingyi&commonconfig=" + commonconfig + "&commonmodel=" + commonmodel;
 
+let threeWorldHost = import.meta.env.VITE_APP_THREE_WORLD_URL;
 
+let commonconfig = threeWorldHost + "3dMain/model2/";
+let commonmodel = threeWorldHost + "3dMain/model2/";
 
-
-
-
-
+let threeWorldUrl = "3dMain/index.html#/main?id=zidingyi_lu_cun&user=zidingyi"
++ '&commonconfig=' + commonconfig
++ '&commonmodel=' + commonmodel;
 
 /**
  * 上一步是否显示