zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 打包时使用服务器host获取厂区模型

This commit is contained in:
caoqianming 2024-04-17 15:04:14 +08:00
parent e1d846cd2d
commit dfe4f1d1c3
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/config/index.js
View File

@ -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: process.env.NODE_ENV === 'development' && process.env.VUE_APP_PROXY === 'false' ? "/api" : process.env.VUE_APP_API_BASEURL,
API_URL: get_api_url(), API_URL: get_api_url(),
//端口地址
HOST_URL: get_host_url(),
//请求超时 //请求超时
TIMEOUT: 200000, TIMEOUT: 200000,
@ -78,6 +81,12 @@ function get_api_url(){
return 'http://' + window.location.host + '/api' 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" import MY_CONFIG from "./myConfig"
Object.assign(DEFAULT_CONFIG, MY_CONFIG) Object.assign(DEFAULT_CONFIG, MY_CONFIG)

4
src/views/bigScreen/index_enm.vue
View File

@ -130,6 +130,7 @@
</template> </template>
<script> <script>
import tool from '@/utils/tool'; import tool from '@/utils/tool';
import config from "@/config"
import * as echarts from "echarts"; import * as echarts from "echarts";
import * as BABYLON from "babylonjs" import * as BABYLON from "babylonjs"
import * as BABYLON_GUI from "babylonjs-gui" import * as BABYLON_GUI from "babylonjs-gui"
@ -886,7 +887,8 @@ export default {
mesh_name.color = 'white'; mesh_name.color = 'white';
mesh_name.fontSize = '14px'; mesh_name.fontSize = '14px';
mesh_rect.addControl(mesh_name); 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) { BABYLON.SceneLoader.Append(remoteGlbUrl, "", scene, function (scene) {
// debugger; // debugger;
// console.log(scene) // console.log(scene)

3
src/views/bigScreen/index_enp.vue
View File

@ -506,7 +506,8 @@
mesh_name.color = 'white'; mesh_name.color = 'white';
mesh_name.fontSize = '14px'; mesh_name.fontSize = '14px';
mesh_rect.addControl(mesh_name); 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) { BABYLON.SceneLoader.Append(remoteGlbUrl, "", scene, function (scene) {
for (let key in that.sectionNames) { for (let key in that.sectionNames) {
const value = that.sectionNames[key]; const value = that.sectionNames[key];

6
src/views/bigScreen/index_photon.vue
View File

@ -1389,9 +1389,9 @@ export default {
mesh_name.color = "white"; mesh_name.color = "white";
mesh_name.fontSize = "14px"; mesh_name.fontSize = "14px";
mesh_rect.addControl(mesh_name); mesh_rect.addControl(mesh_name);
var remoteGlbUrl = config.HOST_URL + "/media/model/photon4.glb";
var remoteGlbUrl = // var remoteGlbUrl =
process.env.VUE_APP_BASEURL + "/media/model/photon4.glb"; // process.env.VUE_APP_BASEURL + "/media/model/photon4.glb";
BABYLON.SceneLoader.Append( BABYLON.SceneLoader.Append(
remoteGlbUrl, remoteGlbUrl,
"", "",