From 30287441db558994d1e1530d39f73bd7116a112b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 13 May 2024 14:33:25 +0800
Subject: [PATCH] fix

---
 public/index.html                        |  2 +-
 src/api/index.js                         |  2 +-
 src/pages/match/manage/matchArchList.vue |  4 +-
 src/pages/match/manage/matchInfo.vue     | 66 ++++++++++++------------
 src/pages/match/manage/matchRank.vue     |  2 +-
 src/pages/match/manage/matchReport.vue   | 12 +++--
 src/pages/match/manage/matchSignup.vue   |  8 +--
 src/pages/project/add/index.vue          |  7 ++-
 src/pages/station/preview/index.vue      |  1 -
 src/plugins/requests/index.js            |  6 ++-
 src/setting.js                           |  2 +-
 11 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/public/index.html b/public/index.html
index 2a0608a..7b9845e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,7 +10,7 @@
             var _hmt = _hmt || [];
             (function() {
                 var hm = document.createElement('script');
-                hm.src = 'https://hm.baidu.com/hm.js?e4d7deeca2d6ea71d2bd5fa2365bc654';
+                hm.src = 'https://hm.baidu.com/hm.js?72fbad6ebf1d6c705117fe8fe0686a0e';
                 var s = document.getElementsByTagName('script')[0];
                 s.parentNode.insertBefore(hm, s);
             })();
diff --git a/src/api/index.js b/src/api/index.js
index a1b6657..5621867 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -14,7 +14,7 @@ export default {
     getCurrentTime : `competition/competition/management/getCurrentTime`,
 		heartbeatDetection : `nakadai/message/heartbeatDetection`,
 
-    getPlayAuth: `${uploadURL}oss/manage/getPlayAuth`, // 获取播放凭证
+    getPlayAuth: `oss/manage/getPlayAuth`, // 获取播放凭证
     
     platformLogList: `nakadai/nakadai/log/platformLogList`,
     logNotification: `nakadai/nakadai/log/logNotification`,
diff --git a/src/pages/match/manage/matchArchList.vue b/src/pages/match/manage/matchArchList.vue
index 9c1f201..cc8a6f5 100644
--- a/src/pages/match/manage/matchArchList.vue
+++ b/src/pages/match/manage/matchArchList.vue
@@ -91,7 +91,7 @@
                              min-width="100"
                              align="center"></el-table-column>
             <el-table-column prop="realSchool"
-                             label="学生所属院校"
+                             label="学生所在院校"
                              min-width="100"
                              align="center"></el-table-column>
             <el-table-column v-if="competitionType"
@@ -184,7 +184,7 @@
                              label="学生账号归属"
                              align="center"></el-table-column>
             <el-table-column prop="realSchool"
-                             label="学生所属院校"
+                             label="学生所在院校"
                              align="center"></el-table-column>
             <el-table-column v-if="competitionType"
                              prop="teamName"
diff --git a/src/pages/match/manage/matchInfo.vue b/src/pages/match/manage/matchInfo.vue
index eecf844..3e41105 100644
--- a/src/pages/match/manage/matchInfo.vue
+++ b/src/pages/match/manage/matchInfo.vue
@@ -146,7 +146,7 @@
                   <td>
                     <span v-if="item.score >= 0"
                           class="m-r-10">分数{{item.score}}</span>
-                    <el-button v-if="form.completeCompetitionSetup.competitionType || (!form.completeCompetitionSetup.competitionType && item.resultsDetails === 0 && item.reportId)"
+                    <el-button v-if="form.completeCompetitionSetup.competitionType || (!form.completeCompetitionSetup.competitionType && item.reportId)"
                                type="text"
                                @click="show(item)">查看成绩详情</el-button>
                   </td>
@@ -268,7 +268,7 @@
             <td>{{ item.timeSum }}min</td>
             <td>{{ item.score }}</td>
             <td>
-              <el-button v-if="curRow.resultsDetails === 0 && item.reportId"
+              <el-button :disabled="!item.reportId"
                          type="text"
                          @click="toReport(item)">查看</el-button>
             </td>
@@ -278,6 +278,16 @@
           <td colspan="6">暂无数据</td>
         </tr>
       </table>
+      <div class="pagination">
+        <el-pagination background
+                       layout="total, prev, pager, next"
+                       :total="total"
+                       @current-change="handleCurrentChange"
+                       :current-page="page"
+                       :page-size="pageSize">
+        </el-pagination>
+      </div>
+
       <span slot="footer"
             class="dialog-footer">
         <el-button size="small"
@@ -289,7 +299,6 @@
 </template>
 
 <script>
-import Setting from "@/setting";
 import Util from "@/libs/util";
 export default {
   data () {
@@ -316,6 +325,9 @@ export default {
       },
       memberVisible: false,
       members: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
       curRow: {},
       teamVisible: false,
       teams: [],
@@ -347,17 +359,12 @@ export default {
       checkedMember: '',
       checkedMembers: [],
       chooses: [],
-      timerList: [],
       timer: null
     };
   },
   mounted () {
     this.$once('hook:beforeDestroy', function () {
       clearInterval(this.timer)
-      this.timerList.forEach(n => {
-        clearTimeout(n)
-      })
-      this.timerList = []
     })
     this.getData()
   },
@@ -400,19 +407,6 @@ export default {
             e.participants = participants
           }
         })
-        // 设置定时器，阶段比赛结束后公布成绩，到时间后调本接口
-        const now = Date.now()
-        this.form.competitionStage.map(e => {
-          // 如果公布成绩详情勾选的是
-          if (!e.resultsDetails) {
-            const endTime = new Date(e.endTime).getTime() + e.resultAnnouncementTime * 3600000 // 阶段结束时间+成绩公布时间（成绩公布时间单位是小时，所以要转化为毫秒）
-            if (now > endTime) { // 如果到了公布时间
-              info.stages.find(n => n.stageId == e.stageId).showDetail = 1
-            } else if (endTime - now < 86400000) { // 没有到公布时间，则加定时器，到点后调用
-              this.timerList.push(setTimeout(this.getInfo, endTime - now))
-            }
-          }
-        })
         this.info = info
       }).catch(err => { });
     },
@@ -619,23 +613,27 @@ export default {
         this.chooseVisible = false
       }).catch(res => { })
     },
+    async getMembers () {
+      try {
+        const { page } = await this.$post(this.api.stageTeamScoreDetails, {
+          pageNum: this.page,
+          pageSize: this.pageSize,
+          competitionId: this.id,
+          stageId: this.curRow.stageId,
+          teamId: this.info.teamId
+        })
+        this.members = page.records
+        this.total = page.total
+      } catch (e) { }
+    },
     // 查看成绩详情
     show (row) {
       // 团队展示弹框，个人跳转实验报告
       if (this.form.completeCompetitionSetup.competitionType) { // 团队比赛并且是队长，则展示团队成员成绩详情
         this.curRow = row
         this.memberVisible = true
-        const teamId = this.info.teamId
-        if (teamId) {
-          this.$post(this.api.frontOfficeCompetitionRanking, {
-            pageNum: 1,
-            pageSize: 1000,
-            competitionId: this.id,
-            isOverallRanking: 0,
-            teamId
-          }).then(({ list }) => {
-            this.members = list
-          }).catch(res => { })
+        if (this.info.teamId) {
+          this.getMembers()
         } else {
           this.members = []
         }
@@ -643,6 +641,10 @@ export default {
         this.toReport(row)
       }
     },
+    handleCurrentChange (val) {
+      this.page = val;
+      this.getMembers()
+    },
     // 跳转实验报告
     toReport (row) {
       this.$router.push(`/match/report?reportId=${row.reportId}`)
diff --git a/src/pages/match/manage/matchRank.vue b/src/pages/match/manage/matchRank.vue
index addc292..ffbb52f 100644
--- a/src/pages/match/manage/matchRank.vue
+++ b/src/pages/match/manage/matchRank.vue
@@ -95,7 +95,7 @@
                          min-width="100"
                          align="center"></el-table-column>
         <el-table-column prop="realSchool"
-                         label="学生所属院校"
+                         label="学生所在院校"
                          min-width="100"
                          align="center"></el-table-column>
         <el-table-column prop="timeSum"
diff --git a/src/pages/match/manage/matchReport.vue b/src/pages/match/manage/matchReport.vue
index 3bafd97..b3354c9 100644
--- a/src/pages/match/manage/matchReport.vue
+++ b/src/pages/match/manage/matchReport.vue
@@ -6,7 +6,8 @@
                       content="查看报告"></el-page-header>
     </el-card>
 
-    <div class="content">
+    <div class="content"
+         v-loading="loading">
       <div class="text-right">
         <el-button type="primary"
                    @click="exportPage">导出报告</el-button>
@@ -232,6 +233,7 @@ export default {
   },
   methods: {
     getData () { // 查询详情
+      this.loading = true
       this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => {
         this.form = report
         this.expData = userScores
@@ -260,7 +262,9 @@ export default {
         } else {
           this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
         }
-      }).catch(res => { })
+      }).catch(res => {
+        this.loading = false
+      })
     },
     // 处理实验数据
     handleList (list) {
@@ -278,6 +282,7 @@ export default {
         })
       }
       this.expData = list
+      this.loading = false
     },
     exportPage () {
       const form = Object.assign(this.form, this.infoData)
@@ -335,9 +340,6 @@ samp {
 .content {
     padding: 16px 40px;
     background: #fff;
-    &.loading {
-        padding-top: 30px;
-    }
     .r-title {
         margin-bottom: 40px;
         font-size: 24px;
diff --git a/src/pages/match/manage/matchSignup.vue b/src/pages/match/manage/matchSignup.vue
index 523c985..9154b02 100644
--- a/src/pages/match/manage/matchSignup.vue
+++ b/src/pages/match/manage/matchSignup.vue
@@ -73,7 +73,7 @@
                        min-width="180"
                        align="center"></el-table-column>
       <el-table-column prop="realSchool"
-                       label="学生所属院校"
+                       label="学生所在院校"
                        min-width="180"
                        align="center"></el-table-column>
       <el-table-column v-if="info.completeCompetitionSetup.competitionType"
@@ -183,7 +183,7 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="studentAffiliatedInstitutionId"
-                      label="学生所属院校">
+                      label="学生所在院校">
           <el-select v-model="form.studentAffiliatedInstitutionId"
                      filterable
                      style="width: 100%">
@@ -192,7 +192,7 @@
                        :label="item.schoolName"
                        :value="item.schoolId"></el-option>
           </el-select>
-          <p style="margin-top: 10px;line-height: 1.4;font-size: 12px;">学生所属院校为学生实际院校</p>
+          <p style="margin-top: 10px;line-height: 1.4;font-size: 12px;">学生所在院校为学生实际院校</p>
         </el-form-item>
         <el-form-item prop="workNumber"
                       label="学生学号">
@@ -786,7 +786,7 @@ export default {
       }
       this.teamVisible = true
     },
-    // 学生所属院校固定查询所有学校
+    // 学生所在院校固定查询所有学校
     async getSchool () {
       const { list } = await this.$get(this.api.querySchoolData)
       this.schools = list
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index 183a215..4e4ddc3 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -696,7 +696,7 @@ export default {
       };
       if (systemId == 2 || systemId == 3) {
         console.log("系统id：", systemId);
-      } else if (systemId == 11 || systemId == 12) {
+      } else if (this.isLc) {
         // (流程)交易类
         this.rowKey = "lcId";
         this.getProcessClassData(params);
@@ -762,7 +762,6 @@ export default {
     toJudgePoint (type, row) { // 进入判分点系统
       this.handleCacheData();
       let jumpPath = Setting.jumpPath;
-      // let jumpPath = "http://192.168.31.154:8087/"; // 本地
       let { systemId } = this.projectManage;
       let href = "";
       if (type === "view") {
@@ -771,7 +770,7 @@ export default {
           console.log(systemId);
         } else if (systemId == 3) {
           console.log(systemId);
-        } else if (systemId == 11 || systemId == 12) {
+        } else if (this.isLc) {
           // 交易类判分点（银行综合系统）
           href = `${jumpPath}#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${window.btoa(location.href)}`;
         } else {
@@ -784,7 +783,7 @@ export default {
           console.log(systemId);
         } else if (systemId == 3) {
           console.log(systemId);
-        } else if (systemId == 11 || systemId == 12) {
+        } else if (this.isLc) {
           // 交易类判分点（银行综合系统）
           href = `${jumpPath}#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
         } else {
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index 88c7e00..b12dc58 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -600,7 +600,6 @@ export default {
     async getChapter () {
       let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`);
       this.chapterList = res.chapterList;
-      console.log(11, this.chapter)
       const chapter = this.chapter === undefined ? 0 : +this.chapter
       const section = this.section === undefined ? 0 : +this.section
       const clist = this.chapterList[chapter]
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index caac512..9218b40 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -26,6 +26,7 @@ service.interceptors.request.use(config => {
     return Promise.reject(err);
 });
 
+let logouted = 0;
 // 响应拦截器
 service.interceptors.response.use(
     response => {
@@ -48,13 +49,16 @@ service.interceptors.response.use(
                 // 未登录则跳转登录页面，并携带当前页面的路径
                 // 在登录成功后返回当前页面，这一步需要在登录页操作。
                 case 401:
+									if (!logouted) {
                     util.local.remove(Setting.storeKey);
                     util.local.remove(Setting.tokenKey);
                     util.errorMsg("登录过期，请重新登录");
                     setTimeout(() => {
                         store.dispatch('user/logout')
                     }, 1000);
-                    break;
+										logouted = 1
+									}
+                  break;
                 case 500:
                     util.errorMsg("网络错误");
                     break;
diff --git a/src/setting.js b/src/setting.js
index fade122..5183a1e 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -23,7 +23,7 @@ let title = '教师管理端'
 if (isPro) {
     // 职站生产
     uploadURL = `https://www.huorantech.cn/`
-    jumpPath = `https://www.huorantech.cn/judgmentPoint/`
+    jumpPath = `https://judgment.huorantech.cn/`
 } else if (isDev) {
     jumpPath = `http://${location.hostname}:8087/`
     bankPath = `http://${location.hostname}:8093`