bug md

package.json

@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "start": "npm run electron:serve",
-    "e:build": "npm run electron:build",
+    "start": "yarn run electron:serve",
+    "e:build": "yarn run electron:build",
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",

src/background.js

@@ -22,7 +22,7 @@ function createWindow() {
     width: isDevelopment ? 1428 : 1024,
     height: 700,
     minWidth: 1024,
-    minHeight: 700,
+    minHeight: 600,
     frame: isDevelopment,
     useContentSize: true,
     webPreferences: {

src/modules/client/views/GroupScan.vue

@@ -409,7 +409,9 @@ export default {
       });
     },
     getCurCollectConfig() {
-      return this.curStudent.collectConfig || this.curSubject.collectConfig;
+      return this.curStudent && this.curStudent.collectConfig
+        ? this.curStudent.collectConfig
+        : this.curSubject.collectConfig;
     },
     scrollTaskList() {
       if (this.curTaskScanCount < 6) return;

src/plugins/imageUpload.js

@@ -37,6 +37,7 @@ function toUploadStudent(options) {
   const datas = {
     subjectId: options.subjectId,
     examNumber: options.examNumber,
+    level: options.level,
     absent: false,
     manual: !!options.isManual
   };
@@ -51,6 +52,7 @@ function toSaveCollectLog(options) {
     clientUserId: options.clientUserId,
     clientUserLoginTime: options.clientUserLoginTime,
     time: formatDate(),
+    level: options.level,
     name: options.studentName,
     manual: options.isManual + ""
   };