zhangjie 2 years ago
parent
commit
674ed86ce3

+ 1 - 0
.gitignore

@@ -11,6 +11,7 @@ modules-old*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+client.rdb
 
 # Editor directories and files
 .idea

+ 3 - 2
dist_electron/package.json

@@ -17,6 +17,7 @@
   "dependencies": {
     "axios": "^0.19.2",
     "core-js": "^3.6.4",
+    "crypto": "^1.0.1",
     "crypto-js": "^4.0.0",
     "deepmerge": "^4.2.2",
     "element-ui": "^2.14.1",
@@ -39,10 +40,10 @@
     "eslint": "^6.7.2",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-vue": "^6.2.2",
-    "sass": "^1.26.5",
-    "sass-loader": "^8.0.2",
     "lint-staged": "^9.5.0",
     "prettier": "^1.19.1",
+    "sass": "^1.26.5",
+    "sass-loader": "^8.0.2",
     "terser-webpack-plugin": "^3.0.1",
     "vue-cli-plugin-electron-builder": "~1.4.6",
     "vue-template-compiler": "^2.6.11"

BIN
extra/database/client.rdb


+ 0 - 1
src/components/ViewHeader.vue

@@ -34,7 +34,6 @@ export default {
   },
   methods: {
     logout() {
-      this.$ls.clear();
       this.$router.push({ name: "Login" });
     }
   }

+ 2 - 1
src/mixins/uploadTaskMixin.js

@@ -28,7 +28,8 @@ export default {
     async initUploadTask() {
       this.clearTaskSetTs();
       const unuploadList = await db.searchUploadList({
-        isUpload: 0
+        isUpload: 0,
+        clientUserId: this.$ls.get("user", { id: "" }).id
       });
       // 创建上传任务
       this.uploadTask = new UploadTask({

+ 4 - 1
src/modules/login/views/Login.vue

@@ -86,7 +86,10 @@ export default {
     };
   },
   mounted() {
-    this.$ls.clear();
+    this.$ls.remove("token");
+    this.$ls.remove("user");
+    this.$ls.remove("orgId");
+    this.$ls.remove("schoolId");
   },
   methods: {
     toSet() {

+ 0 - 2
src/plugins/axios.js

@@ -92,7 +92,6 @@ axios.interceptors.request.use(
     // console.log(error);
     // logger.error("");
     // 关闭loading提示
-    // 串联并发请求,延时处理是为防止多个loading实例闪屏。
     setTimeout(() => {
       queue.shift();
       if (!queue.length) load && load.close();
@@ -196,7 +195,6 @@ const errorDataCallback = response => {
       callback: action => {
         unauthMsgBoxIsShow = false;
         if (action !== "confirm") return;
-        Vue.ls.clear();
         router.push({ name: "Login" });
       }
     });

+ 0 - 1
src/plugins/imageUpload.js

@@ -24,7 +24,6 @@ function toUploadImg(options) {
   formData.append("versoFile", versoFile);
 
   formData.append("paperScanTaskId", options.taskId);
-  formData.append("scanUserId", options.clientUserId);
 
   return uploadFormalImage(formData);
 }

+ 0 - 1
src/router.js

@@ -51,7 +51,6 @@ router.beforeEach((to, from, next) => {
 
   if (!token) {
     // 登录失效的处理
-    Vue.ls.clear();
     next({ name: "Login" });
     return;
   }

+ 0 - 1
src/views/Layout.vue

@@ -65,7 +65,6 @@ export default {
   },
   methods: {
     logout() {
-      this.$ls.clear();
       this.$router.push({ name: "Login" });
     },
     toBack() {