zhangjie 4 жил өмнө
parent
commit
611528c2bc

+ 2 - 2
src/assets/styles/pages.less

@@ -246,8 +246,8 @@
     border: 2px solid @blue;
     border-radius: 50%;
     opacity: 1;
-    width: 10px;
-    height: 10px;
+    width: 10px !important;
+    height: 10px !important;
 
     &.point-e {
       margin-top: -5px;

+ 2 - 1
src/mixins/initStoreMixin.js

@@ -29,12 +29,13 @@ export default {
       let startCountTime = {};
       if (storeStartCountTime) {
         startCountTime = JSON.parse(storeStartCountTime);
+        this.$store.commit("client/setStartCountTime", startCountTime);
       } else {
         subjects.map(subject => {
           startCountTime[subject.id] = 0;
         });
+        this.$store.dispatch("client/updateStartCountTime", startCountTime);
       }
-      this.$store.commit("client/setStartCountTime", startCountTime);
     },
     async initStore() {
       const storeDict = await db.getAllDict();

+ 8 - 5
src/mixins/uploadTaskMixin.js

@@ -18,14 +18,17 @@ export default {
   },
   methods: {
     async addUploadTask(task) {
-      const id = await db.saveUploadInfo(task).catch(err => {
+      await db.saveUploadInfo(task).catch(err => {
         console.log(err);
       });
+      // const id = await db.saveUploadInfo(task).catch(err => {
+      //   console.log(err);
+      // });
 
-      if (id) {
-        task.id = id;
-        this.uploadTask.addUploadTask(task);
-      }
+      // if (id) {
+      //   task.id = id;
+      //   this.uploadTask.addUploadTask(task);
+      // }
     },
     async uploadSuccessCallback(curUploadTask) {
       await db.updateUploadState(curUploadTask.id);

+ 1 - 1
src/modules/client/components/steps/ImageOrientation.vue

@@ -66,7 +66,7 @@ export default {
       this.contStyle = {
         transform: `rotate(${this.picRotate}deg)`
       };
-      this.coverBoxStyle.transform = this.contStyle.transform;
+      // this.coverBoxStyle.transform = this.contStyle.transform;
     },
     checkValid() {
       this.$emit("on-next", { imageRotate: this.picRotate });

+ 1 - 1
src/plugins/db.js

@@ -33,7 +33,7 @@ function saveUploadInfo(params) {
     params.roomCode,
     params.formalImgPath,
     params.sliceImgPath,
-    params.isManual,
+    params.isManual ? 1 : 0,
     params.imageEncrypt,
     params.level,
     params.clientUserId,

+ 1 - 1
src/views/Home.vue

@@ -67,7 +67,7 @@ export default {
     this.examName = this.$ls.get("user", { examName: "" }).examName;
     const scanBackRouter = this.clientConfig.paperStage
       ? "CheckInfo"
-      : "ScanArea";
+      : "ScanWait";
     this.backRouters.GroupScan = scanBackRouter;
     this.backRouters.LineScan = scanBackRouter;
     this.initUploadTask();