11111111

src/modules/oe/component/commonExport.vue

@@ -4,11 +4,13 @@
       v-show="!exportLoading"
       @click="exportData"
       type="primary"
-      size="medium"
+      size="small"
       plain
       >批量导出</el-button
     >
-    <el-button :loading="true" v-show="exportLoading">导出数据中...</el-button>
+    <el-button size="small" :loading="true" v-show="exportLoading"
+      >导出数据中...</el-button
+    >
   </span></template
 >
 <script>

src/modules/oe/mixin/pagePrivilege.js

@@ -16,7 +16,6 @@ export default {
             false
         )
         .then(response => {
-          debugger;
           var pagePermissions = this.filterPagePermission(response.data);
           if (pagePermissions.length > 0) {
             for (var currentPagePrivilege in this.currentPagePrivileges) {

src/modules/oe/routes/routes.js

@@ -11,6 +11,11 @@ import captureDetail from "../views/captureDetail.vue";
 import examPaperDetail from "../views/examPaperDetail.vue";
 import examSummary from "../views/examSummary.vue";
 export default [
+  {
+    path: "/oe/examPaperDetail/:courseId/:examRecordDataId",
+    name: "examPaperDetail",
+    component: examPaperDetail //考卷详情
+  },
   {
     path: "/questions", //首页
     meta: { auth: false },
@@ -61,11 +66,6 @@ export default [
         name: "captureDetail",
         component: captureDetail //抓拍详情
       },
-      {
-        path: "/oe/examPaperDetail/:courseId/:examRecordDataId",
-        name: "examPaperDetail",
-        component: examPaperDetail //考卷详情
-      },
       {
         path: "/oe/examSummary",
         name: "examSummary",

src/modules/oe/views/absent.vue

@@ -6,16 +6,22 @@
         :getExamCondition="getExamCondition"
       ></commonFormVue>
       <el-row>
-        <el-col :span="24">
-          <el-button @click="search" size="medium" type="primary"
-            >查询</el-button
-          >
-          <commonExportVue
-            :form="form"
-            :exportUrl="exportUrl"
-            :exportFileName="exportFileName"
-            v-show="currentPagePrivileges.ABSENT_EXPORT"
-          ></commonExportVue>
+        <el-col>
+          <div class="pull-right">
+            <el-button
+              @click="search"
+              size="small"
+              icon="el-icon-search"
+              type="primary"
+              >查询
+            </el-button>
+            <commonExportVue
+              :form="form"
+              :exportUrl="exportUrl"
+              :exportFileName="exportFileName"
+              v-show="currentPagePrivileges.ABSENT_EXPORT"
+            ></commonExportVue>
+          </div>
         </el-col>
       </el-row>
       <el-row class="margin-top-10">
@@ -44,7 +50,7 @@
           </el-table>
         </el-col>
       </el-row>
-      <div class="block">
+      <div class="page pull-right">
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"

src/modules/oe/views/alreadyAudited.vue

@@ -18,7 +18,12 @@
               <el-option value="PASS" label="通过"></el-option>
               <el-option value="UN_PASS" label="不通过"></el-option>
             </el-select>
-            <el-input placeholder="不通过" :disabled="true"> </el-input>
+            <el-input
+              v-if="!currentPagePrivileges.INVIGILATE_AUDIT_STATUS"
+              placeholder="不通过"
+              :disabled="true"
+            >
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -47,9 +52,15 @@
       </commonFormVue>
       <el-row>
         <el-col :span="24">
-          <el-button @click="search" size="medium" type="primary"
-            >查询</el-button
-          >
+          <div class="pull-right">
+            <el-button
+              @click="search"
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              >查询
+            </el-button>
+          </div>
         </el-col>
       </el-row>
       <el-row class="margin-top-10"
@@ -66,7 +77,7 @@
               <template slot-scope="scope">
                 <el-button
                   v-show="currentPagePrivileges.SNAPSHOT_DETAILS"
-                  @click="gotoCaptureDetail(scope.row.examRecordDataId);"
+                  @click="gotoCaptureDetail(scope.row.examRecordDataId)"
                   type="text"
                   >{{ scope.row.examRecordDataId }}
                 </el-button>
@@ -198,6 +209,10 @@ export default {
             this.tableData = [];
           }
           this.tableLoading = false;
+          var params = this.form;
+          this.$router.push({
+            path: "/oe/alreadyAudited?" + new URLSearchParams(params)
+          });
         });
     },
     selectable(row) {
@@ -221,14 +236,37 @@ export default {
     },
     gotoCaptureDetail(examRecordDataId) {
       this.$router.push({ path: "/oe/captureDetail/" + examRecordDataId });
+    },
+    backFill() {
+      var formData = this.$route.query;
+      if (formData && formData.examId) {
+        for (var attr in formData) {
+          var value = formData[attr];
+          if (value && value != "null") {
+            if (!isNaN(value)) {
+              if (~~value == value) {
+                value = parseInt(value);
+              } else {
+                value = parseFloat(value);
+              }
+            }
+            this.form[attr] = value;
+          }
+        }
+        this.search();
+      }
     }
   },
-  created() {
-    if (this.currentPagePrivileges.INVIGILATE_AUDIT_STATUS) {
-      this.form.status = "";
-    } else {
-      this.form.status = "UN_PASS";
+  watch: {
+    "currentPagePrivileges.INVIGILATE_AUDIT_STATUS": function(val) {
+      this.form.status = val ? "" : "UN_PASS";
     }
+  },
+  created() {
+    this.form.status = this.currentPagePrivileges.INVIGILATE_AUDIT_STATUS
+      ? ""
+      : "UN_PASS";
+    this.backFill();
   }
 };
 </script>

src/modules/oe/views/awaitingAudit.vue

@@ -68,27 +68,34 @@
       </commonFormVue>
       <el-row>
         <el-col :span="24">
-          <el-button @click="search" size="medium" type="primary"
-            >查询</el-button
-          >
-        </el-col>
-      </el-row>
-      <el-row v-show="currentPagePrivileges.PANEING_BATCHAUDIT">
-        <el-col :span="24" style="text-align: right;">
-          <el-button-group>
+          <div class="pull-right">
             <el-button
+              @click="search"
+              size="small"
               type="primary"
-              :disabled="batchAuditBtnDisabled"
-              @click="batchAudit('pass');"
-              >通过</el-button
+              icon="el-icon-search"
+              >查询
+            </el-button>
+            <el-button-group
+              v-show="currentPagePrivileges.PANEING_BATCHAUDIT"
+              style="margin-left:5px;"
             >
-            <el-button
-              type="primary"
-              :disabled="batchAuditBtnDisabled"
-              @click="batchAudit('nopass');"
-              >不通过</el-button
-            >
-          </el-button-group>
+              <el-button
+                type="primary"
+                size="small"
+                :disabled="batchAuditBtnDisabled"
+                @click="batchAudit('pass')"
+                >通过</el-button
+              >
+              <el-button
+                type="primary"
+                size="small"
+                :disabled="batchAuditBtnDisabled"
+                @click="batchAudit('nopass')"
+                >不通过</el-button
+              >
+            </el-button-group>
+          </div>
         </el-col>
       </el-row>
       <el-row class="margin-top-10">
@@ -110,7 +117,7 @@
               <template slot-scope="scope">
                 <el-button
                   v-show="currentPagePrivileges.SNAPSHOT_DETAILS"
-                  @click="gotoCaptureDetail(scope.row.dataId);"
+                  @click="gotoCaptureDetail(scope.row.dataId)"
                   type="text"
                   >{{ scope.row.dataId }}
                 </el-button>
@@ -177,6 +184,7 @@
             <el-table-column
               label="操作"
               v-if="currentPagePrivileges.PENDING_OPERATE"
+              fixed="right"
             >
               <template slot-scope="scope">
                 <el-button
@@ -184,7 +192,7 @@
                   size="mini"
                   type="success"
                   icon="el-icon-success"
-                  @click="auditPass(scope.row.dataId);"
+                  @click="auditPass(scope.row.dataId)"
                   >通过</el-button
                 >
                 <el-button
@@ -192,7 +200,7 @@
                   size="mini"
                   type="danger"
                   icon="el-icon-error"
-                  @click="openAuditDialog(scope.row.dataId);"
+                  @click="openAuditDialog(scope.row.dataId)"
                   >不通过</el-button
                 >
               </template>
@@ -214,7 +222,7 @@
       <el-dialog title="审核" :visible.sync="dialogFormVisible">
         <auditVue :auditForm="auditForm">
           <div class="dialog-footer">
-            <el-button @click="dialogFormVisible = false;">取 消</el-button>
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
             <el-button type="primary" @click="doAudit">确 定</el-button>
           </div>
         </auditVue>
@@ -405,6 +413,25 @@ export default {
     },
     gotoCaptureDetail(examRecordDataId) {
       this.$router.push({ path: "/oe/captureDetail/" + examRecordDataId });
+    },
+    backFill() {
+      var formData = this.$route.query;
+      if (formData && formData.examId) {
+        for (var attr in formData) {
+          var value = formData[attr];
+          if (value && value != "null") {
+            if (!isNaN(value)) {
+              if (~~value == value) {
+                value = parseInt(value);
+              } else {
+                value = parseFloat(value);
+              }
+            }
+            this.form[attr] = value;
+          }
+        }
+        this.search();
+      }
     }
   },
   watch: {
@@ -413,23 +440,7 @@ export default {
     }
   },
   created() {
-    var formData = this.$route.query;
-    if (formData && formData.examId) {
-      for (var attr in formData) {
-        var value = formData[attr];
-        if (value && value != "null") {
-          if (!isNaN(value)) {
-            if (~~value == value) {
-              value = parseInt(value);
-            } else {
-              value = parseFloat(value);
-            }
-          }
-          this.form[attr] = value;
-        }
-      }
-      this.search();
-    }
+    this.backFill();
   }
 };
 </script>

src/modules/oe/views/captureDetail.vue

@@ -128,7 +128,7 @@
       <el-dialog title="审核" :visible.sync="dialogFormVisible">
         <auditVue :auditForm="auditForm">
           <div class="dialog-footer">
-            <el-button @click="dialogFormVisible = false;">取 消</el-button>
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
             <el-button type="primary" @click="doAuditNoPass">确 定</el-button>
           </div>
         </auditVue>
@@ -213,6 +213,7 @@ export default {
             message: "操作成功",
             type: "success"
           });
+          this.back();
         });
     },
     openAuditDialog() {
@@ -234,6 +235,7 @@ export default {
             message: "操作成功",
             type: "success"
           });
+          this.back();
         });
     },
     back() {

src/modules/oe/views/examDetail.vue

@@ -31,15 +31,21 @@
       </commonFormVue>
       <el-row>
         <el-col :span="24">
-          <el-button @click="search" size="medium" type="primary"
-            >查询</el-button
-          >
-          <commonExportVue
-            v-show="currentPagePrivileges.EXAM_DETAIL_EXPORT"
-            :form="form"
-            :exportUrl="exportUrl"
-            :exportFileName="exportFileName"
-          ></commonExportVue>
+          <div class="pull-right">
+            <el-button
+              @click="search"
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              >查询
+            </el-button>
+            <commonExportVue
+              v-show="currentPagePrivileges.EXAM_DETAIL_EXPORT"
+              :form="form"
+              :exportUrl="exportUrl"
+              :exportFileName="exportFileName"
+            ></commonExportVue>
+          </div>
         </el-col>
       </el-row>
       <el-row class="margin-top-10"
@@ -56,7 +62,7 @@
               <template slot-scope="scope">
                 <el-button
                   v-show="currentPagePrivileges.SNAPSHOT_DETAILS"
-                  @click="gotoCaptureDetail(scope.row.dataId);"
+                  @click="gotoCaptureDetail(scope.row.dataId)"
                   type="text"
                   >{{ scope.row.dataId }}
                 </el-button>
@@ -113,16 +119,14 @@
               <template slot-scope="scope">
                 <el-button
                   v-show="scope.row.examType == 'ONLINE'"
-                  @click="
-                    examPaperDetail(scope.row.courseId, scope.row.dataId);
-                  "
+                  @click="examPaperDetail(scope.row.courseId, scope.row.dataId)"
                   >调卷</el-button
                 >
                 <el-button
                   v-show="
                     scope.row.examType == 'OFFLINE' && scope.row.offlineFileUrl
                   "
-                  @click="downloadOfflineFile(scope.row.offlineFileUrl);"
+                  @click="downloadOfflineFile(scope.row.offlineFileUrl)"
                   >调卷</el-button
                 >
               </template>
@@ -221,6 +225,10 @@ export default {
             this.tableData = [];
           }
           this.tableLoading = false;
+          var params = this.form;
+          this.$router.push({
+            path: "/oe/examDetail?" + new URLSearchParams(params)
+          });
         });
     },
     handleSelectionChange(val) {
@@ -240,19 +248,37 @@ export default {
       this.search();
     },
     examPaperDetail(courseId, examRecordDataId) {
-      this.$router.push({
-        path: "/oe/examPaperDetail/" + courseId + "/" + examRecordDataId
-      });
+      window.open("/oe/examPaperDetail/" + courseId + "/" + examRecordDataId);
     },
     gotoCaptureDetail(examRecordDataId) {
       this.$router.push({ path: "/oe/captureDetail/" + examRecordDataId });
     },
     downloadOfflineFile(url) {
       window.open(url);
+    },
+    backFill() {
+      var formData = this.$route.query;
+      if (formData && formData.examId) {
+        for (var attr in formData) {
+          var value = formData[attr];
+          if (value && value != "null") {
+            if (!isNaN(value)) {
+              if (~~value == value) {
+                value = parseInt(value);
+              } else {
+                value = parseFloat(value);
+              }
+            }
+            this.form[attr] = value;
+          }
+        }
+        this.search();
+      }
     }
   },
   created() {
     this.form.rootOrgId = this.user.rootOrgId;
+    this.backFill();
   }
 };
 </script>

src/modules/oe/views/examPaperDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="paperView">
-    <h1 id="paperName">{{ paperStruct.name }}</h1>
+    <div id="paperName">{{ paperStruct.name }}</div>
     <div id="studentInfoDiv">
       <table id="studentInfoTable" border>
         <thead>
@@ -314,10 +314,12 @@ export default {
 }
 #paperName {
   text-align: center;
+  font-size: 32px;
+  font-weight: bold;
 }
 #studentInfoDiv {
   text-align: center;
-  margin: 0 60px;
+  margin: 20px 60px;
 }
 #studentInfoTable {
   width: 100%;

src/modules/oe/views/examScheduling.vue

@@ -19,15 +19,21 @@
       </commonFormVue>
       <el-row>
         <el-col :span="24">
-          <el-button @click="search" size="medium" type="primary"
-            >查询</el-button
-          >
-          <commonExportVue
-            v-show="currentPagePrivileges.EXAM_PARTICULARS_EXPORT"
-            :form="form"
-            :exportUrl="exportUrl"
-            :exportFileName="exportFileName"
-          ></commonExportVue>
+          <div class="pull-right">
+            <el-button
+              @click="search"
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              >查询
+            </el-button>
+            <commonExportVue
+              v-show="currentPagePrivileges.EXAM_PARTICULARS_EXPORT"
+              :form="form"
+              :exportUrl="exportUrl"
+              :exportFileName="exportFileName"
+            ></commonExportVue>
+          </div>
         </el-col>
       </el-row>
       <el-row class="margin-top-10"
@@ -91,7 +97,7 @@
                   v-show="scope.row.examType == 'OFFLINE'"
                   type="success"
                   icon="el-icon-success"
-                  @click="previewPaper(scope.row.examStudentId);"
+                  @click="previewPaper(scope.row.examStudentId)"
                   >查看考题</el-button
                 >
                 <el-button
@@ -99,7 +105,7 @@
                   v-show="scope.row.examType == 'OFFLINE'"
                   type="success"
                   icon="el-icon-success"
-                  @click="exportPaper(scope.row.examStudentId);"
+                  @click="exportPaper(scope.row.examStudentId)"
                   >下载考题</el-button
                 >
                 <el-button
@@ -107,13 +113,13 @@
                   v-show="scope.row.examType == 'OFFLINE'"
                   type="success"
                   icon="el-icon-success"
-                  @click="openUploadAnswerDialog(scope.row.examStudentId);"
+                  @click="openUploadAnswerDialog(scope.row.examStudentId)"
                   >上传作答</el-button
                 >
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
+          <div class="page pull-right">
             <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
@@ -138,7 +144,7 @@
               <div>温馨提示:仅支持pdf和zip文件,文件大小请不要超过30M!</div>
             </el-form-item>
             <div class="dialog-footer">
-              <el-button @click="uploadAnswerDialogVisible = false;"
+              <el-button @click="uploadAnswerDialogVisible = false"
                 >取 消</el-button
               >
               <el-button
@@ -264,7 +270,7 @@ export default {
                   examRecordList[0].basePaperId
               );
             } else {
-              alert("该考生未参加考试");
+              this.$message("该考生未参加考试");
             }
           }
         });
@@ -296,7 +302,7 @@ export default {
                 "&$token=" +
                 token;
             } else {
-              alert("该考生未参加考试");
+              this.$message("该考生未参加考试");
             }
           }
         });
@@ -321,7 +327,7 @@ export default {
           debugger;
           var examRecordDataList = response.data;
           if (examRecordDataList.length == 0) {
-            alert("改学生未参加考试");
+            this.$message("该考生未参加考试");
             return;
           }
           let param = new FormData();

src/modules/oe/views/illegalityNameList.vue

@@ -22,15 +22,21 @@
       </commonFormVue>
       <el-row>
         <el-col :span="24">
-          <el-button @click="search" size="medium" type="primary"
-            >查询</el-button
-          >
-          <commonExportVue
-            v-show="currentPagePrivileges.BREACH_THE_PRINCIPLE_EXPORT"
-            :form="form"
-            :exportUrl="exportUrl"
-            :exportFileName="exportFileName"
-          ></commonExportVue>
+          <div class="pull-right">
+            <el-button
+              @click="search"
+              size="small"
+              icon="el-icon-search"
+              type="primary"
+              >查询</el-button
+            >
+            <commonExportVue
+              v-show="currentPagePrivileges.BREACH_THE_PRINCIPLE_EXPORT"
+              :form="form"
+              :exportUrl="exportUrl"
+              :exportFileName="exportFileName"
+            ></commonExportVue>
+          </div>
         </el-col>
       </el-row>
       <el-row class="margin-top-10"
@@ -47,7 +53,7 @@
               <template slot-scope="scope">
                 <el-button
                   v-show="currentPagePrivileges.SNAPSHOT_DETAILS"
-                  @click="gotoCaptureDetail(scope.row.examRecordDataId);"
+                  @click="gotoCaptureDetail(scope.row.examRecordDataId)"
                   type="text"
                   >{{ scope.row.examRecordDataId }}
                 </el-button>
@@ -166,6 +172,7 @@ export default {
         return false;
       }
       this.tableLoading = true;
+      var params = this.form;
       this.$http
         .post("/api/ecs_oe_admin/exam/audit/discipline/list", this.form)
         .then(response => {
@@ -176,6 +183,9 @@ export default {
             this.tableData = [];
           }
           this.tableLoading = false;
+          this.$router.push({
+            path: "/oe/illegalityNameList?" + new URLSearchParams(params)
+          });
         });
     },
     selectable(row) {
@@ -199,10 +209,30 @@ export default {
     },
     gotoCaptureDetail(examRecordDataId) {
       this.$router.push({ path: "/oe/captureDetail/" + examRecordDataId });
+    },
+    backFill() {
+      var formData = this.$route.query;
+      if (formData && formData.examId) {
+        for (var attr in formData) {
+          var value = formData[attr];
+          if (value && value != "null") {
+            if (!isNaN(value)) {
+              if (~~value == value) {
+                value = parseInt(value);
+              } else {
+                value = parseFloat(value);
+              }
+            }
+            this.form[attr] = value;
+          }
+        }
+        this.search();
+      }
     }
   },
   created() {
     this.form.rootOrgId = this.user.rootOrgId;
+    this.backFill();
   }
 };
 </script>

src/modules/oe/views/reexamine.vue

@@ -5,9 +5,15 @@
       </commonFormVue>
       <el-row>
         <el-col :span="24">
-          <el-button @click="search" size="medium" type="primary"
-            >查询</el-button
-          >
+          <div class="pull-right">
+            <el-button
+              @click="search"
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              >查询
+            </el-button>
+          </div>
         </el-col>
       </el-row>
       <el-row class="margin-top-10"
@@ -37,7 +43,7 @@
                 <el-button
                   size="mini"
                   type="info"
-                  @click="openReexamineDialog(scope.row.examStudentId);"
+                  @click="openReexamineDialog(scope.row.examStudentId)"
                   icon="el-icon-info"
                   >设置重考</el-button
                 >
@@ -82,7 +88,7 @@
             </el-input>
           </el-form-item>
           <div class="dialog-footer">
-            <el-button @click="dialogFormVisible = false;">取 消</el-button>
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
             <el-button type="primary" @click="doSetReexamine">确 定</el-button>
           </div>
         </el-form>

src/modules/oe/views/scoreStatistics.vue

@@ -13,15 +13,21 @@
       </commonFormVue>
       <el-row>
         <el-col :span="24">
-          <el-button @click="search" size="medium" type="primary"
-            >查询</el-button
-          >
-          <commonExportVue
-            v-show="currentPagePrivileges.SCORE_STATICS_EXPORT"
-            :form="form"
-            :exportUrl="exportUrl"
-            :exportFileName="exportFileName"
-          ></commonExportVue>
+          <div class="pull-right">
+            <el-button
+              @click="search"
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              >查询
+            </el-button>
+            <commonExportVue
+              v-show="currentPagePrivileges.SCORE_STATICS_EXPORT"
+              :form="form"
+              :exportUrl="exportUrl"
+              :exportFileName="exportFileName"
+            ></commonExportVue>
+          </div>
         </el-col>
       </el-row>
       <el-row class="margin-top-10">