Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/basic/view/user.vue

@@ -636,6 +636,16 @@ export default {
         ];
       } else {
         this.rules.orgId = [];
+        if (this.updateDialog) {
+          this.$refs.updateForm && this.$refs.updateForm.clearValidate("orgId");
+        } else if (this.addingDialog) {
+          this.$refs.addingForm && this.$refs.addingForm.clearValidate("orgId");
+        }
+      }
+      if (this.updateDialog) {
+        this.$refs.updateForm && this.$refs.updateForm.validateField("orgId");
+      } else if (this.addingDialog) {
+        this.$refs.addingForm && this.$refs.addingForm.validateField("orgId");
       }
     },
     rootOrgChanged4Search() {

src/modules/examwork/view/examInfo.vue

@@ -82,20 +82,32 @@
           @selection-change="selectChange"
         >
           <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column prop="id" width="60" label="ID"> </el-table-column>
-          <el-table-column prop="name" label="考试名称"> </el-table-column>
-          <el-table-column width="80" label="考试类型">
+          <el-table-column prop="id" width="60" label="ID" sortable>
+          </el-table-column>
+          <el-table-column prop="name" label="考试名称" sortable>
+          </el-table-column>
+          <el-table-column width="130" label="考试类型" sortable>
             <template slot-scope="scope">
               <div>
                 <span>{{ getExamType(scope.row.examType) }}</span>
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="beginTime" width="155" label="开始时间">
+          <el-table-column
+            prop="beginTime"
+            width="155"
+            label="开始时间"
+            sortable
+          >
           </el-table-column>
-          <el-table-column prop="endTime" width="155" label="结束时间">
+          <el-table-column prop="endTime" width="155" label="结束时间" sortable>
           </el-table-column>
-          <el-table-column prop="updateTime" width="155" label="更新时间">
+          <el-table-column
+            prop="updateTime"
+            width="155"
+            label="更新时间"
+            sortable
+          >
           </el-table-column>
           <el-table-column width="50" label="状态">
             <span slot-scope="scope">
@@ -157,7 +169,6 @@
                       <el-button
                         v-else-if="rolePrivileges.change_exam_availability"
                         size="mini"
-                        plain
                         type="danger"
                         icon="el-icon-close"
                         @click="disableById(scope.row)"

src/modules/examwork/view/examStudent.vue

@@ -583,8 +583,8 @@
           @selection-change="selectChange"
         >
           <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column prop="id" label="ID"></el-table-column>
-          <el-table-column label="考生">
+          <el-table-column prop="id" label="ID" sortable></el-table-column>
+          <el-table-column label="考生" sortable>
             <template slot-scope="scope">
               <el-popover trigger="hover" placement="left">
                 <div style="font-size: 18px;font-family: 新宋体">
@@ -674,14 +674,22 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column prop="studentCode" label="学号"> </el-table-column>
-          <el-table-column prop="identityNumber" label="身份证号">
+          <el-table-column prop="studentCode" label="学号" sortable>
           </el-table-column>
-          <el-table-column prop="orgName" label="学习中心"> </el-table-column>
-          <el-table-column prop="examName" label="考试名称"> </el-table-column>
-          <el-table-column prop="courseName" label="课程名称">
+          <el-table-column prop="identityNumber" label="身份证号" sortable>
           </el-table-column>
-          <el-table-column prop="updateTime" width="155" label="更新时间">
+          <el-table-column prop="orgName" label="学习中心" sortable>
+          </el-table-column>
+          <el-table-column prop="examName" label="考试名称" sortable>
+          </el-table-column>
+          <el-table-column prop="courseName" label="课程名称" sortable>
+          </el-table-column>
+          <el-table-column
+            prop="updateTime"
+            width="155"
+            label="更新时间"
+            sortable
+          >
           </el-table-column>
           <el-table-column width="50" label="状态">
             <span slot-scope="scope">
@@ -732,7 +740,6 @@
                         v-if="rolePrivileges.del_examStudent"
                         size="mini"
                         type="danger"
-                        plain
                         icon="el-icon-delete"
                         @click="deleteExamStudent(scope.row)"
                         >删除
@@ -769,7 +776,6 @@
                         "
                         size="mini"
                         type="danger"
-                        plain
                         icon="el-icon-close"
                         @click="disableExamStudent(scope.row)"
                         >禁用
@@ -1414,6 +1420,7 @@ export default {
       this.examStudentForm.specialtyName = null;
       this.examStudentForm.phone = null;
       this.examStudentForm.infoCollector = null;
+      this.examStudentForm.ext1 = null;
       if (this.pureLC) {
         this.examStudentForm.orgId = this.lc_id;
         this.orgList4InsertOrUpdate = [

src/modules/examwork/view/examStudentImport.vue

@@ -94,16 +94,27 @@
           border
           style="width: 100%;text-align:center;"
         >
-          <el-table-column prop="id" width="50" label="ID"></el-table-column>
-          <el-table-column prop="rootOrgName" label="顶级机构">
+          <el-table-column
+            prop="id"
+            width="50"
+            label="ID"
+            sortable
+          ></el-table-column>
+          <el-table-column prop="rootOrgName" label="顶级机构" sortable>
           </el-table-column>
-          <el-table-column prop="examName" label="考试"> </el-table-column>
-          <el-table-column prop="fileName" label="上传文件名">
+          <el-table-column prop="examName" label="考试" sortable>
+          </el-table-column>
+          <el-table-column prop="fileName" label="上传文件名" sortable>
           </el-table-column>
           <el-table-column prop="statusDesc" width="120" label="状态">
           </el-table-column>
           <el-table-column prop="errorDesc" label="异常"> </el-table-column>
-          <el-table-column prop="creationTime" width="170" label="上传时间">
+          <el-table-column
+            prop="creationTime"
+            width="170"
+            label="上传时间"
+            sortable
+          >
           </el-table-column>
           <el-table-column label="操作" width="230">
             <template slot-scope="scope">

src/modules/examwork/view/student.vue

@@ -102,7 +102,7 @@
         <el-button
           v-if="rolePrivileges.change_student_availability"
           size="small"
-          type="danger"
+          type="success"
           icon="el-icon-check"
           :disabled="noBatchSelected"
           @click="enableStudent('')"
@@ -129,8 +129,13 @@
           @selection-change="selectChange"
         >
           <el-table-column type="selection" width="50"></el-table-column>
-          <el-table-column prop="id" width="100" label="ID"></el-table-column>
-          <el-table-column label="考生" width="100">
+          <el-table-column
+            prop="id"
+            width="100"
+            label="ID"
+            sortable
+          ></el-table-column>
+          <el-table-column label="考生" width="100" sortable>
             <template slot-scope="scope">
               <el-popover trigger="hover" placement="left">
                 <div style="font-size: 18px;font-family: 新宋体">
@@ -188,16 +193,19 @@
             prop="studentCode"
             width=""
             label="学号"
+            sortable
           ></el-table-column>
           <el-table-column
             prop="identityNumber"
             width=""
             label="身份证"
+            sortable
           ></el-table-column>
           <el-table-column
             prop="updateTime"
             width="168"
             label="更新时间"
+            sortable
           ></el-table-column>
           <el-table-column width="50" label="状态">
             <span slot-scope="scope">
@@ -251,7 +259,6 @@
                 v-else-if="rolePrivileges.change_student_availability"
                 size="mini"
                 type="danger"
-                plain
                 icon="el-icon-close"
                 @click="disableStudent(scope.row)"
                 >禁用
@@ -268,7 +275,6 @@
                     <el-button
                       size="mini"
                       type="danger"
-                      plain
                       icon="el-icon-refresh"
                       @click="resetPassword(scope.row)"
                       >重置密码
@@ -278,7 +284,6 @@
                     <el-button
                       size="mini"
                       type="primary"
-                      plain
                       icon="el-icon-document"
                       @click="showStuExamDialog(scope.row)"
                       >考试记录
@@ -288,7 +293,6 @@
                     <el-button
                       size="mini"
                       type="danger"
-                      plain
                       icon="el-icon-refresh"
                       @click="unbindStudentCode(scope.row)"
                       >解绑学号
@@ -298,7 +302,6 @@
                     <el-button
                       size="mini"
                       type="danger"
-                      plain
                       icon="el-icon-refresh"
                       @click="unbindSecurityPhone(scope.row)"
                       >解绑安全手机
@@ -377,9 +380,11 @@
             <el-table-column prop="studentCode" label="学号"> </el-table-column>
             <el-table-column prop="identityNumber" label="身份证">
             </el-table-column>
-            <el-table-column prop="examName" label="考试"> </el-table-column>
-            <el-table-column prop="courseName" label="课程"> </el-table-column>
-            <el-table-column width="80" label="考试状态">
+            <el-table-column prop="examName" label="考试" sortable>
+            </el-table-column>
+            <el-table-column prop="courseName" label="课程" sortable>
+            </el-table-column>
+            <el-table-column width="130" label="考试状态" sortable>
               <div slot-scope="scope">
                 <span v-if="null == scope.row.started"></span>
                 <span v-else-if="scope.row.started">已考</span>

vue.config.js

@@ -51,7 +51,7 @@ module.exports = {
     proxy
   },
   configureWebpack: {
-    devtool: "source-map",
+    // devtool: "source-map",  // for vscode debug
     plugins: [
       // Ignore all locale files of moment.js
       new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/)