Commit d15cfd92 authored by jingnan's avatar jingnan 👀

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

parents f3aa0a61 c9e51196
...@@ -40,13 +40,13 @@ axios.interceptors.request.use( ...@@ -40,13 +40,13 @@ axios.interceptors.request.use(
fullscreen: true, fullscreen: true,
background: 'rgba(0, 0, 0, 0.0)' background: 'rgba(0, 0, 0, 0.0)'
}) })
ajaxTimer = window.setTimeout(() => { // ajaxTimer = window.setTimeout(() => {
if (loadingInstance) { // if (loadingInstance) {
loadingInstance.close() // loadingInstance.close()
} // }
ajaxCount = 0 // ajaxCount = 0
}, 50000) // }, 50000)
ajaxCount++ // ajaxCount++
} }
if (!localStorage.getItem('uid')) { if (!localStorage.getItem('uid')) {
localStorage.setItem('uid', guid.guid()) localStorage.setItem('uid', guid.guid())
...@@ -96,11 +96,12 @@ axios.interceptors.response.use( ...@@ -96,11 +96,12 @@ axios.interceptors.response.use(
return response && response.config.url.includes(el) return response && response.config.url.includes(el)
}) })
if (!disLoading) { if (!disLoading) {
ajaxCount > 0 ? ajaxCount-- : ajaxCount = 0 // ajaxCount > 0 ? ajaxCount-- : ajaxCount = 0
if (ajaxCount === 0) { // if (ajaxCount === 0) {
// loadingInstance.close()
// window.clearTimeout(ajaxTimer)
// }
loadingInstance.close() loadingInstance.close()
window.clearTimeout(ajaxTimer)
}
} }
if (response.headers.token) { if (response.headers.token) {
store.dispatch('user/updateToken', response.headers.token) store.dispatch('user/updateToken', response.headers.token)
......
<template> <template>
<div v-dee-loading="loading" class="TfMomWebUnit-model"> <div class="TfMomWebUnit-model">
<div class="search-bar"> <div class="search-bar">
<el-input v-model="AOname" size="small" placeholder="AO(号/名称)" class="input-with-select"> <el-input v-model="AOname" size="small" placeholder="AO(号/名称)" class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="search" /> <el-button slot="append" icon="el-icon-search" @click="search" />
......
<template> <template>
<div v-dee-loading="loading" class="TfMomWebView-model"> <div class="TfMomWebView-model">
<div class="search-bar"> <div class="search-bar">
<el-input v-model="AOname" size="small" placeholder="AO(号/名称)" class="input-with-select"> <el-input v-model="AOname" size="small" placeholder="AO(号/名称)" class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="search" /> <el-button slot="append" icon="el-icon-search" @click="search" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment