diff --git a/src/api/index.js b/src/api/index.js
index 6c6798d..dd8fdfe 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -242,6 +242,7 @@ export default {
     addCompetitionStageRankingTime: `competition/competitionReleaseTime/addCompetitionStageRankingTime`,
     cancelCompetitionStageRankingTime: `competition/competitionReleaseTime/cancelCompetitionStageRankingTime`,
     getCompetitionStageRankingTime: `competition/competitionReleaseTime/getCompetitionStageRankingTime`,
+    frontOfficeCompetitionRanking: `competition/competition/rank/frontOfficeCompetitionRanking`,
     gradeImport: `https://www.occupationlab.com/template/赛事成绩导入模板.xlsx`,
     rankImportTeam: `https://www.occupationlab.com/template/赛事排名导入模板(团队赛).xlsx`,
     rankImportPerson: `https://www.occupationlab.com/template/赛事排名导入模板(个人赛).xlsx`,
diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index e948d08..03b04ff 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -1,244 +1,320 @@
 <template>
-    <div class="wrap">
-        <el-card shadow="hover" class="m-b-20">
-            <el-page-header @back="$router.back()" content="查看报告"></el-page-header>
-        </el-card>
+  <div class="wrap">
+    <el-card shadow="hover"
+             class="m-b-20">
+      <el-page-header @back="$router.back()"
+                      content="查看报告"></el-page-header>
+    </el-card>
 
-        <div class="content">
-            <div class="text-right">
-              <el-button type="primary" @click="exportPage">导出报告</el-button>
+    <div class="content">
+      <div class="text-right">
+        <el-button type="primary"
+                   @click="exportPage">导出报告</el-button>
+      </div>
+      <h6 class="r-title">标准实验报告</h6>
+      <div class="info">
+        <h6 class="l-title">
+          <img src="@/assets/img/info1.png"
+               alt="">
+          基本信息
+        </h6>
+        <ul :class="['info-list', {edit: editing}]">
+          <li>
+            <label>学生姓名：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.userName"
+                      disabled></el-input>
+            <span v-else>{{ infoData.userName }}</span>
+          </li>
+          <li>
+            <label>学生学号：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.workNumber"
+                      disabled></el-input>
+            <span v-else>{{ infoData.workNumber }}</span>
+          </li>
+          <li>
+            <label>实验时间：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.submitTime"
+                      disabled></el-input>
+            <span v-else>{{ infoData.submitTime }}</span>
+          </li>
+          <li>
+            <label>实验成绩：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.score"
+                      disabled></el-input>
+            <div v-else
+                 class="score-wrap">
+              <em>{{ infoData.score }}</em>
+              <img src="@/assets/img/point.png"
+                   alt="">
             </div>
-            <h6 class="r-title">标准实验报告</h6>
-            <div class="info">
-                <h6 class="l-title">
-                    <img src="@/assets/img/info1.png" alt="">
-                    基本信息
-                </h6>
-                <ul :class="['info-list', {edit: editing}]">
-                    <li>
-                        <label>学生姓名：</label>
-                        <el-input v-if="editing" v-model="infoData.userName" disabled></el-input>
-                        <span v-else>{{ infoData.userName }}</span>
-                    </li>
-                    <li>
-                        <label>学生学号：</label>
-                        <el-input v-if="editing" v-model="infoData.workNumber" disabled></el-input>
-                        <span v-else>{{ infoData.workNumber }}</span>
-                    </li>
-                    <li>
-                        <label>实验时间：</label>
-                        <el-input v-if="editing" v-model="infoData.submitTime" disabled></el-input>
-                        <span v-else>{{ infoData.submitTime }}</span>
-                    </li>
-                    <li>
-                        <label>实验成绩：</label>
-                        <el-input v-if="editing" v-model="infoData.score" disabled></el-input>
-                        <div v-else class="score-wrap">
-                            <em>{{ infoData.score }}</em>
-                            <img src="@/assets/img/point.png" alt="">
-                        </div>
-                    </li>
-                    <li>
-                        <label>学生班级：</label>
-                        <el-input v-if="editing" v-model="infoData.workNumber"></el-input>
-                        <span v-else>{{ infoData.workNumber }}</span>
-                    </li>
-                    <li>
-                        <label>指导老师：</label>
-                        <el-input v-if="editing" v-model="infoData.instructor"></el-input>
-                        <span v-else>{{ infoData.instructor }}</span>
-                    </li>
-                    <li>
-                        <label>实验学时：</label>
-                        <el-input v-if="editing" v-model="infoData.period"></el-input>
-                        <span v-else>{{ infoData.period }}</span>
-                    </li>
-                </ul>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report2.png" alt="">
-                        实验项目名称
-                    </h6>
-                    <el-input v-if="editing" v-model="form.projectName" type="textarea"></el-input>
-                    <div v-else class="pre-wrap" v-html="form.projectName"></div>
-                </div>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report3.png" alt="">
-                        实验目的
-                    </h6>
-                    <div :class="['pre-wrap', {edit: editing}]" v-html="form.purpose"></div>
+          </li>
+          <li>
+            <label>学生班级：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.workNumber"></el-input>
+            <span v-else>{{ infoData.workNumber }}</span>
+          </li>
+          <li>
+            <label>指导老师：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.instructor"></el-input>
+            <span v-else>{{ infoData.instructor }}</span>
+          </li>
+          <li>
+            <label>实验学时：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.period"></el-input>
+            <span v-else>{{ infoData.period }}</span>
+          </li>
+        </ul>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report2.png"
+                 alt="">
+            实验项目名称
+          </h6>
+          <el-input v-if="editing"
+                    v-model="form.projectName"
+                    type="textarea"></el-input>
+          <div v-else
+               class="pre-wrap"
+               v-html="form.projectName"></div>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report3.png"
+                 alt="">
+            实验目的
+          </h6>
+          <div :class="['pre-wrap', {edit: editing}]"
+               v-html="form.purpose"></div>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report4.png"
+                 alt="">
+            实验数据
+          </h6>
+          <el-table :data="expData"
+                    class="table"
+                    border
+                    stripe
+                    header-align="center">
+            <el-table-column type="index"
+                             label="序号"
+                             align="center"
+                             width="60">
+              <template slot-scope="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="judgmentName"
+                             label="判分点"
+                             width="270"
+                             align="center"></el-table-column>
+            <el-table-column v-if='project'
+                             prop="judgmentName"
+                             label="考核点"
+                             align="center"
+                             width="150">
+              <template slot-scope="scope">
+                <div v-for="(item, index) in scope.row.lcRuleRecords"
+                     :key="index">
+                  <span>
+                    <span>{{index+1}}. </span>{{item.name}}
+                  </span>
                 </div>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report4.png" alt="">
-                        实验数据
-                    </h6>
-                    <el-table :data="expData" class="table" border stripe header-align="center">
-                        <el-table-column type="index" label="序号" align="center" width="60">
-                            <template slot-scope="scope">
-                                {{ scope.$index + 1 }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="judgmentName" label="判分点" width="270" align="center"></el-table-column>
-                        <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
-                            <template slot-scope="scope">
-                                <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                    <span>
-                                        <span>{{index+1}}. </span>{{item.name}}
-                                    </span>
-                                </div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="ruleAnswer" label="参考答案" style='word-wrap: break-word'>
-                            <template slot-scope="scope">
-                                <div v-if='scope.row.lcRuleRecords'>
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                    <span>
-                                        <span>{{index+1}}. </span>{{item.ruleAnswer}}
-                                    </span>
-                                    </div>
-                                </div>
-                                <div v-else v-html="scope.row.referenceAnswer"></div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="userAnswer" label="学生答案">
-                            <template slot-scope="scope">
-                                <div v-if='scope.row.lcRuleRecords'>
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                        <span v-if='item.userAnswer'>
-                                            <span>{{index+1}}. </span>{{item.userAnswer}}
-                                        </span>
-                                        <span v-else>
-                                            <span>{{index+1}}. </span>未填写
-                                        </span>
-                                    </div>
-                                </div>
-                                <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'></div>
-                                <template v-if="scope.row.runThePictureList">
-                                  <img v-for="(img, i) in scope.row.runThePictureList" :key="i" width="200" class="result-pic" :src="img" alt="">
-                                </template>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="score" label="得分" width="80" align="center"></el-table-column>
-                    </el-table>
+              </template>
+            </el-table-column>
+            <el-table-column prop="ruleAnswer"
+                             label="参考答案"
+                             style='word-wrap: break-word'>
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span>
+                      <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                    </span>
+                  </div>
                 </div>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report5.png" alt="">
-                        实验总结与体会
-                    </h6>
-                    <quill v-if="editing" :border="true" v-model="form.summarize" :minHeight="150" :height="150" :index="1" />
-                    <div v-else class="pre-wrap" v-html="form.summarize"></div>
+                <div v-else
+                     v-html="scope.row.referenceAnswer"></div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userAnswer"
+                             label="学生答案">
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span v-if='item.userAnswer'>
+                      <span>{{index+1}}. </span>{{item.userAnswer}}
+                    </span>
+                    <span v-else>
+                      <span>{{index+1}}. </span>未填写
+                    </span>
+                  </div>
                 </div>
-            </div>
+                <div v-else
+                     v-html='scope.row.answer'
+                     style='white-space: pre-wrap'></div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="runResult"
+                             label="学生运行结果"
+                             align="center">
+              <template slot-scope="scope">
+                <div class="m-b-20"
+                     v-html='scope.row.runResult'
+                     style='white-space: pre-wrap'></div>
+                <template v-if="scope.row.runThePictureList">
+                  <img v-for="(img, i) in scope.row.runThePictureList"
+                       :key="i"
+                       width="200"
+                       class="result-pic"
+                       :src="img"
+                       alt="">
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="score"
+                             label="得分"
+                             width="80"
+                             align="center"></el-table-column>
+          </el-table>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report5.png"
+                 alt="">
+            实验总结与体会
+          </h6>
+          <quill v-if="editing"
+                 :border="true"
+                 v-model="form.summarize"
+                 :minHeight="150"
+                 :height="150"
+                 :index="1" />
+          <div v-else
+               class="pre-wrap"
+               v-html="form.summarize"></div>
         </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
 import util from "@/libs/util";
 export default {
-    data() {
-        return {
-            reportId: this.$route.query.reportId,
-            title: "实验报告",
-            form: {
-                className: "",
-                instructor: "",
-                period: "",
-                projectName: "",
-                summarize: "",
-            },
-            infoData: {},
-            expData: [],
-            editing: false,
-            loadIns: null,
-            loading: false,
-            project:false,
-            userScores: []
-        };
-    },
-    mounted() {
-        this.getData()
+  data () {
+    return {
+      reportId: this.$route.query.reportId,
+      title: "实验报告",
+      form: {
+        className: "",
+        instructor: "",
+        period: "",
+        projectName: "",
+        summarize: "",
+      },
+      infoData: {},
+      expData: [],
+      editing: false,
+      loadIns: null,
+      loading: false,
+      project: false,
+      userScores: []
+    };
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    getData () { // 查询详情
+      this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => {
+        this.form = report
+        this.expData = userScores
+        this.project = this.expData.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
+        let form = this.form;
+        this.infoData = {
+          workNumber: form.workNumber,
+          experimentalClassName: form.experimentalClassName,
+          instructor: form.instructor,
+          period: form.period,
+          laboratory: form.laboratory,
+          submitTime: form.submitTime,
+          score: form.score,
+          userName: form.userName
+        }
+        const data = report.data
+        this.userScores = userScores
+        // 如果没有data，则添加，否则，直接使用
+        if (!data) {
+          this.handleList(userScores)
+          this.$post(this.api.editExperimentalData, {
+            reportId,
+            data: JSON.stringify(userScores)
+          }).then(res => { }).catch(err => { })
+        } else {
+          this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
+        }
+      }).catch(res => { })
     },
-    methods: {
-        getData() { // 查询详情
-            this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => {
-                this.form = report
-                this.expData = userScores
-                this.project = this.expData.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-                let form = this.form;
-                this.infoData = {
-                    workNumber: form.workNumber,
-                    experimentalClassName: form.experimentalClassName,
-                    instructor: form.instructor,
-                    period: form.period,
-                    laboratory: form.laboratory,
-                    submitTime: form.submitTime,
-                    score: form.score,
-                    userName: form.userName
-                }
-                const data = report.data
-                this.userScores = userScores
-                // 如果没有data，则添加，否则，直接使用
-                if (!data) {
-                  this.handleList(userScores)
-                  this.$post(this.api.editExperimentalData, {
-                    reportId,
-                    data: JSON.stringify(userScores)
-                  }).then(res => {}).catch(err => {})
-                } else {
-                  this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
-                }
-            }).catch(res => {})
-        },
-        // 处理实验数据
-        handleList(list) {
-          this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-          if (this.project) {
-            list.map(e => {
-              e.assessmentPoint = ''
-              e.referenceAnswer = ''
-              e.answer = ''
-              e.lcRuleRecords.map((n, i) => {
-                e.assessmentPoint += `${i + 1}.${n.name}`
-                e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
-                e.answer += `${i + 1}.${n.userAnswer}`
-              })
-            })
-          } else { // python系统显示图片（从userScores里取）
-            list.forEach(e => {
-              const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
-              if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
-            })
-          }
-          this.expData = list
-        },
-        exportPage() {
-          const form = Object.assign(this.form, this.infoData)
-          const list = JSON.parse(JSON.stringify(this.expData))
-          list.map((e, i) => {
-            const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
-            if (item && item.runThePicture) e.runThePicture = item.runThePicture
-            if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
-            e.id = i + 1
-            // if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
-            if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+    // 处理实验数据
+    handleList (list) {
+      this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
+      if (this.project) {
+        list.map(e => {
+          e.assessmentPoint = ''
+          e.referenceAnswer = ''
+          e.answer = ''
+          e.lcRuleRecords.map((n, i) => {
+            e.assessmentPoint += `${i + 1}.${n.name}`
+            e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
+            e.answer += `${i + 1}.${n.userAnswer}`
           })
-          for (const i in form) {
-            if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
+        })
+      } else { // python系统显示图片（从userScores里取）
+        list.forEach(e => {
+          const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
+          if (item) {
+            if (item.runThePictureList) e.runThePictureList = item.runThePictureList
+            if (item.runResult) e.runResult = item.runResult
           }
-          form.purpose = form.purpose.replace(/<[^>]+>/g, '')
-          this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
-            ...form,
-            experimentalData: list
-          }).then(res => {
-            console.log(res)
-            util.downloadFileDirect(`实验报告.docx`,new Blob([res]))
-          }).catch(res => {})
-        },
-    }
+        })
+      }
+      this.expData = list
+    },
+    exportPage () {
+      const form = Object.assign(this.form, this.infoData)
+      const list = JSON.parse(JSON.stringify(this.expData))
+      list.map((e, i) => {
+        const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
+        if (item && item.runThePicture) e.runThePicture = item.runThePicture
+        if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
+        e.id = i + 1
+        // if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+        if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+      })
+      for (const i in form) {
+        if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
+      }
+      form.purpose = form.purpose.replace(/<[^>]+>/g, '')
+      this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
+        ...form,
+        experimentalData: list
+      }).then(res => {
+        console.log(res)
+        util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
+      }).catch(res => { })
+    },
+  }
 };
 </script>
 
@@ -246,22 +322,24 @@ export default {
 .wrap {
     padding: 12px 300px 20px;
 }
-code, kbd, samp{
-    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
+code,
+kbd,
+samp {
+    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
     word-wrap: break-word;
     white-space: pre-wrap;
 }
-/deep/ pre{
-    white-space: pre-wrap;       /* css-3 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
-    word-break:break-all;
-    overflow:hidden;
+/deep/ pre {
+    white-space: pre-wrap; /* css-3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: pre-wrap; /* Opera 4-6 */
+    white-space: -o-pre-wrap; /* Opera 7 */
+    word-wrap: break-word; /* Internet Explorer 5.5+ */
+    word-break: break-all;
+    overflow: hidden;
     font-size: 12px;
-    font-weight:400;
-    font-family:'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif
+    font-weight: 400;
+    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
 }
 .content {
     padding: 16px 40px;
@@ -277,7 +355,7 @@ code, kbd, samp{
     }
     .info {
         padding: 20px 16px;
-        border: 1px solid #E1E6F2;
+        border: 1px solid #e1e6f2;
     }
     .l-title {
         display: flex;
@@ -311,7 +389,7 @@ code, kbd, samp{
         span {
             min-width: 150px;
             padding: 0 10px 3px;
-            border-bottom: 1px solid #E1E6F2;
+            border-bottom: 1px solid #e1e6f2;
         }
         /deep/.el-input {
             width: 174px;
@@ -320,7 +398,7 @@ code, kbd, samp{
     .score-wrap {
         position: relative;
         min-width: 150px;
-        border-bottom: 1px solid #E1E6F2;
+        border-bottom: 1px solid #e1e6f2;
         em {
             position: absolute;
             top: -12px;
@@ -328,7 +406,7 @@ code, kbd, samp{
             font-family: din;
             font-size: 30px;
             font-weight: 600;
-            color: #0B1D30;
+            color: #0b1d30;
         }
         img {
             position: absolute;
@@ -336,16 +414,17 @@ code, kbd, samp{
             left: 0;
         }
     }
-    /deep/.el-textarea .el-textarea__inner, .pre-wrap {
+    /deep/.el-textarea .el-textarea__inner,
+    .pre-wrap {
         min-height: 72px;
         padding: 10px 16px;
         font-size: 14px;
         color: #333;
         &.edit {
-            color: #ABB3C6;
-            border: 1px solid #CACFDB;
+            color: #abb3c6;
+            border: 1px solid #cacfdb;
             border-radius: 4px;
-            background-color: #F6F7F9;
+            background-color: #f6f7f9;
         }
     }
     /deep/ .table th {
@@ -357,7 +436,7 @@ code, kbd, samp{
     }
 }
 .result-pic {
-  margin: 10px 0;
+    margin: 10px 0;
 }
 @media (max-width: 1650px) {
     .wrap {
diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue
index e10d25f..6243c38 100644
--- a/src/pages/achievement/teach/index.vue
+++ b/src/pages/achievement/teach/index.vue
@@ -358,7 +358,7 @@ export default {
       // 考核和练习调不同接口
       const { message } = await this.$post(`${this.api.practiceActivity}?pageNum=${this.pageActivation}&pageSize=${this.pageSizeActivation}&projectId=${this.id}`)
       this.activations = message.records
-      this.total = message.total
+      this.totalActivation = message.total
     },
     initData () {
       this.$refs.table.clearSelection();
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 1aff188..3c5e881 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -448,7 +448,7 @@ export default {
         this.$post(`${this.api.collectPaper}?id=${row.id}`).then(async res => {
           util.successMsg("提前结束成功！");
           this.getData();
-          // await this.$post(`${this.api.refreshPageNotification}?content=3-${row.id}`)
+          await this.$post(`${this.api.refreshPageNotification}?content=3-${row.id}`)
         }).catch(err => {
           console.log(err);
         });
diff --git a/src/pages/expSystem/backstage/model.vue b/src/pages/expSystem/backstage/model.vue
index 46948b2..59d13c1 100644
--- a/src/pages/expSystem/backstage/model.vue
+++ b/src/pages/expSystem/backstage/model.vue
@@ -56,7 +56,7 @@
         <el-table-column label="状态"
                          align="center">
           <template slot-scope="scope">
-            {{ scope.row.isOpen ? '禁用' : '启用' }}
+            {{ scope.row.isOpen || scope.row.ztOpen ? '禁用' : '启用' }}
           </template>
         </el-table-column>
         <el-table-column label="操作"
diff --git a/src/pages/match/add/set.vue b/src/pages/match/add/set.vue
index 83f9308..d99ff5c 100644
--- a/src/pages/match/add/set.vue
+++ b/src/pages/match/add/set.vue
@@ -1,247 +1,275 @@
 <template>
-    <div>
-      <el-card shadow="hover" class="m-b-20">
-          <div>
-              <p class="m-b-20">比赛名称</p>
-              {{ form.stageName }}
-          </div>
-      </el-card>
-      <el-card shadow="hover" class="m-b-20">
-          <div>
-              <p class="m-b-20">比赛时间</p>
-              <div class="date-inputs">
-                  起止时间：
-                <div style="display: inline-flex;align-items: center;">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetimerange"
-                    range-separator="~"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    format="yyyy-MM-dd HH:mm:ss"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    @change="timeChange">
-                  </el-date-picker>
-                  <el-alert
-                    style="width: auto;padding: 4px 16px;margin-left: 10px;"
-                    :title="'(请设置在 ' + step1.playStartTime + ' ~ ' + step1.playEndTime + '间)'"
-                    type="error"
-                    :closable="false"
-                    effect="dark">
-                  </el-alert>
-                </div>
-              </div>
+  <div>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div>
+        <p class="m-b-20">比赛名称</p>
+        {{ form.stageName }}
+      </div>
+    </el-card>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div>
+        <p class="m-b-20">比赛时间</p>
+        <div class="date-inputs">
+          起止时间：
+          <div style="display: inline-flex;align-items: center;">
+            <el-date-picker v-model="form.time"
+                            type="datetimerange"
+                            range-separator="~"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            format="yyyy-MM-dd HH:mm:ss"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            @change="timeChange">
+            </el-date-picker>
+            <el-alert style="width: auto;padding: 4px 16px;margin-left: 10px;"
+                      :title="'(请设置在 ' + step1.playStartTime + ' ~ ' + step1.playEndTime + '间)'"
+                      type="error"
+                      :closable="false"
+                      effect="dark">
+            </el-alert>
           </div>
-      </el-card>
-      <el-card shadow="hover" class="mgr20 m-b-20">
+        </div>
+      </div>
+    </el-card>
+    <el-card shadow="hover"
+             class="mgr20 m-b-20">
+      <div>
+        <p class="m-b-20">课程</p>
+        <div class="inline-input">
+          <el-select v-model="form.cid"
+                     @change="courseChange">
+            <el-option v-for="item in curriculumList"
+                       :key="item.associatedProduct"
+                       :label="item.productName"
+                       :value="item.associatedProduct
+">
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+    </el-card>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div class="flex-between m-b-20">
+        <span>实训项目</span>
+        <div style="display: inline-flex;">
           <div>
-              <p class="m-b-20">课程</p>
-              <div class="inline-input">
-                  <el-select v-model="form.cid" @change="courseChange">
-                      <el-option
-                          v-for="item in curriculumList"
-                          :key="item.cid"
-                          :label="item.curriculumName"
-                          :value="item.cid">
-                      </el-option>
-                  </el-select>
-              </div>
-          </div>
-      </el-card>
-      <el-card shadow="hover" class="m-b-20">
-          <div class="flex-between m-b-20">
-              <span>实训项目</span>
-              <div style="display: inline-flex;">
-                  <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 @click="toProject">自定义实验项目</el-button>
-              </div>
+            <el-input placeholder="请输入项目名称"
+                      prefix-icon="el-icon-search"
+                      v-model.trim="keyword"
+                      clearable></el-input>
           </div>
-          <!-- 实训项目表格 -->
-          <el-table :data="projects" class="table" stripe header-align="center">
-              <el-table-column width="60" label="选择" align="center">
-                  <template slot-scope="scope">
-                      <el-radio v-model="form.projectId" :label="scope.row.projectId">&nbsp;</el-radio>
-                  </template>
-              </el-table-column>
-              <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
-              <el-table-column prop="auth" label="项目权限" align="center">
-                  <template slot-scope="scope">
-                      {{ permissionsKeys[scope.row.permissions] }}
-                  </template>
-              </el-table-column>
-              <el-table-column prop="founder" label="创建人" align="center">
-                  <template slot-scope="scope">
-                      {{ scope.row.founder ? '老师创建' : '系统内置' }}
-                  </template>
-              </el-table-column>
-              <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
-              <!-- <el-table-column label="操作" align="center">
+          <el-button style="margin-left: 5px"
+                     type="primary"
+                     round
+                     @click="toProject">自定义实验项目</el-button>
+        </div>
+      </div>
+      <!-- 实训项目表格 -->
+      <el-table :data="projects"
+                class="table"
+                stripe
+                header-align="center">
+        <el-table-column width="60"
+                         label="选择"
+                         align="center">
+          <template slot-scope="scope">
+            <el-radio v-model="form.projectId"
+                      :label="scope.row.projectId">&nbsp;</el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column prop="projectName"
+                         label="项目名称"
+                         align="center"></el-table-column>
+        <el-table-column prop="auth"
+                         label="项目权限"
+                         align="center">
+          <template slot-scope="scope">
+            {{ permissionsKeys[scope.row.permissions] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="founder"
+                         label="创建人"
+                         align="center">
+          <template slot-scope="scope">
+            {{ scope.row.founder ? '老师创建' : '系统内置' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime"
+                         label="创建时间"
+                         align="center"></el-table-column>
+        <!-- <el-table-column label="操作" align="center">
                   <template slot-scope="scope">
                       <el-button type="text" @click="showProject(scope.row)">查看</el-button>
                   </template>
               </el-table-column>  -->
-          </el-table>
-          <div class="pagination">
-              <el-pagination
-                  background
-                  :page-size="pageSize"
-                  @current-change="handleCurrentChange"
-                  layout="total,prev, pager, next"
-                  :total="total"
-              ></el-pagination>
-          </div>
-      </el-card>
-
-      <div style="text-align: center">
-        <el-button @click="back">返回</el-button>
-        <el-button type="primary" @click="save">保存</el-button>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background
+                       :page-size="pageSize"
+                       @current-change="handleCurrentChange"
+                       layout="total,prev, pager, next"
+                       :total="total"></el-pagination>
       </div>
+    </el-card>
+
+    <div style="text-align: center">
+      <el-button @click="back">返回</el-button>
+      <el-button type="primary"
+                 @click="save">保存</el-button>
     </div>
+  </div>
 </template>
 
 <script>
 import util from "@/libs/util";
 import { Loading } from 'element-ui'
 export default {
-    props: ['form', 'step1'],
-    data() {
-        return {
-          loadIns: null,
-          curriculumList: [],
-          keyword: '',
-          projects: [],
-          page: 1,
-          pageSize: 5,
-          total: 0,
-          sysId: '',
-          permissionsKeys: ['练习', '考核', '竞赛'],
-          timeInvalid: false
-        };
+  props: ['form', 'step1'],
+  data () {
+    return {
+      loadIns: null,
+      curriculumList: [],
+      keyword: '',
+      projects: [],
+      page: 1,
+      pageSize: 5,
+      total: 0,
+      sysId: '',
+      permissionsKeys: ['练习', '考核', '竞赛'],
+      timeInvalid: false
+    };
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler () {
+        this.updateTime++
+      },
+      deep: true
     },
-    watch: {
-        // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
-        form: {
-          handler(){
-            this.updateTime++
-          },
-          deep:true
-        },
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
-        }
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    this.getCourse()
+  },
+  methods: {
+    // 获取课程
+    getCourse () {
+      this.loadIns = Loading.service()
+      this.$post(this.api.listOfGoods, {
+        hotTag: 1,
+        isShelves: 0,
+        sort: 0,
+        pageNum: 1,
+        pageSize: 1000
+      }).then(({ page }) => {
+        const list = page.records
+        this.curriculumList = list
+        if (!this.form.cid && list.length) this.form.cid = list[0].associatedProduct
+        this.courseChange()
+      }).catch(err => {
+        this.loadIns.close()
+      });
     },
-    mounted() {
-      this.getCourse()
+    // 课程选择回调
+    courseChange (val) {
+      const { systemId } = this.curriculumList.find(e => e.cid == this.form.cid)
+      this.sysId = systemId
+      if (val) this.loadIns = Loading.service()
+      this.getProject()
     },
-    methods: {
-      // 获取课程
-      getCourse() {
-          this.loadIns = Loading.service()
-          this.$get(this.api.curriculumList).then(({ data }) => {
-            const list = data
-            this.curriculumList = data
-            if (!this.form.cid && list.length) this.form.cid = list[0].cid
-            this.courseChange()
-          }).catch(err => {
-            this.loadIns.close()
-          });
-      },
-      // 课程选择回调
-      courseChange(val) {
-        const { systemId } = this.curriculumList.find(e => e.cid == this.form.cid)
-        this.sysId = systemId
-        if (val) this.loadIns = Loading.service()
-        this.getProject()
-      },
-      // 查询项目
-      getProject() {
-        this.$post(this.api.getProjectAssessmentByCompetition, {
-          pageNum: this.page,
-          pageSize: this.pageSize,
-          cid: this.form.cid,
-          projectName: this.keyword,
-          systemId: this.sysId,
-          permissions: 2
-        }).then(({ data }) => {
-          this.projects = data.records
-          this.total = data.total
-          this.loadIns.close()
-        }).catch(err => {
-          this.loadIns.close()
-        });
-      },
-      initData() {
-        this.page = 1;
-        this.getProject();
-      },
-      handleCurrentChange(val) {
-          this.page = val;
-          this.getProject();
-      },
-      // 自定义项目
-      toProject() {
+    // 查询项目
+    getProject () {
+      this.$post(this.api.getProjectAssessmentByCompetition, {
+        pageNum: this.page,
+        pageSize: this.pageSize,
+        cid: this.form.cid,
+        projectName: this.keyword,
+        systemId: this.sysId,
+        permissions: 2
+      }).then(({ data }) => {
+        this.projects = data.records
+        this.total = data.total
+        this.loadIns.close()
+      }).catch(err => {
+        this.loadIns.close()
+      });
+    },
+    initData () {
+      this.page = 1;
+      this.getProject();
+    },
+    handleCurrentChange (val) {
+      this.page = val;
+      this.getProject();
+    },
+    // 自定义项目
+    toProject () {
+      const { form, curStep } = this.$parent
+      form[curStep] = this.form
+      this.$store.commit('match/setCache', {
+        form,
+        curStep
+      })
+      this.$parent.pass = 1
+      this.$router.push(`/project/list?show=1`)
+    },
+    // 时间选择回调
+    timeChange (val) {
+      if (val.length) {
+        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
         const { form, curStep } = this.$parent
-        form[curStep] = this.form
-        this.$store.commit('match/setCache', {
-          form,
-          curStep
-        })
-        this.$router.push(`/project/list?show=1`)
-      },
-      // 时间选择回调
-      timeChange(val) {
-        if (val.length) {
-          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
-          const { form, curStep } = this.$parent
-          for (const i in form) {
-            // 判断其他阶段的时间跟当前选的时间是否重叠
-            if (i !== curStep) {
-              const time1 = new Date(form[i].startTime)
-              const time2 = new Date(form[i].endTime)
-              if ((startTime >= time1 && startTime <= time2) || (endTime >= time1 && endTime <= time2)) {
-                util.warningMsg('请注意，所设置的时间与已设置的阶段时间重合。')
-                break
-              }
+        for (const i in form) {
+          // 判断其他阶段的时间跟当前选的时间是否重叠
+          if (i !== curStep) {
+            const time1 = new Date(form[i].startTime)
+            const time2 = new Date(form[i].endTime)
+            if ((startTime >= time1 && startTime <= time2) || (endTime >= time1 && endTime <= time2)) {
+              util.warningMsg('请注意，所设置的时间与已设置的阶段时间重合。')
+              break
             }
           }
         }
-      },
-      // 提交
-      save() {
-        const { form } = this
-        if (!form.time.length) 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 { systemId, systemName, projectName } = this.projects.find(e => e.projectId == form.projectId)
-        if (systemId) form.systemId = systemId
-        if (projectName) form.projectName = projectName
-        if (systemName) form.systemName = systemName
-        form.startTime = form.time[0]
-        form.endTime = form.time[1]
-        this.$emit('hideSet', this.form)
-      },
-      // 返回
-      back() {
-        this.$emit('hideSet')
       }
+    },
+    // 提交
+    save () {
+      const { form } = this
+      if (!form.time.length) 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 { systemId, systemName, projectName } = this.projects.find(e => e.projectId == form.projectId)
+      if (systemId) form.systemId = systemId
+      if (projectName) form.projectName = projectName
+      if (systemName) form.systemName = systemName
+      form.startTime = form.time[0]
+      form.endTime = form.time[1]
+      this.$emit('hideSet', this.form)
+    },
+    // 返回
+    back () {
+      this.$emit('hideSet')
     }
+  }
 };
 </script>
 
 <style scoped lang="scss">
-
 </style>
\ No newline at end of file
diff --git a/src/pages/match/add/step3.vue b/src/pages/match/add/step3.vue
index ba73ef6..7506d06 100644
--- a/src/pages/match/add/step3.vue
+++ b/src/pages/match/add/step3.vue
@@ -1,319 +1,355 @@
 <template>
-    <div>
-        <div v-show="!setVisible" class="page">
-          <div class="page-content">
-            <div class="p-title">比赛内容设置</div>
-            <el-form label-width="170px" label-suffix=":" size="small" :disabled="!editing && id">
-              <div v-for="(item, i) in form" :key="i" class="step">
-                <div class="title">
-                  <span>{{ item.stageName }}（第{{ nums[i] }}阶段） | {{ methods.find(e => e.id === item.method).name }} </span>
-                  <el-button v-if="item.method !== 2" type="primary" @click="toSet(i)">设置</el-button>
-                </div>
-                <el-form-item class="req" prop="time" label="比赛时间">
-                  <span v-if="item.method !== 2 && item.startTime">{{ item.startTime + ' 至 ' + item.endTime }}</span>
-                  <div style="display: flex;align-items: center;" v-if="item.method === 2">
-                    <el-date-picker
-                      v-model="item.time"
-                      type="datetimerange"
-                      range-separator="~"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                      format="yyyy-MM-dd HH:mm:ss"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      @change="timeChange">
-                    </el-date-picker>
-                    <el-alert
-                      style="width: auto;padding: 0px 16px;margin-left: 10px;"
-                      :title="'(请设置在 ' + step1.playStartTime + ' ~ ' + step1.playEndTime + '间)'"
-                      type="error"
-                      :closable="false"
-                      effect="dark">
-                    </el-alert>
-                  </div>
-                </el-form-item>
-                <template v-if="item.method === 2">
-                  <el-form-item class="req" label="比赛地点">
-                    <el-input v-model="item.offlineAddress" style="width: 80%"></el-input>
-                  </el-form-item>
-                  <el-form-item class="req" label="比赛内容">
-                    <el-input v-model="item.contentDescription" type="textarea" style="width: 80%"></el-input>
-                  </el-form-item>
-                  <el-form-item class="req" label="评分规则">
-                    <el-input v-model="item.scoreRule" type="textarea" style="width: 80%"></el-input>
-                  </el-form-item>
-                </template>
-                <template v-else>
-                  <el-form-item class="req" prop="cid" label="课程系统">
-                    {{ item.systemName }}
-                  </el-form-item>
-                  <el-form-item class="req" prop="assessmentId" label="已选择考核">
-                    {{ item.projectName }}
-                  </el-form-item>
-                  <el-form-item class="req" prop="resultAnnouncementTime" label="比赛地点">
-                    <div class="line">
-                      <el-checkbox v-model="item.onlineButton">线上</el-checkbox>
-                      <el-input v-model="item.onlineAddress" clearable placeholder="请输入比赛网址" :disabled="!item.onlineButton" style="width: 400px;margin-left: 10px"></el-input>
-                    </div>
-                    <div class="line">
-                      <el-checkbox v-model="item.offlineButton">线下</el-checkbox>
-                      <el-input v-model="item.offlineAddress" clearable placeholder="请输入地址" :disabled="!item.offlineButton" style="width: 400px;margin-left: 10px"></el-input>
-                    </div>
-                  </el-form-item>
-                </template>
+  <div>
+    <div v-show="!setVisible"
+         class="page">
+      <div class="page-content">
+        <div class="p-title">比赛内容设置</div>
+        <el-form label-width="170px"
+                 label-suffix=":"
+                 size="small"
+                 :disabled="!editing && id">
+          <div v-for="(item, i) in form"
+               :key="i"
+               class="step">
+            <div class="title">
+              <span>{{ item.stageName }}（第{{ nums[i] }}阶段） | {{ methods.find(e => e.id === item.method).name }} </span>
+              <el-button v-if="item.method !== 2"
+                         type="primary"
+                         @click="toSet(i)">设置</el-button>
+            </div>
+            <el-form-item class="req"
+                          prop="time"
+                          label="比赛时间">
+              <span v-if="item.method !== 2 && item.startTime">{{ item.startTime + ' 至 ' + item.endTime }}</span>
+              <div style="display: flex;align-items: center;"
+                   v-if="item.method === 2">
+                <el-date-picker v-model="item.time"
+                                type="datetimerange"
+                                range-separator="~"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                                format="yyyy-MM-dd HH:mm:ss"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                @change="timeChange">
+                </el-date-picker>
+                <el-alert style="width: auto;padding: 0px 16px;margin-left: 10px;"
+                          :title="'(请设置在 ' + step1.playStartTime + ' ~ ' + step1.playEndTime + '间)'"
+                          type="error"
+                          :closable="false"
+                          effect="dark">
+                </el-alert>
               </div>
-            </el-form>
+            </el-form-item>
+            <template v-if="item.method === 2">
+              <el-form-item class="req"
+                            label="比赛地点">
+                <el-input v-model="item.offlineAddress"
+                          style="width: 80%"></el-input>
+              </el-form-item>
+              <el-form-item class="req"
+                            label="比赛内容">
+                <el-input v-model="item.contentDescription"
+                          type="textarea"
+                          style="width: 80%"></el-input>
+              </el-form-item>
+              <el-form-item class="req"
+                            label="评分规则">
+                <el-input v-model="item.scoreRule"
+                          type="textarea"
+                          style="width: 80%"></el-input>
+              </el-form-item>
+            </template>
+            <template v-else>
+              <el-form-item class="req"
+                            prop="cid"
+                            label="课程系统">
+                {{ item.systemName }}
+              </el-form-item>
+              <el-form-item class="req"
+                            prop="assessmentId"
+                            label="已选择考核">
+                {{ item.projectName }}
+              </el-form-item>
+              <el-form-item class="req"
+                            prop="resultAnnouncementTime"
+                            label="比赛地点">
+                <div class="line">
+                  <el-checkbox v-model="item.onlineButton">线上</el-checkbox>
+                  <el-input v-model="item.onlineAddress"
+                            clearable
+                            placeholder="请输入比赛网址"
+                            :disabled="!item.onlineButton"
+                            style="width: 400px;margin-left: 10px"></el-input>
+                </div>
+                <div class="line">
+                  <el-checkbox v-model="item.offlineButton">线下</el-checkbox>
+                  <el-input v-model="item.offlineAddress"
+                            clearable
+                            placeholder="请输入地址"
+                            :disabled="!item.offlineButton"
+                            style="width: 400px;margin-left: 10px"></el-input>
+                </div>
+              </el-form-item>
+            </template>
           </div>
-        </div>
-
-        <set v-if="setVisible" :form.sync="form[curStep]" :step1.sync="step1" @hideSet="hideSet" />
+        </el-form>
+      </div>
     </div>
+
+    <set v-if="setVisible"
+         :form.sync="form[curStep]"
+         :step1.sync="step1"
+         @hideSet="hideSet" />
+  </div>
 </template>
 
 <script>
 import util from "@/libs/util";
 import set from './set'
 export default {
-    props: ['setupId', 'competitionId', 'editing'],
-    data() {
-        return {
-          id: this.$route.query.id,
-          updateTime: 0,
-          step1: this.$parent.$refs.step1.form,
-          cache: this.$store.state.match.cache,
-          nums: ['一', '二', '三'],
-          methods: [
-            {
-              id: 0,
-              name: '实操'
-            },
-            {
-              id: 1,
-              name: '理论'
-            },
-            {
-              id: 2,
-              name: '线下'
-            }
-          ],
-          originForm: {
-            cid: '',
-            contentDescription: '',
-            endTime: '',
-            scoreRule: '',
-            stageId: '',
-            startTime: '',
-            systemId: '',
-            offlineAddress: '',
-            offlineButton: 0,
-            onlineAddress: '',
-            onlineButton: 0,
-            time: []
-          },
-          form: [],
-          setVisible: false,
-          curStep: 0,
-        };
-    },
-    components: {
-      set
-    },
-    watch: {
-      // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
-      form: {
-        handler(){
-          this.updateTime++
+  props: ['setupId', 'competitionId', 'editing'],
+  data () {
+    return {
+      id: this.$route.query.id,
+      updateTime: 0,
+      step1: this.$parent.$refs.step1.form,
+      cache: this.$store.state.match.cache,
+      nums: ['一', '二', '三'],
+      methods: [
+        {
+          id: 0,
+          name: '实操'
         },
-        deep:true
-      },
-    },
-    mounted() {
-      this.handleForm()
-    },
-    methods: {
-      // 如果是从自定义项目入口进去后返回的，要恢复上次的阶段和数据
-      resumeData() {
-        if (this.cache) {
-          this.curStep = this.cache.curStep
-          if (this.cache.form) this.form = this.cache.form
-          this.setVisible = true
-          this.$store.commit('match/setCache', null)
+        {
+          id: 1,
+          name: '理论'
+        },
+        {
+          id: 2,
+          name: '线下'
         }
+      ],
+      originForm: {
+        cid: '',
+        mallId: '',
+        contentDescription: '',
+        endTime: '',
+        scoreRule: '',
+        stageId: '',
+        startTime: '',
+        systemId: '',
+        offlineAddress: '',
+        offlineButton: 0,
+        onlineAddress: '',
+        onlineButton: 0,
+        time: []
       },
-      // 处理form
-      handleForm() {
-        // 根据赛事id查询赛事规则
-        this.$post(`${this.api.queryCompetitionStageBySetupId}?setupId=${this.setupId}`).then(res => {
-          res.competitionStages.map(e => {
-            const form = e.competitionContent || JSON.parse(JSON.stringify(this.originForm))
-            if (form.startTime) {
-              form.time = [form.startTime, form.endTime]
-            } else {
-              form.time = []
-            }
-            form.offlineButton = !!form.offlineButton
-            form.onlineButton = !!form.onlineButton
-            form.method = e.method
-            form.stageId = e.stageId
-            form.stageName = e.stageName
-            this.form.push(form)
-          })
-          this.resumeData()
-          this.$nextTick(() => {
-            this.updateTime = 0
-          })
-        }).catch(res => {})
+      form: [],
+      setVisible: false,
+      curStep: 0,
+      pass: 0
+    };
+  },
+  components: {
+    set
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler () {
+        this.updateTime++
       },
-      // 显示设置页面
-      toSet(i) {
-        this.curStep = i
-        this.$parent.showBtns = false
+      deep: true
+    },
+  },
+  mounted () {
+    this.handleForm()
+  },
+  methods: {
+    // 如果是从自定义项目入口进去后返回的，要恢复上次的阶段和数据
+    resumeData () {
+      if (this.cache) {
+        this.curStep = this.cache.curStep
+        if (this.cache.form) this.form = this.cache.form
         this.setVisible = true
-      },
-      // 隐藏设置
-      hideSet(form) {
-        if (form) this.form[this.curStep] = form
-        this.setVisible = false
-        this.$parent.showBtns = true
-      },
-      // 时间选择回调
-      timeChange(val) {
-        if (val.length) {
-          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)) return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
-          const { form, curStep } = this
-          for (const i in form) {
-            // 判断其他阶段的时间跟当前选的时间是否重叠
-            if (i !== curStep) {
-              const time1 = new Date(form[i].startTime)
-              const time2 = new Date(form[i].endTime)
-              if ((startTime >= time1 && startTime <= time2) || (endTime >= time1 && endTime <= time2)) {
-                util.warningMsg('请注意，所设置的时间与已设置的阶段时间重合。')
-                break
-              }
+        this.$store.commit('match/setCache', null)
+      }
+    },
+    // 处理form
+    handleForm () {
+      // 根据赛事id查询赛事规则
+      this.$post(`${this.api.queryCompetitionStageBySetupId}?setupId=${this.setupId}`).then(res => {
+        res.competitionStages.map(e => {
+          const form = e.competitionContent || JSON.parse(JSON.stringify(this.originForm))
+          if (form.startTime) {
+            form.time = [form.startTime, form.endTime]
+          } else {
+            form.time = []
+          }
+          form.offlineButton = !!form.offlineButton
+          form.onlineButton = !!form.onlineButton
+          form.method = e.method
+          form.stageId = e.stageId
+          form.stageName = e.stageName
+          this.form.push(form)
+        })
+        this.resumeData()
+        this.$nextTick(() => {
+          this.updateTime = 0
+        })
+      }).catch(res => { })
+    },
+    // 显示设置页面
+    toSet (i) {
+      this.curStep = i
+      this.$parent.showBtns = false
+      this.setVisible = true
+    },
+    // 隐藏设置
+    hideSet (form) {
+      if (form) this.form[this.curStep] = form
+      this.setVisible = false
+      this.$parent.showBtns = true
+    },
+    // 时间选择回调
+    timeChange (val) {
+      if (val.length) {
+        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)) return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
+        const { form, curStep } = this
+        for (const i in form) {
+          // 判断其他阶段的时间跟当前选的时间是否重叠
+          if (i !== curStep) {
+            const time1 = new Date(form[i].startTime)
+            const time2 = new Date(form[i].endTime)
+            if ((startTime >= time1 && startTime <= time2) || (endTime >= time1 && endTime <= time2)) {
+              util.warningMsg('请注意，所设置的时间与已设置的阶段时间重合。')
+              break
             }
           }
         }
-      },
-      // 发布赛事
-      publish() {
-        this.competitionId && this.$post(`${this.api.publishCompetition}?competitionId=${this.competitionId}&publishStatus=1`).then(res => {}).catch(err => {})
-      },
-      // 提交
-      save(status, next = 0,releaseType,cb) {
-        const { form } = this
-        if (!form.length) {
-          this.$parent.hideLoad()
-          util.successMsg('保存成功')
-          this.$emit('next', next)
-          return
-        }
-        // 发布才需要判断必填
-        if (status) {
-          let invalid = 0
-          const { playStartTime, playEndTime } = this.step1
-          for (const e of form) {
-            if (!e.time.length) {
+      }
+    },
+    // 发布赛事
+    publish () {
+      this.competitionId && this.$post(`${this.api.publishCompetition}?competitionId=${this.competitionId}&publishStatus=1`).then(res => { }).catch(err => { })
+    },
+    // 提交
+    save (status, next = 0, releaseType, cb) {
+      const { form } = this
+      if (!form.length) {
+        this.$parent.hideLoad()
+        util.successMsg('保存成功')
+        this.$emit('next', next)
+        return
+      }
+      // 发布才需要判断必填
+      if (status) {
+        let invalid = 0
+        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) {
+            invalid = 1
+            util.errorMsg('请选择课程')
+            break
+          }
+          if (e.method === 2) { // 线下
+            if (!e.offlineAddress) {
+              invalid = 1
+              util.errorMsg('请输入比赛地点')
+              break
+            }
+            if (!e.contentDescription) {
               invalid = 1
-              util.errorMsg('请选择比赛时间')
+              util.errorMsg('请输入比赛内容')
               break
             }
-            if (new Date(e.time[0]) < new Date(playStartTime) || new Date(e.time[1]) > new Date(playEndTime)) {
+            if (!e.scoreRule) {
               invalid = 1
-              util.errorMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
+              util.errorMsg('请输入评分规则')
               break
             }
-            e.startTime = e.time[0]
-            e.endTime = e.time[1]
-            if (e.method !== 2 && !e.cid) {
+          } else {
+            if (e.onlineButton && !e.onlineAddress) {
               invalid = 1
-              util.errorMsg('请选择课程')
+              util.errorMsg('请输入线上地点')
               break
             }
-            if (e.method === 2) { // 线下
-              if (!e.offlineAddress) {
-                invalid = 1
-                util.errorMsg('请输入比赛地点')
-                break
-              }
-              if (!e.contentDescription) {
-                invalid = 1
-                util.errorMsg('请输入比赛内容')
-                break
-              }
-              if (!e.scoreRule) {
-                invalid = 1
-                util.errorMsg('请输入评分规则')
-                break
-              }
-            } else {
-              if (e.onlineButton && !e.onlineAddress) {
-                invalid = 1
-                util.errorMsg('请输入线上地点')
-                break
-              }
-              if (e.offlineButton && !e.offlineAddress) {
-                invalid = 1
-                util.errorMsg('请输入线下地点')
-                break
-              }
-              if (!e.onlineAddress && !e.offlineAddress) {
-                invalid = 1
-                util.errorMsg('请输入比赛地点')
-                break
-              }
+            if (e.offlineButton && !e.offlineAddress) {
+              invalid = 1
+              util.errorMsg('请输入线下地点')
+              break
+            }
+            if (!e.onlineAddress && !e.offlineAddress) {
+              invalid = 1
+              util.errorMsg('请输入比赛地点')
+              break
             }
           }
-          if (invalid) return
         }
-        // 处理单选框
-        for (const e of form) {
-          e.offlineButton = e.offlineButton ? 1 : 0
-          e.onlineButton = e.onlineButton ? 1 : 0
-        }
-        this.$parent.showLoad()
-        this.$post(this.api[form[0].contentId ? 'editCompetitionContent' : 'addCompetitionContent'], {
-          competitionContents: form
-        }).then(res => {
-          this.$parent.hideLoad()
-          // 新增赛事，并且点的是发布按钮，则发布该赛事
-          status && this.publish(status)
-          util.successMsg((status ? '发布' : '保存') + '成功')
-          this.$emit('next', next,cb)
-        }).catch(err => {
-          this.$parent.hideLoad()
-        })
-      },
-    }
+        if (invalid) return
+      }
+      // 处理单选框
+      for (const e of form) {
+        e.offlineButton = e.offlineButton ? 1 : 0
+        e.onlineButton = e.onlineButton ? 1 : 0
+      }
+      this.$parent.showLoad()
+      this.$post(this.api[form[0].contentId ? 'editCompetitionContent' : 'addCompetitionContent'], {
+        competitionContents: form
+      }).then(res => {
+        this.$parent.hideLoad()
+        // 新增赛事，并且点的是发布按钮，则发布该赛事
+        status && this.publish(status)
+        util.successMsg((status ? '发布' : '保存') + '成功')
+        this.$emit('next', next, cb)
+      }).catch(err => {
+        this.$parent.hideLoad()
+      })
+    },
+  }
 };
 </script>
 
 <style scoped lang="scss">
 .step {
-  padding-bottom: 10px;
-  background-color: #f9f9f9;
-  .title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 10px 15px;
-    margin-bottom: 10px;
-    background-color: #ededed;
-  }
+    padding-bottom: 10px;
+    background-color: #f9f9f9;
+    .title {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 10px 15px;
+        margin-bottom: 10px;
+        background-color: #ededed;
+    }
 }
 .line {
-  margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 /deep/.req {
-  .el-form-item__label {
-    &:before {
-      content: '*';
-      margin-right: 5px;
-      font-size: 18px;
-      vertical-align: middle;
-      color: #f00;
+    .el-form-item__label {
+        &:before {
+            content: '*';
+            margin-right: 5px;
+            font-size: 18px;
+            vertical-align: middle;
+            color: #f00;
+        }
     }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/match/manage/index.vue b/src/pages/match/manage/index.vue
index 9a4420f..3fff8f0 100644
--- a/src/pages/match/manage/index.vue
+++ b/src/pages/match/manage/index.vue
@@ -1,22 +1,30 @@
 <template>
-    <!--  赛事管理  -->
-    <div>
-        <el-card shadow="hover" class="m-b-20">
-            <div class="flex-between">
-                <el-page-header @back="back" :content="name + '/管理'"></el-page-header>
-            </div>
-        </el-card>
-        <div class="page" style="margin-bottom: 24px">
-            <div class="tabs">
-                <a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a>
-            </div>
-            <MatchDetail v-if="active == 'tab1'" ref="detail" />
-            <MatchArch v-if="active == 'tab2'" />
-            <MatchProgress v-else-if="active == 'tab3'" />
-            <notice v-else-if="active == 'tab4'" />
-            <MatchSignup v-else-if="active == 'tab5'" />
-        </div>
+  <!--  赛事管理  -->
+  <div>
+    <el-card shadow="hover"
+             class="m-b-20">
+      <div class="flex-between">
+        <el-page-header @back="back"
+                        :content="name + '/管理'"></el-page-header>
+      </div>
+    </el-card>
+    <div class="page"
+         style="margin-bottom: 24px">
+      <div class="tabs">
+        <a class="item"
+           v-for="(item,index) in tabs"
+           :key="index"
+           :class="{active: index == active}"
+           @click="tabChange(index)">{{ item }}</a>
+      </div>
+      <MatchDetail v-if="active == 'tab1'"
+                   ref="detail" />
+      <MatchArch v-if="active == 'tab2'" />
+      <MatchProgress v-else-if="active == 'tab3'" />
+      <notice v-else-if="active == 'tab4'" />
+      <MatchSignup v-else-if="active == 'tab5'" />
     </div>
+  </div>
 
 </template>
 
@@ -29,132 +37,133 @@ import notice from "./notice";
 import MatchSignup from "./matchSignup";
 import { mapState } from "vuex";
 export default {
-    name: "matchManage",
-    data() {
-        return {
-            name: this.$route.query.name,
-            active: this.$route.query.tab || "tab1",
-            tabs: {
-                tab1: "大赛详情",
-                tab2: "大赛成绩管理",
-                tab3: "竞赛进展",
-                tab4: "公告通知",
-                tab5: "报名人员"
-            },
-        };
-    },
-    components: {
-        MatchDetail,
-        MatchArch,
-        MatchProgress,
-        notice,
-        MatchSignup
-    },
-    computed: {
-      ...mapState("user", [
-        'page'
-      ]),
-      ...mapState('auth', [
-        'btns'
-      ])
-    },
-    mounted() {
-      Setting.dynamicRoute && this.initTabs()
-    },
-    beforeRouteLeave(to, from, next) {
-      const { detail } = this.$refs
-      if (detail) {
-        const step = detail.$refs['step' + detail.step]
-        if (detail.step < 4 && step && step.updateTime) {
-          this.$confirm(`编辑的内容未保存，是否保存并且发布？`, '提示.......', {
-            type: 'warning'
-          }).then(() => {
-            detail.save(1,to.path,next)
-          }).catch(() => {
-            next()
-          })
-        } else {
+  name: "matchManage",
+  data () {
+    return {
+      name: this.$route.query.name,
+      active: this.$route.query.tab || "tab1",
+      tabs: {
+        tab1: "大赛详情",
+        tab2: "大赛成绩管理",
+        tab3: "竞赛进展",
+        tab4: "公告通知",
+        tab5: "报名人员"
+      },
+      pass: 0
+    };
+  },
+  components: {
+    MatchDetail,
+    MatchArch,
+    MatchProgress,
+    notice,
+    MatchSignup
+  },
+  computed: {
+    ...mapState("user", [
+      'page'
+    ]),
+    ...mapState('auth', [
+      'btns'
+    ])
+  },
+  mounted () {
+    Setting.dynamicRoute && this.initTabs()
+  },
+  beforeRouteLeave (to, from, next) {
+    const { detail } = this.$refs
+    if (detail) {
+      const step = detail.$refs['step' + detail.step]
+      if (detail.step < 4 && step && step.updateTime && !step.pass && !this.pass) {
+        this.$confirm(`编辑的内容未保存，是否保存并且发布？`, '提示.......', {
+          type: 'warning'
+        }).then(() => {
+          detail.save(1, to.path, next)
+        }).catch(() => {
           next()
-        }
+        })
       } else {
         next()
       }
-    },
-    methods: {
-        initTabs() {
-          const { btns } = this
-          console.log("🚀 ~ file: index.vue:67 ~ initTabs ~ btns", btns)
-          const tab1 = btns.includes('/match/list:管理:大赛详情')
-          const tab2 = btns.includes('/match/list:管理:大赛成绩管理')
-          const tab3 = btns.includes('/match/list:管理:竞赛进展')
-          const tab4 = btns.includes('/match/list:管理:公告通知')
-          const tab5 = btns.includes('/match/list:管理:报名人员')
+    } else {
+      next()
+    }
+  },
+  methods: {
+    initTabs () {
+      const { btns } = this
+      console.log("🚀 ~ file: index.vue:67 ~ initTabs ~ btns", btns)
+      const tab1 = btns.includes('/match/list:管理:大赛详情')
+      const tab2 = btns.includes('/match/list:管理:大赛成绩管理')
+      const tab3 = btns.includes('/match/list:管理:竞赛进展')
+      const tab4 = btns.includes('/match/list:管理:公告通知')
+      const tab5 = btns.includes('/match/list:管理:报名人员')
 
-          tab1 || this.$delete(this.tabs, 'tab1')
-          tab2 || this.$delete(this.tabs, 'tab2')
-          tab3 || this.$delete(this.tabs, 'tab3')
-          tab4 || this.$delete(this.tabs, 'tab4')
-          tab5 || this.$delete(this.tabs, 'tab5')
-          const type = this.$route.query.tab
-          const keys = Object.keys(this.tabs)
-          this.active = keys.includes(type) ? type : keys[0]
-        },
-        // 移除成绩管理
-        hideArch() {
-          this.$delete(this.tabs, 'tab2')
-        },
-        back() {
-          this.handleSave(0) && this.backPage()
-        },
-        // 判断是否需要confirm
-        handleSave(i) {
-          // 如果是赛事详情，则要判断是否已经保存，未保存则提示是否保存
-          if (this.active === 'tab1') {
-            const { detail } = this.$refs
-            if (detail) {
-              const step = detail.$refs['step' + detail.step]
-              if (detail.step < 4 && step && step.updateTime) {
-                this.$confirm(`编辑的内容未保存，是否保存并且发布？`, '提示', {
-                  type: 'warning'
-                }).then(() => {
-                  detail.save(1, 1)
-                  this.backOrTab(i)
-                }).catch(() => {
-                  this.backOrTab(i)
-                })
-              } else {
-                this.backOrTab(i)
-              }
-            } else {
+      tab1 || this.$delete(this.tabs, 'tab1')
+      tab2 || this.$delete(this.tabs, 'tab2')
+      tab3 || this.$delete(this.tabs, 'tab3')
+      tab4 || this.$delete(this.tabs, 'tab4')
+      tab5 || this.$delete(this.tabs, 'tab5')
+      const type = this.$route.query.tab
+      const keys = Object.keys(this.tabs)
+      this.active = keys.includes(type) ? type : keys[0]
+    },
+    // 移除成绩管理
+    hideArch () {
+      this.$delete(this.tabs, 'tab2')
+    },
+    back () {
+      this.handleSave(0) && this.backPage()
+    },
+    // 判断是否需要confirm
+    handleSave (i) {
+      // 如果是赛事详情，则要判断是否已经保存，未保存则提示是否保存
+      if (this.active === 'tab1') {
+        const { detail } = this.$refs
+        if (detail) {
+          const step = detail.$refs['step' + detail.step]
+          if (detail.step < 4 && step && step.updateTime) {
+            this.$confirm(`编辑的内容未保存，是否保存并且发布？`, '提示', {
+              type: 'warning'
+            }).then(() => {
+              detail.save(1, 1)
+              this.backOrTab(i)
+            }).catch(() => {
               this.backOrTab(i)
-            }
-            return false
+            })
           } else {
-            return true
+            this.backOrTab(i)
           }
-        },
-        // 返回列表
-        backPage(){
-          console.log(444, this.$store.state)
-          this.$router.push(`/match?page=${this.$store.state.match.page}`)
-        },
-        // tab切换
-        tabSwitch(i) {
-          this.active = i
-          this.$router.push(`/match/manage?id=${this.$route.query.id}&tab=${i}&name=${this.name}`)
-        },
-        // 判断返回还是tab
-        backOrTab(i) {
-          i ? this.tabSwitch(i) : this.backPage()
-        },
-        // tab回调
-        tabChange(i) {
-          this.handleSave(i) && this.tabSwitch(i)
+        } else {
+          this.backOrTab(i)
         }
+        return false
+      } else {
+        return true
+      }
+    },
+    // 返回列表
+    backPage () {
+      console.log(444, this.$store.state)
+      this.pass = 1
+      this.$router.push(`/match?page=${this.$store.state.match.page}`)
+    },
+    // tab切换
+    tabSwitch (i) {
+      this.active = i
+      this.$router.push(`/match/manage?id=${this.$route.query.id}&tab=${i}&name=${this.name}`)
+    },
+    // 判断返回还是tab
+    backOrTab (i) {
+      i ? this.tabSwitch(i) : this.backPage()
+    },
+    // tab回调
+    tabChange (i) {
+      this.handleSave(i) && this.tabSwitch(i)
     }
+  }
 };
 </script>
 
 <style scoped>
-
 </style>
\ No newline at end of file
diff --git a/src/pages/match/manage/matchRank.vue b/src/pages/match/manage/matchRank.vue
index 47d9ef8..d95a633 100644
--- a/src/pages/match/manage/matchRank.vue
+++ b/src/pages/match/manage/matchRank.vue
@@ -356,7 +356,7 @@ export default {
             publicationType: this.type,
             locationStageId: this.stageId,
             stageIds: ids.splice(0, ids.length - 1)
-          }).then(({ page, publishStatus }) => {
+          }).then(({ page, publishStatus, total }) => {
             this.published = publishStatus
             this.list = page
             this.total = total
@@ -392,12 +392,7 @@ export default {
     // 排序类型切换回调
     typeChange (val) {
       this.$post(`${this.api.toggleTheSortingMode}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => { }).catch(res => { })
-
-      // this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => {
-      // if (whetherToPublish && !val) this.sourceType = '0'
       this.getRank()
-      // this.published = whetherToPublish
-      // }).catch(res => {})
     },
     initData () {
       this.page = 1
@@ -498,12 +493,10 @@ export default {
     },
     // 发布排名
     publishSubmit () {
-      const { startTime, endTime } = this.grades[this.index]
-      if (Date.now() <= new Date(endTime)) return util.errorMsg('当前阶段还在进行中,请在本阶段结束后再发布!')
       if (this.type) { // 手动发布
         this.$post(this.api.batchRelease, this.list.map(e => e.id)).then(res => {
-          this.getData()
-          util.successMsg('发布成功！')
+          // this.getData()
+          // util.successMsg('发布成功！')
         }).catch(res => { })
       } else {
         let data = [] // 手动上传后发布排名，数据直接取批量上传后返回的data
@@ -529,30 +522,15 @@ export default {
         const ids = this.grades.map(e => e.stageId)
         ids.pop()
         // 发布前校验
-        // 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()
-          util.successMsg('发布成功！')
+          // this.getData()
+          // util.successMsg('发布成功！')
         }).catch(res => { })
-        // }).catch(res => {})
       }
     },
     // 发布排名确认
     publish () {
-      // 如果已发布，并且上次发布的类型跟这次发布的类型不一致，则要提示确认
-      // if (this.published && this.sourceType != this.type) {
-      //   this.$confirm(this.sourceType == 1 && !this.type ?
-      //     '手动排名已发布，是否要取消手动排名的内容，改为系统排名的内容？' :
-      //     '默认系统排名已发布，是否要取消系统排名的内容，改为手动发布的内容？', '提示', {
-      //     type: 'success'
-      //   }).then(() => {
-      //     this.publishSubmit()
-      //   }).catch(() => {})
-      // } else {
-      //   this.publishSubmit()
-      // }
-
       this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => {
         whetherToPublish ?
           this.$confirm('排名已经发布，是否直接覆盖？', '提示', {
@@ -562,7 +540,6 @@ export default {
           }).catch(() => { }) :
           this.publishSubmit()
       }).catch(res => { })
-      // this.publishSubmit()
     },
     // 获取定时发布排名
     async getPublishTime () {
@@ -584,13 +561,18 @@ export default {
     },
     // 定时发布排名
     async publishTimeSubmit () {
-      this.$post(this.api.addCompetitionStageRankingTime, {
+      const { startTime, endTime } = this.grades[this.index]
+      if (Date.now() <= new Date(endTime)) return util.errorMsg('当前阶段还在进行中,请在本阶段结束后再发布!')
+
+      this.publishSubmit()
+      await this.$post(this.api.addCompetitionStageRankingTime, {
         competitionId: this.id,
         isOverallRanking: this.active ? 0 : 1,
         publicationType: this.type,
         stageId: this.active || this.stageId,
         releaseTime: util.formatDate("yyyy-MM-dd hh:mm:ss", this.publishTime)
       })
+
       util.successMsg('发布成功')
       this.getData()
       this.uploaded = 0
@@ -608,7 +590,7 @@ export default {
       // 如果是取消发布，则直接调取消发布的接口
       if (publish) {
         // 如果是手动发布，并且没有上传排名，则提示
-        if (this.type && !this.uploaded) {
+        if (this.type && !this.uploaded && !this.list.length) {
           return util.errorMsg('请先上传数据！')
         } else {
           this.publishTime = new Date()
@@ -618,9 +600,9 @@ export default {
         try {
           // 取消定时发布的接口跟取消普通发布的接口不一样
           // if (this.timeId) {
-          await this.$post(`${this.api.cancelCompetitionStageRankingTime}?competitionId=${this.id}&releaseId=${this.timeId}&isOverallRanking=${this.active ? 0 : 1}&stageId=${this.active || this.stageId}`)
+          // await this.$post(`${this.api.cancelCompetitionStageRankingTime}?competitionId=${this.id}&releaseId=${this.timeId}&isOverallRanking=${this.active ? 0 : 1}&stageId=${this.active || this.stageId}`)
           // } else {
-          await this.$post(`${this.api.cancelRanking}?competitionId=${this.id}&isOverallRanking=${this.active ? 0 : 1}&${this.active ? 'stageIds=' + this.active : query.join('&')}`)
+          await this.$post(`${this.api.cancelRanking}?competitionId=${this.id}&isOverallRanking=${this.active ? 0 : 1}&${this.active ? 'stageIds=' + this.active : query.join('&')}&releaseId=${this.timeId}`)
           // }
           this.publishTime = ''
           this.sourceType = ''