Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/architecture-dee/src/utils/http.js

@@ -13,7 +13,7 @@ import disShowErrorMsg from './disShowErrorMsg'
 import guid from '@/utils/util'
 let ajaxCount = 0
 let loadingInstance
-const ajaxTimer = {}
+let ajaxTimer = {}
 const disShowLadingRequestUrl = [
   // '/RepoFileUpload/find/recursion'
   '/RepoFileUpload/findWithCondition',
@@ -44,13 +44,13 @@ axios.interceptors.request.use(
         fullscreen: true,
         background: 'rgba(0, 0, 0, 0.0)'
       })
-      // ajaxTimer = window.setTimeout(() => {
-      //   if (loadingInstance) {
-      //     loadingInstance.close()
-      //   }
-      //   ajaxCount = 0
-      // }, 50000)
-      // ajaxCount++
+      ajaxTimer = window.setTimeout(() => {
+        if (loadingInstance) {
+          loadingInstance.close()
+        }
+        ajaxCount = 0
+      }, 50000)
+      ajaxCount++
     }
     if (!localStorage.getItem('uid')) {
       localStorage.setItem('uid', guid.guid())
@@ -100,12 +100,12 @@ axios.interceptors.response.use(
       return response && response.config.url.includes(el)
     })
     if (!disLoading) {
-      // ajaxCount > 0 ? ajaxCount-- : ajaxCount = 0
-      // if (ajaxCount === 0) {
-      //   loadingInstance.close()
-      //   window.clearTimeout(ajaxTimer)
-      // }
-      loadingInstance.close()
+      ajaxCount > 0 ? ajaxCount-- : ajaxCount = 0
+      if (ajaxCount === 0) {
+        loadingInstance.close()
+        window.clearTimeout(ajaxTimer)
+      }
+      // loadingInstance.close()
     }
     if (response.headers.token) {
       store.dispatch('user/updateToken', response.headers.token)