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-06-24 09:24:36 +08:00
commit 45a0f35901
12 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/shape/Train/TrainHead.js
View File

@ -63,6 +63,8 @@ export default class TrainHead extends Group {
}
}
setArrowShow(isShow) {
isShow ? this.arrow.show() : this.arrow.hide();
if (this.arrow) {
isShow ? this.arrow.show() : this.arrow.hide();
}
}
}

12
src/jmapNew/theme/ningbo_01/menus/menuStation.vue
View File

@ -85,12 +85,12 @@ export default {
menuForce: [
{
label: '设置ZC故障',
handler: this.setStoppage,
handler: this.undeveloped,
cmdType: CMD.Station.CMD_STATION_ADD_FAULT
},
{
label: '取消ZC故障',
handler: this.cancelStoppage,
handler: this.undeveloped,
cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
}
]
@ -225,6 +225,14 @@ export default {
this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
}
});
},
undeveloped() {
this.doClose();
this.$alert('实现中......', '提示', {
confirmButtonText: '确定',
callback: action => {
}
});
}
}
};

8
src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
View File

@ -198,12 +198,12 @@ export default {
},
menuForce: [
{
label: '设置通信故障',
handler: this.setStoppage
label: '设置故障',
handler: this.undeveloped
},
{
label: '取消通信故障',
handler: this.cancelStoppage
label: '取消故障',
handler: this.undeveloped
}
],
menuSpeed: [

1
src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue
View File

@ -281,7 +281,6 @@ export default {
});
},
doClose() {
debugger;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
mouseCancelState(this.selected);

1
src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
View File

@ -423,7 +423,6 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};

16
src/jmapNew/theme/xian_01/menus/menuStation.vue
View File

@ -95,13 +95,13 @@ export default {
},
menuForce: [
{
label: '设置ZC故障',
handler: this.setStoppage,
label: '设置故障',
handler: this.undeveloped,
cmdType: CMD.Station.CMD_STATION_ADD_FAULT
},
{
label: '取消ZC故障',
handler: this.cancelStoppage,
label: '取消故障',
handler: this.undeveloped,
cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
}
]
@ -238,6 +238,14 @@ export default {
this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
}
});
},
undeveloped() {
this.doClose();
this.$alert('实现中......', '提示', {
confirmButtonText: '确定',
callback: action => {
}
});
}
}
};

8
src/jmapNew/theme/xian_01/menus/menuTrain.vue
View File

@ -101,13 +101,13 @@ export default {
},
menuForce: [
{
label: this.$t('menu.menuTrain.setCommunicationFault'),
handler: this.setStoppage,
label: '设置故障',
handler: this.undeveloped,
cmdType:CMD.Train.CMD_TRAIN_ADD_FAULT
},
{
label: this.$t('menu.menuTrain.cancelCommunicationFault'),
handler: this.cancelStoppage,
label: '取消故障',
handler: this.undeveloped,
cmdType:CMD.Train.CMD_TRAIN_REMOVE_FAULT
}
],

8
src/jmapNew/theme/xian_02/menus/menuStation.vue
View File

@ -148,12 +148,12 @@ export default {
},
menuForce: [
{
label: '设置ZC故障',
handler: this.setStoppage
label: '设置故障',
handler: this.undeveloped
},
{
label: '取消ZC故障',
handler: this.cancelStoppage
label: '取消故障',
handler: this.undeveloped
}
]
};

8
src/jmapNew/theme/xian_02/menus/menuTrain.vue
View File

@ -212,12 +212,12 @@ export default {
},
menuForce: [
{
label: '设置通信故障',
handler: this.setStoppage
label: '设置故障',
handler: this.undeveloped
},
{
label: '取消通信故障',
handler: this.cancelStoppage
label: '取消故障',
handler: this.undeveloped
}
],
menuSpeed: [

4
src/utils/baseUrl.js
View File

@ -2,11 +2,11 @@ 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.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛

2
src/views/lesson/lessoncategory/edit/chapter/list.vue
View File

@ -180,7 +180,6 @@ export default {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data;
});
if (this.$route.query.drawWay + '' === 'true') {
this.trainingOperateTypeMap = {
Switch: [],
@ -247,6 +246,7 @@ export default {
this.queryForm.queryObject.type.config.data = trainingOperateConfigList;
this.trainingTypeList = trainingOperateConfigList;
this.trainingOperateTypeMap = operateTypeMap;
// console.log(this.$route.query.drawWay, trainingOperateConfigList);
} else {
this.$message.error(this.$t('error.failedToObtainTrainingType'));
}

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

@ -271,11 +271,6 @@ export default {
this.sessionId = response.data.sessionId;
this.loginUrl = response.data.url;
this.loadingCode = false;
// this.clearTimer(this.checkTimeout);
// this.checkTimeout = setTimeout(() => {
// this.loadingCode = true;
// this.loginUrl = '';
// }, 3 * 60 * 1000);
this.checkLoginStatus();
}).catch(() => {
this.loadingCode = false;
@ -446,7 +441,6 @@ export default {
}
.el-loading-spinner .el-loading-text {
font-size: 24px;
color: #FFF;
}
.login-code-box {
.el-loading-spinner i {
@ -454,7 +448,6 @@ export default {
}
.el-loading-spinner .el-loading-text {
font-size: 14px;
color: #409EFF;
}
}
}