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-05-09 20:21:43 +08:00
commit 5b0d16c920
15 changed files with 72 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/theme/beijing_01/model.js
View File

@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType';
class Model {
constructor() {
this.screenLine = 3;
// 公共字段部分默认初始值
this['public'] = {};
this['public'][deviceType.Signal] = {

1
src/jmapNew/theme/chengdu_01/model.js
View File

@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType';
class Model {
constructor() {
this.screenLine = 3;
// 公共字段部分默认初始值
this['public'] = {};
this['public'][deviceType.Signal] = {

1
src/jmapNew/theme/chengdu_03/model.js
View File

@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType';
class Model {
constructor() {
this.screenLine = 3;
// 公共字段部分默认初始值
this['public'] = {};
this['public'][deviceType.Signal] = {

1
src/jmapNew/theme/foshan_01/model.js
View File

@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType';
class Model {
constructor() {
this.screenLine = 3;
// 公共字段部分默认初始值
this['public'] = {};
this['public'][deviceType.Signal] = {

1
src/jmapNew/theme/haerbin_01/model.js
View File

@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType';
class Model {
constructor() {
this.screenLine = 3;
// 公共字段部分默认初始值
this['public'] = {};
this['public'][deviceType.Signal] = {

1
src/jmapNew/theme/ningbo_01/model.js
View File

@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType';
class Model {
constructor() {
this.screenLine = 3;
// 公共字段部分默认初始值
this['public'] = {};
this['public'][deviceType.Signal] = {

1
src/jmapNew/theme/xian_01/model.js
View File

@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType';
class Model {
constructor() {
this.screenLine = 3;
// 公共字段部分默认初始值
this['public'] = {};
this['public'][deviceType.Signal] = {

1
src/jmapNew/theme/xian_02/model.js
View File

@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType';
class Model {
constructor() {
this.screenLine = 3;
// 公共字段部分默认初始值
this['public'] = {};
this['public'][deviceType.Signal] = {

7
src/router/index_Common.js
View File

@ -430,6 +430,13 @@ export const asyncRouter = [
}
]
},
{
path: '/displayBigScreen/:mapId',
component: BigScreen,
meta: {
},
hidden: true
},
{ // 综合演练室
path: '/trainroom',
component: TrainRoom,

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://192.168.3.41:9000'; // 张赛

5
src/views/demonstration/detail/index.vue
View File

@ -234,6 +234,9 @@ export default {
console.log(error);
}
},
async enterScreen() {
this.$router.push({ path: `/displayBigScreen/${this.courseModel.mapId}` });
},
async start() {
if (this.courseModel.prdType == '05') {
this.jumpScheduling();
@ -241,6 +244,8 @@ export default {
this.createRoom();
} else if (this.courseModel.prdType == '06') {
this.enterISCS();
} else if (this.courseModel.prdType == '07') {
this.enterScreen();
} else {
if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
this.jump();

35
src/views/designPlatform/bigScreen.vue
View File

@ -17,7 +17,7 @@ export default {
props: {
widthLeft: {
type: Number,
required: true
default: 0
}
},
data() {
@ -99,18 +99,33 @@ export default {
},
setWindowSize() {
this.$nextTick(() => {
const width = this.$store.state.app.width - (this.widthLeft || 450) - 2;
const height = this.height;
this.$store.dispatch('config/resize', { width, height });
if (this.widthLeft) {
const width = this.$store.state.app.width - (this.widthLeft || 450) - 2;
const height = this.height;
this.$store.dispatch('config/resize', { width, height });
} else {
const width = this.$store.state.app.width - 2;
const height = this.$store.state.app.height;
this.$store.dispatch('config/resize', { width, height });
}
});
},
handleUpdateScreen() {
const size = {
width: this.$store.state.app.width - (this.widthLeft || 450) - 2,
height: this.height,
num: 3
};
this.$jlmap.setUpdateScreen(size);
if (this.widthLeft) {
const size = {
width: this.$store.state.app.width - (this.widthLeft || 450) - 2,
height: this.height,
num: this.$theme.loadPropConvert(this.$store.state.map.map.skinVO.code).screenLine
};
this.$jlmap.setUpdateScreen(size);
} else {
const size = {
width: this.$store.state.app.width - 2,
height: this.$store.state.app.height,
num: this.$theme.loadPropConvert(this.$store.state.map.map.skinVO.code).screenLine
};
this.$jlmap.setUpdateScreen(size);
}
}
}
};

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

@ -156,7 +156,8 @@ export default {
'02': '02', // 行调 => 行调
'04': '02', // 司机 => 行调
'05': '' // 派班 => null
}
},
dataError: false
};
},
computed: {
@ -194,22 +195,22 @@ export default {
return this.$route.query.skinCode;
},
isLesson() {
return this.mode === 'teach' || this.mode === 'manage';
return (this.mode === 'teach' || this.mode === 'manage') && !this.dataError;
},
isShowLeftSlider() {
return (this.mode === 'teach' || this.mode === 'manage') && (this.$route.query.lessonId != '0');
},
isExam() {
return this.mode === 'exam';
return this.mode === 'exam' && !this.dataError;
},
isDemon() {
return this.mode === 'demon';
return this.mode === 'demon' && !this.dataError;
},
isScript() {
return this.mode === 'script';
return this.mode === 'script' && !this.dataError;
},
isScreen() {
return this.model === 'dp';
return this.model === 'dp' && !this.dataError;
},
isDrive() {
return this.prdType == '04';
@ -381,8 +382,9 @@ export default {
},
// 加载仿真信息
async loadSimulationInfo() {
this.dataError = false;
const resp = await getSimulationInfoNew(this.group);
if (resp && resp.code == 200) {
if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
this.questId = Number(resp.data.questId) || 0;
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`));
@ -396,6 +398,9 @@ export default {
} else if (this.isScript) {
this.$refs.menuScript.initPlannedDriving(resp.data.planRunning);
}
} else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
this.dataError = true;
this.$alert('此地图数据正在维护中！', {confirmButtonText: '确定', callback: action => { this.$router.go(-1); }});
}
},
// 加载地图数据

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

@ -298,7 +298,7 @@ export default {
},
async loadSimulationInfo() {
const resp = await getSimulationInfoNew(this.group);
if (resp && resp.code == 200) {
if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
this.questId = Number(resp.data.questId) || 0;
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`));
@ -312,6 +312,9 @@ export default {
} else if (this.isScript) {
this.$refs.menuScript.initPlannedDriving(resp.data.planRunning);
}
} else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
this.dataError = true;
this.$alert('此地图数据正在维护中！', {confirmButtonText: '确定', callback: action => { this.$router.go(-1); }});
}
},
async getUserRole() {

9
src/views/system/existingSimulation/index.vue
View File

@ -42,6 +42,7 @@ export default {
}
},
simulationTypeList: [{label: '仿真', value: 'SIMULATION'}, {label: '课程', value: 'LESSON'}, {label: '考试', value: 'EXAM'}, {label: '剧本编制', value: 'SCRIPT_MAKING'}],
queryList: {
query: getExistingSimulation,
selectCheckShow: false,
@ -95,6 +96,14 @@ export default {
}
}
},
{
title: '类型',
prop: 'type',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.type, this.simulationTypeList, ['value', 'label']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('system.prdType'),
prop: 'prodType',