Browse Source

小优化

xiaochan 1 year ago
parent
commit
2793aaf86a

+ 0 - 4
src/components/xiao-chan/progress-bar/ProgressBar.vue

@@ -24,7 +24,3 @@ onMounted(() => {
   });
 })
 </script>
-
-<style scoped lang="scss">
-
-</style>

+ 9 - 3
src/pinia/progress-bar-store.ts

@@ -1,13 +1,19 @@
 import {defineStore} from 'pinia';
 
+interface ProgressBar {
+    title: string,
+    isOpen: boolean,
+    abnormalClosing: boolean,
+}
+
 export const useProgressBarStore = defineStore('progressBar', {
-    state: () => ({
+    state: (): ProgressBar => ({
         title: '数据上传',
         isOpen: false,
         abnormalClosing: false,
     }),
     getters: {
-        getProgressAttr: (state): object => {
+        getProgressAttr: (state): ProgressBar => {
             return {
                 title: state.title,
                 isOpen: state.isOpen,
@@ -28,7 +34,7 @@ export const useProgressBarStore = defineStore('progressBar', {
         setAbnormalClosing(val: boolean) {
             this.abnormalClosing = val
         },
-        initialize(val: object) {
+        initialize(val: ProgressBar) {
             this.title = val.title
             this.isOpen = val.isOpen
             this.abnormalClosing = val.abnormalClosing

+ 6 - 16
src/utils/cy-use/useChangeToken.ts

@@ -1,8 +1,7 @@
 import {useEventListener} from '@vueuse/core'
-import {onUnmounted} from "vue";
+import {onUnmounted, onMounted} from "vue";
 import {CyMessageBox} from "@/components/cy/message-box";
 
-
 export enum documentVisibilityEnum {
     hidden = 'hidden',
     visible = 'visible'
@@ -18,22 +17,13 @@ function useChangeToken() {
             CyMessageBox.alert({
                 message: '监测到账号不一致',
                 confirmButtonText: '刷新页面'
-            }).finally(() => {
-                window.location.reload()
-            })
-    }
+            }).finally(() => window.location.reload())
 
-    const listener = useEventListener(document, "visibilitychange", () => {
-        isChange()
-    });
-
-    onMounted(() => {
-        isChange()
-    })
+    }
 
-    onUnmounted(() => {
-        listener()
-    })
+    const stop = useEventListener(document, "visibilitychange", isChange);
+    onMounted(isChange)
+    onUnmounted(stop)
 }
 
 export default useChangeToken

+ 8 - 7
src/utils/request.js

@@ -4,6 +4,7 @@ import router from '@/router'
 import {startLoading, endLoading} from './loading'
 import {CyMessageBox} from "@/components/cy/message-box";
 import {useProgressBarStore} from "@/pinia/progress-bar-store";
+import XEUtils from 'xe-utils'
 
 const service = axios.create({
     baseURL: import.meta.env.VITE_BASE_URL,
@@ -62,7 +63,7 @@ service.interceptors.response.use(
                 type: "success",
                 message: response.data.message,
                 dangerouslyUseHTMLString: true,
-            })
+            }).then(XEUtils.noop)
             return response.data.data
         }
         if (response.data.code === 203) {
@@ -89,13 +90,13 @@ service.interceptors.response.use(
                     message: response.data.message,
                     title: '提示',
                     dangerouslyUseHTMLString: true
-                })
+                }).then(XEUtils.noop)
             } else {
                 CyMessageBox.alert({
                     type: 'error',
                     message: response.data.message,
                     title: '提示',
-                })
+                }).then(XEUtils.noop)
             }
         } else if (response.data.code > 3000 && response.data.code < 4000) {
             CyMessageBox.alert({
@@ -104,14 +105,14 @@ service.interceptors.response.use(
                 title: '提示',
                 showIcon: false
             }).then(() => {
-                router.push('/login')
+                router.push('/login').then(XEUtils.noop)
             })
         } else if (response.data.code === 5001) {
             CyMessageBox.alert({
                 type: 'error',
                 message: response.data.message,
                 title: '提示',
-            })
+            }).then(XEUtils.noop)
         }
         if (response.data.code === 6001) {
             ElMessage({
@@ -129,7 +130,7 @@ service.interceptors.response.use(
                 type: 'error',
                 message: response.data.message,
                 title: '提示',
-            })
+            }).then(XEUtils.noop)
             return Promise.reject(response.data.data)
         }
 
@@ -138,7 +139,7 @@ service.interceptors.response.use(
                 type: 'error',
                 message: response.data.message,
                 title: '提示',
-            })
+            }).then(XEUtils.noop)
             return Promise.reject(response.data)
         }
 

+ 1 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/EmrMain.vue

@@ -212,7 +212,7 @@ const EmrAuxiliaryTools = defineAsyncComponent(() =>
 const EmrRightComp = defineAsyncComponent(() =>
     import('./components/emr-right/EmrRightComp.vue'));
 const EmrSidebar = defineAsyncComponent(() =>
-    import("@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/components/EmrSidebar.tsx"));
+    import("@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/components/EmrSidebar"));
 const EmrRefreshDialog = defineAsyncComponent(() =>
     import("@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/components/EmrRefreshDialog.vue"));