fix: 打包时使用服务器host获取厂区模型
This commit is contained in:
parent
e1d846cd2d
commit
dfe4f1d1c3
|
@ -15,6 +15,9 @@ const DEFAULT_CONFIG = {
|
|||
// API_URL: process.env.NODE_ENV === 'development' && process.env.VUE_APP_PROXY === 'false' ? "/api" : process.env.VUE_APP_API_BASEURL,
|
||||
API_URL: get_api_url(),
|
||||
|
||||
//端口地址
|
||||
HOST_URL: get_host_url(),
|
||||
|
||||
//请求超时
|
||||
TIMEOUT: 200000,
|
||||
|
||||
|
@ -78,6 +81,12 @@ function get_api_url(){
|
|||
return 'http://' + window.location.host + '/api'
|
||||
}
|
||||
|
||||
function get_host_url(){
|
||||
if(process.env.NODE_ENV === 'development'){
|
||||
return process.env.VUE_APP_API_BASEURL
|
||||
}
|
||||
return 'http://' + window.location.host
|
||||
}
|
||||
//合并业务配置
|
||||
import MY_CONFIG from "./myConfig"
|
||||
Object.assign(DEFAULT_CONFIG, MY_CONFIG)
|
||||
|
|
|
@ -130,6 +130,7 @@
|
|||
</template>
|
||||
<script>
|
||||
import tool from '@/utils/tool';
|
||||
import config from "@/config"
|
||||
import * as echarts from "echarts";
|
||||
import * as BABYLON from "babylonjs"
|
||||
import * as BABYLON_GUI from "babylonjs-gui"
|
||||
|
@ -886,7 +887,8 @@ export default {
|
|||
mesh_name.color = 'white';
|
||||
mesh_name.fontSize = '14px';
|
||||
mesh_rect.addControl(mesh_name);
|
||||
var remoteGlbUrl = process.env.VUE_APP_BASEURL + "/media/model/factory.glb";
|
||||
var remoteGlbUrl = config.HOST_URL + "/media/model/factory.glb";
|
||||
// var remoteGlbUrl = process.env.VUE_APP_BASEURL + "/media/model/factory.glb";
|
||||
BABYLON.SceneLoader.Append(remoteGlbUrl, "", scene, function (scene) {
|
||||
// debugger;
|
||||
// console.log(scene)
|
||||
|
|
|
@ -506,7 +506,8 @@
|
|||
mesh_name.color = 'white';
|
||||
mesh_name.fontSize = '14px';
|
||||
mesh_rect.addControl(mesh_name);
|
||||
var remoteGlbUrl = process.env.VUE_APP_BASEURL + "/media/model/factory.glb";
|
||||
var remoteGlbUrl = config.HOST_URL + "/media/model/factory.glb";
|
||||
// var remoteGlbUrl = process.env.VUE_APP_BASEURL + "/media/model/factory.glb";
|
||||
BABYLON.SceneLoader.Append(remoteGlbUrl, "", scene, function (scene) {
|
||||
for (let key in that.sectionNames) {
|
||||
const value = that.sectionNames[key];
|
||||
|
|
|
@ -1389,9 +1389,9 @@ export default {
|
|||
mesh_name.color = "white";
|
||||
mesh_name.fontSize = "14px";
|
||||
mesh_rect.addControl(mesh_name);
|
||||
|
||||
var remoteGlbUrl =
|
||||
process.env.VUE_APP_BASEURL + "/media/model/photon4.glb";
|
||||
var remoteGlbUrl = config.HOST_URL + "/media/model/photon4.glb";
|
||||
// var remoteGlbUrl =
|
||||
// process.env.VUE_APP_BASEURL + "/media/model/photon4.glb";
|
||||
BABYLON.SceneLoader.Append(
|
||||
remoteGlbUrl,
|
||||
"",
|
||||
|
|
Loading…
Reference in New Issue