111111111

src/modules/oe/routes/routes.js

@@ -68,7 +68,7 @@ export default [
         component: examScheduling //考试进度详情
       },
       {
-        path: "captureDetail/:examRecordDataId",
+        path: "captureDetail/:examRecordDataId/:from",
         name: "captureDetail",
         component: captureDetail //抓拍详情
       },

src/modules/oe/views/absent.vue

@@ -13,7 +13,9 @@
           type="primary"
           >查询
         </el-button>
-        <el-button size="small" @click="resetForm">重置</el-button>
+        <el-button size="small" icon="el-icon-refresh" @click="resetForm"
+          >重置</el-button
+        >
       </el-col>
       <el-row>
         <el-col>

src/modules/oe/views/alreadyAudited.vue

@@ -66,7 +66,7 @@
           </el-col>
         </el-row>
       </commonFormVue>
-      <el-col :span="6">
+      <el-col :span="8">
         <el-button
           @click="search"
           size="small"
@@ -91,7 +91,12 @@
         >
           简单查询
         </el-button>
-        <el-button size="small" @click="resetForm" class="margin-bottom-10">
+        <el-button
+          size="small"
+          icon="el-icon-refresh"
+          @click="resetForm"
+          class="margin-bottom-10"
+        >
           重置
         </el-button>
       </el-col>
@@ -298,7 +303,9 @@ export default {
       this.search();
     },
     gotoCaptureDetail(examRecordDataId) {
-      this.$router.push({ path: "/oe/captureDetail/" + examRecordDataId });
+      this.$router.push({
+        path: "/oe/captureDetail/" + examRecordDataId + "/alreadyAudited"
+      });
     },
     backFill() {
       var formData = this.$route.query;

src/modules/oe/views/awaitingAudit.vue

@@ -81,7 +81,7 @@
           </el-col>
         </el-row>
       </commonFormVue>
-      <el-col :span="6">
+      <el-col :span="8">
         <el-button
           @click="search"
           size="small"
@@ -106,7 +106,12 @@
         >
           简单查询
         </el-button>
-        <el-button size="small" @click="resetForm" class="margin-bottom-10">
+        <el-button
+          size="small"
+          icon="el-icon-refresh"
+          @click="resetForm"
+          class="margin-bottom-10"
+        >
           重置
         </el-button>
       </el-col>
@@ -504,7 +509,9 @@ export default {
         });
     },
     gotoCaptureDetail(examRecordDataId) {
-      this.$router.push({ path: "/oe/captureDetail/" + examRecordDataId });
+      this.$router.push({
+        path: "/oe/captureDetail/" + examRecordDataId + "/awaitingAudit"
+      });
     },
     backFill() {
       var formData = this.$route.query;

src/modules/oe/views/captureDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-header> <div class="header-title">抓拍详情</div> </el-header>
+    <el-header> <LinkTitlesCustom :currentPaths="currentPaths" /> </el-header>
     <el-main>
       <el-row>
         <el-col :span="6">
@@ -30,12 +30,13 @@
                 @click="openAuditDialog"
               ></el-button>
               <el-button
+                size="small"
                 icon="el-icon-back"
-                type="info"
-                title="返回"
-                circle
+                type="primary"
                 @click="back"
-              ></el-button>
+              >
+                返回
+              </el-button>
             </el-col>
           </el-row>
           <el-row class="margin-top-10">
@@ -139,8 +140,9 @@
 <script>
 import { mapState } from "vuex";
 import auditVue from "../component/audit.vue";
+import LinkTitlesCustom from "@/components/LinkTitlesCustom.vue";
 export default {
-  components: { auditVue },
+  components: { auditVue, LinkTitlesCustom },
   data() {
     return {
       examRecordDataId: "",
@@ -155,7 +157,8 @@ export default {
         disciplineType: "",
         disciplineDetail: "",
         isPass: null
-      }
+      },
+      currentPaths: ["抓拍详情"]
     };
   },
   computed: {
@@ -243,7 +246,16 @@ export default {
     }
   },
   created() {
+    debugger;
     this.examRecordDataId = this.$route.params.examRecordDataId;
+    var fromPage = this.$route.params.from;
+    if (fromPage == "awaitingAudit") {
+      this.currentPaths = ["监考待审", "抓拍详情"];
+    } else if (fromPage == "alreadyAudited") {
+      this.currentPaths = ["监考已审", "抓拍详情"];
+    } else if (fromPage == "examDetail") {
+      this.currentPaths = ["考试明细", "抓拍详情"];
+    }
     this.getExamAuditData();
     this.listExamCapture();
   }

src/modules/oe/views/examDetail.vue

@@ -38,7 +38,7 @@
           </el-col>
         </el-row>
       </commonFormVue>
-      <el-col :span="6">
+      <el-col :span="8">
         <el-button
           @click="search"
           size="small"
@@ -63,7 +63,12 @@
         >
           简单查询
         </el-button>
-        <el-button size="small" @click="resetForm" class="margin-bottom-10">
+        <el-button
+          size="small"
+          icon="el-icon-refresh"
+          @click="resetForm"
+          class="margin-bottom-10"
+        >
           重置
         </el-button>
       </el-col>
@@ -322,7 +327,9 @@ export default {
       window.open("/oe/examPaperDetail/" + courseId + "/" + examRecordDataId);
     },
     gotoCaptureDetail(examRecordDataId) {
-      this.$router.push({ path: "/oe/captureDetail/" + examRecordDataId });
+      this.$router.push({
+        path: "/oe/captureDetail/" + examRecordDataId + "/examDetail"
+      });
     },
     downloadOfflineFile(url) {
       window.open(url);

src/modules/oe/views/examScheduling.vue

@@ -43,7 +43,7 @@
           </el-col>
         </el-row>
       </commonFormVue>
-      <el-col :span="6">
+      <el-col :span="8">
         <el-button
           @click="search"
           size="small"
@@ -68,13 +68,17 @@
         >
           简单查询
         </el-button>
-        <el-button size="small" @click="resetForm" class="margin-bottom-10"
+        <el-button
+          size="small"
+          icon="el-icon-refresh"
+          @click="resetForm"
+          class="margin-bottom-10"
           >重置</el-button
         >
       </el-col>
-      <div class="block-seperator"></div>
       <el-row>
         <el-col :span="24">
+          <div class="block-seperator"></div>
           <span>批量操作：</span>
           <commonExportVue
             v-show="currentPagePrivileges.EXAM_PARTICULARS_EXPORT"
@@ -84,8 +88,8 @@
           ></commonExportVue>
         </el-col>
       </el-row>
-      <el-row class="margin-top-10"
-        ><el-col :span="24">
+      <el-row class="margin-top-10">
+        <el-col :span="24">
           <el-table
             v-loading="tableLoading"
             element-loading-text="数据加载中"

src/modules/oe/views/illegalityNameList.vue

@@ -31,7 +31,12 @@
             type="primary"
             >查询
           </el-button>
-          <el-button size="small" @click="resetForm" style="margin-right:10px;">
+          <el-button
+            size="small"
+            icon="el-icon-refresh"
+            @click="resetForm"
+            style="margin-right:10px;"
+          >
             重置
           </el-button>
           <commonExportVue

src/modules/oe/views/reexamine.vue

@@ -11,7 +11,9 @@
           icon="el-icon-search"
           >查询
         </el-button>
-        <el-button size="small" @click="resetForm"> 重置 </el-button>
+        <el-button size="small" icon="el-icon-refresh" @click="resetForm">
+          重置
+        </el-button>
       </el-col>
       <el-row class="margin-top-10"
         ><el-col :span="24">

src/modules/oe/views/scoreStatistics.vue

@@ -26,7 +26,16 @@
             icon="el-icon-search"
             >查询
           </el-button>
-          <el-button size="small" @click="resetForm"> 重置 </el-button>
+          <el-button size="small" icon="el-icon-refresh" @click="resetForm">
+            重置
+          </el-button>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <div class="block-seperator"></div>
+          <span>批量操作：</span>
           <el-button
             type="primary"
             size="small"
@@ -45,6 +54,7 @@
           </el-button>
         </el-col>
       </el-row>
+
       <el-row class="margin-top-10">
         <el-col :span="24">
           <el-table