fix

src/pages/match/details/index.vue

@@ -1410,6 +1410,7 @@ export default {
     async enterSubmit () {
       if (this.fromOffical && !this.agreeCheck) return Util.errorMsg('请勾选同意，才可继续报名！')
       const form = this.enterForm
+      if (!form.realSchoolId) return Util.errorMsg('请选择来自学校')
       if (!form.teamId) return Util.errorMsg('请选择团队')
       if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
       if (this.form.completeCompetitionSetup.isNeedCode && !form.registrationInvitationCode) return Util.errorMsg('请输入大赛邀请码')
@@ -1425,11 +1426,11 @@ export default {
       if (!this.agreeCheck) return Util.errorMsg('请勾选同意，才可继续报名！')
       const form = this.enterForm
       const isTeam = this.form.completeCompetitionSetup.competitionType // 团队赛
+      if (!form.realSchoolId) return Util.errorMsg('请选择来自学校')
       if (isTeam) {
         if (!form.teamId) return Util.errorMsg('请选择团队')
         if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
       }
-      if (!form.realSchoolId) return Util.errorMsg('请选择来自学校')
       if (this.form.completeCompetitionSetup.isNeedCode && !form.registrationInvitationCode) return Util.errorMsg('请输入大赛邀请码')
       this.submiting = true
       await this.$post(this.api[isTeam ? 'joinCompetitionTeam' : 'addCompetitionRegistration'], form)
@@ -1720,10 +1721,10 @@ export default {
           if (competitionType || this.fromOffical) {
             this.enterVisible = true
             this.agreeCheck = false
-            this.enterForm.realSchoolId = this.curRealSchoolId
+            this.enterForm.realSchoolId = ''
           } else { // 个人赛报名
             this.peopleSignupForm = {
-              realSchoolId: this.curRealSchoolId,
+              realSchoolId: '',
               registrationInvitationCode: '',
             }
             this.peopleSignupVisible = true

src/pages/match/list/index.vue

@@ -422,6 +422,7 @@ export default {
       timerList: [],
 
 
+      choosing: false,
       enterVisible: false,
       enterForm: {
         realSchoolId: '',
@@ -606,7 +607,7 @@ export default {
               }
             }
           }
-          this.$set(item, 'curStage', curStage)
+          if (!this.choosing) this.$set(item, 'curStage', curStage)
         } else { // 仅发布信息
           this.$set(item, 'endText', '竞赛结束')
           total = playEndTime - now
@@ -722,6 +723,7 @@ export default {
     // 团队报名提交
     enterSubmit () {
       const form = this.enterForm
+      if (!form.realSchoolId) return Util.errorMsg('请选择来自学校')
       if (!form.teamId) return Util.errorMsg('请选择团队')
       if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
       if (this.curItem.isNeedCode && !form.registrationInvitationCode) return Util.errorMsg('请输入大赛邀请码')
@@ -737,11 +739,11 @@ export default {
       if (!this.agreeCheck) return Util.errorMsg('请勾选同意，才可继续报名！')
       const form = this.enterForm
       const isTeam = this.curItem.competitionType // 团队赛
+      if (!form.realSchoolId) return Util.errorMsg('请选择来自学校')
       if (isTeam) {
         if (!form.teamId) return Util.errorMsg('请选择团队')
         if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
       }
-      if (!form.realSchoolId) return Util.errorMsg('请选择来自学校')
       if (this.curItem.isNeedCode && !form.registrationInvitationCode) return Util.errorMsg('请输入大赛邀请码')
       this.submiting = true
       await this.$post(this.api[isTeam ? 'joinCompetitionTeam' : 'addCompetitionRegistration'], form)
@@ -934,6 +936,7 @@ export default {
     },
     // 阶段弹框关闭回调
     stageClose () {
+      this.choosing = false
       this.fileList = []
       this.getData()
     },
@@ -949,12 +952,14 @@ export default {
     stageClick (e) { },
     // 选择要进入的阶段
     chooseStage (e, item) {
+      this.choosing = true
       item.curStage = e
       this.signup(item)
     },
     // 判断是否能进赛事
-    getAllow (item) {
+    getAllow () {
       // 是否允许参加赛事（淘汰赛制）
+      const item = this.curItem
       if (item.rule === 1) {
         this.$post(this.api.allowedParticipateCompetition, {
           competitionId: item.id,
@@ -1018,10 +1023,10 @@ export default {
                 stageId: item.curStage.stageId,
                 teamId: item.teamId,
               }).then(res => {
-                this.getAllow(item)
+                this.getAllow()
               }).catch(res => { })
             } else {
-              this.getAllow(item)
+              this.getAllow()
             }
           }
         } else if (status == 2) { // 报名
@@ -1029,7 +1034,7 @@ export default {
           if (competitionType || this.fromOffical) {
             this.getTeam()
             this.enterForm = {
-              realSchoolId: this.curRealSchoolId,
+              realSchoolId: '',
               competitionId: id,
               teamId: '',
               invitationCode: '',
@@ -1040,7 +1045,7 @@ export default {
           } else { // 个人赛报名
             this.curRow = item
             this.peopleSignupForm = {
-              realSchoolId: this.curRealSchoolId,
+              realSchoolId: '',
               registrationInvitationCode: '',
             }
             this.peopleSignupVisible = true
@@ -1108,6 +1113,7 @@ export default {
       // 理论考试
       if (method === 1) {
         window.open(this.$router.resolve(`/match/theoryExam?id=${form.id}&stageId=${stageId}&teamId=${teamId}`).href)
+        this.choosing = false
       } else {
         let token = Util.local.get(Setting.tokenKey)
         if (systemId == 11) {

src/pages/match/theoryExam/index.vue

@@ -81,9 +81,9 @@
                   <span class="label">{{ item.questionTypeName }}</span>
                 </div>
                 <div class="stem html-parse" :id="'stem' + ques.id" v-html="ques.stem"></div>
-                <p>（{{ ques.score }}分）</p>
+                <p v-if="ques.score !== 0">（{{ ques.score }}分）</p>
                 <img class="tag" :src="require('@/assets/img/' + (ques.sign ? 'tag-active' : 'tag') + '.svg')" alt=""
-                  @click="ques.sign = ques.sign ? 0 : 1">
+                  @click="tagClick(ques)">
               </div>
 
               <!-- 单选、多选、判断的选项 -->
@@ -475,6 +475,11 @@ export default {
         return stem
       }
     },
+    // 标签点击回调
+    tagClick (ques) {
+      ques.sign = ques.sign ? 0 : 1
+      this.submit(0)
+    },
     preventAllKeyPress (event) {
       // 阻止所有键盘事件
       event.preventDefault();

src/pages/touristMatch/list/index.vue

@@ -336,6 +336,7 @@ export default {
       isFirst: true,
       timerList: [],
 
+      choosing: false,
       enterVisible: false,
       enterForm: {
         realSchoolId: '',
@@ -502,7 +503,7 @@ export default {
               }
             }
           }
-          this.$set(item, 'curStage', curStage)
+          if (!this.choosing) this.$set(item, 'curStage', curStage)
         } else { // 仅发布信息
           this.$set(item, 'endText', '竞赛结束')
           total = playEndTime - now
@@ -602,6 +603,7 @@ export default {
     // 团队报名提交
     async enterSubmit () {
       const form = this.enterForm
+      if (!form.realSchoolId) return Util.errorMsg('请选择来自学校')
       if (!form.teamId) return Util.errorMsg('请选择团队')
       if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
       if (this.curItem.isNeedCode && !form.registrationInvitationCode) return Util.errorMsg('请输入大赛邀请码')
@@ -616,11 +618,11 @@ export default {
       if (!this.agreeCheck) return Util.errorMsg('请勾选同意，才可继续报名！')
       const form = this.enterForm
       const isTeam = this.curItem.competitionType // 团队赛
+      if (!form.realSchoolId) return Util.errorMsg('请选择来自学校')
       if (isTeam) {
         if (!form.teamId) return Util.errorMsg('请选择团队')
         if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
       }
-      if (!form.realSchoolId) return Util.errorMsg('请选择来自学校')
       if (this.curItem.isNeedCode && !form.registrationInvitationCode) return Util.errorMsg('请输入大赛邀请码')
       this.submiting = true
       await this.$post(this.api[isTeam ? 'joinCompetitionTeam' : 'addCompetitionRegistration'], form)
@@ -705,6 +707,7 @@ export default {
 
     // 选择要进入的阶段
     chooseStage (e, item) {
+      this.choosing = true
       item.curStage = e
       this.signup(item)
     },
@@ -752,7 +755,7 @@ export default {
           if (competitionType || this.fromOffical) {
             this.getTeam()
             this.enterForm = {
-              realSchoolId: this.curRealSchoolId,
+              realSchoolId: '',
               competitionId: id,
               teamId: '',
               invitationCode: '',
@@ -763,7 +766,7 @@ export default {
           } else { // 个人赛报名
             this.curRow = item
             this.peopleSignupForm = {
-              realSchoolId: this.curRealSchoolId,
+              realSchoolId: '',
               registrationInvitationCode: '',
             }
             this.peopleSignupVisible = true
@@ -826,20 +829,29 @@ export default {
       const form = this.curItem
       let { systemId, systemName, projectId, cid, stageId, startTime, endTime, mallId, resultAnnouncementTime, method } = form.curStage
       const competitionId = form.id
-      const { teamId } = form
-      let token = Util.local.get(Setting.tokenKey);
-      if (systemId == 11) {
-        // 银行系统
-        location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true`
-      } else if (systemId == 12) {
-        // 众筹系统
-        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}`);
-      } else if (systemId == 19) {
-        // 沙盘
-        location.href = `${Setting.sandPath}/#/?curriculumName=${systemName}&token=${token}&cid=${cid}&mallId=${mallId}&systemId=${systemId}&projectId=${projectId}&assessmentId=&classId=&startTime=&stopTime=${endTime}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&resultAnnouncementTime=${isNaN(resultAnnouncementTime) ? '' : resultAnnouncementTime}&userId=${this.userId}&account=${this.account}&referrer=${encodeURIComponent(location.href)}`
+      const teamId = form.teamId || ''
+      cid = cid || ''
+      mallId = mallId || ''
+
+      // 理论考试
+      if (method === 1) {
+        window.open(this.$router.resolve(`/match/theoryExam?id=${form.id}&stageId=${stageId}&teamId=${teamId}`).href)
+        this.choosing = false
       } else {
-        // python系统
-        this.toPython(this.curProject)
+        let token = Util.local.get(Setting.tokenKey)
+        if (systemId == 11) {
+          // 银行系统
+          location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true`
+        } else if (systemId == 12) {
+          // 众筹系统
+          window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}`);
+        } else if (systemId == 19) {
+          // 沙盘
+          location.href = `${Setting.sandPath}/#/?curriculumName=${systemName}&token=${token}&cid=${cid}&mallId=${mallId}&systemId=${systemId}&projectId=${projectId}&assessmentId=&classId=&startTime=&stopTime=${endTime}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&resultAnnouncementTime=${isNaN(resultAnnouncementTime) ? '' : resultAnnouncementTime}&userId=${this.userId}&account=${this.account}&referrer=${encodeURIComponent(location.href)}`
+        } else {
+          // python系统
+          this.toPython(this.curProject)
+        }
       }
     }
   }

src/setting.js

@@ -30,7 +30,7 @@ if (isDev) {
   host = "http://121.37.12.51/"; // 测试服
   // host = 'https://www.occupationlab.com/' // 正式服
   const ip = localStorage.getItem('localIp')
-  const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'http://121.37.12.51/']
+  const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'https://izhixinyun.com/']
   host = ips[+ip]
   // host = 'http://192.168.31.51:9000/'
 } else if (isSq) {