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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
fan 2020-12-29 15:56:44 +08:00
commit 43429fb2cc
19 changed files with 123 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/api/iscs.js
View File

@ -15,3 +15,29 @@ export function getIscsData(params) {
params
});
}
// 分页获取ISCS数据
export function getIscsDataByPage(params) {
return request({
url: '/api/v1/iscs/pagedQuery',
method: 'get',
params
});
}
// 复制iscs数据
export function copyIscsData(data) {
return request({
url: '/api/v1/iscs/copy',
method: 'post',
data
});
}
// 删除iscs数据绘图数据(发布的)
export function deleteIscs(id) {
return request({
url: `/api/v1/iscs/${id}`,
method: 'delete'
});
}

34
src/api/jlmap3d/assets3d.js
View File

@ -1,37 +1,13 @@
import request from '@/utils/request';
import { getBaseUrl } from '@/utils/baseUrl';
// const baseconfig = require('../../../vue.config.js');
const publicPath = process.env.VUE_APP_PRO == 'local' ? '' : '/cbtc';
// console.log(publicPath);
const BASE_API = getBaseUrl();
export const JL3D_LOCAL_STATIC = publicPath+"/static";
console.log(JL3D_LOCAL_STATIC);
let uploadurl = null;
let asseturl = null;
if(BASE_API == "https://test.joylink.club/jlcloud"){
uploadurl = "https://joylink.club/jlfile";
asseturl = "https://joylink.club/oss/joylink";
// uploadurl = "https://test.joylink.club/jlfile";
// asseturl = "https://test.joylink.club/oss/joylink";
}else if(BASE_API == "https://joylink.club/jlcloud"){
uploadurl = "https://joylink.club/jlfile";
asseturl = "https://joylink.club/oss/joylink";
}else{
uploadurl = "https://joylink.club/jlfile";
asseturl = "https://joylink.club/oss/joylink";
// uploadurl = "";
// asseturl = "";
}
const BASE_UPLOAD_API = uploadurl;
export const BASE_ASSET_API = asseturl;
const BASE_UPLOAD_API = process.env.VUE_APP_UPLOAD_API;
export const BASE_ASSET_API = process.env.VUE_APP_VOICE_API;
// console.log(JL3D_LOCAL_STATIC);
// console.log(BASE_UPLOAD_API);
// console.log(BASE_ASSET_API);
export function getUploadModelUrl() {
return (BASE_UPLOAD_API+"/api/upload/MODEL?appId=00001&appSecret=joylink00001");

3
src/i18n/langs/en/router.js
View File

@ -88,5 +88,6 @@ export default {
questionsRuleManage: 'Question rule manage',
preTheoryData: 'Pre Theory Data',
boardManage: 'Message Board Manage',
publishIBPManage:'publish IBP Manage'
publishIBPManage:'publish IBP Manage',
publishISCSManage:'publish ISCS Manage'
};

3
src/i18n/langs/zh/router.js
View File

@ -93,5 +93,6 @@ export default {
questionsRuleManage: '出题规则管理',
preTheoryData: '理论导入预处理',
boardManage: '留言板管理',
publishIBPManage:'发布IBP盘管理'
publishIBPManage:'发布IBP盘管理',
publishISCSManage:'发布ISCS管理'
};

1
src/jlmap3d/jl3dsimulation/jlmap3d.js
View File

@ -390,6 +390,7 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
//相机轨迹动画
this.camerarailmove = function(){
console.log(scope.mixers);
camerarail.moveswitch = true;
camerarail.progress = 0;
let points = [];

43
src/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js
View File

@ -97,6 +97,9 @@ export function Jl3dTrafficPlan(dom,skinCode,routegroup,viewMap,initCode) {
//定义全局光
let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
scene.add(ambientLight);
var light = new THREE.HemisphereLight( 0xffffff, 0x444444 );
light.position.set( 0, 4000, 0 );
scene.add( light );
let controls = new THREE.OrbitControls(camerass, dom);
controls.maxPolarAngle = Math.PI / 2;
@ -345,26 +348,26 @@ export function Jl3dTrafficPlan(dom,skinCode,routegroup,viewMap,initCode) {
mixers[i].update( delta );
}
}
for(let i=topWaitPassers.children.length-1;i>=0;i--){
if(topWaitPassers.children[i].mixer._actions[0].isRunning()){
topWaitPassers.children[i].mixer.update( delta );
}
}
for(let i=downWaitPassers.children.length-1;i>=0;i--){
if(downWaitPassers.children[i].mixer._actions[0].isRunning()){
downWaitPassers.children[i].mixer.update( delta );
}
}
for(let i=outStationPassers.children.length-1;i>=0;i--){
if(outStationPassers.children[i].mixer._actions[0].isRunning()){
outStationPassers.children[i].mixer.update( delta );
}
}
for(let i=humanlist.children.length-1;i>=0;i--){
if(humanlist.children[i].mixer._actions[0].isRunning()){
humanlist.children[i].mixer.update( delta );
}
}
// for(let i=topWaitPassers.children.length-1;i>=0;i--){
// if(topWaitPassers.children[i].mixer._actions[0].isRunning()){
// topWaitPassers.children[i].mixer.update( delta );
// }
// }
// for(let i=downWaitPassers.children.length-1;i>=0;i--){
// if(downWaitPassers.children[i].mixer._actions[0].isRunning()){
// downWaitPassers.children[i].mixer.update( delta );
// }
// }
// for(let i=outStationPassers.children.length-1;i>=0;i--){
// if(outStationPassers.children[i].mixer._actions[0].isRunning()){
// outStationPassers.children[i].mixer.update( delta );
// }
// }
// for(let i=humanlist.children.length-1;i>=0;i--){
// if(humanlist.children[i].mixer._actions[0].isRunning()){
// humanlist.children[i].mixer.update( delta );
// }
// }
}
}
, 100);

4
src/jlmap3d/jl3dtrafficplan/loader/stationconfig.js
View File

@ -5,13 +5,13 @@ var Staticmodel = [
name: "人物1",
deviceType: "man1",
type: "man1",
url: BASE_ASSET_API + "/MODEL/2020-07-16/1-9933.FBX"
url: BASE_ASSET_API + "/MODEL/2020-12-28/165-74879.FBX"
},{
id: "2",
name: "人物2",
deviceType: "man2",
type: "man2",
url: BASE_ASSET_API + "/MODEL/2020-07-16/2-87850.FBX"
url: BASE_ASSET_API + "/MODEL/2020-12-28/165-74879.FBX"
},{
id: "3",
name: "车站",

24
src/jlmap3d/jl3dtrafficplan/model/passerhuman.js
View File

@ -48,12 +48,14 @@ export function PasserHuman() {
if(mantype == 1){
newhuman = THREE.SkeletonUtils.clone( originhuman1 );
newhuman = originhuman1.clone( );
newhuman.animations = [];
newhuman.animations.push(originanima1.clone());
// newhuman.animations.push(originanima1.clone());
}else{
newhuman = THREE.SkeletonUtils.clone( originhuman2 );
newhuman = originhuman2.clone( );
newhuman.animations = [];
newhuman.animations.push(originanima2.clone());
// newhuman.animations.push(originanima2.clone());
}
let mixer = new THREE.AnimationMixer( newhuman );
@ -84,11 +86,11 @@ export function PasserHuman() {
}else{
newhuman.door = null;
}
newhuman.action = mixer.clipAction( newhuman.animations[ 0 ] );
newhuman.mixer = mixer;
// newhuman.action = mixer.clipAction( newhuman.animations[ 0 ] );
// newhuman.mixer = mixer;
newhuman.runrail = null;
newhuman.speed = 0;
newhuman.mixer = mixer;
// newhuman.mixer = mixer;
humanlist.add(newhuman);
}
//定义新模型走路动画
@ -103,7 +105,7 @@ export function PasserHuman() {
// speed动画速度
// console.log(curve);
model.action.play();
// model.action.play();
model.progress = 0;
model.runrail = curve;
model.speed = 0.2/curve.getLength();
@ -114,7 +116,7 @@ export function PasserHuman() {
if(outStationPassers.children[i].status == 1){
if(outStationPassers.children[i].progress>=1){
outStationPassers.children[i].progress = 1;
outStationPassers.children[i].action.stop();
// outStationPassers.children[i].action.stop();
outStationPassers.children[i].status = 0;
if(outStationPassers.children[i].stage == 8){
@ -156,7 +158,7 @@ export function PasserHuman() {
if(topWaitPassers.children[i].status == 1){
if(topWaitPassers.children[i].progress>=1){
topWaitPassers.children[i].progress = 1;
topWaitPassers.children[i].action.stop();
// topWaitPassers.children[i].action.stop();
topWaitPassers.children[i].status = 0;
if(topWaitPassers.children[i].stage == 4){
@ -191,7 +193,7 @@ export function PasserHuman() {
if(downWaitPassers.children[i].status == 1){
if(downWaitPassers.children[i].progress>=1){
downWaitPassers.children[i].progress = 1;
downWaitPassers.children[i].action.stop();
// downWaitPassers.children[i].action.stop();
downWaitPassers.children[i].status = 0;
if(downWaitPassers.children[i].stage == 4){
passerHuman.uncache(downWaitPassers.children[i]);
@ -229,7 +231,7 @@ export function PasserHuman() {
humanlist.children[i].progress = 1;
humanlist.children[i].action.stop();
// humanlist.children[i].action.stop();
humanlist.children[i].status = 0;
if(humanlist.children[i].stage == 3){
@ -284,7 +286,7 @@ export function PasserHuman() {
//离开车站释放缓存
this.uncache = function(uncachemodel){
if(uncachemodel){
uncachemodel.mixer.uncacheAction();
// uncachemodel.mixer.uncacheAction();
uncachemodel.traverse( function ( child ) {
if ( child.isMesh ) {
child.geometry.dispose();

2
src/jlmap3d/main/loaders/SimulationLoadNew.js
View File

@ -66,7 +66,7 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
let signaldata = JSON.parse(netdata.signals);
let standsdata = JSON.parse(netdata.stands);
let psddata = mapdata.psdList;
console.log(mapdata);
if(standsdata[0].inside == undefined){
for(let i=0;i<standsdata.length;i++){
for(let j=0;j<mapdata.stationStandList.length;j++){

3
src/jlmap3d/main/newmodel/StationStandListN.js
View File

@ -221,6 +221,7 @@ export function StationStandListN() {
let newclip =null;
let nowModelType = "normal";
if(otherStation){
for(let o=0;o<otherStation.length;o++){
if(standsdata[i].code == otherStation[o].code){
@ -283,7 +284,9 @@ export function StationStandListN() {
let mixer = new THREE.AnimationMixer( newstationmesh.getObjectByName('door'+num) );
for(let n=0;n<psddata.length;n++){
if(psddata[n].standCode == standsdata[i].stands[j].code){
let key = psddata[n].code;
actionss[key] = {
status:"01",

8
src/router/index_Common.js
View File

@ -108,6 +108,7 @@ const RunplanView = () => import('@/views/publish/runPlanEveryDay/runPlanView');
const PublishExamRule = () => import('@/views/publish/examRule/index');
const PublishExamRuleDraft = () => import('@/views/publish/examRule/draft/index');
const PublishIBP = () => import('@/views/publish/publishIBP/index');
const PublishISCS = () => import('@/views/publish/publishISCS/index');
const TrainingPlatform = () => import('@/views/trainingPlatform/index');
@ -673,6 +674,13 @@ export const asyncRouter = [
meta: {
i18n: 'router.publishIBPManage'
}
},
{ // 发布ibp盘
path: 'iscs',
component: PublishISCS,
meta: {
i18n: 'router.publishISCSManage'
}
}
]
},

3
src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
View File

@ -80,7 +80,8 @@ export default {
methods: {
async getDetail(mode, system, part) {
const params = {
lineCode: this.$route.query.lineCode,
// lineCode: this.$route.query.lineCode,
mapId:this.$route.query.mapId,
totalSystem: mode,
system: system,
userInterface : part

3
src/views/iscs/iscsSystem/index.vue
View File

@ -8,7 +8,8 @@
<router-view />
</div>
</div>
<div v-if="lineCode=='02'" style="height:100%">
<!-- if="lineCode=='02'" -->
<div v-else style="height:100%">
<station-nav v-if="$route.query.group" />
<div class="content-box-station iscs_content_box" :class="{'displayStationIscs': $route.query.group}">
<router-view />

3
src/views/iscs/iscsSystem/stationConfig/environment/index.vue
View File

@ -144,7 +144,8 @@ export default {
},
getDetail() {
const params = {
lineCode: this.$route.query.lineCode,
// lineCode: this.$route.query.lineCode,
mapId: this.$route.query.mapId,
system: this.system,
totalSystem :'environment02',
userInterface : this.mode

3
src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue
View File

@ -51,7 +51,8 @@ export default {
methods:{
getInitData() {
const params = {
lineCode: this.$route.query.lineCode,
// lineCode: this.$route.query.lineCode,
mapId: this.$route.query.mapId,
system: 'powerMonitoring',
totalSystem :'powerMonitoring02'
};

3
src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue
View File

@ -37,7 +37,8 @@ export default {
},
mounted() {
const params = {
lineCode: this.$route.query.lineCode,
// lineCode: this.$route.query.lineCode,
mapId: this.$route.query.mapId,
totalSystem: 'psdSystem02',
system: 'psdSystem',
userInterface: 'psdOne'

16
src/views/iscs/iscsSystem/stationNav.vue
View File

@ -328,10 +328,18 @@ export default {
this.stationList = [];
res.data.forEach(station => {
if (!station.depot && station.visible) {
const param = {
name: station.runPlanName + '站',
id: station.code
};
let param = {};
if (station.runPlanName.includes('站')) {
param = {
name: station.runPlanName,
id: station.code
};
} else {
param = {
name: station.runPlanName + '站',
id: station.code
};
}
this.stationList.push(param);
}
});

3
src/views/iscsSystem/index.vue
View File

@ -115,7 +115,8 @@ export default {
});
Vue.prototype.$iscs = this.$iscs;
const params = {
lineCode: this.$route.query.lineCode,
// lineCode: this.$route.query.lineCode,
mapId: this.$route.query.mapId,
totalSystem: mode,
system: system,
userInterface: part

13
src/views/newMap/jointTrainingNew/index.vue
View File

@ -408,6 +408,19 @@ export default {
this.hideIbp();
}
},
async getTrainDetail() {
try {
// await loadNewMapDataByGroup(this.group);
await loadMapDataById(this.mapId, 'Group');
await this.$store.dispatch('training/setMapDefaultState');
// if (this.userRole == 'MAINTAINER') {
// this.jl3dmaintainershow = true;
// }
} catch (error) {
this.$messageBox(this.$t('error.getMapDataFailed'));
this.endViewLoading();
}
},
back() {
this.$refs.demonMenu.back();
},