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:
zyy 2020-07-09 18:52:25 +08:00
commit ab2d2b004e
16 changed files with 65 additions and 55 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'

2
src/jlmap3d/config/SetScene.js
View File

@ -14,7 +14,7 @@ export function SetScene(project) {
// console.log(project);
if(project == "login" || project == undefined){
bgTexture = new THREE.TextureLoader().load("../../static/background/other.jpg");
}else if(project == "hyd"){
}else if(project == "heb"){
bgTexture = new THREE.TextureLoader().load("../../static/background/other.jpg");
}
scene.background = bgTexture;

2
src/jlmap3d/jl3ddrive/jl3ddrive.js
View File

@ -153,7 +153,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
getPublishMapDetail(mapId).then(data => {
let mapnetdata = data.data;
getPublish3dMapDetail(mapId).then(netdata => {
console.log(netdata);
// console.log(netdata);
let assetsdata = JSON.parse(netdata.data.sections);
if(assetsdata.link){
scope.datatype = "old";

4
src/layout/components/Entry.vue
View File

@ -61,7 +61,7 @@ export default {
handle: this.goEmpty,
isHelp:true,
style:'padding-right:0px;',
hidden:getSessionStorage('project').endsWith('hyd') || getSessionStorage('project').startsWith('refereeJsxt') || getSessionStorage('project').startsWith('jsxt')
hidden:getSessionStorage('project').endsWith('heb') || getSessionStorage('project').startsWith('refereeJsxt') || getSessionStorage('project').startsWith('jsxt')
},
{
name: 'global.scan', // 扫码
@ -82,7 +82,7 @@ export default {
{
name: 'global.help',
handle: this.goToHelp,
hidden: getSessionStorage('project').endsWith('hyd') || getSessionStorage('project').startsWith('refereeJsxt') || getSessionStorage('project').startsWith('jsxt')
hidden: getSessionStorage('project').endsWith('heb') || getSessionStorage('project').startsWith('refereeJsxt') || getSessionStorage('project').startsWith('jsxt')
}
],

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

@ -50,7 +50,7 @@ export default {
height: 40px;
top: 10px;
}
.logo_hyd {
.logo_heb {
position: absolute;
width: 120px;
height: 40px;

4
src/router/index_Common.js
View File

@ -178,7 +178,7 @@ export const projectGzzb = '014'; // 贵州装备
export const projectJsxt = '015'; // 竞赛系统
export const projectJyd = '017'; // 竞业达
export const projectTky = '018'; // 铁科院
export const projectHyd = '019'; // 哈盈达
export const projectHeb = '019'; // 哈盈达
export const userTrainingPlatform = '016'; // 实训系统
// export const refereePlatform = '017'; // 裁判系统
@ -1059,7 +1059,7 @@ export const projectRoute = {
]
}
],
designhyd: [
designheb: [
{ // 系统管理
path: '/system',
component: Layout,

2
src/router/index_HYD.js
View File

@ -146,7 +146,7 @@ export const projectGzzb = '014'; // 贵州装备
export const projectJsxt = '015'; // 竞赛系统
export const projectJyd = '017'; // 竞业达
export const projectTky = '018'; // 铁科院
export const projectHyd = '019'; // 哈盈达
export const projectHeb = '019'; // 哈盈达
export const userTrainingPlatform = '016'; // 实训系统
// export const refereePlatform = '017'; // 裁判系统

40
src/scripts/ProjectConfig.js
View File

@ -2,7 +2,7 @@ import LangStorage from '@/utils/lang';
import Favicon from '@/assets/icon/favicon.png';
import FaviconXty from '@/assets/icon/favicon_xty.png';
import FaviconGzb from '@/assets/icon/favicon_gzb.png';
import FaviconHyd from '@/assets/icon/favicon_hyd.png';
import FaviconHeb from '@/assets/icon/favicon_hyd.png';
import FaviconXadt from '@/assets/icon/favicon_xas.png';
import FaviconJyd from '@/assets/icon/favicon_jyd.png';
import Bottom_Jyd from '@/assets/icon/bottom_jyd.png';
@ -55,21 +55,21 @@ export const loginInfo = {
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
},
hyd: {
heb: {
title: '城市轨道交通综合行车模拟仿真系统V1.0',
loginTitle: '城市轨道交通综合行车模拟仿真系统V1.0',
logoWidth: '140px',
loginPath: '/login?project=hyd',
loginPath: '/login?project=heb',
bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273',
loginParam: 'HEB',
navigationLogoWidth: '120px',
navigationMarginLeft: '140px'
},
designhyd: {
designheb: {
title: '城市轨道交通设计平台V1.0',
loginTitle: '城市轨道交通设计平台V1.0',
logoWidth: '140px',
loginPath: '/design/login?project=hyd',
loginPath: '/design/login?project=heb',
bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273',
loginParam: 'HEB',
navigationLogoWidth: '120px',
@ -164,8 +164,8 @@ export const ProjectIcon = {
designxty: FaviconXty,
gzb: FaviconGzb,
designgzb:FaviconGzb,
hyd: FaviconHyd,
designhyd: FaviconHyd,
heb: FaviconHeb,
designheb: FaviconHeb,
xadt: FaviconXadt,
designxadt: FaviconXadt,
jsxt: Favicon,
@ -181,8 +181,8 @@ export const ProjectCode = {
designxty: 'XTY',
gzb: 'GZB',
designgzb: 'GZB',
hyd: 'HEB',
designhyd: 'HEB',
heb: 'HEB',
designheb: 'HEB',
xadt: 'XADT',
designxadt: 'XADT',
jyd: 'JYD',
@ -190,11 +190,11 @@ export const ProjectCode = {
tky: 'TKY',
designtky: 'TKY'
};
export const BottomColumnOnlyConInfo = ['hyd', 'designhyd', 'jyd', 'designjyd', 'tky', 'designtky']; // 底部栏仅展示公司信息不展示备案号
export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'hyd', 'designhyd']; // 实训设计平台通过项目code获取地图列表的项目
export const CaseHideProjectList = ['hyd', 'designhyd']; // 案例展示隐藏的项目
export const VersionBaseNoShow = ['hyd', 'designhyd']; // 登录页右下角版本开发基于不展示
export const MainBodyNoShow = ['hyd', 'designhyd', 'jyd', 'designjyd', 'tky', 'designtky']; // 登录页右下角主体不展示
export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky']; // 底部栏仅展示公司信息不展示备案号
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']; // 登录页右下角主体不展示
export const GenerateRouteProjectList = ['jsxt', 'refereeJsxt'];// 需要在公共路由中生成登录页面的项目
export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd']; // 登录页样式
export const goOtherPlatformMenu = { // 导航栏快速切换平台
@ -204,8 +204,8 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台
designxty: '/login?project=xty',
gzb: '/design/login?project=gzb',
designgzb: '/login?project=gzb',
hyd: '/design/login?project=hyd',
designhyd: '/login?project=hyd',
heb: '/design/login?project=heb',
designheb: '/login?project=heb',
xadt: '/design/login?project=xadt',
designxadt: '/login?project=xadt',
jyd: '/design/login?project=jyd',
@ -214,12 +214,12 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台
designtky: '/login?project=tky'
};
export const PermissionParam = { // 路径权限处理所需参数配置（跳转白名单&路径正则匹配&clientId）
hyd: {
whitePage: '/login?project=hyd',
heb: {
whitePage: '/login?project=heb',
systemType: '019'
},
designhyd: {
whitePage: '/design/login?project=hyd',
designheb: {
whitePage: '/design/login?project=heb',
systemType: '019'
},
login: {

3
src/store/modules/map.js
View File

@ -749,8 +749,9 @@ const map = {
state.activeTrainListUpdate++;
},
resetActiveTrainList:(state) => {
state.activeTrainListUpdate = 0;
state.activeTrainList = [];
state.activeTrainListUpdate = 0;
state.activeTrainListChange = 0;
},
setDeleteCount: (state) => {
state.deleteCount++;

8
src/store/modules/permission.js
View File

@ -1,4 +1,4 @@
import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, projectXian, projectXty, projectGzzb, projectJsxt, projectJyd, projectTky, projectHyd, superAdmin, admin, userTrainingPlatform, JSXT, projectRoute } from '@/router/index_APP_TARGET';
import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, projectXian, projectXty, projectGzzb, projectJsxt, projectJyd, projectTky, projectHeb, superAdmin, admin, userTrainingPlatform, JSXT, projectRoute } from '@/router/index_APP_TARGET';
import { PermissionParam } from '@/scripts/ProjectConfig';
import { getSessionStorage } from '@/utils/auth';
@ -61,9 +61,9 @@ function resetAsyncRouter({ systemType }) {
});
}
list = [...list, ...asyncRouter];
} else if (systemType == projectHyd) {
if (projectRoute && projectRoute.designhyd && projectRoute.designhyd.length) {
projectRoute.designhyd.forEach(item => {
} else if (systemType == projectHeb) {
if (projectRoute && projectRoute.designheb && projectRoute.designheb.length) {
projectRoute.designheb.forEach(item => {
if (item.merge) {
asyncRouter[item.mergeIndex].children = [...asyncRouter[item.mergeIndex].children, ...item.children];
} else { list.push(item); }

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

@ -2,7 +2,7 @@
<div class="drivepane">
<div style="position: absolute;right:50%;top:50%;z-index:10;background: #EBEBEB;" v-show="tuoguanbutton" @click="tuoguan">{{ tuoguanbuttonmsg }}</div>
<div style="position: absolute;right:50%;top:60%;z-index:10;background: #EBEBEB;">
<el-select v-model="value" placeholder="请选择列车" @change="currentsel" @visible-change="clickselect" >
<el-select v-model="value" :placeholder="initMsg" @change="currentsel" @visible-change="clickselect" >
<el-option
v-for="item in options"
:key="item.value"
@ -76,6 +76,7 @@ import axios from 'axios';
data() {
return {
options: [],
initMsg:"请选择列车",
value: '',
teststomp:null,
topid:null,
@ -172,7 +173,7 @@ import axios from 'axios';
getSimulationTrainlistNew(this.group).then(netdata => {
this.options = [];
this.trainlist = netdata.data;
console.log(netdata);
for(let i=0;i<netdata.data.length;i++){
let option= {
value: netdata.data[i].groupNumber,
@ -180,11 +181,15 @@ import axios from 'axios';
name:null,
}
option.disabled = false;
if(netdata.data[i].name){
option.label = netdata.data[i].name+"正在驾驶"+netdata.data[i].groupNumber;
this.initMsg = netdata.data[i].name+"正在驾驶"+netdata.data[i].groupNumber;
this.groupNumber = netdata.data[i].groupNumber;
option.disabled = true;
}
if(netdata.data[i].driverId){
if(netdata.data[i].driverId == this.userId){

28
src/views/login/index.vue
View File

@ -8,7 +8,7 @@
element-loading-background="rgba(0, 0, 0, 0)"
>
<el-button v-if="syncLogin && loadingCode" type="text" style="font-size: 24px;font-weight: bold;" @click="loginRefresh">关联设备未登录,点击重新检测</el-button>
<div v-if="loginTitle && !syncLogin" :class="$route.query.project=='hyd'?'text-box':'left-logo-box'">
<div v-if="loginTitle && !syncLogin" :class="project.endsWith('heb')?'text-box':'left-logo-box'">
<img class="logo" :src="logoImg" :style="{width: logoWidth}">
<span>{{ loginTitle==='空串'?'':loginTitle }}</span>
</div>
@ -21,8 +21,8 @@
<el-button class="language_btn" type="text" @click="handleLanguage">{{ language }}</el-button>
</el-tooltip>
</div>
<div v-if="!syncLogin" class="content-box" :style="$route.query.project=='hyd'?'width: 450px;':''">
<div v-if="$route.query.project!='hyd'" class="qrcode-main">
<div v-if="!syncLogin" class="content-box" :style="project.endsWith('heb')?'width: 450px;':''">
<div v-if="!project.endsWith('heb')" class="qrcode-main">
<div class="login-code-box" @click="loginRefresh">
<qrcode-vue
v-loading="loadingCode"
@ -49,7 +49,7 @@
</div>
</div>
<el-form ref="loginForm" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
<div v-if="!isProject&&$route.query.project!='hyd'" class="title_box">{{ $t('login.welcomeTo') + title }}</div>
<div v-if="!isProject&&!project.endsWith('heb')" class="title_box">{{ $t('login.welcomeTo') + title }}</div>
<el-form-item prop="username" class="item_form_box">
<span class="svg-container svg-container_login">
<svg-icon icon-class="user" />
@ -183,7 +183,11 @@ export default {
project() {
const project = this.$route.query.project;
const split = this.$route.path.split('/')[1];
if (split == 'design') {
if (process.env.VUE_APP_PRO === 'local' && split == 'design') {
return split + 'heb';
} else if (process.env.VUE_APP_PRO === 'local' && split == 'login') {
return 'heb';
} else if (split == 'design') {
return project ? split + project : split;
} else if (split == 'login') {
return project || 'login';
@ -210,7 +214,7 @@ export default {
return ProjectIcon[projectName];
},
bgImg() {
const bgImgAll = this.$route.query.project == 'hyd' ? '' : bgImg;
const bgImgAll = process.env.VUE_APP_PRO === 'local' || this.$route.query.project == 'heb' ? '' : bgImg;
const synchronousLogin = ['IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD'];
const imgMap = {
ISCS_LW: bgIscsImg,
@ -231,9 +235,9 @@ export default {
ISCS_LW: '检测现地工作站登录中',
ISCS_CW: '检测行调工作站登录中',
IBP: '检测现地工作站登陆中',
CCTV: '检测教研机登录中',
VR_PSD: '检测教研机登录中',
LSW: '检测教研机登录中'
CCTV: '检测教员机登录中',
VR_PSD: '检测教员机登录中',
LSW: '检测教员机登录中'
};
return this.$route.query.type ? textMap[this.$route.query.type] : '';
}
@ -252,7 +256,7 @@ export default {
if (error.code === '30001') {
this.tipsMsg = this.$t('login.accountOrPasswordIsIncorrect');
} else if (error.code == '10001') {
this.tipsMsg = '教研机尚未登录，请稍后重试！';
this.tipsMsg = '教员机尚未登录，请稍后重试！';
} else {
this.tipsMsg = error.message;
}
@ -263,7 +267,7 @@ export default {
},
mounted() {
document.title = loginInfo[this.project].browserTitle || loginInfo[this.project].title;
if (this.syncLogin || this.$route.query.project != 'hyd') {
if (this.syncLogin || !this.project.endsWith('heb')) {
this.loginRefresh();
}
},
@ -380,7 +384,7 @@ export default {
if (error.code === '30001') {
this.tipsMsg = this.$t('login.accountOrPasswordIsIncorrect');
} else if (error.code == '10001') {
this.tipsMsg = '教研机尚未登录，请稍后重试！';
this.tipsMsg = '教员机尚未登录，请稍后重试！';
} else {
this.tipsMsg = error.message;
}

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

@ -419,6 +419,7 @@ export default {
this.scriptId = Number(resp.data.scriptId) || 0;
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
this.planRunning = resp.data.planRunning;
this.$store.dispatch('map/setRunPlanStatus', this.planRunning);
if (!resp.data.planRunning) {
this.$store.dispatch('training/over');
}

2
src/views/newMap/displayNew/menuScript.vue
View File

@ -177,6 +177,7 @@ export default {
this.$store.dispatch('training/setMapDefaultState').then(() => {
this.$store.dispatch('map/setRunPlanStatus', false);
this.$store.dispatch('map/clearJlmapTrainView');
this.$store.dispatch('map/resetActiveTrainList');
this.$store.dispatch('map/setTrainWindowShow', false);
});
});
@ -193,6 +194,7 @@ export default {
back() {
this.$store.dispatch('training/over').then(() => {
EventBus.$emit('runPlanStop');
this.$store.dispatch('map/resetActiveTrainList');
EventBus.$emit('chatSubscribeStop');
history.go(-1);
Notification.closeAll();

3
src/views/scriptManage/display/tipScriptRecordNew.vue
View File

@ -102,6 +102,7 @@ export default {
},
beforeDestroy() {
// this.clearAutoSave();
this.$store.dispatch('map/resetActiveTrainList');
this.$store.dispatch('scriptRecord/updateBgSet', false);
this.$store.dispatch('scriptRecord/updateRole', null);
},
@ -111,7 +112,6 @@ export default {
this.backDisabled = response.data.bgSet;
this.mapLocation = response.data.mapLocation;
this.$store.dispatch('scriptRecord/updateBgSet', response.data.bgSet);
// if (response.data.bgSet) { this.$store.dispatch('map/setRunPlanStatus', true); }
});
},
methods:{
@ -301,6 +301,7 @@ export default {
this.memberId = '';
this.$store.dispatch('map/setRunPlanStatus', false);
this.$store.dispatch('training/setPrdType', '01');
this.$store.dispatch('map/resetActiveTrainList');
// this.initAutoSaveScript();
this.$store.state.scriptRecord.bgSet;
this.$store.dispatch('scriptRecord/updateBgSet', false);

8
src/views/system/deviceManage/index.vue
View File

@ -38,9 +38,8 @@ export default {
projectMap: {
designxty: 'XTY',
designgzb: 'GZB',
designhyd: 'HED'
designheb: 'HEB'
},
projectPathMap: { designxty: 'xty', designgzb: 'gzb', designhyd: 'hyd'},
queryForm: {
labelWidth: '120px',
reset: true,
@ -122,9 +121,6 @@ export default {
computed: {
projectCode() {
return this.projectMap[getSessionStorage('project')];
},
projectPath() {
return this.projectPathMap[getSessionStorage('project')];
}
},
created() {
@ -194,7 +190,7 @@ export default {
},
getPath(index, row) {
let url = '';
url = `${window.location.protocol}//${window.location.host}/login?project=${this.projectPath}&projectDevice=${row.code}&type=${row.type}`;
url = `${window.location.protocol}//${window.location.host}/login?project=${row.project.toLowerCase()}&projectDevice=${row.code}&type=${row.type}`;
this.url = url;
this.$messageBox();
this.$confirm(`登录路径：${url}`, '登录路径', {