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

src/modules/examwork/view/examStudent.vue

@@ -582,9 +582,18 @@
           style="width: 100%;text-align:center;"
           @selection-change="selectChange"
         >
-          <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column prop="id" label="ID" sortable></el-table-column>
-          <el-table-column label="考生">
+          <el-table-column
+            type="selection"
+            width="40"
+            fixed="left"
+          ></el-table-column>
+          <el-table-column
+            prop="id"
+            label="ID"
+            sortable
+            fixed="left"
+          ></el-table-column>
+          <el-table-column label="考生" fixed="left">
             <template slot-scope="scope">
               <el-popover trigger="hover" placement="left">
                 <div style="font-size: 18px;font-family: 新宋体">
@@ -676,13 +685,28 @@
           </el-table-column>
           <el-table-column prop="studentCode" label="学号" sortable>
           </el-table-column>
-          <el-table-column prop="identityNumber" label="身份证号" sortable>
+          <el-table-column
+            prop="identityNumber"
+            label="身份证号"
+            width="120"
+            sortable
+          >
           </el-table-column>
-          <el-table-column prop="orgName" label="学习中心" sortable>
+          <el-table-column prop="orgName" label="学习中心" width="120" sortable>
           </el-table-column>
-          <el-table-column prop="examName" label="考试名称" sortable>
+          <el-table-column
+            prop="examName"
+            label="考试名称"
+            width="120"
+            sortable
+          >
           </el-table-column>
-          <el-table-column prop="courseName" label="课程名称" sortable>
+          <el-table-column
+            prop="courseName"
+            label="课程名称"
+            width="120"
+            sortable
+          >
           </el-table-column>
           <el-table-column
             prop="updateTime"
@@ -715,7 +739,7 @@
               </span>
             </span>
           </el-table-column>
-          <el-table-column width="300" label="操作">
+          <el-table-column width="300" label="操作" fixed="right">
             <template slot-scope="scope">
               <div v-if="scope.row.locked">锁定中，请稍后操作</div>
               <div v-else>
@@ -1110,18 +1134,13 @@ export default {
       this.getOrgList(orgName, "insertOrUpdate");
     },
     getOrgList(orgName, where) {
-      if (Object.prototype.toString.call(orgName) != "[object String]") {
-        return;
-      }
-      orgName = orgName.split(" - ")[0];
       if ("search" == where) {
         this.getOrgList4SearchLoading = true;
       } else if ("insertOrUpdate" == where) {
         this.getOrgList4InsertOrUpdateLoading = true;
       }
 
-      var url =
-        CORE_API + "/org/query?" + new URLSearchParams({ name: orgName });
+      let url = CORE_API + "/org/query?name=" + orgName;
       this.$httpWithMsg
         .get(url)
         .then(response => {
@@ -1229,32 +1248,22 @@ export default {
         });
     },
     getCourses4Search(query) {
-      query = query.split(" - ")[0];
-      if (query) {
-        this.courseLoading4Search = true;
-        this.$httpWithMsg
-          .get(CORE_API + "/course/query?name=" + query)
-          .then(response => {
-            this.courseList4Search = response.data;
-            this.courseLoading4Search = false;
-          });
-      } else {
-        this.courseList4Search = [];
-      }
+      this.courseLoading4Search = true;
+      this.$httpWithMsg
+        .get(CORE_API + "/course/query?name=" + query)
+        .then(response => {
+          this.courseList4Search = response.data;
+          this.courseLoading4Search = false;
+        });
     },
     getCourses4InsertOrUpdate(query) {
-      query = query.split(" - ")[0];
-      if (query) {
-        this.courseLoading4InsertOrUpdate = true;
-        this.$httpWithMsg
-          .get(CORE_API + "/course/query?name=" + query)
-          .then(response => {
-            this.courseList4InsertOrUpdate = response.data;
-            this.courseLoading4InsertOrUpdate = false;
-          });
-      } else {
-        this.courseList4InsertOrUpdate = [];
-      }
+      this.courseLoading4InsertOrUpdate = true;
+      this.$httpWithMsg
+        .get(CORE_API + "/course/query?name=" + query)
+        .then(response => {
+          this.courseList4InsertOrUpdate = response.data;
+          this.courseLoading4InsertOrUpdate = false;
+        });
     },
     //新增信息
     addStudent() {
@@ -1413,11 +1422,13 @@ export default {
       } else {
         this.examStudentForm.orgId = null;
         this.orgList4InsertOrUpdate = null;
+        this.getOrgList4InsertOrUpdate("");
       }
       this.examList4InsertOrUpdate = [];
       this.courseList4InsertOrUpdate = [];
 
       this.queryExams4InsertOrUpdate("");
+      this.getCourses4InsertOrUpdate("");
       this.addingStudentDialog = true;
     },
     //修改
@@ -1679,6 +1690,9 @@ export default {
         this.pureLC = false;
       }
 
+      this.getCourses4Search("");
+      this.getOrgList4Search("");
+      this.queryExams4Search("");
       this.formSearch.rootOrgId = this.user.rootOrgId;
       if (this.pureLC) {
         var url = CORE_API + "/user/" + this.user.userId;
@@ -1695,11 +1709,9 @@ export default {
           ];
           this.formSearch.orgId = this.lc_id;
           this.examStudentForm.orgId = this.lc_id;
-          this.queryExams4Search("");
           this.searchForm();
         });
       } else {
-        this.queryExams4Search("");
         this.searchForm();
       }
     }

src/modules/examwork/view/onlineExamOrgSettings.vue

@@ -31,7 +31,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item class="d-block">
+          <el-form-item>
             <el-button
               size="small"
               type="primary"
@@ -346,6 +346,7 @@
         <el-dialog
           title="学习中心设置导入"
           size="tiny"
+          width="500px"
           :visible.sync="orgSettingsImportDialog"
         >
           <el-form :model="orgSettingsImportForm" ref="orgSettingsImportForm">

src/modules/marking/views/MarkPaperCheck.vue

@@ -249,6 +249,7 @@ export default {
         courseCode: "",
         userId: "",
         workId: "",
+        examType: "",
         markRemark: ""
       },
       orgList: [],
@@ -312,6 +313,7 @@ export default {
         tag: "",
         courseCode: "",
         userId: "",
+        examType: "",
         markRemark: ""
       });
     },
@@ -409,6 +411,7 @@ export default {
         (this.currentPage - 1) +
         "/" +
         this.pageSize;
+      this.formSearch.examType = this.examType;
       this.$http.get(url, { params: this.formSearch }).then(response => {
         console.log("查询的列表集合", response);
         this.tableData = response.data.list;

src/modules/marking/views/MarkSettingMain.vue

@@ -22,7 +22,6 @@
                 v-model="formSearch.courseCode"
                 placeholder="请选择"
               >
-                <el-option value>请选择</el-option>
                 <el-option
                   v-for="item in courseAllListSelect"
                   :label="item.courseInfo"

src/modules/marking/views/MarkWorkOverview.vue

@@ -22,7 +22,6 @@
                       @change="searchMarkWork"
                       @clear="cleanMarkWork"
                     >
-                      <el-option value>请选择</el-option>
                       <el-option
                         v-for="item in markWorkSelect"
                         :label="item.markName"
@@ -56,7 +55,6 @@
                     v-model="formSearch.courseCode"
                     placeholder="请选择"
                   >
-                    <el-option value>请选择</el-option>
                     <el-option
                       v-for="item in courseAllListSelect"
                       :label="item.courseInfo"

src/modules/marking/views/Marker.vue

@@ -18,7 +18,6 @@
                 placeholder="请选择"
                 @clear="clearData"
               >
-                <el-option value>请选择</el-option>
                 <el-option
                   v-for="item in markWorkSelect"
                   :label="item.markName"

src/modules/marking/views/TpScoreBoard.vue

@@ -543,7 +543,7 @@ export default {
       if (!this.markedResult.id) {
         //正常提交情况
         console.log("提交resultItems", this.resultItems);
-        this.$http
+        this.$httpWithMsg
           .post(
             MARKING_API +
               "/markResults?studentPaperId=" +
@@ -623,10 +623,10 @@ export default {
                     }
                   );
                 } else {
-                  this.$notify({
-                    message: error.response.data.desc,
-                    type: "error"
-                  });
+                  if (error.response.data.code == 403) {
+                    this.$loading().close();
+                    return;
+                  }
                   this.$emit("submitMark");
                   this.loading = false;
                   this.markTypeView = false;
@@ -650,41 +650,35 @@ export default {
         console.log("markedResult", this.markedResult);
         this.markedResult.resultItems = this.resultItems;
         this.markedResult.remark = remarkValue;
-        this.$http.put(MARKING_API + "/markResults", this.markedResult).then(
-          response => {
-            this.saveMarkSign();
-            console.log(response);
-            this.$notify({
-              message: "提交成功",
-              type: "success"
-            });
-            this.$emit("submitMark");
-            this.loading = false;
-            this.markTypeView = false;
-            this.problemView = false;
-            this.unusualType = "";
-          },
-          error => {
-            // 响应错误回调
-            console.log(error.response);
-            if (error.response.data.desc) {
-              this.$notify({
-                message: error.response.data.desc,
-                type: "error"
-              });
-            } else {
+        this.$httpWithMsg
+          .put(MARKING_API + "/markResults", this.markedResult)
+          .then(
+            response => {
+              this.saveMarkSign();
+              console.log(response);
               this.$notify({
-                message: "提交失败",
-                type: "error"
+                message: "提交成功",
+                type: "success"
               });
+              this.$emit("submitMark");
+              this.loading = false;
+              this.markTypeView = false;
+              this.problemView = false;
+              this.unusualType = "";
+            },
+            error => {
+              // 响应错误回调
+              if (error.response.data.code == 403) {
+                this.$loading().close();
+                return;
+              }
+              this.$emit("submitMark");
+              this.loading = false;
+              this.markTypeView = false;
+              this.problemView = false;
+              this.unusualType = "";
             }
-            this.$emit("submitMark");
-            this.loading = false;
-            this.markTypeView = false;
-            this.problemView = false;
-            this.unusualType = "";
-          }
-        );
+          );
       }
     },
     initKeyBoardMode() {

src/modules/print/view/CourseStatistic.vue

@@ -7,8 +7,9 @@
           :model="formSearch"
           :inline="true"
           label-position="right"
-          label-width="100px"
-          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
+          label-width="90px"
+          class="el-form el-form--inline"
+          style="border-bottom: 1px solid rgb(221, 221, 221);padding-bottom: 10px;margin-bottom: 10px;"
         >
           <el-form-item label="学校">
             <el-select
@@ -83,7 +84,7 @@
             ></el-input>
           </el-form-item>
 
-          <el-form-item style="padding-left: 30px">
+          <el-form-item style="padding-left: 22px">
             <el-button
               size="small"
               type="primary"
@@ -103,7 +104,7 @@
         </el-form>
 
         <div style="margin-bottom: 5px;">
-          批量操作：
+          操作：
           <el-button
             size="small"
             type="primary"

src/modules/print/view/ExamStructure.vue

@@ -7,8 +7,8 @@
           :model="formSearch"
           :inline="true"
           label-position="right"
-          label-width="100px"
-          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
+          class="el-form el-form--inline"
+          style="border-bottom: 1px solid rgb(221, 221, 221);padding-bottom: 10px;margin-bottom: 10px;"
         >
           <el-form-item label="学校">
             <el-select

src/modules/print/view/Project.vue

@@ -7,8 +7,9 @@
           :model="formSearch"
           :inline="true"
           label-position="right"
-          label-width="100px"
-          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
+          label-width="90px"
+          class="el-form el-form--inline"
+          style="border-bottom: 1px solid rgb(221, 221, 221);padding-bottom: 10px;margin-bottom: 10px;"
         >
           <el-form-item label="学校">
             <el-select
@@ -80,7 +81,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item style="padding-left: 60px">
+          <el-form-item style="padding-left: 40px">
             <el-button
               size="small"
               v-show="false"
@@ -158,7 +159,7 @@
         </el-table>
 
         <!-- 分页 -->
-        <div class="page pull-right">
+        <div class="page pull-right" v-show="false">
           <el-pagination
             @current-change="handlePagerNo"
             :current-page="formSearch.pageNo"
@@ -350,7 +351,7 @@ export default {
         pmId: "",
         supplierId: "",
         pageNo: 1,
-        pageSize: 10
+        pageSize: 50
       },
       curUserRole: {},
       hasPermit: false,

src/modules/print/view/ProjectStatistic.vue

@@ -7,8 +7,8 @@
           :model="formSearch"
           :inline="true"
           label-position="right"
-          label-width="100px"
-          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
+          class="el-form el-form--inline"
+          style="border-bottom: 1px solid rgb(221, 221, 221);padding-bottom: 10px;margin-bottom: 10px;"
         >
           <el-form-item label="学校">
             <el-select

src/modules/print/view/ProjectTemplate.vue

@@ -7,8 +7,8 @@
           :model="formSearch"
           :inline="true"
           label-position="right"
-          label-width="100px"
-          style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px"
+          class="el-form el-form--inline"
+          style="border-bottom: 1px solid rgb(221, 221, 221);padding-bottom: 10px;margin-bottom: 10px;"
         >
           <el-form-item label="学校">
             <el-select