diff --git a/src/api/index.js b/src/api/index.js
index 7e1541b..026b678 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -169,6 +169,7 @@ export default {
     queryCustomer: `nakadai/nakadai/customer/queryCustomer`,
     getSchoolsByProvince: `nakadai/nakadai/school/getSchoolsByProvince`,
     getRedisCacheCompetition: `competition/competition/management/getRedisCache`,
+    copyCompetition: `competition/competition/management/copyCompetition`,
     
     // 赛事内容
     addCompetitionContent: `competition/competition/content/addCompetitionContent`,
@@ -216,6 +217,12 @@ export default {
     enquireAboutSchoolStudents: `users/users/userAccount/enquireAboutSchoolStudents`,
     cancelParticipant: `competition/competition/teamParticipant/cancelParticipant`,
     schoolsInCompetitionArea: `competition/competition/range/schoolsInCompetitionArea`,
+    batchImportPersonalData: `${host}competition/competition/registration/batchImportPersonalData`,
+    batchImportTeamData: `${host}competition/competition/registration/batchImportTeamData`,
+    TeamDataExportFailure: `${host}competition/competition/registration/exportFailure`,
+    competionPersonTemplate: `https://huoran.oss-cn-shenzhen.aliyuncs.com/%E6%95%99%E5%B8%88%E7%AB%AF%E4%B8%AA%E4%BA%BA%E8%B5%9B%E6%8A%A5%E5%90%8D%E4%BA%BA%E5%91%98%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 教师端个人报名人员模板
+    competionTeamTemplate: `https://huoran.oss-cn-shenzhen.aliyuncs.com/%E6%95%99%E5%B8%88%E7%AB%AF%E5%9B%A2%E9%98%9F%E8%B5%9B%E6%8A%A5%E5%90%8D%E4%BA%BA%E5%91%98%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 教师端团队报名人员导入模板
+
     // 赛事公告
     addAnnouncement: `competition/competition/announcement/addAnnouncement`,
     amendmentAnnouncement: `competition/competition/announcement/amendmentAnnouncement`,
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 5b70224..e059012 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -125,9 +125,11 @@
       </el-table-column>
       <el-table-column label="操作"
                        align="center"
-                       width="260">
+                       width="280">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.playingStages && scope.row.playingStages.length"
+          <el-button type="text"
+                     @click="copy(scope.row)">复制</el-button>
+          <el-button v-if="scope.row.publishStatus && scope.row.playingStages && scope.row.playingStages.length"
                      type="text"
                      @click="editEndTime(scope.row)"
                      v-auth>修改结束时间</el-button>
@@ -381,6 +383,16 @@ export default {
     add () {
       this.$router.push("/match/add");
     },
+    // 复制
+    copy (row) {
+      this.$confirm('确定要复制吗', "提示", {
+        type: "warning"
+      }).then(async () => {
+        await this.$post(`${this.api.copyCompetition}?competitionId=${row.id}`)
+        util.successMsg('复制成功')
+        this.getData()
+      }).catch(() => { })
+    },
     // 修改结束时间
     editEndTime (row) {
       this.modifyVisible = true
@@ -406,7 +418,7 @@ export default {
       }).catch(err => { })
     },
     manage (row) {
-      this.$router.push(`/match/manage?id=${row.id}&name=${row.competitionName}`)
+      this.$router.push(`/match/manage?id=${row.id}&releaseType=${row.releaseType}&name=${row.competitionName}`)
     },
 
     changeType () {
diff --git a/src/pages/match/manage/index.vue b/src/pages/match/manage/index.vue
index 925c99c..1f3f689 100644
--- a/src/pages/match/manage/index.vue
+++ b/src/pages/match/manage/index.vue
@@ -52,6 +52,7 @@ export default {
   data () {
     return {
       name: this.$route.query.name,
+      releaseType: +this.$route.query.releaseType,
       active: this.$route.query.tab || '',
       tabs: {
         tab1: "大赛详情",
@@ -110,7 +111,8 @@ export default {
       const tab5 = btns.includes('/match/list:管理:报名人员')
 
       tab1 || this.$delete(this.tabs, 'tab1')
-      tab2 || this.$delete(this.tabs, 'tab2')
+      if (!tab2 || !this.releaseType) this.$delete(this.tabs, 'tab2')
+      console.log("🚀 ~ initTabs ~ this.releaseType:", (!tab2 || !this.releaseType))
       tab3 || this.$delete(this.tabs, 'tab3')
       tab4 || this.$delete(this.tabs, 'tab4')
       tab5 || this.$delete(this.tabs, 'tab5')
diff --git a/src/pages/match/manage/matchArchList.vue b/src/pages/match/manage/matchArchList.vue
index eb9281b..2ed5446 100644
--- a/src/pages/match/manage/matchArchList.vue
+++ b/src/pages/match/manage/matchArchList.vue
@@ -15,8 +15,8 @@
       <div class="stat">
         <div class="nums">
           <div class="item">
-            <p class="name">实验总人数</p>
-            <p class="val">{{ totalNumber }}</p>
+            <p class="name">已参加/应参加人数</p>
+            <p class="val">{{ isNaN(statData.totalNumber) ? '' : statData.attendance + '/' + statData.totalNumber }}</p>
           </div>
           <div class="item">
             <p class="name">实验平均分</p>
@@ -109,22 +109,26 @@
                            width="90"
                            align="center">
             <template slot-scope="scope">
-              {{ scope.row.timeSum }}min
+              {{ scope.row.timeSum ? scope.row.timeSum + 'min' : '--' }}
             </template>
           </el-table-column>
           <el-table-column prop="submitTime"
                            label="提交时间"
                            min-width="150"
                            align="center">
+            <template slot-scope="scope">
+              {{ scope.row.submitTime || '--' }}
+            </template>
           </el-table-column>
           <el-table-column label="操作"
                            align="center"
                            width="160">
             <template slot-scope="scope">
+              <el-button :disabled="!scope.row.reportId"
+                         type="text"
+                         @click="show(scope.row)">{{ scope.row.reportId ? '查看成绩报告' : '未参加' }}</el-button>
               <el-button v-if="scope.row.reportId"
                          type="text"
-                         @click="show(scope.row)">查看成绩报告</el-button>
-              <el-button type="text"
                          @click="handleDelete(scope.row)">删除</el-button>
             </template>
           </el-table-column>
@@ -286,7 +290,6 @@ export default {
       page1: 1,
       total1: 0,
 
-      totalNumber: 0, // 总人数
       avgScore: 0, // 平均分
       importVisible: false,
       uploadList: [],
@@ -356,7 +359,6 @@ export default {
           this.list = page.records
           this.statData = data
           this.avgScore = (+data.avgScore).toFixed(2)
-          this.totalNumber = data.totalNumber
           this.getChart()
         }).catch(res => { })
       }
@@ -625,6 +627,7 @@ export default {
 
         .item {
             width: 300px;
+            min-height: 145px;
             padding: 30px 30px;
             margin: 0 10px;
             box-sizing: border-box;
diff --git a/src/pages/match/manage/matchSignup.vue b/src/pages/match/manage/matchSignup.vue
index 92e781e..fbd02e3 100644
--- a/src/pages/match/manage/matchSignup.vue
+++ b/src/pages/match/manage/matchSignup.vue
@@ -1,118 +1,215 @@
 <template>
-    <!-- 报名人员 -->
-    <div class="page-content" style="padding: 24px">
-        <div class="tool">
-            <ul class="filter">
-                <li>
-                    <label>搜索：</label>
-                    <el-input placeholder="请输入姓名/手机号/学号" prefix-icon="el-icon-search" v-model="keyword" clearable size="mini" style="width: 250px"></el-input>
-                </li>
-                <li v-if="info.releaseType">
-                    <label>参赛人员状态：</label>
-                    <el-select v-model="isDisable" @change="initData">
-                      <el-option v-for="(item, i) in statusList" :key="i" :label="item.name" :value="item.id"></el-option>
-                    </el-select>
-                </li>
-            </ul>
-            <div>
-                <el-button type="primary" round @click="add" v-auth="'/match/list:管理:报名人员:新增'">新增</el-button>
-                <el-button type="primary" round @click="exportAll" v-auth="'/match/list:管理:报名人员:批量导出'">批量导出</el-button>
-            </div>
-        </div>
-
-        <el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id" @sort-change="sortChange">
-            <el-table-column type="selection" width="80" align="center" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="60" label="序号" align="center">
-                <template slot-scope="scope">
-                    {{ scope.$index + (page - 1) * pageSize + 1 }}
-                </template>
-            </el-table-column>
-            <el-table-column prop="school" label="学校" sortable="custom">
-            </el-table-column>
-            <el-table-column v-if="info.completeCompetitionSetup.competitionType" prop="teamName" label="团队名称" sortable="custom">
-            </el-table-column>
-            <el-table-column prop="username" label="学生姓名">
-            </el-table-column>
-            <el-table-column prop="workNumber" label="学号">
-            </el-table-column>
-            <el-table-column prop="phone" label="手机号">
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="320">
-                <template slot-scope="scope">
-                    <el-button v-if="scope.row.identification" type="text" @click="edit(scope.row)" v-auth="'/match/list:管理:报名人员:编辑'">编辑</el-button>
-                    <template v-if="info.releaseType">
-                      <el-button type="text" @click="toInfo(scope.row)" v-auth="'/match/list:管理:报名人员:参赛信息与成绩'">参赛信息与成绩</el-button>
-                      <el-switch
-                          v-auth="'/match/list:管理:报名人员:禁用'"
-                          v-model="scope.row.isDisable"
-                          :active-text="scope.row.isDisable ? '关' : '开'"
-                          :active-value="0"
-                          :inactive-value="1"
-                          style="margin: 0 10px 0 5px"
-                          @change="switchOff($event,scope.row,scope.$index)"
-                      ></el-switch>
-                    </template>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination">
-            <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page">
-            </el-pagination>
-        </div>
+  <!-- 报名人员 -->
+  <div class="page-content"
+       style="padding: 24px">
+    <div class="tool">
+      <ul class="filter">
+        <li>
+          <label>搜索：</label>
+          <el-input placeholder="请输入姓名/手机号/学号"
+                    prefix-icon="el-icon-search"
+                    v-model="keyword"
+                    clearable
+                    size="mini"
+                    style="width: 250px"></el-input>
+        </li>
+        <li v-if="info.releaseType">
+          <label>参赛人员状态：</label>
+          <el-select v-model="isDisable"
+                     @change="initData">
+            <el-option v-for="(item, i) in statusList"
+                       :key="i"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </li>
+      </ul>
+      <div>
+        <el-button type="primary"
+                   round
+                   @click="add"
+                   v-auth="'/match/list:管理:报名人员:新增'">新增</el-button>
+        <el-button type="primary"
+                   round
+                   @click="exportAll"
+                   v-auth="'/match/list:管理:报名人员:批量导出'">批量导出</el-button>
+      </div>
+    </div>
 
-        
-        <el-dialog :title="(!isAdd ? '编辑' : '新增') + '参赛人员'" :visible.sync="addVisible" width="400px" class="dialog" :close-on-click-modal="false" @close="closeAdd">
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px" style='margin-right: 10px;'>
-                <el-form-item v-if="!schoolDisable" prop="schoolId" label="院校">
-                  <el-select v-model="form.schoolId" filterable style="width: 100%">
-                    <el-option v-for="(item, i) in clients" :key="i" :label="item.schoolName" :value="item.schoolId"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="workNumber" label="学生学号">
-                    <el-input v-model="form.workNumber" placeholder="请输入学生学号" @change="workNumberChange"></el-input>
-                </el-form-item>
-                <el-form-item prop="userName" label="学生姓名">
-                    <el-input v-model="form.userName" placeholder="请输入学生姓名" :disabled="isAdd"></el-input>
-                </el-form-item>
-                <el-form-item label="账号角色">
-                  学生
-                </el-form-item>
-                <el-form-item v-if="info.completeCompetitionSetup.competitionType" prop="teamId" label="所属团队">
-                  <div style="display: flex;align-items: center">
-                    <el-select v-model="form.teamId" :disabled="formEnable && isAdd" filterable style="width: 240px;margin-right: 10px">
-                      <el-option v-for="(item, i) in teams" :key="i" :label="item.teamName" :value="item.teamId"></el-option>
-                    </el-select>
-                    <el-button v-if="isAdd && !formEnable" type="text" @click="createTeam">创建团队</el-button>
-                  </div>
-                </el-form-item>
-                <el-form-item prop="phone" label="手机号">
-                    <el-input v-model="form.phone" maxlength="11" placeholder="请输入手机号" :disabled="isAdd"></el-input>
-                </el-form-item>
-                <el-form-item prop="email" label="邮箱">
-                    <el-input v-model="form.email" placeholder="请输入邮箱" :disabled="isAdd"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="addVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确定</el-button>
-            </span>
-        </el-dialog>
-        
-        <el-dialog title="创建团队" :visible.sync="teamVisible" :close-on-click-modal="false" width="300px">
-          <el-form class="dia-form">
-            <el-form-item>
-              <el-input placeholder="请输入团队名称" maxlength="10" v-model="teamForm.teamName"></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-input placeholder="请设置团队邀请码" maxlength="6" v-model="teamForm.invitationCode"></el-input>
-            </el-form-item>
-          </el-form>
-          <span slot="footer" class="dialog-footer">
-            <el-button size="small" type="primary" @click="teamSubmit">确定并使用</el-button>
-            <el-button size="small" @click="teamVisible = false">取消</el-button>
-          </span>
-        </el-dialog>
+    <el-table ref="table"
+              :data="listData"
+              class="table"
+              stripe
+              header-align="center"
+              @selection-change="handleSelectionChange"
+              row-key="id"
+              @sort-change="sortChange">
+      <el-table-column type="selection"
+                       width="80"
+                       align="center"
+                       :reserve-selection="true"></el-table-column>
+      <el-table-column type="index"
+                       width="60"
+                       label="序号"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + (page - 1) * pageSize + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="school"
+                       label="学校"
+                       sortable="custom">
+      </el-table-column>
+      <el-table-column v-if="info.completeCompetitionSetup.competitionType"
+                       prop="teamName"
+                       label="团队名称"
+                       sortable="custom">
+      </el-table-column>
+      <el-table-column prop="username"
+                       label="学生姓名">
+      </el-table-column>
+      <el-table-column prop="workNumber"
+                       label="学号">
+      </el-table-column>
+      <el-table-column prop="phone"
+                       label="手机号">
+      </el-table-column>
+      <el-table-column label="操作"
+                       align="center"
+                       width="320">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.identification"
+                     type="text"
+                     @click="edit(scope.row)"
+                     v-auth="'/match/list:管理:报名人员:编辑'">编辑</el-button>
+          <template v-if="info.releaseType">
+            <el-button type="text"
+                       @click="toInfo(scope.row)"
+                       v-auth="'/match/list:管理:报名人员:参赛信息与成绩'">参赛信息与成绩</el-button>
+            <el-switch v-auth="'/match/list:管理:报名人员:禁用'"
+                       v-model="scope.row.isDisable"
+                       :active-text="scope.row.isDisable ? '关' : '开'"
+                       :active-value="0"
+                       :inactive-value="1"
+                       style="margin: 0 10px 0 5px"
+                       @change="switchOff($event,scope.row,scope.$index)"></el-switch>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination">
+      <el-pagination background
+                     layout="total, prev, pager, next"
+                     :total="total"
+                     @current-change="handleCurrentChange"
+                     :current-page="page">
+      </el-pagination>
     </div>
+
+    <el-dialog :title="(!isAdd ? '编辑' : '新增') + '参赛人员'"
+               :visible.sync="addVisible"
+               width="400px"
+               class="dialog"
+               :close-on-click-modal="false"
+               @close="closeAdd">
+      <el-form ref="form"
+               :model="form"
+               :rules="rules"
+               label-width="80px"
+               style='margin-right: 10px;'>
+        <el-form-item v-if="!schoolDisable"
+                      prop="schoolId"
+                      label="院校">
+          <el-select v-model="form.schoolId"
+                     filterable
+                     style="width: 100%">
+            <el-option v-for="(item, i) in clients"
+                       :key="i"
+                       :label="item.schoolName"
+                       :value="item.schoolId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="workNumber"
+                      label="学生学号">
+          <el-input v-model="form.workNumber"
+                    placeholder="请输入学生学号"
+                    @change="workNumberChange"></el-input>
+        </el-form-item>
+        <el-form-item prop="userName"
+                      label="学生姓名">
+          <el-input v-model="form.userName"
+                    placeholder="请输入学生姓名"
+                    :disabled="isAdd"></el-input>
+        </el-form-item>
+        <el-form-item label="账号角色">
+          学生
+        </el-form-item>
+        <el-form-item v-if="info.completeCompetitionSetup.competitionType"
+                      prop="teamId"
+                      label="所属团队">
+          <div style="display: flex;align-items: center">
+            <el-select v-model="form.teamId"
+                       :disabled="formEnable && isAdd"
+                       filterable
+                       style="width: 240px;margin-right: 10px">
+              <el-option v-for="(item, i) in teams"
+                         :key="i"
+                         :label="item.teamName"
+                         :value="item.teamId"></el-option>
+            </el-select>
+            <el-button v-if="isAdd && !formEnable"
+                       type="text"
+                       @click="createTeam">创建团队</el-button>
+          </div>
+        </el-form-item>
+        <el-form-item prop="phone"
+                      label="手机号">
+          <el-input v-model="form.phone"
+                    maxlength="11"
+                    placeholder="请输入手机号"
+                    :disabled="isAdd"></el-input>
+        </el-form-item>
+        <el-form-item prop="email"
+                      label="邮箱">
+          <el-input v-model="form.email"
+                    placeholder="请输入邮箱"
+                    :disabled="isAdd"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="addVisible = false">取消</el-button>
+        <el-button type="primary"
+                   @click="submit">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="创建团队"
+               :visible.sync="teamVisible"
+               :close-on-click-modal="false"
+               width="300px">
+      <el-form class="dia-form">
+        <el-form-item>
+          <el-input placeholder="请输入团队名称"
+                    maxlength="10"
+                    v-model="teamForm.teamName"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="请设置团队邀请码"
+                    maxlength="6"
+                    v-model="teamForm.invitationCode"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   type="primary"
+                   @click="teamSubmit">确定并使用</el-button>
+        <el-button size="small"
+                   @click="teamVisible = false">取消</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -120,375 +217,375 @@ import util from "@/libs/util";
 import axios from 'axios'
 import Setting from "@/setting";
 export default {
-    name: "matchSignup",
-    data() {
-        return {
-            token: util.local.get(Setting.tokenKey),
-            id: +this.$route.query.id,
-            info: {
-              completeCompetitionSetup: {}
-            },
-            isDisable: '',
-            statusList: [
-              {
-                id: '',
-                name: '不限'
-              },
-              {
-                id: 1,
-                name: '已禁用'
-              },
-              {
-                id: 0,
-                name: '未禁用'
-              }
-            ],
-            keyword: "",
-            listData: [],
-            multipleSelection: [],
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            schoolOrder: '',
-            teamOrder: '',
-            clients: [],
-            addVisible: false,
-            formEnable: true,
-            isAdd: false,
-            form: {
-              captain: 0,
-              competitionId: this.$route.query.id,
-              userName: '',
-              workNumber: '',
-              schoolId: '',
-              teamId: '',
-              whetherSignUp: 0,
-              phone: '',
-              email: '',
-              identification: 1,
-              uniqueIdentification: Date.now(),
-              password: Setting.initialPassword
-            },
-            rules: {
-              schoolId: [
-                { required: true, message: "请选择所属院校", trigger: "change" }
-              ],
-              workNumber: [
-                { required: true, message: "请输入学号", trigger: "blur" }
-              ],
-              teamId: [
-                { required: true, message: "请选择所属团队", trigger: "change" }
-              ]
-            },
-            submiting: false,
+  name: "matchSignup",
+  data () {
+    return {
+      token: util.local.get(Setting.tokenKey),
+      id: +this.$route.query.id,
+      info: {
+        completeCompetitionSetup: {}
+      },
+      isDisable: '',
+      statusList: [
+        {
+          id: '',
+          name: '不限'
+        },
+        {
+          id: 1,
+          name: '已禁用'
+        },
+        {
+          id: 0,
+          name: '未禁用'
+        }
+      ],
+      keyword: "",
+      listData: [],
+      multipleSelection: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      schoolOrder: '',
+      teamOrder: '',
+      clients: [],
+      addVisible: false,
+      formEnable: true,
+      isAdd: false,
+      form: {
+        captain: 0,
+        competitionId: this.$route.query.id,
+        userName: '',
+        workNumber: '',
+        schoolId: '',
+        teamId: '',
+        whetherSignUp: 0,
+        phone: '',
+        email: '',
+        identification: 1,
+        uniqueIdentification: Date.now(),
+        password: Setting.initialPassword
+      },
+      rules: {
+        schoolId: [
+          { required: true, message: "请选择所属院校", trigger: "change" }
+        ],
+        workNumber: [
+          { required: true, message: "请输入学号", trigger: "blur" }
+        ],
+        teamId: [
+          { required: true, message: "请选择所属团队", trigger: "change" }
+        ]
+      },
+      submiting: false,
 
-            
-            teamVisible: false,
-            teams: [],
-            teamNameRepeat: false,
-            teamForm: {
-              competitionId: this.$route.query.id,
-              registrationInvitationCode: '',
-              teamName: '',
-              invitationCode: '',
-              whetherSignUp: 1,
-              identification: 1
-            },
-            originForm: {},
-            exitMember: 0,
-            notExit: 0,
-            schoolDisable: false
-        };
+
+      teamVisible: false,
+      teams: [],
+      teamNameRepeat: false,
+      teamForm: {
+        competitionId: this.$route.query.id,
+        registrationInvitationCode: '',
+        teamName: '',
+        invitationCode: '',
+        whetherSignUp: 1,
+        identification: 1
+      },
+      originForm: {},
+      exitMember: 0,
+      notExit: 0,
+      schoolDisable: false
+    };
+  },
+  watch: {
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    console.log(44, this.$store.state.user.schoolId)
+    this.initData()
+    this.getInfo()
+    this.getTeam()
+  },
+  methods: {
+    getData () {
+      this.$post(this.api.queryRegistrationByCondition, {
+        pageNum: this.page,
+        pageSize: this.pageSize,
+        competitionId: this.id,
+        keyWord: this.keyword,
+        isDisable: this.isDisable,
+        schoolOrder: this.schoolOrder,
+        teamOrder: this.teamOrder,
+      }).then(({ data }) => {
+        this.listData = data.records;
+        this.total = data.total;
+        this.$refs.table.clearSelection();
+      }).catch(res => {
+      });
     },
-    watch: {
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
+    // 获取赛事信息
+    getInfo () {
+      this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
+        this.info = competition
+        // 非本校内则查询接口获取学校列表
+        if (competition.competitionScope) {
+          this.getClient()
+        } else {
+          this.schoolDisable = true
+          this.form.schoolId = this.$store.state.user.schoolId
         }
+      }).catch(err => { })
     },
-    mounted() {
-      console.log(44, this.$store.state.user.schoolId)
-        this.initData()
-        this.getInfo()
-        this.getTeam()
+    initData () {
+      this.page = 1
+      this.getData()
     },
-    methods: {
-        getData() {
-            this.$post(this.api.queryRegistrationByCondition, {
-              pageNum: this.page,
-              pageSize: this.pageSize,
-              competitionId: this.id,
-              keyWord: this.keyword,
-              isDisable: this.isDisable,
-              schoolOrder: this.schoolOrder,
-              teamOrder: this.teamOrder,
-            }).then(({ data }) => {
-                this.listData = data.records;
-                this.total = data.total;
-                this.$refs.table.clearSelection();
-            }).catch(res => {
-            });
-        },
-        // 获取赛事信息
-        getInfo() {
-          this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
-            this.info = competition
-            // 非本校内则查询接口获取学校列表
-            if (competition.competitionScope) {
-              this.getClient()
-            } else {
-              this.schoolDisable = true
-              this.form.schoolId = this.$store.state.user.schoolId
-            }
-          }).catch(err => {})
-        },
-        initData() {
-          this.page = 1
-          this.getData()
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        handleCurrentChange(val) {
-            this.page = val;
-            this.getData();
-        },
-        switchOff(val, row, index) {
-            this.$put(`${this.api.disableRegistration}?competitionRegistrationId=${row.id}&isDisable=${val}`).then(res => {}).catch(err => {});
-        },
-        // 排序回调
-        sortChange(column) {
-          // 1上2下
-          if (column.prop === 'school') this.schoolOrder = column.order ? column.order === 'ascending' ? 2 : 1 : ''
-          if (column.prop === 'teamName') this.teamOrder = column.order ? column.order === 'ascending' ? 2 : 1 : ''
-          this.getData()
-        },
-        // 新增
-        add() {
-          this.notExit = 0
-          this.isAdd = true
-          this.addVisible = true
-        },
-        // 编辑
-        edit(row) {
-          this.isAdd = false
-          this.notExit = 0
-          this.addVisible = true
-          row.userName = row.username
+    handleSelectionChange (val) {
+      this.multipleSelection = val;
+    },
+    handleCurrentChange (val) {
+      this.page = val;
+      this.getData();
+    },
+    switchOff (val, row, index) {
+      this.$put(`${this.api.disableRegistration}?competitionRegistrationId=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { });
+    },
+    // 排序回调
+    sortChange (column) {
+      // 1上2下
+      if (column.prop === 'school') this.schoolOrder = column.order ? column.order === 'ascending' ? 2 : 1 : ''
+      if (column.prop === 'teamName') this.teamOrder = column.order ? column.order === 'ascending' ? 2 : 1 : ''
+      this.getData()
+    },
+    // 新增
+    add () {
+      this.notExit = 0
+      this.isAdd = true
+      this.addVisible = true
+    },
+    // 编辑
+    edit (row) {
+      this.isAdd = false
+      this.notExit = 0
+      this.addVisible = true
+      row.userName = row.username
+      this.exitMember = 0
+      row.id = row.accountId
+      this.originForm = JSON.parse(JSON.stringify(row))
+      this.form = JSON.parse(JSON.stringify(row))
+    },
+    // 学号输入完回调。学校和学号都输入完后，调这个接口查询是否有存在的学生，如果有，才能继续输入，如果不能，不让添加
+    workNumberChange () {
+      const { form } = this
+      if (this.originForm.workNumber !== form.workNumber) {
+        form.schoolId && form.workNumber && this.$get(`${this.api.enquireAboutSchoolStudents}?schoolId=${form.schoolId}&workNumber=${form.workNumber}${this.isAdd ? '' : '&applyFor=1'}`).then(({ account }) => {
           this.exitMember = 0
-          row.id = row.accountId
-          this.originForm = JSON.parse(JSON.stringify(row))
-          this.form = JSON.parse(JSON.stringify(row))
-        },
-        // 学号输入完回调。学校和学号都输入完后，调这个接口查询是否有存在的学生，如果有，才能继续输入，如果不能，不让添加
-        workNumberChange() {
-          const { form } = this
-          if (this.originForm.workNumber !== form.workNumber) {
-            form.schoolId && form.workNumber && this.$get(`${this.api.enquireAboutSchoolStudents}?schoolId=${form.schoolId}&workNumber=${form.workNumber}${this.isAdd ? '' : '&applyFor=1'}`).then(({ account }) => {
-              this.exitMember = 0
-              if (account) {
-                this.form = account
-              }
-              this.formEnable = !account
-            }).catch(res => {
-              if (res.message === '学生不存在') this.notExit = 1
-              if (!this.isAdd) this.exitMember = 1
-            })
-          } else {
-            this.exitMember = 0
+          if (account) {
+            this.form = account
           }
-        },
-        // 新增编辑人员
-        submitForm() {
-          if (this.notExit) {
-            this.submiting = false
-            return util.errorMsg('学生不存在，无法添加！')
-          }
-          if (this.exitMember) {
-            this.submiting = false
-            return util.errorMsg('学生已存在')
+          this.formEnable = !account
+        }).catch(res => {
+          if (res.message === '学生不存在') this.notExit = 1
+          if (!this.isAdd) this.exitMember = 1
+        })
+      } else {
+        this.exitMember = 0
+      }
+    },
+    // 新增编辑人员
+    submitForm () {
+      if (this.notExit) {
+        this.submiting = false
+        return util.errorMsg('学生不存在，无法添加！')
+      }
+      if (this.exitMember) {
+        this.submiting = false
+        return util.errorMsg('学生已存在')
+      }
+      const { form } = this
+      if (!this.isAdd) { // 编辑
+        this.$post(this.api.updateUser, {
+          hrUserAccount: {
+            ...form,
+            id: form.id,
+          },
+          hrUserInfo: {
+            userId: form.userId,
+            schoolId: form.schoolId,
+            email: form.email
           }
-          const { form } = this
-          if (!this.isAdd) { // 编辑
-            this.$post(this.api.updateUser, {
-              hrUserAccount: {
-                ...form,
-                id: form.id,
-              },
-              hrUserInfo: {
-                userId: form.userId,
-                schoolId: form.schoolId,
-                email: form.email
-              }
-            }).then(res => {
-              // 团队有更换，则调加入团队的接口
-              if (this.originForm.teamId !== form.teamId) {
-                this.$post(this.api.joinCompetitionTeam, {
-                  accountId: form.id,
-                  competitionId: this.id,
-                  teamId: form.teamId,
-                  identification: 1,
-                  whetherSignUp: 1
-                }).then(res => {
-                  this.addVisible = false
-                  this.getData()
-                  this.submiting = false
-                  util.successMsg('编辑成功！')
-                }).catch(res => {
-                  this.submiting = false
-                })
-              } else {
-                this.addVisible = false
-                this.getData()
-                this.submiting = false
-                util.successMsg('编辑成功！')
-              }
-            }).catch(res => {
-              this.submiting = false
-            })
-          } else {
-            // 新增人员后再调加入团队的接口
-            this.$post(this.api[this.info.completeCompetitionSetup.competitionType ? 'joinCompetitionTeam' : 'addCompetitionRegistration'], {
+        }).then(res => {
+          // 团队有更换，则调加入团队的接口
+          if (this.originForm.teamId !== form.teamId) {
+            this.$post(this.api.joinCompetitionTeam, {
               accountId: form.id,
               competitionId: this.id,
-              teamId: this.form.teamId,
+              teamId: form.teamId,
               identification: 1,
               whetherSignUp: 1
             }).then(res => {
               this.addVisible = false
               this.getData()
               this.submiting = false
-              util.successMsg('报名成功！')
+              util.successMsg('编辑成功！')
             }).catch(res => {
               this.submiting = false
             })
-          }
-        },
-        // 新增人员
-        submit() {
-          this.$refs.form.validate((valid) => {
-            if (valid) {
-              if (this.submiting) return false
-              this.submiting = true
-              const { form } = this
-              const team = this.teams.find(e => e.teamId == form.teamId)
-              if (team && team.invitationCode) form.invitationCode = team.invitationCode
-              // 平台id-端id-schoolId-workNumber组成账号
-              form.account = `${Setting.platformId}-3-${form.schoolId}-${form.workNumber}`
-              const { phone } = form
-              if (phone && !/^1[3456789]\d{9}$/.test(phone)) {
-                return util.errorMsg("请输入正确的手机号/邮箱")
-              } else {
-                this.submitForm()
-              }
-            }
-          })
-        },
-        // 关闭新增员工对话框
-        closeAdd() {
-          this.form = {
-            captain: 0,
-            competitionId: this.id,
-            userName: '',
-            workNumber: '',
-            schoolId: this.schoolDisable ? this.$store.state.user.schoolId : '',
-            teamId: '',
-            whetherSignUp: 0,
-            phone: '',
-            email: '',
-            identification: 1,
-            uniqueIdentification: Date.now(),
-            password: Setting.initialPassword
-          }
-        },
-        // 创建团队
-        createTeam() {
-          this.teamForm = {
-            competitionId: this.id,
-            registrationInvitationCode: '',
-            teamName: '',
-            invitationCode: '',
-            whetherSignUp: 1,
-            identification: 1
-          }
-          this.teamVisible = true
-        },
-        // 获取客户
-        getClient() {
-          if (this.info.competitionScope === 2) { // 指定范围
-            this.$get(`${this.api.schoolsInCompetitionArea}?competitionId=${this.id}`).then(({ schools }) => {
-              this.clients = schools
-            }).catch(res => {})
-          } else { // 本校内查询所有学校
-            this.$get(this.api.querySchoolData).then(({ list }) => {
-              this.clients = list
-            }).catch(res => {})
-          }
-        },
-        // 获取团队列表
-        getTeam() {
-          this.$get(this.api.searchTeam, {
-            teamName: '',
-            competitionId: this.id
-          }).then(({ teamList }) => {
-            this.teams = teamList
-          }).catch(res => {})
-        },
-        // 团队提交
-        teamSubmit() {
-          const form = this.teamForm
-          if (!form.teamName) return util.errorMsg('请输入团队名称')
-          if (form.invitationCode.length !== 6) return util.errorMsg('请输入6位数团队邀请码')
-          form.accountId = this.form.id
-          this.$post(this.api.addCompetitionTeam, form).then(res => {
-            this.teamVisible = false
+          } else {
             this.addVisible = false
             this.getData()
-            util.successMsg('报名成功！')
-          }).catch(res => {})
-        },
-        // 参赛信息
-        toInfo(row) {
-          this.$router.push(`info?id=${this.id}&accountId=${row.accountId}`)
-        },
-        exportAll() {
-          const data = this.multipleSelection
-          if (data.length) {
-            data.map((e, i) => e.id = i + 1)
-            axios.post(this.api.exportDataInBatches, data, {
-              headers: {
-                token: this.token
-              },
-              responseType: 'blob'
-            }).then((res) => {
-              util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
-            }).catch(res => {})
+            this.submiting = false
+            util.successMsg('编辑成功！')
+          }
+        }).catch(res => {
+          this.submiting = false
+        })
+      } else {
+        // 新增人员后再调加入团队的接口
+        this.$post(this.api[this.info.completeCompetitionSetup.competitionType ? 'joinCompetitionTeam' : 'addCompetitionRegistration'], {
+          accountId: form.id,
+          competitionId: this.id,
+          teamId: this.form.teamId,
+          identification: 1,
+          whetherSignUp: 1
+        }).then(res => {
+          this.addVisible = false
+          this.getData()
+          this.submiting = false
+          util.successMsg('报名成功！')
+        }).catch(res => {
+          this.submiting = false
+        })
+      }
+    },
+    // 新增人员
+    submit () {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.submiting) return false
+          this.submiting = true
+          const { form } = this
+          const team = this.teams.find(e => e.teamId == form.teamId)
+          if (team && team.invitationCode) form.invitationCode = team.invitationCode
+          // 平台id-端id-schoolId-workNumber组成账号
+          form.account = `${Setting.platformId}-3-${form.schoolId}-${form.workNumber}`
+          const { phone } = form
+          if (phone && !/^1[3456789]\d{9}$/.test(phone)) {
+            return util.errorMsg("请输入正确的手机号/邮箱")
           } else {
-            axios.get(`${this.api.excelExport}?competitionId=${this.id}`, {
-              headers: {
-                token: this.token
-              },
-              responseType: 'blob'
-            }).then((res) => {
-              util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
-            }).catch(res => {})
+            this.submitForm()
           }
         }
+      })
+    },
+    // 关闭新增员工对话框
+    closeAdd () {
+      this.form = {
+        captain: 0,
+        competitionId: this.id,
+        userName: '',
+        workNumber: '',
+        schoolId: this.schoolDisable ? this.$store.state.user.schoolId : '',
+        teamId: '',
+        whetherSignUp: 0,
+        phone: '',
+        email: '',
+        identification: 1,
+        uniqueIdentification: Date.now(),
+        password: Setting.initialPassword
+      }
+    },
+    // 创建团队
+    createTeam () {
+      this.teamForm = {
+        competitionId: this.id,
+        registrationInvitationCode: '',
+        teamName: '',
+        invitationCode: '',
+        whetherSignUp: 1,
+        identification: 1
+      }
+      this.teamVisible = true
+    },
+    // 获取客户
+    getClient () {
+      if (this.info.competitionScope === 2) { // 指定范围
+        this.$get(`${this.api.schoolsInCompetitionArea}?competitionId=${this.id}`).then(({ schools }) => {
+          this.clients = schools
+        }).catch(res => { })
+      } else { // 本校内查询所有学校
+        this.$get(this.api.querySchoolData).then(({ list }) => {
+          this.clients = list
+        }).catch(res => { })
+      }
+    },
+    // 获取团队列表
+    getTeam () {
+      this.$get(this.api.searchTeam, {
+        teamName: '',
+        competitionId: this.id
+      }).then(({ teamList }) => {
+        this.teams = teamList
+      }).catch(res => { })
+    },
+    // 团队提交
+    teamSubmit () {
+      const form = this.teamForm
+      if (!form.teamName) return util.errorMsg('请输入团队名称')
+      if (form.invitationCode.length !== 6) return util.errorMsg('请输入6位数团队邀请码')
+      form.accountId = this.form.id
+      this.$post(this.api.addCompetitionTeam, form).then(res => {
+        this.teamVisible = false
+        this.addVisible = false
+        this.getData()
+        util.successMsg('报名成功！')
+      }).catch(res => { })
+    },
+    // 参赛信息
+    toInfo (row) {
+      this.$router.push(`info?id=${this.id}&accountId=${row.accountId}`)
+    },
+    exportAll () {
+      const data = this.multipleSelection
+      if (data.length) {
+        data.map((e, i) => e.id = i + 1)
+        axios.post(this.api.exportDataInBatches, data, {
+          headers: {
+            token: this.token
+          },
+          responseType: 'blob'
+        }).then((res) => {
+          util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
+        }).catch(res => { })
+      } else {
+        axios.get(`${this.api.excelExport}?competitionId=${this.id}`, {
+          headers: {
+            token: this.token
+          },
+          responseType: 'blob'
+        }).then((res) => {
+          util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
+        }).catch(res => { })
+      }
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 /deep/.dia-form {
-  .w-100 {
-    width: 100%;
-  }
-  .tips {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
+    .w-100 {
+        width: 100%;
+    }
+    .tips {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index cc40af4..ca9e626 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -189,7 +189,7 @@
           <el-form-item v-if="!curRow.projectManage.founder"
                         label="课程">
             <el-cascader v-model="copyMallId"
-                         :options="curs"
+                         :options="copyCurs"
                          :props="{ checkStrictly: true, value: 'id' }"
                          popper-class="course-cas"
                          @expand-change="copySystemChange"
@@ -200,6 +200,7 @@
               class="dialog-footer">
           <el-button @click="copyVisible = false">取 消</el-button>
           <el-button type="primary"
+                     :loading="submiting"
                      @click="copySubmit">确 定</el-button>
         </span>
       </el-dialog>
@@ -214,6 +215,7 @@ export default {
   data () {
     return {
       showBack: Boolean(this.$route.query.show),
+      lc: [11, 12, 19],
       cid: [],
       curs: [],
       systemId: "",
@@ -288,10 +290,12 @@ export default {
       page: +this.$route.query.page || 1,
       pageSize: 10,
       multipleSelection: [],
+      submiting: false,
       copyVisible: false,
+      copyCurs: [],
       copyForm: {
         projectName: '',
-        mallId: []
+        mallId: ''
       },
       copyMallId: [],
       curRow: {
@@ -481,8 +485,15 @@ export default {
     copyData (projectId) { // 复制，根据项目id查询详情
       this.copyVisible = true;
       this.$get(`${this.api.getProjectDetail}?projectId=${projectId}`).then(res => {
+        const { systemId } = res.projectManage
+        // 沙盘、银行、众筹只能选各自的系统，因此如果是这3个系统的话，要把其他系统都过滤掉
+        this.copyCurs = this.lc.includes(systemId) ? this.curs.filter(e => e.systemId == systemId) : this.curs.filter(e => !this.lc.includes(+e.systemId))
+        console.log("🚀 ~ this.$get ~ this.curs:", this.copyCurs)
         this.copyMallId = []
-        this.copyForm.projectName = res.projectManage.projectName;
+        this.copyForm = {
+          projectName: res.projectManage.projectName,
+          mallId: ''
+        }
         this.curRow = {
           projectManage: JSON.parse(JSON.stringify(res.projectManage)),
           projectJudgmentList: JSON.parse(JSON.stringify(res.projectJudgmentVos))
@@ -496,8 +507,9 @@ export default {
       this.copyForm.mallId = val[0]
     },
     copySubmit () {
+      if (this.submiting) return false
       const form = this.copyForm
-      const row = this.curRow
+      const row = JSON.parse(JSON.stringify(this.curRow))
       const fromSystem = !row.projectManage.founder
       if (!form.projectName) {
         util.warningMsg("请输入项目名称");
@@ -508,6 +520,7 @@ export default {
         util.warningMsg("请选择课程");
         return;
       }
+      this.submiting = true
       row.projectManage.projectName = form.projectName
       if (fromSystem) row.projectManage.mallId = form.mallId
       row.projectManage.projectId = "";
@@ -519,8 +532,9 @@ export default {
         this.initData();
         util.successMsg("复制实验项目成功");
         this.copyVisible = false;
+        this.submiting = false
       }).catch(err => {
-        console.log(err);
+        this.submiting = false
       });
     },
     goBack () { // 返回
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index b43706d..497e00e 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -75,6 +75,7 @@
           <div class="inner"
                v-else-if="videoSrc">
             <video class="video"
+                   :key="videoSrc"
                    width="100%"
                    height="100%"
                    autoplay
diff --git a/src/setting.js b/src/setting.js
index 02c2f94..44e6744 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -32,7 +32,7 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 中台测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    // host = "http://192.168.31.217:9000/";
+    host = "http://192.168.31.217:9000/";
 } else if (isSq) {
 	zcPath = `10.20.100.204:8883`
 }