From 8d3cba7de709e7ef0d2cd573a6f7a05e9495bac0 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 29 Mar 2024 14:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E4=BA=BA=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                       |   1 +
 src/assets/img/entry.png               | Bin 0 -> 15730 bytes
 src/layouts/header/index.vue           |   2 +-
 src/pages/course/preview/index.vue     | 464 ++++++++++++++++---------
 src/pages/match/list/index.vue         |   8 +
 src/pages/match/manage/matchSignup.vue | 157 ++++++++-
 src/setting.js                         |   3 +-
 7 files changed, 456 insertions(+), 179 deletions(-)
 create mode 100644 src/assets/img/entry.png

diff --git a/src/api/index.js b/src/api/index.js
index 026b678..3c94b83 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -220,6 +220,7 @@ export default {
     batchImportPersonalData: `${host}competition/competition/registration/batchImportPersonalData`,
     batchImportTeamData: `${host}competition/competition/registration/batchImportTeamData`,
     TeamDataExportFailure: `${host}competition/competition/registration/exportFailure`,
+    batchDeleteApplicants: `competition/competition/registration/batchDeleteApplicants`,
     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`, // 教师端团队报名人员导入模板
 
diff --git a/src/assets/img/entry.png b/src/assets/img/entry.png
new file mode 100644
index 0000000000000000000000000000000000000000..fefe9aea60120bbec8b65a5b2ffb932be61d2632
GIT binary patch
literal 15730
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
OI(pbh>F&s>+5ZJ#Y~BI@

literal 0
HcmV?d00001

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 80da1b2..f1c2967 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -104,7 +104,7 @@ export default {
     this.getSystemDetail();
     this.getUserDetail();
     this.getNotice()
-    this.heartbeatDetection()
+    Setting.isPro && this.heartbeatDetection()
   },
   methods: {
     ...mapMutations("user", [
diff --git a/src/pages/course/preview/index.vue b/src/pages/course/preview/index.vue
index 90f7ef8..b5f6615 100644
--- a/src/pages/course/preview/index.vue
+++ b/src/pages/course/preview/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!--  课程预览  -->
-  <div>
+  <div class="wrap">
     <el-card shadow="hover"
              class="m-b-20">
       <div class="flex-between">
@@ -9,102 +9,118 @@
       </div>
     </el-card>
 
-    <el-card shadow="hover"
-             class="m-b-20"
-             style="background: none;">
-      <div class="flex">
-        <div class="cover"
-             :class="{'is-word': showMask1}">
-          <img v-if="coverUrl"
-               :src="coverUrl"
-               alt=""
-               width="100%"
-               height="100%">
-          <template v-else-if="iframeSrc">
-            <iframe class="inner fileIframe"
-                    id="fileIframe"
-                    :src="iframeSrc"
-                    frameborder="0"></iframe>
-            <template v-if="showMask">
-              <div class="mask"
-                   style="width: 500px;height: 30px;top: 53px;right: 320px"></div>
-              <div class="mask"
-                   style="width: 175px;height: 30px;top: 53px;right: 5px"></div>
-            </template>
-            <template v-if="showMask1">
-              <div class="word-mask"
-                   style="height: 40px;"></div>
-              <div class="word-mask2"
-                   style="top: 55px;left: 28%;width: 44%;height: calc(100% - 80px);"></div>
-            </template>
-            <template v-if="showMask2">
-              <div class="excel-mask1"
-                   style="height: 48px;"></div>
-            </template>
+    <div class="flex">
+      <div class="cover"
+           :class="{'is-word': showMask1}">
+        <img v-if="coverUrl"
+             :src="coverUrl"
+             alt=""
+             width="100%"
+             height="100%">
+        <template v-else-if="iframeSrc">
+          <iframe class="inner fileIframe"
+                  id="fileIframe"
+                  :src="iframeSrc"
+                  frameborder="0"></iframe>
+          <template v-if="showMask">
+            <div class="mask"
+                 style="width: 500px;height: 30px;top: 53px;right: 320px"></div>
+            <div class="mask"
+                 style="width: 175px;height: 30px;top: 53px;right: 5px"></div>
           </template>
-          <div class="pdf inner"
-               v-else-if="pdfSrc">
-            <p class="arrow">
-              <span @click="changePdfPage(0)"
-                    class="turn el-icon-arrow-left"
-                    :class="{grey: currentPage==1}"></span>
-              {{ currentPage }} / {{ pageCount }}
-              <span @click="changePdfPage(1)"
-                    class="turn el-icon-arrow-right"
-                    :class="{grey: currentPage==pageCount}"></span>
-            </p>
-            <pdf class="pdf-wrap"
-                 :src="pdfSrc"
-                 :page="currentPage"
-                 @num-pages="pageCount=$event"
-                 @page-loaded="currentPage=$event"
-                 @loaded="loadPdfHandler">
-            </pdf>
-          </div>
-          <div class="inner"
-               v-else-if="playAuth">
-            <div class="video_wid"
-                 id="player"></div>
-          </div>
+          <template v-if="showMask1">
+            <div class="word-mask"
+                 style="height: 40px;"></div>
+            <div class="word-mask2"
+                 style="top: 55px;left: 28%;width: 44%;height: calc(100% - 80px);"></div>
+          </template>
+          <template v-if="showMask2">
+            <div class="excel-mask1"
+                 style="height: 48px;"></div>
+          </template>
+        </template>
+        <div class="pdf inner"
+             v-else-if="pdfSrc">
+          <p class="arrow">
+            <span @click="changePdfPage(0)"
+                  class="turn el-icon-arrow-left"
+                  :class="{grey: currentPage==1}"></span>
+            {{ currentPage }} / {{ pageCount }}
+            <span @click="changePdfPage(1)"
+                  class="turn el-icon-arrow-right"
+                  :class="{grey: currentPage==pageCount}"></span>
+          </p>
+          <pdf class="pdf-wrap"
+               :src="pdfSrc"
+               :page="currentPage"
+               @num-pages="pageCount=$event"
+               @page-loaded="currentPage=$event"
+               @loaded="loadPdfHandler">
+          </pdf>
         </div>
-        <div class="catalog flex-1">
-          <div class="list">
-            <h4 class="title">{{ courseName }}</h4>
-            <div class="desc-wrap">
-              <div class="desc"
-                   :class="{active: desShrink}"
-                   v-html="description"></div>
-              <i class="arrow"
+        <div class="inner"
+             v-else-if="playAuth">
+          <div class="video_wid"
+               id="player"></div>
+        </div>
+      </div>
+      <div class="catalog flex-1">
+        <div class="list">
+          <h4 class="title">{{ courseName }}</h4>
+          <div class="desc-wrap">
+            <div class="desc"
                  :class="{active: desShrink}"
-                 v-if="description.length > 40">
-                <span>...</span>
-                <img src="@/assets/img/arrow-down.png"
-                     alt=""
-                     @click="desShrink = !desShrink">
-              </i>
-            </div>
-            <div class="chapters">
-              <template v-if="videoList.length">
-                <div class="chapter"
-                     v-for="(item,index) in videoList"
-                     :key="index">
-                  <div class="chapterName">{{ item.name }}</div>
-                  <div class="section"
-                       v-if="item.subsectionList.length">
-                    <div v-for="(section,i) in item.subsectionList"
-                         :key="i"
-                         @click="preview(section, item.name)">
-                      <p class="sectionName"
-                         :class="{active: curLink === `${item.name}${section.name}`}">{{ section.name }}</p>
-                    </div>
+                 v-html="description"></div>
+            <i class="arrow"
+               :class="{active: desShrink}"
+               v-if="description.length > 40">
+              <span>...</span>
+              <img src="@/assets/img/arrow-down.png"
+                   alt=""
+                   @click="desShrink = !desShrink">
+            </i>
+          </div>
+          <div class="chapters">
+            <template v-if="videoList.length">
+              <div class="chapter"
+                   v-for="(item,index) in videoList"
+                   :key="index">
+                <div class="chapterName">{{ item.name }}</div>
+                <div class="section"
+                     v-if="item.subsectionList.length">
+                  <div v-for="(section,i) in item.subsectionList"
+                       :key="i"
+                       @click="preview(section, item.name)">
+                    <p class="sectionName"
+                       :class="{active: curLink === `${item.name}${section.name}`}">
+                      <img v-if="section.fileType === 'pptx'"
+                           src="@/assets/img/exts/ppt.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'mp4'"
+                           src="@/assets/img/exts/video.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'doc' || section.fileType === 'docx'"
+                           src="@/assets/img/exts/word.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'txt'"
+                           src="@/assets/img/exts/txt.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'pdf'"
+                           src="@/assets/img/exts/pdf.png"
+                           alt="">
+                      <img v-else
+                           src="@/assets/img/exts/pic.png"
+                           alt="">
+                      {{ section.name }}
+                    </p>
                   </div>
                 </div>
-              </template>
-            </div>
+              </div>
+            </template>
           </div>
         </div>
       </div>
-    </el-card>
+    </div>
   </div>
 </template>
 
@@ -285,30 +301,42 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.wrap {
+    padding: 0 200px;
+}
 $height: 700px;
 .video_wid,
 .cover {
     position: relative;
     width: 76%;
-    max-width: 1400px;
     height: $height !important;
     border: 0;
 }
-
+.page {
+    /deep/.des {
+        overflow: auto;
+        div,
+        p,
+        span {
+            font-family: PingFangSC-Regular !important;
+        }
+    }
+}
+.l-title {
+    font-size: 17px;
+}
 .cover {
+    background-color: #252528;
     img {
         border-radius: 8px;
     }
-
     &.is-word {
         overflow: hidden;
     }
 }
-
 .fileIframe {
     height: $height !important;
 }
-
 .video_wid,
 .inner {
     width: 100%;
@@ -316,49 +344,100 @@ $height: 700px;
     border: 0;
     overflow: auto;
 }
-
 .cover.is-word {
     .inner {
         height: calc(100% + 38px) !important;
         margin-top: -38px;
     }
 }
-
 .video_wid:focus {
     outline: none;
 }
-
 .catalog {
-    margin-left: 40px;
+    width: 296px;
+    padding: 16px;
+    margin-left: 12px;
+    background-color: #252528;
+    .renew {
+        width: 100%;
+        margin-bottom: 16px;
+        font-size: 17px;
+    }
+    .entry {
+        display: block;
+        width: 100%;
+        height: 34px;
+        margin-bottom: 16px;
+        font-size: 17px;
+        color: #fff;
+        text-align: center;
+        line-height: 34px;
+        background: url(../../../assets/img/entry.png) 0 0/100% 100% no-repeat;
+        cursor: pointer;
+        &:hover {
+            opacity: 0.9;
+        }
+    }
+    .types {
+        display: flex;
+        margin: 15px 0;
+        .item {
+            display: inline-flex;
+            justify-content: center;
+            align-items: center;
+            width: 120px;
+            height: 40px;
+            color: #fff;
+            background-color: #4e4e4e;
+            border-radius: 4px;
+            cursor: pointer;
+            &:first-child {
+                margin-right: 10px;
+            }
+            &:hover {
+                background-color: #377be3;
+            }
+            &.active {
+                background-color: $main-color;
+            }
+        }
+        .icon {
+            margin-right: 5px;
+            font-size: 18px;
+        }
+    }
 }
-
 .list {
-    height: $height;
+    height: calc(700px - 82px);
     overflow-y: auto;
-    padding: 24px 16px;
-    background: #fff;
-
     .title {
-        margin-bottom: 8px;
-        color: rgba(0, 0, 0, 0.85);
-        font-size: 20px;
+        margin-bottom: 11px;
+        color: #fff;
+        font-size: 16px;
+    }
+    .pro-title {
+        margin-bottom: 5px;
+        color: #fff;
+        font-size: 12px;
+    }
+    /deep/.el-progress-bar {
+        width: 92%;
+    }
+    /deep/.el-progress__text {
+        color: #fff;
     }
-
     .desc-wrap {
         position: relative;
-
         .desc {
-            font-size: 14px;
-            color: rgba(0, 0, 0, 0.65);
+            font-size: 12px;
+            color: #fff;
             line-height: 22px;
             @include mul-ellipsis(2);
-
             &.active {
                 display: block;
                 overflow: visible;
             }
         }
-
         .arrow {
             position: absolute;
             bottom: 2px;
@@ -367,62 +446,79 @@ $height: 700px;
             justify-content: space-between;
             width: 46px;
             background-color: #fff;
-
             span {
                 font-size: 14px;
                 color: rgba(0, 0, 0, 0.65);
             }
-
             img {
                 width: 16px;
                 cursor: pointer;
             }
-
             &.active {
                 span {
                     opacity: 0;
                 }
-
                 img {
                     transform: rotate(180deg);
                 }
             }
         }
     }
-
     .chapters {
         margin-top: 16px;
         max-height: calc(100% - 53px);
         overflow: auto;
     }
-
     .chapter {
         margin-bottom: 20px;
-
-        .chapterName {
-            color: rgba(0, 0, 0, 0.85);
-            font-size: 16px;
+    }
+    .chapterName {
+        color: #fff;
+        font-size: 14px;
+    }
+    .section {
+        padding: 5px 15px;
+        margin-top: 12px;
+        background-color: #121214;
+    }
+    .sectionName {
+        position: relative;
+        padding-right: 15px;
+        margin: 12px 0;
+        font-size: 12px;
+        color: #999;
+        cursor: pointer;
+        @include ellipsis;
+        img {
+            margin-right: 8px;
         }
-
-        .section {
-            padding: 5px 15px;
-            margin-top: 8px;
-            background: rgba(0, 0, 0, 0.02);
-
-            .sectionName {
-                margin: 10px 0;
-                font-size: 14px;
-                color: rgba(0, 0, 0, 0.65);
-                cursor: pointer;
-                @include ellipsis;
-                &.active {
-                    color: #9278ff;
-                }
-            }
+        .icon {
+            position: absolute;
+            right: 0;
+            font-size: 14px;
+            color: #00c935;
+        }
+        .circle {
+            width: 14px;
+            height: 14px;
+            border-radius: 50%;
+            border: 1px solid #ccc;
+        }
+        &.active {
+            color: #fff;
         }
     }
 }
-
+.buy {
+    text-align: center;
+    .tips {
+        margin-bottom: 10px;
+        font-size: 14px;
+    }
+    img {
+        width: 85%;
+    }
+}
 .el-image-viewer__wrapper {
     transform: translateY(-10px);
     transition: transform 0.5s;
@@ -431,23 +527,19 @@ $height: 700px;
         transform: translateY(0);
     }
 }
-
 .el-image-viewer__close {
     z-index: 2000;
     top: 15px;
     right: 15px;
-
     &.doc-close {
         i {
-            // color: #000 !important;
+            color: #000 !important;
         }
     }
 }
-
 .list::-webkit-scrollbar {
     width: 4px;
 }
-
 .list::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: rgba(0, 0, 0, 0.06);
@@ -458,7 +550,6 @@ $height: 700px;
     position: absolute;
     background-color: rgb(57, 58, 61);
 }
-
 .word-mask {
     z-index: 9;
     position: absolute;
@@ -467,7 +558,6 @@ $height: 700px;
     width: 100%;
     background-color: rgb(243, 242, 241);
 }
-
 .word-mask1 {
     z-index: 9;
     position: absolute;
@@ -476,13 +566,11 @@ $height: 700px;
     width: 100%;
     background-color: #185abd;
 }
-
 .word-mask2 {
     z-index: 9;
     position: absolute;
     background-color: transparent;
 }
-
 .excel-mask1 {
     z-index: 9;
     position: absolute;
@@ -491,29 +579,30 @@ $height: 700px;
     width: 60%;
     background-color: #107c41;
 }
-
-/deep/ .pdf-dia {
+/deep/.pdf-dia {
     border-radius: 0 !important;
-
     .el-dialog__header {
         display: none;
     }
-
     .el-dialog__body {
         padding: 0;
     }
-
     .el-dialog__headerbtn {
         top: 10px;
-
         .el-dialog__close {
             color: #fff;
             font-size: 16px;
         }
     }
 }
-
 .pdf {
+    position: relative;
+    .full {
+        position: absolute;
+        top: 7px;
+        right: 10px;
+        cursor: pointer;
+    }
     .arrow {
         padding: 10px 0;
         display: flex;
@@ -522,17 +611,78 @@ $height: 700px;
         font-size: 16px;
         color: #fff;
         background-color: #333;
-
         .turn {
             margin: 0 10px;
             font-size: 18px;
             cursor: pointer;
         }
     }
-
     .pdf-wrap {
         width: 80%;
         margin: 0 auto;
     }
 }
+/deep/.project-dia {
+    .el-dialog__body {
+        padding: 28px 32px;
+    }
+}
+.projects {
+    display: flex;
+    flex-wrap: wrap;
+    max-height: 400px;
+    overflow: auto;
+    li {
+        display: inline-flex;
+        align-items: center;
+        width: 238px;
+        padding: 16px;
+        margin: 0 20px 20px 0;
+        background-color: #f6f8fa;
+        border-radius: 16px;
+        cursor: pointer;
+        &:hover {
+            span {
+                color: #007eff;
+            }
+        }
+        &:nth-child(3n) {
+            margin-right: 0;
+        }
+        &.active {
+            background-color: #f2f7ff;
+            span {
+                color: #3988ff;
+            }
+        }
+    }
+    span {
+        max-width: 140px;
+        margin-left: 14px;
+        font-size: 14px;
+        color: #333;
+    }
+}
+.tabs {
+    display: flex;
+    align-items: center;
+    margin: 10px 0;
+    .item {
+        padding: 0 10px;
+        margin-right: 16px;
+        font-size: 16px;
+        text-align: center;
+        color: #333;
+        line-height: 50px;
+        border-bottom: 3px solid transparent;
+        cursor: pointer;
+        &.active {
+            color: #007eff;
+            border-color: #007eff;
+        }
+    }
+}
+.tab-content {
+    width: calc(100% - 308px);
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index e059012..9de0be0 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -91,6 +91,14 @@
       <el-table-column prop="competitionName"
                        label="竞赛名称"
                        align="center"></el-table-column>
+      <el-table-column prop="name"
+                       label="竞赛类型"
+                       width="90"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.row.setup ? (scope.row.setup.competitionType ? '团队赛' : '个人赛') : '' }}
+        </template>
+      </el-table-column>
       <el-table-column prop="applicantNum"
                        label="报名人数"
                        align="center"
diff --git a/src/pages/match/manage/matchSignup.vue b/src/pages/match/manage/matchSignup.vue
index 950e422..8c2bae7 100644
--- a/src/pages/match/manage/matchSignup.vue
+++ b/src/pages/match/manage/matchSignup.vue
@@ -6,12 +6,12 @@
       <ul class="filter">
         <li>
           <label>搜索：</label>
-          <el-input placeholder="请输入姓名/手机号/学号"
+          <el-input :placeholder="'请输入姓名、手机号、' + (info.completeCompetitionSetup.competitionType ? '团队名称、' : '') + '学号、学校'"
                     prefix-icon="el-icon-search"
                     v-model="keyword"
                     clearable
                     size="mini"
-                    style="width: 250px"></el-input>
+                    style="width: 350px"></el-input>
         </li>
         <li v-if="info.releaseType">
           <label>参赛人员状态：</label>
@@ -25,6 +25,9 @@
         </li>
       </ul>
       <div>
+        <el-button type="primary"
+                   round
+                   @click="autoAllocation">自动分配阶段成员</el-button>
         <el-button type="primary"
                    round
                    @click="batchImport">导入</el-button>
@@ -36,6 +39,10 @@
                    round
                    @click="exportAll"
                    v-auth="'/match/list:管理:报名人员:批量导出'">批量导出</el-button>
+        <el-button type="primary"
+                   @click="batchDel"
+                   round
+                   v-auth="'/match:管理:报名人员:导出'">批量删除</el-button>
       </div>
     </div>
 
@@ -60,31 +67,75 @@
         </template>
       </el-table-column>
       <el-table-column prop="school"
-                       label="学校"
-                       sortable="custom">
+                       label="学生账号归属"
+                       min-width="180"
+                       align="center">
+      </el-table-column>
+      <el-table-column prop="realSchool"
+                       label="学生所属院校"
+                       sortable="custom"
+                       min-width="180"
+                       align="center">
       </el-table-column>
       <el-table-column v-if="info.completeCompetitionSetup.competitionType"
                        prop="teamName"
                        label="团队名称"
-                       sortable="custom">
+                       sortable="custom"
+                       min-width="140"
+                       align="center">
       </el-table-column>
       <el-table-column prop="username"
-                       label="学生姓名">
+                       label="队长/成员"
+                       min-width="140"
+                       align="center">
       </el-table-column>
       <el-table-column prop="workNumber"
-                       label="学号">
+                       label="队长/成员学号"
+                       min-width="140"
+                       align="center">
       </el-table-column>
       <el-table-column prop="phone"
-                       label="手机号">
+                       label="队长/成员手机号"
+                       min-width="140"
+                       align="center">
+      </el-table-column>
+      <el-table-column label="是否为队长"
+                       min-width="80"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.row.captain ? '否' : '是' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="teachers"
+                       label="指导老师"
+                       min-width="200"
+                       align="center"
+                       show-overflow-tooltip>
+        <template slot-scope="scope">
+          <template v-if="scope.row.teachers">
+            <el-tooltip placement="top">
+              <div slot="content"
+                   style="line-height: 1.8">
+                <div v-for="(item, i) in scope.row.teachers"
+                     :key="i">
+                  {{ item.name }}{{ item.phone ? '，' + item.phone : '' }}{{ item.position ? '，' + item.position : '' }}
+                </div>
+              </div>
+              <p>{{ scope.row.teachers[0].name }}{{ scope.row.teachers[0].phone ? '，' + scope.row.teachers[0].phone : '' }}{{ scope.row.teachers[0].position ? '，' + scope.row.teachers[0].position : '' }}</p>
+            </el-tooltip>
+          </template>
+        </template>
       </el-table-column>
       <el-table-column label="操作"
                        align="center"
-                       width="320">
+                       width="270">
         <template slot-scope="scope">
           <el-button v-if="scope.row.identification"
                      type="text"
                      @click="edit(scope.row)"
                      v-auth="'/match/list:管理:报名人员:编辑'">编辑</el-button>
+          <el-button type="text"
+                     @click="del(scope.row)">删除</el-button>
           <template v-if="info.releaseType">
             <el-button type="text"
                        @click="toInfo(scope.row)"
@@ -118,12 +169,25 @@
       <el-form ref="form"
                :model="form"
                :rules="rules"
-               label-width="80px"
+               label-width="110px"
                style='margin-right: 10px;'>
         <el-form-item v-if="!schoolDisable"
                       prop="schoolId"
-                      label="院校">
+                      label="学生账号归属">
           <el-select v-model="form.schoolId"
+                     filterable
+                     :disabled="!isAdd"
+                     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 v-if="!schoolDisable"
+                      prop="studentAffiliatedInstitutionId"
+                      label="学生所属院校">
+          <el-select v-model="form.studentAffiliatedInstitutionId"
                      filterable
                      style="width: 100%">
             <el-option v-for="(item, i) in clients"
@@ -303,6 +367,7 @@ export default {
         userName: '',
         workNumber: '',
         schoolId: '',
+        studentAffiliatedInstitutionId: '',
         teamId: '',
         whetherSignUp: 0,
         phone: '',
@@ -359,12 +424,16 @@ export default {
     }
   },
   mounted () {
-    console.log(44, this.$store.state.user.schoolId)
     this.initData()
     this.getInfo()
     this.getTeam()
   },
   methods: {
+    init () {
+      this.initData()
+      this.getTeam()
+      this.getClient()
+    },
     getData () {
       this.$post(this.api.queryRegistrationByCondition, {
         pageNum: this.page,
@@ -375,7 +444,13 @@ export default {
         schoolOrder: this.schoolOrder,
         teamOrder: this.teamOrder,
       }).then(({ data }) => {
-        this.listData = data.records;
+        const list = data.records;
+        list.map(e => {
+          if (e.teacherDetails) {
+            e.teachers = JSON.parse(e.teacherDetails)
+          }
+        })
+        this.listData = list
         this.total = data.total;
         this.$refs.table.clearSelection();
       }).catch(res => {
@@ -415,6 +490,10 @@ export default {
       if (column.prop === 'teamName') this.teamOrder = column.order ? column.order === 'ascending' ? 2 : 1 : ''
       this.getData()
     },
+    // 自动分配
+    autoAllocation () {
+
+    },
 
 
     // 批量导入
@@ -440,7 +519,8 @@ export default {
         responseType: 'blob'
       }).then((res) => {
         console.log("🚀 ~ showFaild ~ res:", res)
-        util.downloadFileDirect(decodeURI(res.headers['content-disposition']), new Blob([res.data]))
+        const name = res.headers['content-disposition']
+        util.downloadFileDirect(name ? decodeURI(name) : '批量导入报名人员失败数据导出.xlsx', new Blob([res.data]))
       }).catch(res => { })
     },
     uploadSuccess ({ data, status }) {
@@ -470,6 +550,7 @@ export default {
       this.uploadFaild = false
     },
     uploadSure () {
+      this.init()
       this.importVisible = false
       this.keyWord = ''
     },
@@ -490,13 +571,30 @@ export default {
       this.originForm = JSON.parse(JSON.stringify(row))
       this.form = JSON.parse(JSON.stringify(row))
     },
+    del (row) {
+      this.$confirm(row.captain ? '此删除操作不可逆，是否确认删除选中项？' : '删除队长后，该团队下所有成员都会同步移除报名，是否确认删除？', "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.$post(this.api.batchDeleteApplicants, { registrationVOS: [row] }).then(res => {
+            util.successMsg("删除成功");
+            this.getData();
+          }).catch(res => {
+          });
+        })
+        .catch(() => {
+        });
+    },
     // 学号输入完回调。学校和学号都输入完后，调这个接口查询是否有存在的学生，如果有，才能继续输入，如果不能，不让添加
     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.notExit = 0
           this.exitMember = 0
           if (account) {
+            const { studentAffiliatedInstitutionId } = form
+            account.studentAffiliatedInstitutionId = studentAffiliatedInstitutionId
             this.form = account
           }
           this.formEnable = !account
@@ -534,6 +632,7 @@ export default {
           // 团队有更换，则调加入团队的接口
           if (this.originForm.teamId !== form.teamId) {
             this.$post(this.api.joinCompetitionTeam, {
+              studentAffiliatedInstitutionId: form.studentAffiliatedInstitutionId,
               accountId: form.id,
               competitionId: this.id,
               teamId: form.teamId,
@@ -541,7 +640,7 @@ export default {
               whetherSignUp: 1
             }).then(res => {
               this.addVisible = false
-              this.getData()
+              this.init()
               this.submiting = false
               util.successMsg('编辑成功！')
             }).catch(res => {
@@ -549,7 +648,7 @@ export default {
             })
           } else {
             this.addVisible = false
-            this.getData()
+            this.init()
             this.submiting = false
             util.successMsg('编辑成功！')
           }
@@ -559,6 +658,7 @@ export default {
       } else {
         // 新增人员后再调加入团队的接口
         this.$post(this.api[this.info.completeCompetitionSetup.competitionType ? 'joinCompetitionTeam' : 'addCompetitionRegistration'], {
+          studentAffiliatedInstitutionId: form.studentAffiliatedInstitutionId,
           accountId: form.id,
           competitionId: this.id,
           teamId: this.form.teamId,
@@ -566,7 +666,7 @@ export default {
           whetherSignUp: 1
         }).then(res => {
           this.addVisible = false
-          this.getData()
+          this.init()
           this.submiting = false
           util.successMsg('报名成功！')
         }).catch(res => {
@@ -650,10 +750,11 @@ export default {
       if (!form.teamName) return util.errorMsg('请输入团队名称')
       if (form.invitationCode.length !== 6) return util.errorMsg('请输入6位数团队邀请码')
       form.accountId = this.form.id
+      form.studentAffiliatedInstitutionId = this.form.studentAffiliatedInstitutionId
       this.$post(this.api.addCompetitionTeam, form).then(res => {
         this.teamVisible = false
         this.addVisible = false
-        this.getData()
+        this.init()
         util.successMsg('报名成功！')
       }).catch(res => { })
     },
@@ -683,7 +784,25 @@ export default {
           util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
         }).catch(res => { })
       }
-    }
+    },
+    // 批量删除
+    batchDel () {
+      if (this.multipleSelection.length) {
+        this.$confirm("确定要删除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$post(this.api.batchDeleteApplicants, { registrationVOS: this.multipleSelection }).then(res => {
+            this.getData();
+            this.$message.success("删除成功");
+            this.$refs.table.clearSelection()
+          }).catch(err => {
+          });
+        }).catch(() => {
+        });
+      } else {
+        this.$message.warning("请先选择数据 ！");
+      }
+    },
   }
 };
 </script>
diff --git a/src/setting.js b/src/setting.js
index 202bf28..0b96562 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -5,8 +5,7 @@ const url = location.host;
 const isDev = process.env.NODE_ENV === "development"; // 开发环境
 const isHh = url.includes("10.196.131.73"); //河海版本
 const isCH = url.includes("124.71.12.62"); //巢湖版本
-const isPro = url.includes("occupationlab.com"); //职站生产
-const isZxy = url.includes("izhixinyun.com"); //智信云
+const isPro = url.includes("occupationlab.com") || url.includes("izhixinyun.com"); //生产
 const isTest = url.includes('121.37.12.51'); //中台测试服
 const isSq = url.includes('10.20.100.204'); // 商丘