소스 검색

add 错误提示

Michael Wang 4 년 전
부모
커밋
14f60a7cc3
5개의 변경된 파일29개의 추가작업 그리고 75개의 파일을 삭제
  1. 1 1
      src/components/inspect/MarkHeader.vue
  2. 1 1
      src/components/mark/MarkHeader.vue
  3. 11 47
      src/plugins/axiosApp.ts
  4. 11 20
      src/plugins/axiosNoAuth.ts
  5. 5 6
      src/plugins/axiosNotice.ts

+ 1 - 1
src/components/inspect/MarkHeader.vue

@@ -162,7 +162,7 @@ export default defineComponent({
 
 <style scoped>
 .header-container {
-  z-index: 10000;
+  /* z-index: 10000; */
   position: relative;
   font-size: 16px;
   height: 40px;

+ 1 - 1
src/components/mark/MarkHeader.vue

@@ -237,7 +237,7 @@ export default defineComponent({
 
 <style scoped>
 .header-container {
-  z-index: 10000;
+  /* z-index: 10000; */
   position: relative;
   font-size: 16px;
   height: 40px;

+ 11 - 47
src/plugins/axiosApp.ts

@@ -6,10 +6,7 @@ import { loadProgressBar } from "axios-progress-bar";
 import cachingGet from "./axiosCache";
 import { notifyInvalidTokenThrottled } from "./axiosNotice";
 import axiosRetry from "axios-retry";
-// import { Notification } from "element-ui";
-const Notification = (...args: any) => {
-  console.log(args);
-};
+import { message } from "ant-design-vue";
 
 const config = {
   // baseURL: process.env.baseURL || process.env.apiUrl || ""
@@ -26,12 +23,7 @@ _axiosApp.interceptors.request.use(
     return config;
   },
   function (error) {
-    // Do something with request error
-    Notification({
-      showClose: true,
-      message: error,
-      type: "error",
-    });
+    message.error({ content: error, duration: 10 });
     console.log(error);
     return Promise.reject(error);
   }
@@ -47,10 +39,9 @@ _axiosApp.interceptors.response.use(
     if (!error.response) {
       if (showErrorMessage) {
         // "Network Error" 网络不通,直接返回
-        Notification({
-          showClose: true,
-          message: "网络连接异常,请检查网络设置。",
-          type: "error",
+        message.error({
+          content: "网络连接异常,请检查网络设置。",
+          duration: 10,
         });
       }
       return Promise.reject(error);
@@ -64,20 +55,12 @@ _axiosApp.interceptors.response.use(
       return Promise.reject(error);
     } else if (status == 405) {
       if (showErrorMessage) {
-        Notification({
-          showClose: true,
-          message: "没有权限!",
-          type: "error",
-        });
+        message.error({ content: "没有权限!", duration: 10 });
       }
       return Promise.reject(error);
     } else if (status == 502) {
       if (showErrorMessage) {
-        Notification({
-          showClose: true,
-          message: "服务器异常(502)!",
-          type: "error",
-        });
+        message.error({ content: "服务器异常(502)!", duration: 10 });
       }
       return Promise.reject(error);
     }
@@ -86,18 +69,13 @@ _axiosApp.interceptors.response.use(
       const data = error.response.data;
       if (data && data.message) {
         if (showErrorMessage) {
-          Notification({
-            showClose: true,
-            message: data.message,
-            type: "error",
-          });
+          message.error({ content: data.message, duration: 10 });
         }
       } else {
         if (showErrorMessage) {
-          Notification({
-            showClose: true,
-            message: "未定义异常: " + JSON.stringify(data, null, 2),
-            type: "error",
+          message.error({
+            content: "未定义异常: " + JSON.stringify(data, null, 2),
+            duration: 10,
           });
         }
       }
@@ -109,18 +87,4 @@ _axiosApp.interceptors.response.use(
 _axiosApp.get = cachingGet(_axiosApp, cacheGetUrls);
 loadProgressBar(null, _axiosApp);
 
-// Plugin.install = function (Vue) {
-//   Object.defineProperties(Vue.prototype, {
-//     $http: {
-//       get() {
-//         return _axiosApp;
-//       },
-//     },
-//   });
-// };
-
-// Vue.use(Plugin);
-
-// export default Plugin;
-
 export const httpApp = _axiosApp;

+ 11 - 20
src/plugins/axiosNoAuth.ts

@@ -4,6 +4,7 @@ import axios from "axios";
 import { loadProgressBar } from "axios-progress-bar";
 import cachingGet from "./axiosCache";
 import axiosRetry from "axios-retry";
+import { message } from "ant-design-vue";
 
 const config = {
   timeout: 60 * 1000, // Timeout
@@ -24,11 +25,7 @@ _axiosNoAuth.interceptors.request.use(
     return config;
   },
   function (error) {
-    // Vue.prototype.$notify({
-    //   showClose: true,
-    //   message: error,
-    //   type: "error",
-    // });
+    message.error({ content: error, duration: 10 });
     return Promise.reject(error);
   }
 );
@@ -41,27 +38,21 @@ _axiosNoAuth.interceptors.response.use(
   (error) => {
     if (!error.response) {
       // "Network Error" 网络不通,直接返回
-      // Vue.prototype.$notify({
-      //   showClose: true,
-      //   message: "网络连接异常,请检查网络设置。",
-      //   type: "error",
-      // });
+      message.error({
+        content: "网络连接异常,请检查网络设置。",
+        duration: 10,
+      });
       return Promise.reject(error);
     }
 
     const data = error.response.data;
     if (data && data.desc) {
-      // Vue.prototype.$notify({
-      //   showClose: true,
-      //   message: data.desc,
-      //   type: "error",
-      // });
+      message.error({ content: data.desc, duration: 10 });
     } else {
-      // Vue.prototype.$notify({
-      //   showClose: true,
-      //   message: `异常(${error.response.status}): ${error.config.url}`,
-      //   type: "error",
-      // });
+      message.error({
+        content: `异常(${error.response.status}): ${error.config.url}`,
+        duration: 10,
+      });
     }
     return Promise.reject(error);
   }

+ 5 - 6
src/plugins/axiosNotice.ts

@@ -1,12 +1,11 @@
 import Vue from "vue";
 import { throttle } from "lodash-es";
+import { message } from "ant-design-vue";
 
-// function printErr(val) {
 export const notifyInvalidTokenThrottled = throttle(() => {
-  // Vue.prototype.$notify({
-  //   showClose: true,
-  //   message: "登录失效,请重新登录!",
-  //   type: "error",
-  // });
+  message.error({
+    content: "登录失效,请重新登录!",
+    duration: 10,
+  });
   console.log("登录失效");
 }, 1000);