joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

修改三维编辑器

Browse Source
This commit is contained in:
sunzhenyu 2020-07-09 15:46:12 +08:00
parent eff2657d08
commit 27d4c93775
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -1,6 +1,6 @@
# just a flag
NODE_ENV = 'development'
# VUE_APP_PRO = 'local'
VUE_APP_PRO = 'local'
# base api
# VUE_APP_BASE_API = 'https://joylink.club/jlcloud'

4
src/jlmap3d/edit/Jlmap3dnewdata.js
View File

@ -18,6 +18,7 @@ export function Jlmap3ddata(mapid,scope){
let editmapid = mapid;
let scene = scope.scene;
let jlmap3ddata = scope.mapdata;
let jlmap3dasset = scope.assetManager;
let assetloader = scope.assetloader;
let loadingInstance = Loading.service({ fullscreen: true });
get3dMapData(editmapid).then(data => {
@ -120,7 +121,8 @@ export function Jlmap3ddata(mapid,scope){
let switchdata = JSON.parse(netdata.switchs);
let signaldata = JSON.parse(netdata.signals);
let standsdata = JSON.parse(netdata.stands);
// console.log(mapdata);
jlmap3dasset = JSON.parse(netdata.assets);
console.log(jlmap3dasset);
assetloader.setmodellistnew(netdata.assets,5);
assetloader.assetpromise(scene)
.then(function(data){

2
src/jlmap3d/edit/jlmap3dedit.js
View File

@ -95,7 +95,7 @@ export function JLmap3dEdit(dom, data, mapid) {
raillist:null,
path:[]
};
this.assetManager = null;
Jlmap3ddata(mapid,scope);
let scalControls = new THREE.ScalControls(scope.scene,scope.camera, scope.renderer.domElement );

4
src/utils/baseUrl.js
View File

@ -2,9 +2,9 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';

5
src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
View File

@ -47,10 +47,7 @@
</template>
<script>
//
// import { sendSimulationCommand,getSimulationTrainlist,getSimulationTrainlistNew,getSimulationMember, getSimulationMemberNew,bindSimulationTrain,trainSimulationEb,trainSimulationForce,trainSimulationGear} from '@/api/simulation.js';
// import { creatSubscribe, clearSubscribe, SocketStatusMap } from '@/utils/subscribe.js';
// import { hideLoading } from '@/utils/loading.js';
import CentercPane from '@/views/jlmap3d/drive/drivecontrol/centerpane';
import LeftPane from '@/views/jlmap3d/drive/drivecontrol/leftpane';
import RightPane from '@/views/jlmap3d/drive/drivecontrol/rightpane';

20
src/views/jlmap3d/edit/component/action.vue
View File

@ -227,8 +227,8 @@ export default {
driverAssetList:driverListConfig,
sceneAssetList:sceneListConfig,
deviceAssetList:deviceListConfig,
cctvAssetList:maintainerListConfig,
maintainerAssetList:cctvListConfig,
cctvAssetList:cctvListConfig,
maintainerAssetList:maintainerListConfig,
stationTextureList:stationTextureListConfig,
deviceTextureList:deviceTextureListConfig,
@ -241,7 +241,7 @@ export default {
},
mounted() {
window.updateSelectAsset = this.updateSelectAsset;
// assetListAll. = ;
},
methods: {
@ -287,7 +287,6 @@ export default {
//选中需要更新的资源
assetSelect(assetData,index){
this.isActive=index;
console.log(index);
this.nowSelect = index;
},
//切换资源库内容
@ -349,12 +348,23 @@ export default {
this.deviceTextureList[this.nowSelect].id = selectData.id;
this.deviceTextureList[this.nowSelect].packageName = selectData.packageName;
this.deviceTextureList[this.nowSelect].type = selectData.deviceType;
this.$emit('changeAsset',this.modelList[index]);
console.log(this.deviceTextureList);
}
}
}
this.assetListAll ={
driverAssetList:this.driverAssetList,
sceneAssetList:this.sceneAssetList,
deviceAssetList:this.deviceAssetList,
cctvAssetList:this.cctvAssetList,
maintainerAssetList:this.maintainerAssetList,
stationTextureList:this.stationTextureList,
deviceTextureList:this.deviceTextureList,
signalTextureAssetList:this.signalTextureAssetList
};
console.log(this.assetListAll);
},
actionevent(event){
console.log(event.currentTarget.id);