From d0c11c180ce066a19a6f9294c8e1b7cb556d4a61 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 16 Feb 2023 16:01:09 +0800
Subject: [PATCH] fix

---
 src/api/index.js                         |  24 ++--
 src/pages/achievement/list/index.vue     |   2 +-
 src/pages/match/add/index.vue            |  23 ++--
 src/pages/match/add/set.vue              |  36 +++--
 src/pages/match/add/step1.vue            |  13 +-
 src/pages/match/add/step2.vue            | 123 ++++++++++-------
 src/pages/match/add/step3.vue            |  30 +++-
 src/pages/match/list/index.vue           |  11 +-
 src/pages/match/manage/matchInfo.vue     |  11 +-
 src/pages/match/manage/matchProgress.vue |   4 +-
 src/pages/match/manage/matchRank.vue     | 168 +++++++++++++++--------
 src/pages/match/manage/matchSignup.vue   |  51 ++++---
 src/pages/match/manage/notice.vue        |   8 +-
 src/pages/match/manage/noticeDetail.vue  |   4 +-
 src/pages/project/add/index.vue          |   2 +-
 src/pages/screen/index.vue               |   8 +-
 src/setting.js                           |   2 +-
 src/store/modules/match.js               |   8 +-
 18 files changed, 331 insertions(+), 197 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 14420d8..fd139ab 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,7 +1,6 @@
 import Setting from "@/setting";
 const host = Setting.apiBaseURL
 const uploadURL = Setting.upload.apiURL;
-const host1 = "https://www.occupationlab.com:8080/"
 const host2 = 'http://192.168.31.51:9000/'
 
 export default {
@@ -76,7 +75,7 @@ export default {
     // 成绩管理
     deleteExperimentalReport: `occupationlab/occupationlab/achievement/deleteExperimentalReport`, // 单个、批量删除实验报告
     exportAssessmentInfo: `${host}occupationlab/occupationlab/achievement/exportAssessmentInfo`, // 批量导出考核成绩
-    exportPracticeInfo: `${host2}occupationlab/occupationlab/achievement/exportPracticeInfo`, // 批量导出练习成绩
+    exportPracticeInfo: `occupationlab/occupationlab/achievement/exportPracticeInfo`, // 批量导出练习成绩
     getAchievementInfo: `occupationlab/occupationlab/achievement/getAchievementInfo`, // 管理端成绩管理
     getAssessmentDetail: `occupationlab/occupationlab/achievement/getAssessmentDetail`, // 管理端考核成绩详情
     getPracticeDetail: `occupationlab/occupationlab/achievement/getPracticeDetail`, // 管理端练习成绩详情
@@ -127,6 +126,7 @@ export default {
     getCustomerOrder: `nakadai/nakadai/valueModuleManagement/getCustomerOrder`,
     curriculumList: `nakadai/nakadai/curriculum/schoolCourse`,
     queryCustomer: `nakadai/nakadai/customer/queryCustomer`,
+    getSchoolsByProvince: `nakadai/nakadai/school/getSchoolsByProvince`,
     
     // 赛事内容
     addCompetitionContent: `competition/competition/content/addCompetitionContent`,
@@ -156,8 +156,8 @@ export default {
     cancelRegistration: `competition/competition/registration/cancelRegistration`,
     disableContests: `competition/competition/registration/disableContests`,
     disableRegistration: `competition/competition/registration/disableRegistration`,
-    excelExport: `competition/competition/registration/excelExport`,
-    exportDataInBatches: `competition/competition/registration/exportDataInBatches`,
+    excelExport: `${host}competition/competition/registration/excelExport`,
+    exportDataInBatches: `${host}competition/competition/registration/exportDataInBatches`,
     queryRegistrationByCondition: `competition/competition/registration/queryRegistrationByCondition`,
     searchTeam: `competition/competition/team/searchTeam`,
     joinCompetitionTeam: `competition/competition/team/joinCompetitionTeam`,
@@ -183,14 +183,14 @@ export default {
     saveAnnouncementAnnex: `competition/competition/announcementAnnex/save`,
     // 赛事成绩
     batchDeleteContestGrade: `competition/competition/performance/batchDeleteContestGrade`,
-    batchImportGrades: `competition/competition/performance/batchImportGrades`,
-    exportExperimentalResultsInBatch: `competition/competition/performance/exportExperimentalResultsInBatch`,
-    performanceExportFailure: `competition/competition/performance/exportFailure`,
-    rankExportFailure: `competition/competition/rank/exportFailure`,
+    batchImportGrades: `${host}competition/competition/performance/batchImportGrades`,
+    exportExperimentalResultsInBatch: `${host}competition/competition/performance/exportExperimentalResultsInBatch`,
+    performanceExportFailure: `${host}competition/competition/performance/exportFailure`,
+    rankExportFailure: `${host}competition/competition/rank/exportFailure`,
     stageGradeManagementList: `competition/competition/performance/stageGradeManagementList`,
     stageRaceRanking: `competition/competition/rank/stageRaceRanking`,
     overallStandingsInThePointsRace: `competition/competition/rank/overallStandingsInThePointsRace`,
-    batchImportRanking: `competition/competition/rank/batchImportRanking`,
+    batchImportRanking: `${host}competition/competition/rank/batchImportRanking`,
     publishRanking: `competition/competition/rank/publishRanking`,
     stageTeamScoreDetails: `competition/competition/rank/stageTeamScoreDetails`,
     multipleStageTeamScoreDetails: `competition/competition/rank/multipleStageTeamScoreDetails`,
@@ -202,9 +202,9 @@ export default {
     manuallyRankTheUploadList: `competition/competition/rank/manuallyRankTheUploadList`,
     queryPublicationSource: `competition/competition/rank/queryPublicationSource`,
     releaseVerification: `competition/competition/rank/releaseVerification`,
-    gradeImport: `${host2}template/赛事成绩导入模板.xlsx`,
-    rankImportTeam: `${host2}template/赛事排名导入模板(团队赛).xlsx`,
-    rankImportPerson: `${host2}template/赛事排名导入模板(个人赛).xlsx`,
+    gradeImport: `${host}template/赛事成绩导入模板.xlsx`,
+    rankImportTeam: `${host}template/赛事排名导入模板(团队赛).xlsx`,
+    rankImportPerson: `${host}template/赛事排名导入模板(个人赛).xlsx`,
     // 栏目管理
     addColumn: `occupationlab/occupationlab/information/column/addColumn`,
     deleteColumn: `occupationlab/occupationlab/information/column/deleteColumn`,
diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue
index 40967bc..a71d92e 100644
--- a/src/pages/achievement/list/index.vue
+++ b/src/pages/achievement/list/index.vue
@@ -3,7 +3,7 @@
         <h6 class="p-title">筛选</h6>
         <div class="tool mul">
             <ul class="filter">
-                <li>
+                <li v-if="projectPermissions">
                     <label>时间</label>
                     <el-radio-group v-model="month" @change="initData">
                         <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{ item.name }}</el-radio>
diff --git a/src/pages/match/add/index.vue b/src/pages/match/add/index.vue
index 6c38e69..ef8db35 100644
--- a/src/pages/match/add/index.vue
+++ b/src/pages/match/add/index.vue
@@ -75,6 +75,7 @@ export default {
     data() {
         return {
             id: this.$route.query.id || '',
+            cache: this.$store.state.match.cache,
             hasPer: false,
             releaseTypes: [
               {
@@ -109,16 +110,20 @@ export default {
       this.getPer()
     },
     methods: {
+      // 如果是从第三步里的自定义项目入口进去后返回的，则要直接进入第三步
+      resumeData() {
+        if (this.cache) {
+          this.step = 3
+          this.editing = true
+          this.showBtns = false
+        }
+      },
       // 查询客户增值模块（如果返回了true，则显示设置完整比赛选项）
       getPer() {
-        this.$get(this.api.isClient).then(({ customerId }) => {
-          customerId && this.$get(this.api.getCustomerOrder, {
-            customerId
-          }).then(({ show }) => {
-            this.hasPer = show
-            show || this.$parent.hideArch()
-          }).catch(err => {})
-        }).catch(res => {})
+        this.$get(this.api.getCustomerOrder).then(({ show }) => {
+          this.hasPer = show
+          show || this.$parent.hideArch()
+        }).catch(err => {})
       },
       // 展示loading
       showLoad() {
@@ -171,7 +176,7 @@ export default {
       // 预览
       preview() {
         util.local.set('match', this.$refs.step1.form)
-        window.open(this.$router.resolve('/matchPreview').href)
+        window.open(this.$router.resolve('/match/preview').href)
       },
       // 取消
       cancel() {
diff --git a/src/pages/match/add/set.vue b/src/pages/match/add/set.vue
index 1b9835e..74216a9 100644
--- a/src/pages/match/add/set.vue
+++ b/src/pages/match/add/set.vue
@@ -55,7 +55,7 @@
                   <div>
                       <el-input placeholder="请输入项目名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
                   </div>
-                  <el-button style="margin-left: 5px" type="primary" round>自定义实验项目</el-button>
+                  <el-button style="margin-left: 5px" type="primary" round @click="toProject">自定义实验项目</el-button>
               </div>
           </div>
           <!-- 实训项目表格 -->
@@ -104,10 +104,12 @@
 
 <script>
 import util from "@/libs/util";
+import { Loading } from 'element-ui'
 export default {
     props: ['form', 'step1'],
     data() {
         return {
+          loadIns: null,
           curriculumList: [],
           keyword: '',
           projects: [],
@@ -140,18 +142,22 @@ export default {
     methods: {
       // 获取课程
       getCourse() {
+          this.loadIns = Loading.service()
           this.$get(this.api.curriculumList).then(({ data }) => {
             const list = data
             this.curriculumList = data
-            if (list.length) this.form.cid = list[0].cid
+            if (!this.form.cid && list.length) this.form.cid = list[0].cid
             this.courseChange()
-          }).catch(err => {});
+          }).catch(err => {
+            this.loadIns.close()
+          });
       },
       // 课程选择回调
-      courseChange() {
+      courseChange(val) {
         const { sysId, sysName } = this.curriculumList.find(e => e.cid == this.form.cid)
         this.form.sysName = sysName
         this.sysId = sysId
+        if (val) this.loadIns = Loading.service()
         this.getProject()
       },
       // 查询项目
@@ -166,7 +172,10 @@ export default {
         }).then(({ data }) => {
           this.projects = data.records
           this.total = data.total
-        }).catch(err => {});
+          this.loadIns.close()
+        }).catch(err => {
+          this.loadIns.close()
+        });
       },
       initData() {
         this.page = 1;
@@ -176,6 +185,14 @@ export default {
           this.page = val;
           this.getProject();
       },
+      // 自定义项目
+      toProject() {
+        this.$store.commit('match/setCache', {
+          form: this.form,
+          curStep: this.$parent.curStep
+        })
+        this.$router.push(`/project/list?show=1`)
+      },
       // 时间选择回调
       timeChange(val) {
         if (val.length) {
@@ -205,12 +222,15 @@ export default {
       save() {
         const { form } = this
         if (!form.time.length) return util.warningMsg('请选择比赛时间')
-        if (this.timeInvalid) return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
+        const { playStartTime, playEndTime } = this.step1
+        if (new Date(form.time[0]) < new Date(playStartTime) || new Date(form.time[1]) > new Date(playEndTime)) return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
         if (!form.cid) return util.warningMsg('请选择课程')
         if (!form.projectId) return util.warningMsg('请选择项目')
+        const cur = this.curriculumList.find(e => e.cid == form.cid)
+        if (cur) form.systemName = cur.sysName
         const { systemId, projectName } = this.projects.find(e => e.projectId == form.projectId)
-        form.systemId = systemId
-        form.projectName = projectName
+        if (systemId) form.systemId = systemId
+        if (projectName) form.projectName = projectName
         form.startTime = form.time[0]
         form.endTime = form.time[1]
         this.$emit('hideSet', this.form)
diff --git a/src/pages/match/add/step1.vue b/src/pages/match/add/step1.vue
index b9e2639..055ca86 100644
--- a/src/pages/match/add/step1.vue
+++ b/src/pages/match/add/step1.vue
@@ -138,7 +138,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item class="req" label="竞赛详情">
-                    <quill :border="true" v-model="form.description" :height="400" />
+                    <quill v-if="quillShow" ref="quill" :border="true" v-model="form.description" :height="400" :readonly="!editing && form.id !== ''" />
                 </el-form-item>
                 <el-form-item label="附件">
                   <el-upload
@@ -246,7 +246,7 @@ export default {
             fileList: [],
             pickerOptions: {
                 disabledDate: time => {
-                    return time.getTime() < new Date().getTime() - 86400000;
+                    return this.$route.query.id ? false : time.getTime() < new Date().getTime() - 86400000;
                 }
             },
             rangeVisible: false,
@@ -325,12 +325,19 @@ export default {
             },
             submiting: false,
             updateTime: 0,
+            quillShow: true
         };
     },
     components: {
         quill
     },
     watch: {
+        editing: function(val) {
+          this.quillShow = false
+          this.$nextTick(() => {
+            this.quillShow = true
+          })
+        },
         // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
         form: {
           handler(){
@@ -369,7 +376,6 @@ export default {
         id && this.$post(`${this.api.getCompetition}?competitionId=${id}`).then(({ competition }) => {
           this.$parent.publishStatus = competition.publishStatus
           this.$parent.releaseType = competition.releaseType
-          if (!competition.releaseType) this.$parent.editing = 1 // 仅发布信息默认可以编辑
           this.$parent.setupId = competition.completeCompetitionSetup.setupId
           if (competition.signUpStartTime) this.signupTime = [competition.signUpStartTime, competition.signUpEndTime]
           if (competition.playStartTime) this.playTime = [competition.playStartTime, competition.playEndTime]
@@ -413,6 +419,7 @@ export default {
             this.rangeName = range.join('，')
           }
           this.form = competition
+          this.$parent.resumeData()
           this.$nextTick(() => {
             this.updateTime = 0
           })
diff --git a/src/pages/match/add/step2.vue b/src/pages/match/add/step2.vue
index e88b11f..ce90f7e 100644
--- a/src/pages/match/add/step2.vue
+++ b/src/pages/match/add/step2.vue
@@ -122,7 +122,7 @@
                       </div>
                     </div>
                   </el-form-item>
-                  <el-form-item prop="resultAnnouncementTime" label="成绩公布时间">
+                  <el-form-item prop="rule" label="成绩公布时间">
                     （阶段）比赛结束后
                     <el-input v-model.number="form.competitionStageList[0].resultAnnouncementTime" type="number" style="width: 120px"></el-input>
                     小时，公布（阶段）比赛成绩。
@@ -298,69 +298,86 @@ export default {
         // 下一步需要校验
         if (next === 2) {
           const stages = form.competitionStageList
-          for (const i in stages) {
-            const e = stages[i]
-            if (rule !== 2 && !e.stageName) {
-              invalid = 1
-              util.errorMsg('请输入阶段名称')
-              break
-            }
-            const { competitionType, maxTeamSize } = step1.completeCompetitionSetup // 0为个人赛，1为团队赛
-            // rule: 0为积分赛，1为淘汰赛，2为单项赛
-            // 积分赛
-            if (!rule) {
-              // 个人
-              if (form.resultCalculationMethod == 0 && e.pointWeight === '') {
-                invalid = 1
-                util.errorMsg('请输入权重')
-                break
-              }
-              pointWeight += e.pointWeight // 权重求和
-            } else if (rule === 1) { // 淘汰赛
-              // 晋级规则必须至少填一个(最后一个阶段不用填写)
-              if (i != stages.length - 1 && e.peopleLimit === '' && e.percentageLimit === '' && e.score === '') {
-                invalid = 1
-                util.errorMsg('请至少填写一条晋级规则')
-                break
-              }
-              if (e.score !== '') e.scoreLimit = e.operator + e.score
-            }
-            if (rule !== 2 && competitionType && e.teamNumLimitOpt) {
-              if (e.teamNumLimit === '') {
-                invalid = 1
-                util.errorMsg('请输入团队参数人数限制')
-                break
-              } else if (e.teamNumLimit < 0) {
-                invalid = 1
-                util.errorMsg('团队参数人数不得小于0')
-                break
-              } else if (maxTeamSize !== '' && e.teamNumLimit > maxTeamSize) {
-                invalid = 1
-                util.errorMsg('团队参数人数不得大于团队人数上限')
-                break
-              }
-            }
+          if (form.rule === 2) { // 单项赛只需要输入成绩公布时间
+            const e = stages[0]
             if (!e.resultsDetails) {
               if (e.resultAnnouncementTime === '') {
-                invalid = 1
-                util.errorMsg('请填写成绩公布时间')
-                break
+                return util.errorMsg('请填写成绩公布时间')
               }
               if (e.resultAnnouncementTime < 0) {
-                invalid = 1
-                util.errorMsg('成绩公布时间不得小于0')
-                break
+                return util.errorMsg('成绩公布时间不得小于0')
               }
               if (e.resultAnnouncementTime % 1) {
+                return util.errorMsg('成绩公布时间须为整数')
+              }
+              e.resultAnnouncementTime = +e.resultAnnouncementTime
+            }
+            form.competitionStageList = stages.slice(0, 1) // 单项赛只需要存第一个阶段的数据
+          } else { // 非积分赛则全部字段校验
+            for (const i in stages) {
+              const e = stages[i]
+              if (rule !== 2 && !e.stageName) {
                 invalid = 1
-                util.errorMsg('成绩公布时间须为整数')
+                util.errorMsg('请输入阶段名称')
                 break
               }
-              e.resultAnnouncementTime = +e.resultAnnouncementTime
+              const { competitionType, maxTeamSize } = step1.completeCompetitionSetup // 0为个人赛，1为团队赛
+              // rule: 0为积分赛，1为淘汰赛，2为单项赛
+              // 积分赛
+              if (!rule) {
+                // 个人
+                if (form.resultCalculationMethod == 0 && e.pointWeight === '') {
+                  invalid = 1
+                  util.errorMsg('请输入权重')
+                  break
+                }
+                pointWeight += e.pointWeight // 权重求和
+              } else if (rule === 1) { // 淘汰赛
+                // 晋级规则必须至少填一个(最后一个阶段不用填写)
+                if (i != stages.length - 1 && e.peopleLimit === '' && e.percentageLimit === '' && e.score === '') {
+                  invalid = 1
+                  util.errorMsg('请至少填写一条晋级规则')
+                  break
+                }
+                if (e.score !== '') e.scoreLimit = e.operator + e.score
+              }
+              if (rule !== 2 && competitionType && e.teamNumLimitOpt) {
+                if (e.teamNumLimit === '') {
+                  invalid = 1
+                  util.errorMsg('请输入团队参数人数限制')
+                  break
+                } else if (e.teamNumLimit < 0) {
+                  invalid = 1
+                  util.errorMsg('团队参数人数不得小于0')
+                  break
+                } else if (maxTeamSize !== '' && e.teamNumLimit > maxTeamSize) {
+                  invalid = 1
+                  util.errorMsg('团队参数人数不得大于团队人数上限')
+                  break
+                }
+              }
+              if (!e.resultsDetails) {
+                if (e.resultAnnouncementTime === '') {
+                  invalid = 1
+                  util.errorMsg('请填写成绩公布时间')
+                  break
+                }
+                if (e.resultAnnouncementTime < 0) {
+                  invalid = 1
+                  util.errorMsg('成绩公布时间不得小于0')
+                  break
+                }
+                if (e.resultAnnouncementTime % 1) {
+                  invalid = 1
+                  util.errorMsg('成绩公布时间须为整数')
+                  break
+                }
+                e.resultAnnouncementTime = +e.resultAnnouncementTime
+              }
             }
+            if (invalid) return
+            if (form.resultCalculationMethod == 0 && !rule && pointWeight > 0 && pointWeight !== 100) return util.errorMsg('权重须等于100，请重新输入')
           }
-          if (invalid) return
-          if (form.resultCalculationMethod == 0 && !rule && pointWeight > 0 && pointWeight !== 100) return util.errorMsg('权重须等于100，请重新输入')
         } else { // 保存草稿的情况下，只保存输入了阶段名称的阶段
           form.competitionStageList = form.competitionStageList.filter(e => e.stageName)
         }
diff --git a/src/pages/match/add/step3.vue b/src/pages/match/add/step3.vue
index fd94b8c..c47a3c1 100644
--- a/src/pages/match/add/step3.vue
+++ b/src/pages/match/add/step3.vue
@@ -79,6 +79,7 @@ export default {
           id: this.$route.query.id,
           updateTime: 0,
           step1: this.$parent.$refs.step1.form,
+          cache: this.$store.state.match.cache,
           nums: ['一', '二', '三'],
           methods: [
             {
@@ -111,7 +112,6 @@ export default {
           form: [],
           setVisible: false,
           curStep: 0,
-          timeInvalid: false
         };
     },
     components: {
@@ -130,6 +130,15 @@ export default {
       this.handleForm()
     },
     methods: {
+      // 如果是从自定义项目入口进去后返回的，要恢复上次的阶段和数据
+      resumeData() {
+        if (this.cache) {
+          this.curStep = this.cache.curStep
+          if (this.cache.form) this.form[this.curStep] = this.cache.form
+          this.setVisible = true
+          this.$store.commit('match/setCache', null)
+        }
+      },
       // 处理form
       handleForm() {
         // 根据赛事id查询赛事规则
@@ -148,6 +157,7 @@ export default {
             form.stageName = e.stageName
             this.form.push(form)
           })
+          this.resumeData()
           this.$nextTick(() => {
             this.updateTime = 0
           })
@@ -171,11 +181,7 @@ export default {
           const startTime = new Date(val[0])
           const endTime = new Date(val[1])
           const { playStartTime, playEndTime } = this.step1
-          if (startTime < new Date(playStartTime) || endTime > new Date(playEndTime)) {
-            this.timeInvalid = true
-            return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
-          }
-          this.timeInvalid = false
+          if (startTime < new Date(playStartTime) || endTime > new Date(playEndTime)) return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
           const { form, curStep } = this
           for (const i in form) {
             // 判断其他阶段的时间跟当前选的时间是否重叠
@@ -206,13 +212,18 @@ export default {
         // 发布才需要判断必填
         if (status) {
           let invalid = 0
-          if (this.timeInvalid) return util.errorMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
+          const { playStartTime, playEndTime } = this.step1
           for (const e of form) {
             if (!e.time.length) {
               invalid = 1
               util.errorMsg('请选择比赛时间')
               break
             }
+            if (new Date(e.time[0]) < new Date(playStartTime) || new Date(e.time[1]) > new Date(playEndTime)) {
+              invalid = 1
+              util.errorMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
+              break
+            }
             e.startTime = e.time[0]
             e.endTime = e.time[1]
             if (e.method !== 2 && !e.cid) {
@@ -247,6 +258,11 @@ export default {
                 util.errorMsg('请输入线下地点')
                 break
               }
+              if (!e.onlineAddress && !e.offlineAddress) {
+                invalid = 1
+                util.errorMsg('请输入比赛地点')
+                break
+              }
             }
           }
           if (invalid) return
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 28a2ffa..1f883f1 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -126,6 +126,7 @@
 import util from "@/libs/util";
 import Setting from "@/setting";
 import { mapMutations } from "vuex";
+import { Loading } from 'element-ui'
 
 export default {
     name: "match",
@@ -227,9 +228,10 @@ export default {
     },
     methods: {
         ...mapMutations('match', [
-          'SET_PAGE'
+          'setPage'
         ]),
         getList() {
+          const load = Loading.service()
           const { form } = this
           this.$post(this.api.competitionPageConditionQueryByOccupationlab, {
             pageNum: this.page,
@@ -241,6 +243,7 @@ export default {
             startTime: form.startTime || null,
             publishStatus: form.publishStatus === '' ? null : form.publishStatus
           }).then(({ data }) => {
+            load.close()
             const list = data.records
             // 定时处理是否要显示修改结束时间按钮
             this.timer = setInterval(() => {
@@ -275,7 +278,9 @@ export default {
               this.page--
               this.getData()
             }
-          }).catch(res => {})
+          }).catch(res => {
+            load.close()
+          })
         },
         getData() {
           this.getList()
@@ -358,7 +363,7 @@ export default {
             this.page = val;
             this.$router.push(`list?page=${val}`)
             this.getData()
-            this.SET_PAGE(val)
+            this.setPage(val)
         },
         transferTime(date, type) {
             if (date == "0000-00-00 00:00:00") return "---";
diff --git a/src/pages/match/manage/matchInfo.vue b/src/pages/match/manage/matchInfo.vue
index 2f681ba..fed3991 100644
--- a/src/pages/match/manage/matchInfo.vue
+++ b/src/pages/match/manage/matchInfo.vue
@@ -54,7 +54,7 @@
             <tr>
               <th width="130">指导老师：</th>
               <td>
-                <div class="plus">
+                <div v-if="status < 5" class="plus">
                   <i class="el-icon-circle-plus-outline icon" @click="addAdvisor"></i>
                 </div>
                 <div v-for="(item, i) in info.teamInstructors" :key="i" class="line">
@@ -331,10 +331,10 @@ export default {
         let status
         const n = this.form
         let now = new Date().getTime();
-        let signUpStartTime = new Date(this.dateCompatible(n.signUpStartTime)).getTime(); // 报名开始时间
-        let signUpEndTime = new Date(this.dateCompatible(n.signUpEndTime)).getTime(); // 报名结束时间
-        let playStartTime = new Date(this.dateCompatible(n.playStartTime)).getTime(); // 比赛开始时间
-        let playEndTime = new Date(this.dateCompatible(n.playEndTime)).getTime(); // 比赛结束时间
+        let signUpStartTime = new Date(util.dateCompatible(n.signUpStartTime)).getTime(); // 报名开始时间
+        let signUpEndTime = new Date(util.dateCompatible(n.signUpEndTime)).getTime(); // 报名结束时间
+        let playStartTime = new Date(util.dateCompatible(n.playStartTime)).getTime(); // 比赛开始时间
+        let playEndTime = new Date(util.dateCompatible(n.playEndTime)).getTime(); // 比赛结束时间
         if (now < signUpStartTime) { // 报名没开始
           status = 0;
         } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
@@ -347,6 +347,7 @@ export default {
           status = 5;
         }
         this.status = status
+        console.log("🚀 ~ file: matchInfo.vue:350 ~ handleStatus ~ status", status)
       },
       // 编辑保存
       edit(showMsg) {
diff --git a/src/pages/match/manage/matchProgress.vue b/src/pages/match/manage/matchProgress.vue
index 033dc2e..5adc7eb 100644
--- a/src/pages/match/manage/matchProgress.vue
+++ b/src/pages/match/manage/matchProgress.vue
@@ -28,11 +28,11 @@
                 <template slot-scope="scope">
                     <el-button v-if="!scope.row.operate" type="text" @click="operateIt(scope.row)" v-auth="'/match:管理:竞赛进展:编辑'">编辑</el-button>
                     <el-button v-else type="text" @click="saveData(scope.row)">保存</el-button>
-                    <el-button type="text" @click="handleDelete(scope.row, scope.$index)" v-auth="'/match:管理:竞赛进展:删除'">删除</el-button>
+                    <el-button type="text" @click="handleDelete(scope.row, scope.$index)" v-auth="'/match/list:管理:竞赛进展:删除'">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
-        <div class="plus" @click="addData" v-auth="'/match:管理:竞赛进展:新增'">
+        <div class="plus" @click="addData" v-auth="'/match/list:管理:竞赛进展:新增'">
             <i class="el-icon-circle-plus-outline"></i>
         </div>
     </div>
diff --git a/src/pages/match/manage/matchRank.vue b/src/pages/match/manage/matchRank.vue
index 6ee6408..b6106cd 100644
--- a/src/pages/match/manage/matchRank.vue
+++ b/src/pages/match/manage/matchRank.vue
@@ -69,23 +69,36 @@
               <th width="100">分数</th>
               <th width="100">得分详情</th>
             </tr>
-            <tr v-for="(item, i) in teams" :key="i">
-              <template v-if="!active && item.rowspan">
-                <td :rowspan="item.rowspan">{{ item.stageName }}</td>
-                <td :rowspan="item.rowspan">{{ item.teamScore }}</td>
-              </template>
-              <td>{{ i + 1 }}</td>
-              <td>{{ item.userName }}</td>
-              <td>{{ item.schoolName }}</td>
-              <td>{{ item.timeSum }}min</td>
-              <td>{{ item.score }}</td>
-              <td>
-                <el-button type="text" @click="toReport(item)">查看</el-button>
-              </td>
+            <template v-if="teams.length">
+              <tr v-for="(item, i) in teams" :key="i">
+                <template v-if="!active && item.rowspan">
+                  <td :rowspan="item.rowspan">{{ item.stageName }}</td>
+                  <td class="scores" :rowspan="item.rowspan">
+                    <p class="score">{{ item.teamScore }}</p>
+                    <p>{{ item.teamCalculationMethodName }}</p>
+                    <p>权重：</p>
+                    <p>{{ item.pointWeight }}%</p>
+                  </td>
+                </template>
+                <template v-if="item.accountId">
+                  <td>{{ i + 1 }}</td>
+                  <td>{{ item.userName }}</td>
+                  <td>{{ item.schoolName }}</td>
+                  <td>{{ item.timeSum }}min</td>
+                  <td>{{ item.score }}</td>
+                  <td>
+                    <el-button v-if="item.reportId" type="text" @click="toReport(item)">查看</el-button>
+                  </td>
+                </template>
+                <td v-else colspan="6"></td>
+              </tr>
+            </template>
+            <tr v-else>
+              <td colspan="99">暂无数据</td>
             </tr>
-            <tr v-if="!active">
+            <tr v-if="!active && teams.length">
               <td>综合得分</td>
-              <td>{{ totalScore }}</td>
+              <td>{{ curRow.score }}</td>
               <td colspan="6">总排名：第{{ curRow.index }}名</td>
             </tr>
           </table>
@@ -144,6 +157,20 @@ export default {
             method: this.$route.query.method,
             competitionType: +this.$route.query.competitionType,
             rule: +this.$route.query.rule,
+            teamCalculationMethods: [
+              {
+                id: 0,
+                name: '最高分'
+              },
+              {
+                id: 1,
+                name: '平均分'
+              },
+              {
+                id: 2,
+                name: '求和'
+              }
+            ],
             headers: {
                 token: util.local.get(Setting.tokenKey)
             },
@@ -177,9 +204,11 @@ export default {
         // 获排名
         getData() {
           // 查询是否已经发布排名
-          this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || ''}&isOverallRanking=${this.active ? 0 : 1}`).then(({ whetherToPublish }) => {
+          this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ whetherToPublish }) => {
+            const ids = this.grades.map(e => e.stageId)
+            ids.pop()
             // 如果已发布，查询发布上一次排名的来源——>默认顺序或者手动发布(返回数据:是否手动发布(1为是,0不是))
-            whetherToPublish && this.$post(`${this.api.queryPublicationSource}?competitionId=${this.id}&stageId=${this.active || ''}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => {
+            whetherToPublish && this.$post(`${this.api.queryPublicationSource}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => {
               this.sourceType = source
               this.type = source == 1 ? 1 : 0
             }).catch(res => {})
@@ -191,7 +220,6 @@ export default {
         getRank(whetherToPublish) {
           // 已发布，则调已发布的排名接口
           if (whetherToPublish) {
-            console.log(44, this.active)
             this.$post(this.api.manuallyRankTheUploadList, {
               pageNum: this.page,
               pageSize: this.pageSize,
@@ -250,11 +278,13 @@ export default {
         },
         // tab回调
         tabChange(i) {
+          this.type = 0
           this.active = i
           this.initData()
         },
         // 查看详情
         show(row, i) {
+          this.teams = []
           // 个人：跳转实验报告，团队：弹框显示成员列表
           if (this.competitionType == 1) {
             row.index = i + 1
@@ -275,46 +305,57 @@ export default {
               }).catch(res => {})
             } else {
               const ids = this.grades.map(e => e.stageId)
-              data.stageIds = ids.splice(0, ids.length - 1)
-              this.$post(this.api.detailsOfTotalTeamScores, data).then(({ data, resultCalculationMethod }) => {
-                const result = []
-                let totalScore = 0
-                // 合并数据
-                data.map(e => {
-                  const team = e.stageTeamInformation
-                  if (team.length) {
-                    // 第一条才赋值团队得分和合并行数
-                    const method = e.teamCalculationMethod
-                    const scores = team.map(n => +n.score)
-                    let score
-                    // 根据团队规则计算方式计算团队得分
-                    if (method == 0) { // 最高分
-                      score = Math.max(scores)
-                    } else if (method == 1) { // 平均分
-                      score = scores.reduce((prev, next) => prev + next) / scores.length
-                    } else { // 求和
-                      score = scores.reduce((prev, next) => prev + next)
-                    }
-                    team[0].teamScore = score
-                    team[0].rowspan = team.length
-                    team.map(n => {
-                      n = Object.assign(n, e)
+              ids.pop()
+              data.stageIds = ids.splice(0, this.index + 1)
+              // 发布跟没发布调不同的接口
+              // if (this.published) {
+                this.$post(this.api.totalRankingScoreDetails, data).then(({ data }) => {
+                  if (data.length) {
+                    const result = []
+                    // 合并数据
+                    data.map(e => {
+                      const team = e.stageTeamInformation
+                      if (team.length) {
+                        const teamCItem = this.teamCalculationMethods.find(n => n.id == e.teamCalculationMethod)
+                        if (teamCItem) team[0].teamCalculationMethodName = teamCItem.name
+                        team[0].rowspan = team.length
+                        team.map(n => {
+                          n = Object.assign(n, e)
+                        })
+                        result.push(...team)
+                      } else {
+                        e.rowspan = 1
+                        result.push(e)
+                      }
                     })
-                    // 计算权重（权重为0则不计入总成绩） 团队得分*权重/100 总成绩计算方式选的是加权求和才需要计算
-                    if (e.pointWeight && !resultCalculationMethod) totalScore += score * e.pointWeight / 100
-                    result.push(...team)
+                    this.teams = result
                   }
-                })
-                // 根据总成绩计算方式计算总分
-                const teamScores = data.map(e => e.teamScore)
-                if (resultCalculationMethod === 1) { // 求和
-                  totalScore = teamScores.reduce((prev, next) => prev + next)
-                } else if (resultCalculationMethod === 2) { // 平均分
-                  totalScore = teamScores.reduce((prev, next) => prev + next) / teamScores.length
-                }
-                this.totalScore = totalScore
-                this.teams = result
-              }).catch(res => {})
+                }).catch(res => {})
+              // } else { // 没发布
+              //   this.$post(this.api.totalRankingScoreDetails, data).then(({ page }) => {
+              //     const list = page.records
+                  // page.records.map((e, i) => {
+                  //   if (!list.find(n => n.stageId == e.stageId && n.rowspan)) {
+                  //     e.rowspan = list.filter(n => n.stageId == e.stageId).length
+                  //     this.$post(this.api.stageTeamScoreDetails, {
+                  //       pageNum: 1,
+                  //       pageSize: 100,
+                  //       competitionId: this.id,
+                  //       teamId: row.teamId,
+                  //       stageId: e.stageId
+                  //     }).then(({ page }) => {
+                        
+                  //     }).catch(res => {})
+                  //   }
+                  // })
+                //   let totalScore = 0
+                //   this.totalScore = totalScore
+                //   this.teams = list
+                //   console.log("🚀 ~ file: matchRank.vue:346 ~ this.$post ~ list", list)
+
+                // }).catch(res => {})
+              // }
+              
             }
           } else {
             this.toReport(row)
@@ -340,14 +381,16 @@ export default {
               list.map(e => {
                 e.competitionId = id
                 e.isOverallRanking = isOverall
-                if (isOverall) delete e.stageId
+                // if (isOverall) delete e.stageId
                 if (isPerson) e.teamId = null // 个人赛则teamId传null
               })
               data = list
             }
           }
+          const ids = this.grades.map(e => e.stageId)
+          ids.pop()
           // 发布前校验
-          this.$post(`${this.api.releaseVerification}?competitionId=${this.id}&stageId=${this.active || ''}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => {
+          this.$post(`${this.api.releaseVerification}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => {
             this.$post(this.api.publishRanking, data).then(res => {
               this.uploadData = []
               this.getData()
@@ -391,6 +434,7 @@ export default {
           } else {
             this.$post(`${this.api.cancelRanking}?competitionId=${this.id}&isOverallRanking=${this.active ? 0 : 1}&${this.active ? 'stageIds=' + this.active : query.join('&')}`).then(res => {
               this.sourceType = ''
+              this.type = 0
               this.getData()
               util.successMsg('取消发布成功！')
             }).catch(res => {})
@@ -473,5 +517,13 @@ export default {
     text-align: center;
     background-color: #f8faff;
   }
+  .scores {
+    line-height: 1.6;
+  }
+  .score {
+    font-size: 16px;
+    font-weight: 600;
+    color: #9076FF;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/match/manage/matchSignup.vue b/src/pages/match/manage/matchSignup.vue
index d9bb1d3..80ff974 100644
--- a/src/pages/match/manage/matchSignup.vue
+++ b/src/pages/match/manage/matchSignup.vue
@@ -7,7 +7,7 @@
                     <label>搜索：</label>
                     <el-input placeholder="请输入姓名/手机号/团队名称/学号" prefix-icon="el-icon-search" v-model="keyword" clearable size="mini" style="width: 250px"></el-input>
                 </li>
-                <li>
+                <li v-if="info.releaseType">
                     <label>参赛人员状态：</label>
                     <el-select v-model="isDisable" @change="initData">
                       <el-option v-for="(item, i) in statusList" :key="i" :label="item.name" :value="item.id"></el-option>
@@ -16,7 +16,7 @@
             </ul>
             <div>
                 <el-button type="primary" round @click="add">新增</el-button>
-                <el-button type="primary" round @click="exportAll" v-auth="'/match:管理:报名人员:导出'">批量导出</el-button>
+                <el-button type="primary" round @click="exportAll" v-auth="'/match/list:管理:报名人员:批量导出'">批量导出</el-button>
             </div>
         </div>
 
@@ -29,7 +29,7 @@
             </el-table-column>
             <el-table-column prop="school" label="学校" sortable="custom">
             </el-table-column>
-            <el-table-column prop="teamName" label="团队名称" sortable="custom">
+            <el-table-column v-if="info.completeCompetitionSetup.competitionType" prop="teamName" label="团队名称" sortable="custom">
             </el-table-column>
             <el-table-column prop="username" label="学生姓名">
             </el-table-column>
@@ -40,15 +40,17 @@
             <el-table-column label="操作" align="center" width="320">
                 <template slot-scope="scope">
                     <el-button v-if="scope.row.identification" type="text" @click="edit(scope.row)">编辑</el-button>
-                    <el-button type="text" @click="info(scope.row)">参赛信息与成绩</el-button>
-                    <el-switch
-                        v-model="scope.row.isDisable"
-                        :active-text="scope.row.isDisable ? '关' : '开'"
-                        :active-value="0"
-                        :inactive-value="1"
-                        style="margin: 0 10px 0 5px"
-                        @change="switchOff($event,scope.row,scope.$index)"
-                    ></el-switch>
+                    <template v-if="info.releaseType">
+                      <el-button type="text" @click="toInfo(scope.row)">参赛信息与成绩</el-button>
+                      <el-switch
+                          v-model="scope.row.isDisable"
+                          :active-text="scope.row.isDisable ? '关' : '开'"
+                          :active-value="0"
+                          :inactive-value="1"
+                          style="margin: 0 10px 0 5px"
+                          @change="switchOff($event,scope.row,scope.$index)"
+                      ></el-switch>
+                    </template>
                 </template>
             </el-table-column>
         </el-table>
@@ -62,7 +64,7 @@
             <el-form ref="form" :model="form" :rules="rules" label-width="80px" style='margin-right: 10px;'>
                 <el-form-item prop="schoolId" label="院校">
                   <el-select v-model="form.schoolId" filterable style="width: 100%">
-                    <el-option v-for="(item, i) in clients" :key="i" :label="item.customerName" :value="item.schoolId"></el-option>
+                    <el-option v-for="(item, i) in clients" :key="i" :label="item.schoolName" :value="item.schoolId"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="workNumber" label="学生学号">
@@ -122,6 +124,9 @@ export default {
         return {
             token: util.local.get(Setting.tokenKey),
             id: +this.$route.query.id,
+            info: {
+              completeCompetitionSetup: {}
+            },
             isDisable: '',
             statusList: [
               {
@@ -202,6 +207,7 @@ export default {
     },
     mounted() {
         this.initData()
+        this.getInfo()
         this.getClient()
         this.getTeam()
     },
@@ -222,6 +228,12 @@ export default {
             }).catch(res => {
             });
         },
+        // 获取赛事信息
+        getInfo() {
+          this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
+            this.info = competition
+          }).catch(err => {})
+        },
         initData() {
           this.page = 1
           this.getData()
@@ -388,14 +400,9 @@ export default {
         },
         // 获取客户
         getClient() {
-            const sid = this.$store.state.dataPer.find(e => e.permissionName === '客户管理')
-            this.$post(this.api.queryCustomer,{
-                page: 1,
-                size: 1000,
-                supplierId: (sid && !sid.all) ? sid.supplierId : ''
-            }).then(res => {
-                this.clients = res.message.list
-            }).catch(res => {})
+          this.$get(this.api.querySchoolData).then(({ list }) => {
+            this.clients = list
+          }).catch(res => {})
         },
         // 获取团队列表
         getTeam() {
@@ -420,7 +427,7 @@ export default {
           }).catch(res => {})
         },
         // 参赛信息
-        info(row) {
+        toInfo(row) {
           this.$router.push(`info?id=${this.id}&accountId=${row.accountId}`)
         },
         exportAll() {
diff --git a/src/pages/match/manage/notice.vue b/src/pages/match/manage/notice.vue
index 7c83a8d..fac2f4f 100644
--- a/src/pages/match/manage/notice.vue
+++ b/src/pages/match/manage/notice.vue
@@ -2,7 +2,7 @@
     <!-- 报名人员 -->
     <div class="page-content" style="padding: 24px">
         <div class="tool" style="justify-content: flex-end">
-          <el-button type="primary" round @click="add" v-auth="'/match:管理:公告通知:新增'">新增</el-button>
+          <el-button type="primary" round @click="add" v-auth="'/match/list:管理:公告通知:新增'">新增</el-button>
         </div>
 
         <el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
@@ -24,10 +24,10 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="250">
                 <template slot-scope="scope">
-                    <el-button type="text" @click="edit(scope.row)" v-auth="'/match:管理:公告通知:编辑'">编辑</el-button>
-                    <el-button type="text" @click="del(scope.row)" v-auth="'/match:管理:公告通知:删除'">删除</el-button>
+                    <el-button type="text" @click="edit(scope.row)" v-auth="'/match/list:管理:公告通知:编辑'">编辑</el-button>
+                    <el-button type="text" @click="del(scope.row)" v-auth="'/match/list:管理:公告通知:删除'">删除</el-button>
                     <el-switch
-                        v-auth="'/match:管理:公告通知:启用'"
+                        v-auth="'/match/list:管理:公告通知:启用'"
                         v-model="scope.row.isOpen"
                         :active-text="scope.row.isOpen ? '关' : '开'"
                         :active-value="0"
diff --git a/src/pages/match/manage/noticeDetail.vue b/src/pages/match/manage/noticeDetail.vue
index f48c2f1..d934797 100644
--- a/src/pages/match/manage/noticeDetail.vue
+++ b/src/pages/match/manage/noticeDetail.vue
@@ -38,8 +38,8 @@
                     </el-upload>
                   </el-form-item>
                   <el-form-item>
-                      <el-button v-if="!form.id" @click="save(0)" v-auth="'/match:管理:公告通知:草稿'">草稿</el-button>
-                      <el-button type="primary" @click="save(1)" v-auth="'/match:管理:公告通知:发布'">发布</el-button>
+                      <el-button v-if="!form.id" @click="save(0)" v-auth="'/match/list:管理:公告通知:草稿'">草稿</el-button>
+                      <el-button type="primary" @click="save(1)" v-auth="'/match/list:管理:公告通知:发布'">发布</el-button>
                       <el-button @click="back">取消</el-button>
                   </el-form-item>
               </el-form>
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index 9cfcaeb..3deb479 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -617,7 +617,7 @@ export default {
             location.href = href;
         },
         permissionChange(){
-            if (this.projectManage.permissions == 1){
+            if (this.projectManage.permissions){
                 this.projectManage.hintOpen = 1
             }else{
                 this.projectManage.hintOpen = 0
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index fe80571..c8db9fa 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -281,7 +281,7 @@
                 </thead>
               </table>
             </div>
-            <div class="main_table" style="margin-top: 0;overflow: auto">
+            <div class="main_table" ref="ach" style="max-height: 520px;margin-top: 0;overflow: hidden">
               <table>
                 <tbody>
                   <tr v-for="(item, i) in achs" :key="i">
@@ -1017,13 +1017,13 @@ export default {
       // 表格滚动效果
       scrollTable() {
         const dom = this.$refs.popularCourses
-        // const dom1 = this.$refs.gdpList
+        const dom1 = this.$refs.ach
         setInterval(() => {
           dom.scrollTop += 1
           if (dom.clientHeight + dom.scrollTop === dom.scrollHeight) dom.scrollTop = 0
 
-          // dom1.scrollTop += 1
-          // if (dom1.clientHeight + dom1.scrollTop === dom1.scrollHeight) dom1.scrollTop = 0
+          dom1.scrollTop += 1
+          if (dom1.clientHeight + dom1.scrollTop === dom1.scrollHeight) dom1.scrollTop = 0
         }, 30)
       }
     }
diff --git a/src/setting.js b/src/setting.js
index 58a6562..db09ca0 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -26,7 +26,7 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 中台测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    host = "http://192.168.31.51:9000/"; // 榕
+    // host = "http://192.168.31.51:9000/"; // 榕
     host = 'http://192.168.31.116:9000/'; // 赓
 }
 
diff --git a/src/store/modules/match.js b/src/store/modules/match.js
index ed970a1..80d87ff 100644
--- a/src/store/modules/match.js
+++ b/src/store/modules/match.js
@@ -4,11 +4,15 @@
 export default {
     namespaced: true,
     state: {
-      page: 1
+      page: 1,
+      cache: null
     },
     mutations: {
-      SET_PAGE: (state, page) => {
+      setPage: (state, page) => {
         state.page = page
+      },
+      setCache: (state, cache) => {
+        state.cache = cache
       }
     },
     actions: {