zhangjie 4 年之前
父节点
当前提交
10484a8fa3

+ 14 - 0
src/modules/client/views/GroupScan.vue

@@ -52,6 +52,12 @@
           <Button @click="resetStartCountTime">清零</Button>
         </p>
         <div class="scan-reset-area">
+          <Button
+            type="primary"
+            @click="toPaperManage"
+            style="margin-right: 10px;"
+            >调整图片方向</Button
+          >
           <Button type="primary" @click="toResetArea">重新设置采集信息</Button>
         </div>
       </div>
@@ -455,6 +461,14 @@ export default {
     // toreset
     toResetArea() {
       this.$router.push({ name: "ScanArea" });
+    },
+    toPaperManage() {
+      this.$Modal.confirm({
+        content: "当前正处于采集状态,确定要进入调整图片方向页面吗?",
+        onOk: () => {
+          this.$router.push({ name: "PaperManage" });
+        }
+      });
     }
   },
   beforeDestroy() {

+ 14 - 0
src/modules/client/views/LineScan.vue

@@ -24,6 +24,12 @@
           <Button @click="resetStartCountTime">清零</Button>
         </p>
         <div class="scan-reset-area">
+          <Button
+            type="primary"
+            @click="toPaperManage"
+            style="margin-right: 10px;"
+            >调整图片方向</Button
+          >
           <Button type="primary" @click="toResetArea">重新设置采集信息</Button>
         </div>
       </div>
@@ -353,6 +359,14 @@ export default {
     // toreset
     toResetArea() {
       this.$router.push({ name: "ScanArea" });
+    },
+    toPaperManage() {
+      this.$Modal.confirm({
+        content: "当前正处于采集状态,确定要进入调整图片方向页面吗?",
+        onOk: () => {
+          this.$router.push({ name: "PaperManage" });
+        }
+      });
     }
   },
   beforeDestroy() {

+ 5 - 3
src/modules/manage/views/PaperManage.vue

@@ -116,6 +116,7 @@ export default {
   data() {
     return {
       filter: {
+        examId: null,
         areaCode: "",
         subjectId: "",
         sortBy: "",
@@ -126,7 +127,7 @@ export default {
       CAFA_EXCEPTION_TYPE: {},
       paperType: "2",
       current: 1,
-      size: 5,
+      size: 10,
       total: 0,
       totalPage: 0,
       papers: [],
@@ -142,8 +143,9 @@ export default {
   },
   methods: {
     initData() {
-      const user = this.$ls.get("user", {});
-      if (user && user.subjects) {
+      const user = this.$ls.get("user");
+      if (user) {
+        this.filter.examId = user.examId;
         this.subjects = user.subjects;
       }
     },

+ 4 - 0
src/plugins/db.js

@@ -214,6 +214,7 @@ function getAreas(subjectId) {
 }
 
 function getPaperList({
+  examId,
   subjectId,
   areaCode,
   isManual,
@@ -225,6 +226,9 @@ function getPaperList({
   const orderBy = sortBy === "1" ? "id DESC" : "examNumber ASC";
 
   let options = [];
+  if (examId) {
+    options.push(`examId = '${examId}'`);
+  }
   if (subjectId) {
     options.push(`subjectId = '${subjectId}'`);
   }

+ 1 - 0
src/views/Home.vue

@@ -51,6 +51,7 @@ export default {
       // 路由历史只前进,不后退
       backRouters: {
         ActionType: "Login",
+        PaperManage: "ActionType",
         Subject: "ActionType",
         Camera: "Subject",
         ScanArea: "Camera",