Merge remote-tracking branch 'origin/master'

zkqy-ui/src/utils/request.js

@@ -95,9 +95,9 @@ service.interceptors.response.use(res => {
     }
     return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
   } else if (code === 500) {
-    // Message({ message: msg, type: 'error' })
-    // return Promise.reject(new Error(msg))
-    return Promise.resolve()
+    Message({ message: msg, type: 'error' })
+    return Promise.reject(new Error(msg))
+    // return Promise.resolve()
   } else if (code === 601) {
     Message({ message: msg, type: 'warning' })
     return Promise.reject('error')

zkqy-ui/src/views/login.vue

@@ -170,8 +170,10 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
+        // username: "admin",
+        // password: "admin123",
         rememberMe: false,
         code: "",
         uuid: "",

zkqy-ui/src/views/system/engineeringManage/index.vue

@@ -311,6 +311,7 @@ export default {
             navigator.msSaveBlob(blob, fileName);
             this.loading = false;
           }
+          this.getList();
         }
       });
     },