diff --git a/src/utils/elementConfig.js b/src/utils/elementConfig.js index f4dce2a..1b55bb4 100644 --- a/src/utils/elementConfig.js +++ b/src/utils/elementConfig.js @@ -31,9 +31,11 @@ import { Tabs, TabPane, Menu, - MenuItem + MenuItem, + Loading } from 'element-ui' +Vue.prototype.$loading = Loading Vue.prototype.$message = Message Vue.prototype.$confirm = MessageBox.confirm Vue.prototype.$alert = MessageBox.alert diff --git a/src/utils/request.js b/src/utils/request.js index bf8a0c2..33d8672 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,5 +1,12 @@ import axios from 'axios' -import { Message } from 'element-ui' +import { Message, Loading } from 'element-ui' +// const id = Loading.service({ +// target: document.querySelector('.appamin'), +// background: 'rgba(255, 255, 255, 0.1)', +// spinner: 'el-icon-loading', +// text: '请求加载中。。。' +// }) +// id.close() // import store from '@/store' // import { getToken } from '@/utils/auth' // import errorCode from '@/utils/errorCode' @@ -14,8 +21,17 @@ const service = axios.create({ // 超时 timeout: 1500000 }) + +const options = { + fullscreen: true, + target: document.querySelector('.appamin'), + background: 'rgba(255, 255, 255, 0.1)', + spinner: 'el-icon-loading', + text: '请求加载中。。。'} + // request拦截器 service.interceptors.request.use(config => { + Loading.service(options) // 是否需要设置 token // const isToken = (config.headers || {}).isToken === false // if (getToken() && !isToken) { @@ -29,6 +45,10 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { + const id = setTimeout(() => { + Loading.service(options).close() + clearTimeout(id) + }, 300) // 未设置状态码则默认成功状态 const code = res.data.code || 200 if (code !== 200) { @@ -41,6 +61,10 @@ service.interceptors.response.use(res => { } }, error => { + const id = setTimeout(() => { + Loading.service(options).close() + clearTimeout(id) + }, 300) console.log('err' + error) let { message } = error if (message === 'Network Error') { diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue index 41affd4..135d8ee 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/index.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue @@ -7,7 +7,7 @@