Merge remote-tracking branch 'origin/master'

src/modules/marking/views/MarkWorkOverview.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <section class="content">
+    <section class="content content-header">
       <div class="box box-info">
         <div class="box-body">
           <div>
@@ -620,7 +620,9 @@ export default {
 };
 </script>
 <style lang="css" scoped>
-
+.content{
+  overflow-x: hidden;
+}
 li {
     list-style-type: none;
 }
@@ -646,6 +648,7 @@ li {
 }
 .pie{
     height: 350px;
+    width: 500px;
     margin-top: 10px;
     margin-left: 10px
 }

src/modules/oe/component/commonExport.vue

@@ -45,7 +45,8 @@ export default {
             params: {
               query: this.form
             },
-            responseType: "arraybuffer"
+            responseType: "arraybuffer",
+            timeout: 20 * 60 * 1000 //限时20分钟
           })
           .then(response => {
             if (response.data) {

src/modules/oe/style/common.css

@@ -6,7 +6,7 @@
 }
 
 .form_search_width_50 {
-  width: 60px;
+  width: 74px;
 }
 
 .margin-bottom-10 {

src/modules/oe/views/awaitingAudit.vue

@@ -42,7 +42,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="人脸识别">
+            <el-form-item label="人脸比对">
               <el-input
                 class="form_search_width_50"
                 size="small"
@@ -56,11 +56,10 @@
                 v-model="form.faceSuccessPercentUpper"
                 placeholder="上限"
               ></el-input>
-              (成功率)
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="人脸比率">
+            <el-form-item label="真实性">
               <el-row>
                 <el-input
                   class="form_search_width_50"
@@ -75,7 +74,6 @@
                   v-model="form.livenessSuccessPercentUpper"
                   placeholder="上限"
                 ></el-input>
-                (真实性)
               </el-row>
             </el-form-item>
           </el-col>
@@ -291,7 +289,11 @@
           </div>
         </el-col>
       </el-row>
-      <el-dialog title="审核" :visible.sync="dialogFormVisible">
+      <el-dialog
+        title="审核"
+        :visible.sync="dialogFormVisible"
+        @closed="auditDialogClosed"
+      >
         <el-form :model="auditForm" ref="auditForm">
           <el-form-item
             label="违纪类型"
@@ -534,6 +536,9 @@ export default {
         }
       });
     },
+    auditDialogClosed() {
+      this.$refs["auditForm"].resetFields();
+    },
     /**
      * 审核通过
      */

src/modules/oe/views/examDetail.vue

@@ -91,12 +91,20 @@
             <el-table-column label="考试ID" width="120">
               <template slot-scope="scope">
                 <el-button
-                  v-show="currentPagePrivileges.SNAPSHOT_DETAILS"
+                  v-show="
+                    scope.row.examType == 'ONLINE' &&
+                      currentPagePrivileges.SNAPSHOT_DETAILS
+                  "
                   @click="gotoCaptureDetail(scope.row.dataId)"
                   type="text"
                   >{{ scope.row.dataId }}
                 </el-button>
-                <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">
+                <span
+                  v-show="
+                    scope.row.examType != 'ONLINE' ||
+                      !currentPagePrivileges.SNAPSHOT_DETAILS
+                  "
+                >
                   {{ scope.row.dataId }}
                 </span>
               </template>
@@ -315,7 +323,11 @@
             >
             </el-pagination></div></el-col
       ></el-row>
-      <el-dialog title="审核" :visible.sync="dialogAuditFormVisible">
+      <el-dialog
+        title="审核"
+        :visible.sync="dialogAuditFormVisible"
+        @closed="auditDialogClosed"
+      >
         <el-form :model="auditForm" ref="redoAuditForm">
           <el-form-item
             label="违纪类型"
@@ -343,11 +355,11 @@
             >
             </el-input>
           </el-form-item>
-          <div class="dialog-footer">
-            <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
+          <div class="dialog-footer margin-top-10 text-center">
             <el-button type="primary" @click="doRedoAuditNoPass"
-              >确 定</el-button
-            >
+              >确 定
+            </el-button>
+            <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
           </div>
         </el-form>
       </el-dialog>
@@ -548,6 +560,17 @@ export default {
               type: "success"
             });
             this.search();
+          })
+          .catch(res => {
+            var errorMsg = "操作失败";
+            if (res.response && res.response.data) {
+              errorMsg = res.response.data.desc;
+            }
+            this.$notify({
+              title: "提示",
+              message: errorMsg,
+              type: "error"
+            });
           });
       }
     },
@@ -568,20 +591,39 @@ export default {
                 message: "操作成功",
                 type: "success"
               });
-              this.auditForm = {
-                examRecordDataId: null,
-                disciplineType: "",
-                disciplineDetail: "",
-                isPass: null
-              };
-              this.dialogAuditFormVisible = false;
+              this.doRedoAuditNoPassPostProcess();
               this.search();
+            })
+            .catch(res => {
+              var errorMsg = "操作失败";
+              if (res.response && res.response.data) {
+                errorMsg = res.response.data.desc;
+              }
+              this.doRedoAuditNoPassPostProcess();
+              this.$notify({
+                title: "提示",
+                message: errorMsg,
+                type: "error"
+              });
             });
         } else {
           return false;
         }
       });
     },
+    doRedoAuditNoPassPostProcess() {
+      this.auditForm = {
+        examRecordDataId: null,
+        disciplineType: "",
+        disciplineDetail: "",
+        isPass: null
+      };
+      this.$refs["redoAuditForm"].resetFields();
+      this.dialogAuditFormVisible = false;
+    },
+    auditDialogClosed() {
+      this.$refs["redoAuditForm"].resetFields();
+    },
     backFill() {
       var formData = this.$route.query;
       if (formData && formData.examId) {

src/modules/oe/views/reexamine.vue

@@ -61,7 +61,11 @@
             >
             </el-pagination></div></el-col
       ></el-row>
-      <el-dialog title="设置重考" :visible.sync="dialogFormVisible">
+      <el-dialog
+        title="设置重考"
+        :visible.sync="dialogFormVisible"
+        @closed="reexamineDialogClosed"
+      >
         <el-form :model="reexamineForm" ref="reexamineForm">
           <el-form-item
             prop="reexamineType"
@@ -249,6 +253,9 @@ export default {
           return false;
         }
       });
+    },
+    reexamineDialogClosed() {
+      this.$refs["reexamineForm"].resetFields();
     }
   },
   created() {}

src/modules/oe/views/scoreStatistics.vue

@@ -374,7 +374,8 @@ export default {
           params: {
             query: this.form
           },
-          responseType: "arraybuffer"
+          responseType: "arraybuffer",
+          timeout: 20 * 60 * 1000 //限时20分钟
         })
         .then(response => {
           if (response.data) {

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