bug fix

src/modules/base/components/ModifyStudent.vue

@@ -39,12 +39,12 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item prop="collegeId" label="机构：">
-        <org-select
+      <el-form-item prop="collegeId" label="学院：">
+        <college-select
           v-model="modalForm.collegeId"
-          style="width:100%;"
-          placeholder="机构"
-        ></org-select>
+          placeholder="学院"
+          style="width: 100%;"
+        ></college-select>
       </el-form-item>
       <el-form-item prop="majorId" label="专业：">
         <major-select

src/modules/base/components/SelectClassStudent.vue

@@ -2,12 +2,12 @@
   <div class="select-class-student">
     <el-form ref="FilterForm" label-position="left" inline label-width="0px">
       <el-form-item>
-        <org-select
+        <college-select
           v-model="filter.collegeId"
           class="width-200"
-          placeholder="机构"
+          placeholder="学院"
           @change="collegeChange"
-        ></org-select>
+        ></college-select>
       </el-form-item>
       <el-form-item>
         <major-select

src/modules/base/views/StudentManage.vue

@@ -2,16 +2,11 @@
   <div class="student-manage">
     <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" label-width="90px" inline>
-        <el-form-item label="姓名/学号：">
-          <el-input
-            style="width: 142px;"
-            v-model.trim="filter.queryParams"
-            placeholder="姓名/学号"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="机构：">
-          <org-select v-model="filter.collegeId"></org-select>
+        <el-form-item label="学院：">
+          <college-select
+            v-model="filter.collegeId"
+            placeholder="学院"
+          ></college-select>
         </el-form-item>
         <el-form-item label="专业：">
           <major-select
@@ -29,6 +24,14 @@
             placeholder="班级"
           ></class-select>
         </el-form-item>
+        <el-form-item label="姓名/学号：">
+          <el-input
+            style="width: 142px;"
+            v-model.trim="filter.queryParams"
+            placeholder="姓名/学号"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button
             v-if="checkPrivilege('button', 'select')"
@@ -89,7 +92,7 @@
             scope.row.phoneNumber | defaultFieldFilter
           }}</span>
         </el-table-column>
-        <el-table-column prop="collegeName" label="机构"></el-table-column>
+        <el-table-column prop="collegeName" label="学院"></el-table-column>
         <el-table-column prop="majorName" label="专业"></el-table-column>
         <el-table-column prop="clazz" label="班级"></el-table-column>
         <el-table-column prop="createTime" label="创建时间" width="170">

src/modules/exam/components/ApplyContent.vue

@@ -84,7 +84,7 @@
                 class="btn-primary"
                 type="text"
                 :disabled="
-                  !attachment.cardId || attachment.cardType === 'GENERIC'
+                  !attachment.cardId || attachment.createMethod === 'UPLOAD'
                 "
                 @click="toCopyCard(attachment)"
                 >复制</el-button
@@ -93,7 +93,7 @@
                 class="btn-primary"
                 type="text"
                 :disabled="
-                  !attachment.cardId || attachment.cardType === 'GENERIC'
+                  !attachment.cardId || attachment.createMethod === 'UPLOAD'
                 "
                 @click="toEditCard(attachment)"
                 >编辑</el-button
@@ -830,6 +830,7 @@ export default {
         filename: "",
         cardId: "",
         cardType: "",
+        createMethod: "",
         cardTitle: "",
         pages: 0,
         canDelete: true,
@@ -923,6 +924,7 @@ export default {
       if (aind !== -1 && card) {
         this.paperAttachments[aind].cardId = card.id;
         this.paperAttachments[aind].cardType = card.type;
+        this.paperAttachments[aind].createMethod = card.createMethod;
         this.paperAttachments[aind].cardTitle = card.title;
       }
     },
@@ -930,6 +932,7 @@ export default {
       const card = this.cards.find(item => item.id === attachment.cardId);
       if (card) {
         attachment.cardType = card.type;
+        attachment.createMethod = card.createMethod;
         attachment.cardTitle = card.title;
       }
     },

src/modules/exam/components/ModifyTaskPaper.vue

@@ -142,7 +142,7 @@
                   class="btn-primary"
                   type="text"
                   :disabled="
-                    !attachment.cardId || attachment.cardType === 'GENERIC'
+                    !attachment.cardId || attachment.createMethod === 'UPLOAD'
                   "
                   @click="toCopyCard(attachment)"
                   >复制</el-button
@@ -151,7 +151,7 @@
                   class="btn-primary"
                   type="text"
                   :disabled="
-                    !attachment.cardId || attachment.cardType === 'GENERIC'
+                    !attachment.cardId || attachment.createMethod === 'UPLOAD'
                   "
                   @click="toEditCard(attachment)"
                   >编辑</el-button
@@ -378,6 +378,7 @@ export default {
         filename: "",
         cardId: "",
         cardType: "",
+        createMethod: "",
         cardTitle: "",
         pages: 0,
         canDelete: true,
@@ -464,6 +465,7 @@ export default {
       if (aind !== -1 && card) {
         this.paperAttachments[aind].cardId = card.id;
         this.paperAttachments[aind].cardType = card.type;
+        this.paperAttachments[aind].createMethod = card.createMethod;
         this.paperAttachments[aind].cardTitle = card.title;
       }
     },
@@ -488,6 +490,7 @@ export default {
       const card = this.cards.find(item => item.id === attachment.cardId);
       if (card) {
         attachment.cardType = card.type;
+        attachment.createMethod = card.createMethod;
         attachment.cardTitle = card.title;
       }
     },

src/modules/exam/components/createExamAndPrintTask/InfoExamTask.vue

@@ -153,7 +153,7 @@
                 class="btn-primary"
                 type="text"
                 :disabled="
-                  !attachment.cardId || attachment.cardType === 'GENERIC'
+                  !attachment.cardId || attachment.createMethod === 'UPLOAD'
                 "
                 @click="toCopyCard(attachment)"
                 >复制</el-button
@@ -162,7 +162,7 @@
                 class="btn-primary"
                 type="text"
                 :disabled="
-                  !attachment.cardId || attachment.cardType === 'GENERIC'
+                  !attachment.cardId || attachment.createMethod === 'UPLOAD'
                 "
                 @click="toEditCard(attachment)"
                 >编辑</el-button
@@ -432,6 +432,7 @@ export default {
       this.paperAttachments.forEach(item => {
         item.cardId = "";
         item.cardType = "";
+        item.createMethod = "";
         item.cardTitle = "";
       });
       this.cards = [];
@@ -444,6 +445,7 @@ export default {
       this.paperAttachments.forEach(item => {
         item.cardId = "";
         item.cardType = "";
+        item.createMethod = "";
         item.cardTitle = "";
       });
       this.cards = [];
@@ -461,6 +463,7 @@ export default {
       this.paperAttachments.forEach(item => {
         item.cardId = "";
         item.cardType = "";
+        item.createMethod = "";
         item.cardTitle = "";
       });
       this.cards = [];
@@ -491,6 +494,7 @@ export default {
       const card = this.cards.find(item => item.id === attachment.cardId);
       if (card) {
         attachment.cardType = card.type;
+        attachment.createMethod = card.createMethod;
         attachment.cardTitle = card.title;
       }
     },
@@ -552,6 +556,7 @@ export default {
       if (aind !== -1 && card) {
         this.paperAttachments[aind].cardId = card.id;
         this.paperAttachments[aind].cardType = card.type;
+        this.paperAttachments[aind].createMethod = card.createMethod;
         this.paperAttachments[aind].cardTitle = card.title;
       }
     },
@@ -599,6 +604,7 @@ export default {
         attachmentId: "",
         cardId: "",
         cardType: "",
+        createMethod: "",
         cardTitle: "",
         filename: "",
         pages: 0

src/views/Home.vue

@@ -229,9 +229,13 @@ export default {
       if (this.IS_HOME_PAGE) return;
 
       if (this.$route.name === "Home") {
-        this.$router.replace({
-          name: "HomePage"
-        });
+        if (this.IS_SUPER_ADMIN) {
+          this.toMenu(this.menus[0]);
+        } else {
+          this.$router.replace({
+            name: "HomePage"
+          });
+        }
         return;
       }
 
@@ -390,6 +394,7 @@ export default {
       this.$router.push({ name: "Login" });
     },
     toHomePage() {
+      if (this.IS_SUPER_ADMIN) return;
       this.$router.push({ name: "HomePage" });
     },
     toSelectSchool() {