From 44c21fa35ec8c3157eb171ccc460b9683ce26e79 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 18 Oct 2024 17:38:47 +0800
Subject: [PATCH] fix

---
 public/index.html                             |  8 +++----
 src/pages/account/login/accountApplyMatch.vue |  5 ++--
 src/pages/match/list/index.vue                | 14 +++++++++--
 src/pages/match/theoryExam/index.vue          |  9 ++++----
 src/pages/touristMatch/list/index.vue         | 23 +++++++++++++------
 5 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/public/index.html b/public/index.html
index 486c93a..0ba61e4 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,21 +3,21 @@
     <head>
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="keywords" content="职站,教学,教育,在线编程" />
+        <meta name="keywords" content="智信云,教学,教育,在线编程" />
         <meta
             name="description"
-            content="职站是一款辅助院校教师开展虚拟仿真实验教学的智能云实践平台。平台采用了大数据，云计算等技术，为学校搭建信息化平台提供了基础，可助力院校实现教学智能化升级。职站平台设计遵循着极简、高效的理念，可帮助老师轻松开展实验教学，并支持自定义发布考核和练习，智能统计和检验学生的日常实训练习效果；老师还可以通过可视化图表报告直观查看学生实训成绩，评估教学成果。"
+            content="智信云是一家为高等院校提供实验课程数字化服务的国家级高新技术企业。以区块链、大数据、人工智能等前沿技术在行业领域的运用为支撑，将新技术与经济与管理人才培养深度融合，面向全国高等院校的经济、金融、大数据应用等相关专业提供科研创新、金课建设、实验实训教学软件、实践教学以及学生就业培训为一体的专业建设咨询与技术支持服务。"
         />
         <meta name="baidu-site-verification" content="code-TRfXe8xIkJ" />
         <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
         <!-- <meta name="viewport" content="width=device-width, user-scalable=yes, shrink-to-fit=no" /> -->
         <link rel="stylesheet" href="//at.alicdn.com/t/font_830376_qzecyukz0s.css" />
-        <title>职站——为院校打造一站式虚拟仿真实训教学数智云平台</title>
+        <title>智信云</title>
         <script>
             var _hmt = _hmt || [];
             (function () {
                 var hm = document.createElement('script');
-                hm.src = 'https://hm.baidu.com/hm.js?72fbad6ebf1d6c705117fe8fe0686a0e';
+                hm.src = 'https://hm.baidu.com/hm.js?e4d7deeca2d6ea71d2bd5fa2365bc654';
                 var s = document.getElementsByTagName('script')[0];
                 s.parentNode.insertBefore(hm, s);
             })();
diff --git a/src/pages/account/login/accountApplyMatch.vue b/src/pages/account/login/accountApplyMatch.vue
index 4425368..a38758d 100644
--- a/src/pages/account/login/accountApplyMatch.vue
+++ b/src/pages/account/login/accountApplyMatch.vue
@@ -62,6 +62,7 @@ export default {
       }
     }
     return {
+      fixedSchoolId: 2965,
       accountVisible: false,
       exist: true,
       phoneMsg: '',
@@ -113,7 +114,7 @@ export default {
         // const { message } = await this.$get(`${this.api.forgotPreVerification}?phoneOrEmail=${val}&platform=${Setting.platformId}`)
         try {
           await this.$post(this.api.registrationJudgment, {
-            schoolId: 2886,
+            schoolId: this.fixedSchoolId,
             phone: val,
           })
           this.exist = false
@@ -159,7 +160,7 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           const form = this.form
-          form.schoolId = 2886
+          form.schoolId = this.fixedSchoolId
           if (form.password !== form.rePassword) return Util.errorMsg('两次输入的密码不一致，请重新输入！')
           // 平台id-端id-schoolId-workNumber组成账号
           form.account = `${Setting.platformId}-1-${form.schoolId}-${form.workNumber}`
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 5c4fa79..20736a9 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -518,8 +518,18 @@ export default {
       if (eventType === 2 && !competitionScope) form.competitionScope = 3 // 赛事广场下如果competitionScope=0，则传3，赛事广场没有本校内
       if (eventType !== 1) data.competitionScope = form.competitionScope // 本校赛事不传范围
       this.$post(this.api.competitionAfterLogin, data).then(async ({ data }) => {
-        this.listData = data.records
-        this.totals = data.total
+        const list = data.records
+        let result = []
+        // 如果是安财赛事，只展示4条固定的赛事
+        if (this.fromOffical) {
+          list.forEach(e => {
+            (+e.id > 457 && +e.id < 462) && result.push(e)
+          })
+        } else {
+          result = list
+        }
+        this.listData = result
+        this.totals = this.fromOffical ? result.length : data.total
 
         this.now = await Util.getNow()
         this.statusInterval()
diff --git a/src/pages/match/theoryExam/index.vue b/src/pages/match/theoryExam/index.vue
index 5253c50..fefecf2 100644
--- a/src/pages/match/theoryExam/index.vue
+++ b/src/pages/match/theoryExam/index.vue
@@ -110,16 +110,16 @@
                 <UeditorPlus v-if="ques.richTextStatus" :ref="'essayAnswer' + ques.id" v-model="ques.answer"
                   @ready="editor => essayAnswerReady(editor, ques)" />
                 <div v-if="ques.allowAttachment" class="m-t-20">
-                  <div v-if="ques.uploadInstructions" class="flex m-b-10 fs-12">
-                    <span>上传要求说明：</span>
-                    <div class="html-parse" v-html="ques.uploadInstructions"></div>
-                  </div>
                   <el-upload style="max-width: 700px;" accept=".csv,.xlsx,.xls,.docx,.doc,.pdf,.jpg,.png,.zip,.rar,.7z"
                     :before-upload="beforeUpload" :on-remove="e => handleRemove(ques)" :on-error="uploadError"
                     :before-remove="beforeRemove" :on-preview="handlePreview" :limit="1" action="#"
                     :on-exceed="handleExceed" :file-list="ques.fileList" :http-request="e => handleRequest(e, ques)">
                     <el-button type="primary" plain>上传文件</el-button>
                   </el-upload>
+                  <div v-if="ques.uploadInstructions" class="flex m-t-10 fs-12">
+                    <span>上传要求说明：</span>
+                    <div class="html-parse" v-html="ques.uploadInstructions"></div>
+                  </div>
                 </div>
               </template>
             </div>
@@ -970,7 +970,6 @@ export default {
         display: inline-block;
         width: 3em;
       }
-
     }
 
     .opt {
diff --git a/src/pages/touristMatch/list/index.vue b/src/pages/touristMatch/list/index.vue
index 008793b..b58af9b 100644
--- a/src/pages/touristMatch/list/index.vue
+++ b/src/pages/touristMatch/list/index.vue
@@ -413,10 +413,9 @@ export default {
         let result = []
         // 如果是安财赛事，只展示4条固定的赛事
         if (this.fromOffical) {
-          result = list
-          // list.forEach(e => {
-          //   (+e.id > 457 && +e.id < 462) && result.push(e)
-          // })
+          list.forEach(e => {
+            (+e.id > 457 && +e.id < 462) && result.push(e)
+          })
         } else {
           result = list
         }
@@ -801,13 +800,20 @@ export default {
       Util.cookies.set('projectId', form.projectId)
       Util.cookies.set('token', token)
       Util.cookies.set('courseId', form.cid)
-      Util.cookies.set('curriculumName', escape(form.systemName))
+      Util.cookies.set('curriculumName', encodeURIComponent(form.systemName))
       Util.cookies.set('systemId', form.systemId)
       Util.cookies.set('competitionId', this.curItem.id)
       Util.cookies.set('stageId', form.stageId)
       Util.cookies.set('teamId', this.curItem.teamId)
       Util.cookies.set('stopTime', form.endTime)
+      Util.cookies.set('resultsDetails', form.resultsDetails)
+      Util.cookies.set('resultAnnouncementTime', isNaN(form.resultAnnouncementTime) ? '' : form.resultAnnouncementTime)
+      Util.cookies.set('mallId', form.mallId)
       Util.cookies.set('fromManager', '', -1)
+      Util.cookies.set('isSubmit', '', -1)
+      Util.cookies.set('language', '', -1)
+      Util.cookies.set('className', '', -1)
+
       // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
       location.href = process.env.NODE_ENV === 'development' ?
         `http://${location.hostname}:8085/#/` :
@@ -818,9 +824,9 @@ export default {
     // 进入子系统
     toSub () {
       const form = this.curItem
-      const { systemId, projectId, cid, stageId } = form.curStage
+      let { systemId, systemName, projectId, cid, stageId, startTime, endTime, mallId, resultAnnouncementTime, method } = form.curStage
       const competitionId = form.id
-      const teamId = form.teamId
+      const { teamId } = form
       let token = Util.local.get(Setting.tokenKey);
       if (systemId == 11) {
         // 银行系统
@@ -828,6 +834,9 @@ export default {
       } 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)
