- 您的报名信息如下:
姓名:{{ formModel.name }}
+ 您的赛事信息如下:
+
竞赛名称:{{ compition.name }}
+
竞赛时间:{{ compition.startDate }}
+
姓名:{{ formModel.name }}
公司:{{ formModel.organization }}
部门:{{ formModel.department }}
职位:{{ formModel.position }}
@@ -91,7 +97,7 @@ import md5 from 'js-md5';
import Cookies from 'js-cookie';
import QrcodeVue from 'qrcode.vue';
import { getUserinfoMobileCode } from '@/api/management/user';
-import { postSignUp, getRaceUserById } from '@/api/competition';
+import { postSignUp, getRaceUserById, getRaceById } from '@/api/competition';
import applyAlready from '@/assets/applyAlready.png';
import SAFS from '@/assets/SAFS.png';
@@ -148,6 +154,10 @@ export default {
department: '', // 部门
phone: '', // 电话
phoneCode: '' // 验证码
+ },
+ compition:{
+ name:'',
+ startDate:''
}
};
},
@@ -207,6 +217,9 @@ export default {
getRaceUserById(this.$route.query.raceId).then(res => {
if (res.data) {
// 已经报名过
+ getRaceById(this.$route.query.raceId).then(res=>{
+ this.compition = res.data;
+ });
this.formModel = res.data;
this.applyFlag = false;
this.flag = false;
@@ -351,6 +364,9 @@ export default {
if (this.$route.query.raceId) {
postSignUp(this.$route.query.raceId, param).then(res => {
// this.$messageBox('报名成功!');
+ getRaceById(this.$route.query.raceId).then(res=>{
+ this.compition = res.data;
+ });
this.applyFlag = false;
this.flag = true;
}).catch(error => {
diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue
index c147d8212..e4f4afd62 100644
--- a/src/views/jsxt/refereeList/index.vue
+++ b/src/views/jsxt/refereeList/index.vue
@@ -77,7 +77,7 @@ export default {
prop: 'practiceScore'
},
{
- title: '总数',
+ title: '总分',
prop: 'totalScore'
},
// {
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index fcbde11ff..2bca5bdc6 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -125,13 +125,14 @@ export default {
playEachAudio(index) {
this.$nextTick(function() {
document.querySelector('#audio' + index).play();
+ const that = this;
document.querySelector('#audio' + index).onended = function() {
- this.currentAudioList.shift();
- if (this.currentAudioList.length > 0) {
- this.currentAudioIndex++;
- this.playEachAudio(this.currentAudioList[this.currentAudioIndex]);
+ that.currentAudioList.shift();
+ if (that.currentAudioList.length > 0) {
+ that.currentAudioIndex++;
+ that.playEachAudio(that.currentAudioList[that.currentAudioIndex]);
} else {
- this.isPlay = false;
+ that.isPlay = false;
}
};
});