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

【【哈尔滨一号线】这里原本的步骤是点击字母E，现在点了站台门也触发下一步了，会导致实训无法继续】需重新进路录制

Browse Source
This commit is contained in:
fan 2022-12-14 09:36:33 +08:00
parent 684199abd1
commit 0cf34a6aeb
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/scripts/cmdPlugin/newValidateHandler.js
View File

@ -37,6 +37,9 @@ class ValidateHandler {
if (operate.code || stepOperation.deviceCode) {
valid = (operate.code === stepOperation.deviceCode) && valid;
}
if (operate.subType || stepOperation.subType) {
valid = (operate.subType === stepOperation.subType) && valid;
}
if (operate.operation || stepOperation.domId) {
valid = (operate.operation === stepOperation.domId) && valid;
}

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

@ -1,5 +1,6 @@
import Handler from '@/scripts/cmdPlugin/newHandler';
import store from '@/store/index';
import { SimulationUserType, OperateMode } from '@/scripts/ConstDic';
const training = {
namespaced: true,
state: {
@ -140,16 +141,15 @@ const training = {
store.dispatch('training/setOperate', operate);
commit('setTrainingOperate', operate);
return new Promise((resolve, reject) => {
if (!store.state.training.roles) {
reject({message: '您目前无仿真成员角色！'});
} else {
if (store.state.training.roles || (store.state.training.simulationUserType === SimulationUserType.TEACHER && store.state.training.operatemode === OperateMode.FAULT)) {
Handler.handle(operate).then(rtn => {
resolve(rtn);
}).catch(e => {
reject(e);
});
} else {
reject({message: '您目前无仿真成员角色！'});
}
});
},
setOperateErrMsg: ({ commit }, msg) => {

4
src/utils/baseUrl.js
View File

@ -23,7 +23,7 @@ export function handlerUrl() {
let OSS_URL;
if (process.env.NODE_ENV === 'development') {
// 开发分支
BASE_API = 'http://192.168.3.233/rtss-server';
// BASE_API = 'http://192.168.3.233/rtss-server';
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://114.116.51.125/jlcloud';
@ -31,7 +31,7 @@ export function handlerUrl() {
// BASE_API = 'http://192.168.3.94:9000'; // 旭强
// BASE_API = 'http://192.168.3.15:9000'; // 张赛
// BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
// BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛

4
src/views/newMap/display/simulationMenu/simulationMenu.vue
View File

@ -99,10 +99,10 @@ export default {
}
},
mounted() {
window.addEventListener('click', this.close, false);
window.addEventListener('click', this.hideMenuList, false);
},
beforeDestroy() {
window.removeEventListener('click', this.close);
window.removeEventListener('click', this.hideMenuList);
},
methods: {
generateQrCode() {

1
src/views/newMap/display/trainingDesign/editOperate.vue
View File

@ -53,6 +53,7 @@ export default {
const data = {
id: Date.now(),
deviceCode: val.code || '',
subType: val.subType || '',
userOperationType: val.userOperationType || '',
domId: val.operation || '',
operationType: val.cmdType ? val.cmdType.value : '',

2
src/views/newMap/display/trainingList/trainingTip.vue
View File

@ -49,7 +49,7 @@ export default {
this.trainingTipMessage = '实训完成，请点击结束按钮。';
}
},
'$store.state.training.operateErrMsg': function (val) {
'$store.state.trainingNew.operateErrMsg': function (val) {
this.tipInfo({ color: val.color, message: val.errMsg });
}
},