diff --git a/src/api/index.js b/src/api/index.js
index 0a3a692..0193980 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -14,6 +14,7 @@ export default {
     getToken: `users/users/user/getToken`,
     getOtherAccountByPhone: `users/users/user/getOtherAccountByPhone`,
     unbindAccounts: `users/users/user/unbindAccounts`,
+    deleteProfile : `users/users/userInfo/deleteProfile`,
     getUserRolesPermissionMenu: `${host}users/users/user-role/getUserRolesPermissionMenu`,
 
     platformLogList: `nakadai/nakadai/log/platformLogList`,
@@ -44,7 +45,7 @@ export default {
     experimentOverview: `occupationlab/occupationlab/achievement/experimentOverview`, //实验概览
     queryAssessmentByStudent: `occupationlab/occupationlab/achievement/queryAssessmentByStudent`, //学生端考核成绩
     queryPracticeByStudent: `occupationlab/occupationlab/achievement/queryPracticeByStudent`, //学生端练习成绩
-    exportAssessmentByStudent: `occupationlab/occupationlab/achievement/exportAssessmentByStudent`, // 批量导出考核成绩
+    exportAssessmentByStudent: `${host}occupationlab/occupationlab/achievement/exportAssessmentByStudent`, // 批量导出考核成绩
     exportPracticeByStudent: `${host}occupationlab/occupationlab/achievement/exportPracticeByStudent`, // 批量导出练习成绩
     practiceByStudentDetail: `occupationlab/occupationlab/achievement/practiceByStudentDetail`, // 学生端练习实验情况
     exportPracticeByStudentDetail: `${host}occupationlab/occupationlab/achievement/exportPracticeByStudentDetail`, // 导出学生端练习实验情况
@@ -108,6 +109,7 @@ export default {
     frontDeskOverallRanking: `competition/competition/rank/frontDeskOverallRanking`,
     frontOfficeCompetitionRanking: `competition/competition/rank/frontOfficeCompetitionRanking`,
     stageGradeManagementList: `competition/competition/performance/stageGradeManagementList`,
+    stageTeamScoreDetails: `competition/competition/rank/stageTeamScoreDetails`,
 
     // 阿里云文件/视频管理
     fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件
diff --git a/src/assets/img/index/customer.png b/src/assets/img/index/customer.png
index 2bea868..dfd21c5 100644
Binary files a/src/assets/img/index/customer.png and b/src/assets/img/index/customer.png differ
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index e3911c3..775104d 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -300,23 +300,6 @@ export default {
 
                 }
             }, 1000);
-            // this.ticker = setInterval(() => {
-            //     for (let i = 0; i < this.listData.length; i++) {
-            //         const item = this.listData[i];
-            //         if (item.countDown > 0) {
-            //             item.countDown--;
-            //         } else {
-            //             if (item.status == 0 && item.type == 2) { // 待开始-定时发布
-            //                 item.status = 1;
-            //                 item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
-            //             } else if (item.status == 1) {
-            //                 // item.status = 2;
-            //             }
-            //         }
-            //         item.show = true;
-            //         this.$set(this.listData, i, item);
-            //     }
-            // }, 1000);
         },
         getData() {
             this.listLoading = true;
@@ -459,7 +442,7 @@ export default {
             util.cookies.set("curriculumName", escape(this.curRow.sysName));
             util.cookies.set("startTime", this.curRow.startTime)
             util.cookies.set("stopTime", this.curRow.stopTime)
-            util.cookies.set("systemId", curriculumId);
+            util.cookies.set("systemId", this.systemId);
             util.cookies.set('fromManager', '', -1)
             util.cookies.set('competitionId', '', -1)
             let href = ''
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 5d94cb3..c66f552 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -201,8 +201,8 @@
                 </div>
                 <div class="text">
                   <p class="title">售前咨询</p>
-                  <p class="tel-num" style="margin-bottom: 5px">刘老师</p>
-                  <p class="tel-num">18019930142</p>
+                  <p class="tel-num" style="margin-bottom: 5px">郭老师</p>
+                  <p class="tel-num">17671782660</p>
                 </div>
               </div>
               <div class="line">
diff --git a/src/pages/info/list/index.vue b/src/pages/info/list/index.vue
index 1e6b34e..9bb0788 100644
--- a/src/pages/info/list/index.vue
+++ b/src/pages/info/list/index.vue
@@ -140,6 +140,10 @@ export default {
               this.menuRefresh = true
             })
           } else {
+            this.menuList = []
+            parentId ?
+              this.getContent(parentId) :
+              (this.listData = [])
             this.loadIns.close()
           }
         },
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index 8727811..9004ed9 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -52,7 +52,7 @@
                         <p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p>
                         <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
                         <p v-if="rule.method != 2">课程系统：{{ rule.systemName }}</p>
-                        <p v-if="rule.onlineButton">线上地点：{{ rule.onlineAddress }}</p>
+                        <p v-if="rule.onlineButton && rule.method != 2">线上地点：{{ rule.onlineAddress }}</p>
                         <p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p>
                         <template v-if="rule.method === 2">
                           <p>线下地点：{{ rule.offlineAddress }}</p>
@@ -126,7 +126,7 @@
                         <el-table-column prop="teamName" label="团队名称"></el-table-column>
                         <el-table-column prop="leaderName" label="队长"></el-table-column>
                       </template>
-                      <el-table-column v-else prop="schoolName" label="学校"></el-table-column>
+                      <el-table-column v-else prop="userName" label="姓名"></el-table-column>
                       <el-table-column prop="schoolName" label="学校"></el-table-column>
                       <el-table-column prop="school" label="用时">
                         <template slot-scope="scope">
@@ -242,8 +242,8 @@
                               <template v-if="form.completeCompetitionSetup.competitionType">
                                 <th width="110">参赛人数限制</th>
                                 <th>允许参赛人员</th>
-                                <th v-if="info.team.captain === 0 && form.rule === 0" width="70">总分</th>
                               </template>
+                              <th v-if="form.rule === 0" width="70">总分</th>
                               <th>竞赛成绩</th>
                             </tr>
                             <template v-if="info.stages.length">
@@ -266,10 +266,10 @@
                                     <span v-else class="m-r-5">无</span>
                                     <i v-if="info.team.captain === 0" class="el-icon-edit icon" @click="selectPar(item)"></i>
                                   </td>
-                                  <td v-if="info.team.captain === 0 && form.rule === 0 && !i" :rowspan="info.stages.length">{{ info.totalScore }}</td>
                                 </template>
+                                <td v-if="form.rule === 0 && !i" :rowspan="info.stages.length">{{ info.totalScore || 0 }}</td>
                                 <td>
-                                  <span v-if="item.score > 0" class="m-r-10">分数{{item.score}}</span>
+                                  <span v-if="item.score >= 0" class="m-r-10">分数{{item.score}}</span>
                                   <el-button type="text" :disabled="item.showDetail && item.resultsDetails === 1 || (form.completeCompetitionSetup.competitionType && !item.reportId) || (form.completeCompetitionSetup.competitionType === 0 && !item.reportId)" @click="show(item)">查看成绩详情</el-button>
                                 </td>
                               </tr>
@@ -278,6 +278,7 @@
                               <td colspan="6">暂无数据</td>
                             </tr>
                           </table>
+                          <!-- 团队&&队长才显示 -->
                           <el-alert
                             v-if="form.completeCompetitionSetup.competitionType && info.team.captain === 0"
                             style="margin-top: 10px;"
@@ -289,6 +290,7 @@
                       </tr>
                     </table>
                     
+                    <!-- 团队&&队长才显示 -->
                     <template v-if="form.completeCompetitionSetup.competitionType && info.team.captain === 0">
                       <div class="l-title m-t-20">团队成员</div>
                       <div class="flex-center">
@@ -408,7 +410,7 @@
                 <td>{{ item.timeSum }}min</td>
                 <td>{{ item.score }}</td>
                 <td>
-                  <el-button type="text" @click="toReport(item)">查看</el-button>
+                  <el-button :disabled="!item.reportId" type="text" @click="toReport(item)">查看</el-button>
                 </td>
               </tr>
             </template>
@@ -1033,30 +1035,30 @@ export default {
         // 查看成绩详情
         show(row) {
           // 团队展示弹框，个人跳转实验报告
-          if (this.form.completeCompetitionSetup.competitionType && this.info.team.captain === 0) { // 团队比赛并且是队长，则展示团队成员成绩详情
+          if (this.form.completeCompetitionSetup.competitionType) { // 团队比赛则展示团队成员成绩详情
             this.curRow = row
             this.memberVisible = true
             const teamId = this.form.competitionRegistration.teamId
             if (teamId) {
-              this.$post(this.api.stageGradeManagementList, {
+              this.$post(this.api.stageTeamScoreDetails, {
                 pageNum: 1,
                 pageSize: 1000,
                 competitionId: this.id,
                 stageId: row.stageId,
-                isNakadai: 0
+                teamId
               }).then(({ page }) => {
-                this.members = page.records.filter(e => e.teamId === teamId)
+                this.members = page.records
               }).catch(res => {})
             } else {
               this.members = []
             }
-          } else if (row.reportId) { // 团员或者个人比赛，并且有reportId，则进入实验报告
+          } else if (row.reportId) { // 个人比赛，并且有reportId，则进入实验报告
             this.toReport(row)
           }
         },
         // 跳转实验报告
         toReport(row) {
-          this.$router.push(`/record/show?reportId=${row.reportId}`)
+          this.$router.push(`/record/show?reportId=${row.reportId}&matchId=${this.id}&matchName=${this.form.name}`)
         },
         
         // 个人报名提交
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 996b7df..0e41483 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -74,11 +74,8 @@
                                             <div class="metas">
                                               <template v-if="item.sponsor">
                                                 <div :class="{'flex-top': item.sponsor.split(',').length > 1}">
-                                                    <span class="label">主办方：</span>
-                                                    <div v-if="item.sponsor.split(',').length > 1" class="val a-line">
-                                                        <template v-for="sponsor in item.sponsor.split(',')">{{ sponsor }}</template>
-                                                    </div>
-                                                    <span v-else class="val">{{ item.sponsor }}</span>
+                                                    <span class="label">主办方：&emsp;</span>
+                                                    <span class="val">{{ item.sponsor }}</span>
                                                 </div>
                                               </template>
                                                 <div>
@@ -87,7 +84,7 @@
                                                 <div>
                                                     <span class="label">比赛时间：</span><span class="val">{{ item.playStartTime}} ~ {{ item.playEndTime }}</span>
                                                 </div>
-                                                <div>
+                                                <div :title="item.ranges">
                                                     <span class="label">比赛范围：</span><span class="val">{{ item.ranges }}</span>
                                                 </div>
                                                 <div>
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index aea8968..73d75e0 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -7,12 +7,12 @@
                 <el-breadcrumb-item
                 v-if="!i"
                 :key="i"
-                :to="{ path: 'list' }">
+                :to="{ path: matchId ? '/match' : 'list' }">
                 {{item}}
                 </el-breadcrumb-item>
                 <el-breadcrumb-item
                 v-else-if="breadPath.length > 2 && i === 1"
-                :to="{ path: 'details', query: { curriculumId, projectId } }"
+                :to="{ path: matchId ? '/match/details' : 'details', query: matchId ? { id: matchId } : { curriculumId, projectId } }"
                 :key="i">
                 {{item}}
                 </el-breadcrumb-item>
@@ -174,6 +174,8 @@ export default {
             reportId: this.$route.query.reportId,
             curriculumId: this.$route.query.curriculumId,
             projectId: this.$route.query.projectId,
+            matchId: this.$route.query.matchId, // 竞赛特有
+            matchName: this.$route.query.matchName, // 竞赛特有
             breadPath: ['实验记录', '实验情况', '实验报告'],
             title: "实验报告",
             form: {},
@@ -217,7 +219,11 @@ export default {
                     purpose: form.purpose,
                     summarize: form.summarize
                 }
-                form.assessmentId && (this.breadPath = ['实验记录', '实验报告'])
+                // 考核赛事练习的面包屑不一样
+                form.assessmentId ?
+                  (this.breadPath = ['实验记录', '实验报告']) :
+                  this.matchName && (this.breadPath = ['全部赛事', this.matchName, '实验报告'])
+
                 const { data } = report
                 this.userScores = userScores
                 // 如果没有data，则添加，否则，直接使用
diff --git a/src/pages/setting/person/index.vue b/src/pages/setting/person/index.vue
index b3f8421..4e39377 100644
--- a/src/pages/setting/person/index.vue
+++ b/src/pages/setting/person/index.vue
@@ -49,14 +49,16 @@ export default {
     },
     // 离开的时候判断是否有保存更改的信息,没有则拦截并提示
     beforeRouteLeave(to, from, next) {
+            console.log("🚀 ~ file: index.vue:53 ~ beforeRouteLeave ~ this.edited", this.edited)
+
         if(this.edited){
             this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
                 type: 'warning'
             }).then(() => {
                 this.$refs.info.save()
-                next(false)
+                next()
             }).catch(() => {
-                next(false)
+                next()
             })
         }else{
             next()
diff --git a/src/pages/setting/person/info.vue b/src/pages/setting/person/info.vue
index 7bad8a2..8257ba0 100644
--- a/src/pages/setting/person/info.vue
+++ b/src/pages/setting/person/info.vue
@@ -163,8 +163,8 @@
             </div>
         </div>
         <div class="btns">
-            <el-button size="small" v-throttle @click="$router.back()">取消</el-button>
-            <el-button type="primary" size="small" v-throttle @click="save">更新</el-button>
+            <el-button size="small" v-throttle @click="cancel">取消</el-button>
+            <el-button type="primary" size="small" v-throttle @click="save(0)">更新</el-button>
         </div>
 
         <el-dialog :title="form.email ? '更换邮箱' : '绑定邮箱'" :visible.sync="emailVisible" :close-on-click-modal="false" @close="closeEmail" width="30%">
@@ -354,6 +354,13 @@ export default {
                 if(this.updateTime > 1) this.$emit('updateStatus',this.updateTime > 1)
             },
             deep:true
+        },
+        archivesList: {
+            handler(){
+                this.updateTime++
+                if(this.updateTime > 1) this.$emit('updateStatus',this.updateTime > 1)
+            },
+            deep:true
         }
     },
     mounted() {
@@ -413,6 +420,10 @@ export default {
                     }else{
                         this.concatArch()
                     }
+                    setTimeout(() => {
+                      this.updateTime = 1
+                      this.$emit('updateStatus',this.updateTime > 1)
+                    }, 500)
                 })
             }).catch(err => {})
         },
@@ -453,7 +464,21 @@ export default {
                 }
             }).catch(res => {})
         },
-        save() {
+        // 取消
+        cancel() {
+          if(this.updateTime > 1){
+            this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
+                type: 'warning'
+            }).then(() => {
+                this.save(1)
+            }).catch(() => {
+                window.close()
+            })
+          }else{
+              window.close()
+          }
+        },
+        save(close) {
             if (this.form.idNumber && !/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)/.test(this.form.idNumber)) return util.warningMsg("请输入正确的身份证号码");
             let form = this.form;
             let personalFileList = []
@@ -500,6 +525,7 @@ export default {
                 this.setUserName(form.userName);
                 this.$emit('updateStatus',false)
                 this.$message.success('提交成功！')
+                close && window.close()
             }).catch(res => {})
         },
         
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index c34669c..2a4af58 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -184,7 +184,7 @@ export default {
     },
     methods: {
         goBack() {
-            this.$router.back();
+            this.$router.push('/station')
         },
         async getData() {
             let { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}`);
diff --git a/src/pages/touristMatch/list/index.vue b/src/pages/touristMatch/list/index.vue
index e9ba177..1dfb37d 100644
--- a/src/pages/touristMatch/list/index.vue
+++ b/src/pages/touristMatch/list/index.vue
@@ -64,11 +64,8 @@
                                             <div class="title">{{ item.competitionName }}</div>
                                             <div class="metas">
                                                 <div :class="{'flex-top': item.sponsor.split(',').length > 1}">
-                                                    <span class="label">主办方：</span>
-                                                    <div v-if="item.sponsor.split(',').length > 1" class="val a-line">
-                                                        <template v-for="sponsor in item.sponsor.split(',')">{{ sponsor }}</template>
-                                                    </div>
-                                                    <span v-else class="val">{{ item.sponsor }}</span>
+                                                    <span class="label">主办方：&emsp;</span>
+                                                    <span class="val">{{ item.sponsor }}</span>
                                                 </div>
                                                 <div>
                                                     <span class="label">报名时间：</span><span class="val">{{ item.signUpStartTime}} ~ {{ item.signUpEndTime }}</span>
@@ -76,7 +73,7 @@
                                                 <div>
                                                     <span class="label">比赛时间：</span><span class="val">{{ item.playStartTime}} ~ {{ item.playEndTime }}</span>
                                                 </div>
-                                                <div>
+                                                <div :title="item.ranges">
                                                     <span class="label">比赛范围：</span><span class="val">{{ item.ranges }}</span>
                                                 </div>
                                                 <div>
diff --git a/src/setting.js b/src/setting.js
index 5c89eb1..31c9749 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -28,8 +28,8 @@ 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.116:9000/"; // 赓
+    // host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://192.168.31.116:9000/"; // 赓
 }
 
 const Setting = {