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:
joylink_cuiweidong 2020-07-27 17:37:17 +08:00
commit e04214085e
12 changed files with 95 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/icon/favicon_crsc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 43 KiB

BIN
src/assets/icon/link_crsc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

6
src/jlmap3d/edit/neweditmodel/StationStandList.js
View File

@ -161,9 +161,9 @@ export function StationStandList() {
}
this.loadpromise = function(jlmap3ddata,standsdata,jlmapstanddata,scene,assetloader){
return new Promise(function(resolve, reject){
console.log(jlmap3ddata);
console.log(standsdata);
console.log(jlmapstanddata);
// console.log(jlmap3ddata);
// console.log(standsdata);
// console.log(jlmapstanddata);
let stations = jlmap3ddata.stationstandlist.list;
let num;
let num2;

1
src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
View File

@ -93,7 +93,6 @@ export function PassflowConnect(jl3dpass,deviceaction,toptrain,downtrain,routegr
for(let i=0,leni = data.body.length;i<leni;i++){
if(data.body[i].section == jl3dpass.nowstation.topsection){
console.log(data.body[i]);
if(toptrain.nowcode != data.body[i].code){
toptrain.nowcode = data.body[i].code;
}

46
src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
View File

@ -412,7 +412,6 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
let socktest = null;
getPublish3dMapDetail(skinCode).then(netdata3d => {
console.log(JSON.parse(netdata3d.data.assets).cctvAssetList);
this.modelmanager.loadpromise(JSON.parse(netdata3d.data.assets).cctvAssetList, scope.mixers).then(function (data) {
// console.log(scope.modelmanager);
initstationanimation(scope.modelmanager.station.mesh);
@ -652,33 +651,34 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
};
stationwebwork.onmessage = function (event) {
if(aiswitch == 0){
let direct = Math.floor(Math.random()*(3-1+1))+1;
//1--top
//2-- down
if(direct == 1){
newhumancreate(stationzon.getzoneposition("enter1"),0);
}else{
newhumancreate(stationzon.getzoneposition("enter2"),0);
}
if(toppasseron){
for(let i=0,leni=stationzon.list["standtop"].doorpoints.length;i<leni;i++ ){
setTimeout(function(){
newhumancreate(stationzon.list["standtop"].doorpoints[i],5,"top",i);
}, Math.random()*1000);
// console.log(humanlist.children.length);
if(humanlist.children.length < 80){
let direct = Math.floor(Math.random()*(3-1+1))+1;
//1--top
//2-- down
if(direct == 1){
newhumancreate(stationzon.getzoneposition("enter1"),0);
}else{
newhumancreate(stationzon.getzoneposition("enter2"),0);
}
}
if(downpasseron){
if(toppasseron){
for(let i=0,leni=stationzon.list["standtop"].doorpoints.length;i<leni;i++ ){
setTimeout(function(){
newhumancreate(stationzon.list["standtop"].doorpoints[i],5,"top",i);
}, Math.random()*1000);
for(let i=0,leni=stationzon.list["standdown"].doorpoints.length;i<leni;i++ ){
setTimeout(function(){
newhumancreate(stationzon.list["standdown"].doorpoints[i],5,"down",i);
}, Math.random()*1000);
}
}
if(downpasseron){
for(let i=0,leni=stationzon.list["standdown"].doorpoints.length;i<leni;i++ ){
setTimeout(function(){
newhumancreate(stationzon.list["standdown"].doorpoints[i],5,"down",i);
}, Math.random()*1000);
}
}
}
}
};
}

2
src/jlmap3d/jl3dpassflow/loader.js
View File

@ -68,7 +68,6 @@ export function ModelManager(){
this.loadpromise = function (data,mixers){
let initlist = [];
console.log(data);
for(let i=0,leni=data.length;i<leni;i++){
if(data[i].type == "man1" || data[i].type == "cctvMan1"){
@ -121,7 +120,6 @@ function fbxpromise(asset,mixers,model){
// child.receiveShadow = true;
// }
// } );
console.log(asset);
if(asset.type == "cctvTrain"){
// let mixer = new THREE.AnimationMixer( object );
let realtrain = new THREE.Group();

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

@ -47,6 +47,7 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
function initnew3d(data,netdata){
// console.log(JSON.parse(netdata.assets));
console.log(JSON.parse(netdata.assets));
Materialload(scope,JSON.parse(netdata.assets).stationTextureList[0]);
let mapdata = data;
//初始化轨道和道岔

2
src/layout/components/Title.vue
View File

@ -21,7 +21,7 @@ export default {
mounted() {
const project = getSessionStorage('project');
this.systemTitle = loginInfo[project].homeTitle || loginInfo[project].title;
this.logoImg = ProjectIcon[project];
this.logoImg = loginInfo[project].titleIcon || ProjectIcon[project];
this.navigationLogoWidth = loginInfo[project].navigationLogoWidth;
this.navigationMarginLeft = loginInfo[project].navigationMarginLeft;
},

54
src/scripts/ProjectConfig.js
View File

@ -9,7 +9,9 @@ import Bottom_Jyd from '@/assets/icon/bottom_jyd.png';
import Link_Jyd from '@/assets/icon/link_jyd.png';
import FaviconTky from '@/assets/icon/favicon_tky.png';
import FaviconBxkc from '@/assets/icon/favicon_bxkc.png';
import FaviconCrsc from '@/assets/icon/favicon_crsc.png';
import Link_Bxkc from '@/assets/icon/link_bxkc.png';
import Link_Crsc from '@/assets/icon/link_crsc.png';
// title:页面title; loginPath:退出登录跳转路径; loginParam:登录接口参数project;loginTitle:登录页左上角title；logoWidth：登录页左上角logo宽度；
// homeTitle:导航栏title(没有采用title); browserTitle:浏览器窗口title；bottomColumn：底部栏描述；bottomIcon：底部栏Icon;linkIcon:浏览器窗口icon(没有采用ProjectIcon)
@ -179,6 +181,32 @@ export const loginInfo = {
loginParam: 'DEFAULT',
navigationLogoWidth: '160px',
navigationMarginLeft: '175px'
},
crsc: {
title: '城市轨道交通实训平台',
loginPath: '/login?project=xagy',
loginTitle: '空串',
logoWidth: '400px',
bottomIcon: FaviconCrsc,
bottomColumn: '',
linkIcon: Link_Crsc,
titleIcon: Link_Crsc,
loginParam: 'DEFAULT',
navigationLogoWidth: '100px',
navigationMarginLeft: '125px'
},
designcrsc: {
title: '城市轨道交通设计平台',
loginPath: '/design/login?project=xagy',
loginTitle: '空串',
logoWidth: '400px',
bottomIcon: FaviconCrsc,
bottomColumn: '',
linkIcon: Link_Crsc,
titleIcon: Link_Crsc,
loginParam: 'DEFAULT',
navigationLogoWidth: '100px',
navigationMarginLeft: '125px'
}
};
@ -200,7 +228,9 @@ export const ProjectIcon = {
tky: FaviconTky,
designtky: FaviconTky,
bxkc: FaviconBxkc,
designbxkc: FaviconBxkc
designbxkc: FaviconBxkc,
crsc: FaviconCrsc,
designcrsc: FaviconCrsc
};
export const ProjectCode = {
@ -217,15 +247,17 @@ export const ProjectCode = {
tky: 'TKY',
designtky: 'TKY',
bxkc: 'BXKC',
designbxkc: 'BXKC'
designbxkc: 'BXKC',
crsc: 'CRSC',
designcrsc: 'CRSC'
};
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc']; // 底部栏仅展示公司信息不展示备案号
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc']; // 底部栏仅展示公司信息不展示备案号
export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['heb', 'designheb']; // 案例展示隐藏的项目
export const VersionBaseNoShow = ['heb', 'designheb']; // 登录页右下角版本开发基于不展示
export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc']; // 登录页右下角主体不展示
export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc']; // 登录页右下角主体不展示
export const GenerateRouteProjectList = ['jsxt', 'refereeJsxt'];// 需要在公共路由中生成登录页面的项目
export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc']; // 登录页样式
export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc']; // 登录页样式
export const NoQrcodeList = ['heb', 'designheb'];
export const goOtherPlatformMenu = { // 导航栏快速切换平台
login: '/design/login',
@ -243,7 +275,9 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台
tky: '/design/login?project=tky',
designtky: '/login?project=tky',
bxkc: '/design/login?project=bxkc',
designbxkc: '/login?project=bxkc'
designbxkc: '/login?project=bxkc',
crsc: '/design/login?project=crsc',
designcrsc: '/login?project=crsc'
};
export const PermissionParam = { // 路径权限处理所需参数配置（跳转白名单，路由处理类型）
heb: {
@ -286,6 +320,10 @@ export const PermissionParam = { // 路径权限处理所需参数配置（跳
whitePage: '/design/login?project=bxkc',
systemType: '011'
},
designcrsc: {
whitePage: '/design/login?project=crsc',
systemType: '011'
},
xty: {
whitePage: '/login?project=xty',
systemType: '013'
@ -310,6 +348,10 @@ export const PermissionParam = { // 路径权限处理所需参数配置（跳
whitePage: '/login?project=bxkc',
systemType: '011'
},
crsc: {
whitePage: '/login?project=crsc',
systemType: '011'
},
jsxt: {
whitePage: '/jsxt/login',
systemType: '015'

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';

1
src/views/lesson/trainingRule/list.vue
View File

@ -23,7 +23,6 @@ import TrainingEdit from './addEdit';
import AddBatch from './addBatch';
import SaveAs from './saveAs.vue';
import { UrlConfig, getTrainingOperateTypeMap } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import ConstConfig from '@/scripts/ConstConfig';
import Cookies from 'js-cookie';

34
src/views/newMap/displayNew/index.vue
View File

@ -161,10 +161,10 @@ export default {
computed:{
...mapGetters([
'canvasWidth'
]),
...mapGetters('map', [
'map',
'stationList'
]),
...mapGetters('map', [
'map',
'stationList'
]),
mode() {
return this.$route.params.mode;
@ -219,9 +219,9 @@ export default {
'$store.state.config.menuBarLoadedCount': function (val) {
this.setPosition();
},
'$store.state.training.prdType': function (val) { // 根据权限类型计算高度
this.setPosition();
this.setMode();
'$store.state.training.prdType': function (val) { // 根据权限类型计算高度
this.setPosition();
this.setMode();
},
'size.width': function(val) {
this.setWindowSize();
@ -250,7 +250,7 @@ export default {
},
'stationList': function () {
this.setStationList();
},
},
'$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
if (this.planRunning) {
this.$store.dispatch('training/simulationStart');
@ -261,8 +261,8 @@ export default {
async mounted() {
this.group = this.$route.query.group;
await this.setWindowSize();
await this.initLoadData();
this.setMode();
await this.initLoadData();
this.setMode();
},
beforeDestroy() {
this.quit(this.group);
@ -403,12 +403,12 @@ export default {
},
switchMode(prdType) {
this.$store.dispatch('training/setPrdType', prdType); // 改变prdType
},
setMode() {
if (this.map) {
this.showSelectStation = this.map.skinVO.code === '06' && this.$store.state.training.prdType === '01';
}
},
},
setMode() {
if (this.map) {
this.showSelectStation = this.map.skinVO.code === '06' && this.$store.state.training.prdType === '01';
}
},
// 选择脚本
selectQuest(row) {
this.scriptId = parseInt(row.id);
@ -534,7 +534,7 @@ export default {
});
},
setCenter(code) {
this.$jlmap.setCenter(code);
this.$jlmap.setCenter(code);
},
switchStationMode(val) {
if (this.stationListMode.length > 0) {