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

问题调整

Browse Source
This commit is contained in:
fan 2020-11-13 17:07:26 +08:00
parent e971797748
commit 64fbcc1223
4 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i18n/langs/zh/login.js
View File

@ -9,7 +9,7 @@ export default {
mobilePhoneNumberOrEmail: '手机号/邮箱',
password: '密码',
autoLogin: '自动登录',
perfectInformation: '请在琏课堂小程序助手，完善个人信息，设置登录密码，手机号或邮箱。',
perfectInformation: '请在玖琏科技小程序，完善个人信息，设置登录密码，手机号或邮箱。',
unableToLogin: '无法登录?',
login: '登录',
enterTheCorrectUserName: '请输入正确的用户名',

1
src/scripts/plugin/OperateHandler.js
View File

@ -79,7 +79,6 @@ OperateHandler.prototype = {
const basicInfo = store.getters['training/basicInfo'];
if (basicInfo.id && valid) {
const group = router.currentRoute.query.group;
console.log('--------------------------');
sendTrainingNextStep({ trainingId: basicInfo.id, operate: operate }, group);
}

1
src/views/components/limits/index.vue
View File

@ -86,7 +86,6 @@ export default {
notAllow = notAllow + Number(item.remains);
}
});
sums[index] = this.$t('global.hasPermissionTip').replace('{0}', allow).replace('{1}', notAllow);
}
}

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

@ -158,7 +158,6 @@ import { loginInfo, ProjectIcon, ProjectLoginStyleList, VersionBaseNoShow, MainB
import { removeToken, getToken } from '@/utils/auth';
import LangStorage from '@/utils/lang';
import FloatPart from './floatPart';
import { getIsSignUp } from '@/api/competition';
import { getSimulationInfoNew } from '@/api/simulation';
import { getSessionStorage } from '@/utils/auth';
import { launchFullscreen } from '@/utils/screen';
@ -473,23 +472,7 @@ export default {
this.loading = this.project === 'drts' || false;
this.tipsMsg = '';
removeSessionStorage('againEnter');
if (this.$route.query.raceId) {
if (this.$route.path.includes('jsxt/login')) {
getIsSignUp(this.$route.query.raceId, { isLogin: true }).then(res => {
if (res.data) {
setSessionStorage('raceId', this.$route.query.raceId);
this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } });
} else {
this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
}
}).catch(() => {
this.$messageBox('登陆竞赛系统失败，请稍后重试');
});
} else {
setSessionStorage('raceId', this.$route.query.raceId);
this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } });
}
} else if (this.$route.query.projectDevice) {
if (this.$route.query.projectDevice) {
getLoginInfo(getToken()).then(res => {
getSimulationInfoNew(res.data.group).then(resp => {
const query = {
@ -571,20 +554,6 @@ export default {
launchFullscreen();
});
});
// } else if (this.project === 'bjd') {
// getLoginInfo(getToken()).then(res => {
// getSimulationInfoNew(res.data.group).then(resp => {
// this.$store.dispatch('app/transitionAnimations');
// this.$router.push({ path: `/jointTrainingNew`, query: {
// lineCode: resp.data.map.lineCode,
// group: res.data.group,
// mapId: resp.data.map.id,
// project:this.project
// }});
// this.loading = false;
// launchFullscreen();
// });
// });
} else if (!this.$route.path.includes('jsxt/login') && !this.$route.path.includes('refereeJsxt/login')) {
this.$router.push({ path: this.path });
} else {