From 21a629b4fb4309ca8c8a6f8464b665407db71c8c Mon Sep 17 00:00:00 2001 From: wwl Date: Sun, 5 May 2024 21:57:08 +0800 Subject: [PATCH] fix bug --- src/utils/http.ts | 258 +- src/views/extermal/ExternalHome.vue | 3291 ++++++++--------- src/views/home/Home.vue | 2 +- src/views/home/csr/CSRContent23.vue | 17 +- src/views/home/diffspace/Overview.vue | 1634 ++++---- .../intelligence/components/InfosEdit.vue | 259 +- src/views/home/news/news.vue | 13 +- 7 files changed, 2625 insertions(+), 2849 deletions(-) diff --git a/src/utils/http.ts b/src/utils/http.ts index 47b40f8..df50a4b 100755 --- a/src/utils/http.ts +++ b/src/utils/http.ts @@ -7,20 +7,20 @@ import router from '@/router' export const TOKEN_KEY = 'token' declare module 'axios' { - export interface AxiosRequestConfig { - showLoading?: boolean - // [自定义属性声明] - } + export interface AxiosRequestConfig { + showLoading?: boolean + // [自定义属性声明] + } } // const { createMessage, createWarningModal } = useMessage() // 创建axios实例 const service = axios.create({ - // 服务接口请求 - baseURL: '/test-api', - // 超时设置 - timeout: 15000, - headers: { 'Content-Type': 'application/json;charset=utf-8;' }, - showLoading: false + // 服务接口请求 + baseURL: '/test-api', + // 超时设置 + timeout: 15000, + headers: { 'Content-Type': 'application/json;charset=utf-8;' }, + showLoading: false }) // let loading: any; @@ -31,143 +31,141 @@ const service = axios.create({ let requestCount: number = 0 //显示loading const showLoading = () => { - if (requestCount === 0) { - //加载中显示样式可以自行修改 - // loading = ElLoading.service({ - // text: "拼命加载中，请稍后...", - // background: 'rgba(0, 0, 0, 0.7)', - // spinner: 'el-icon-loading', - // }) - message.loading('请求中...') - } - requestCount++ + if (requestCount === 0) { + //加载中显示样式可以自行修改 + // loading = ElLoading.service({ + // text: "拼命加载中，请稍后...", + // background: 'rgba(0, 0, 0, 0.7)', + // spinner: 'el-icon-loading', + // }) + message.loading('请求中...') + } + requestCount++ } //隐藏loading const hideLoading = () => { - requestCount-- - if (requestCount == 0) { - // loading.close() - message.destroyAll() - } + requestCount-- + if (requestCount == 0) { + // loading.close() + message.destroyAll() + } } // 请求拦截 service.interceptors.request.use( - (config) => { - // config.showLoading - if (config.showLoading) { - showLoading() - } - if (token) config.headers[TOKEN_KEY] = unref(token) - // if (getToken()) { - // // 是否需要设置 token放在请求头 - // config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - // } + (config) => { + // config.showLoading + if (config.showLoading) { + showLoading() + } + if (token) config.headers[TOKEN_KEY] = unref(token) + // if (getToken()) { + // // 是否需要设置 token放在请求头 + // config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + // } - // get请求映射params参数 - if (config.method === 'get' && config.params) { - let url = config.url + '?' - for (const propName of Object.keys(config.params)) { - const value = config.params[propName] - const part = encodeURIComponent(propName) + '=' - if (value !== null && typeof value !== 'undefined') { - // 对象处理 - if (typeof value === 'object') { - for (const key of Object.keys(value)) { - const params = propName + '[' + key + ']' - const subPart = encodeURIComponent(params) + '=' - url += subPart + encodeURIComponent(value[key]) + '&' - } - } else { - url += part + encodeURIComponent(value) + '&' - } - } - } - url = url.slice(0, -1) - config.params = {} - config.url = url - } - return config - }, - (error) => { - // console.log(error) - Promise.reject(error) - } + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let url = config.url + '?' + for (const propName of Object.keys(config.params)) { + const value = config.params[propName] + const part = encodeURIComponent(propName) + '=' + if (value !== null && typeof value !== 'undefined') { + // 对象处理 + if (typeof value === 'object') { + for (const key of Object.keys(value)) { + const params = propName + '[' + key + ']' + const subPart = encodeURIComponent(params) + '=' + url += subPart + encodeURIComponent(value[key]) + '&' + } + } else { + url += part + encodeURIComponent(value) + '&' + } + } + } + url = url.slice(0, -1) + config.params = {} + config.url = url + } + return config + }, + (error) => { + // console.log(error) + Promise.reject(error) + } ) // 响应拦截器 service.interceptors.response.use( - async (response: any) => { - // console.log('响应拦截器res', response) - // if (res.config.showLoading) { - // showLoading() - // } - hideLoading() - // 未设置状态码则默认成功状态 + async (response: any) => { + // console.log('响应拦截器res', response) + // if (res.config.showLoading) { + // showLoading() + // } + hideLoading() + // 未设置状态码则默认成功状态 - const { data, status } = response - if (data instanceof Blob || data instanceof ArrayBuffer) { - return { - data, - code: 200 - } - if (response.headers['content-disposition']) { - const fileName = response.headers['content-disposition'] - ?.split(';')[1] - ?.split('=')[1] - } else { - return Promise.reject('没有访问权限') - } - } - const { errCode, code, msg } = data || {} - const errMsg = data?.errMsg || data?.message || msg - // console.log(11, code, errMsg) + const { data, status } = response + if (data instanceof Blob || data instanceof ArrayBuffer) { + return { + data, + code: 200 + } + if (response.headers['content-disposition']) { + const fileName = response.headers['content-disposition']?.split(';')[1]?.split('=')[1] + } else { + return Promise.reject('没有访问权限') + } + } + const { errCode, code, msg } = data || {} + const errMsg = data?.errMsg || data?.message || msg + // console.log(11, code, errMsg) - if (code === 2000) { - await router.push('/') - } + if (code === 2000) { + await router.push('/') + } - if (![0, 200].includes(code)) { - // if(errMsg==='用户未登录') - // { message.error(errMsg);} - // else if(errMsg==='密码不正确'){ - // message.error(errMsg); - // } - // else if(errMsg==="账户信息查找为空"){ - // message.error(errMsg); - // } - // else{ message.error("服务器升级维护中，请稍后重试！")}\ - message.error(errMsg) - return Promise.reject(errMsg) - } + if (![0, 200].includes(code)) { + if (errMsg === '用户未登录') return Promise.reject(errMsg) + // { message.error(errMsg);} + // else if(errMsg==='密码不正确'){ + // message.error(errMsg); + // } + // else if(errMsg==="账户信息查找为空"){ + // message.error(errMsg); + // } + // else{ message.error("服务器升级维护中，请稍后重试！")}\ + message.error(errMsg) + return Promise.reject(errMsg) + } - if (/^[4|5].*/.test(code || errCode || status)) { - // console.error('> axios(interceptors.response): ', errMsg); - message.error(errMsg) - // message.error("服务器访问过多，请稍后重试！"); - // 处理未登录，token过期等 情况 - // if (code !== 404 && /^[4].*/.test(code || errCode || status)) { - // await app.fedLogout(); - // } + if (/^[4|5].*/.test(code || errCode || status)) { + // console.error('> axios(interceptors.response): ', errMsg); + message.error(errMsg) + // message.error("服务器访问过多，请稍后重试！"); + // 处理未登录，token过期等 情况 + // if (code !== 404 && /^[4].*/.test(code || errCode || status)) { + // await app.fedLogout(); + // } - return Promise.reject(data) - } - return data - }, - (error) => { - // console.log('err' + error) - hideLoading() - let { message } = error - if (message == 'Network Error') { - message = '后端接口连接异常' - } else if (message.includes('timeout')) { - message = '系统接口请求超时' - } else if (message.includes('Request failed with status code')) { - message = '系统接口' + message.substr(message.length - 3) + '异常' - } - message.err('服务器升级维护中，请稍后重试！') - return Promise.reject(error) - } + return Promise.reject(data) + } + return data + }, + (error) => { + // console.log('err' + error) + hideLoading() + let { message } = error + if (message == 'Network Error') { + message = '后端接口连接异常' + } else if (message.includes('timeout')) { + message = '系统接口请求超时' + } else if (message.includes('Request failed with status code')) { + message = '系统接口' + message.substr(message.length - 3) + '异常' + } + message.err('服务器升级维护中，请稍后重试！') + return Promise.reject(error) + } ) export default service diff --git a/src/views/extermal/ExternalHome.vue b/src/views/extermal/ExternalHome.vue index 29a8454..00a37f8 100755 --- a/src/views/extermal/ExternalHome.vue +++ b/src/views/extermal/ExternalHome.vue @@ -1,26 +1,26 @@ diff --git a/src/views/home/Home.vue b/src/views/home/Home.vue index 37d0633..346233d 100755 --- a/src/views/home/Home.vue +++ b/src/views/home/Home.vue @@ -168,7 +168,7 @@ onMounted(async () => { addDISH3.value > 0 ? (addDISH3.value = addDISH3.value.toFixed(2)) : 0 } if (isUpPwds.value) { - ElMessageBox.alert('为了您的帐号安全,首次登录必须更改初始密码', '重要提醒', { + ElMessageBox.alert('为了您的帐号安全,此次登录必须更改密码', '重要提醒', { confirmButtonText: 'OK', showClose: false, showCancelButton: false diff --git a/src/views/home/csr/CSRContent23.vue b/src/views/home/csr/CSRContent23.vue index e19ffc7..35d76dc 100755 --- a/src/views/home/csr/CSRContent23.vue +++ b/src/views/home/csr/CSRContent23.vue @@ -13,7 +13,7 @@ const query = ref({ }) const year = new Date().getFullYear() const month = new Date().getMonth() -const jpMonth = (month < 3 ? year - 1 : year) + '' +const jpMonth = (month < 4 ? year - 1 : year) + '' query.value.year = jpMonth const calendar = [4, 5, 6, 7, 8, 9, 10, 11, 12, 1, 2, 3] const calendarShow = new Date().getMonth() + 1 @@ -43,8 +43,11 @@ const getCsrSupplier = () => { try { csrSupplier.value = resData.length ? resData.map((key) => { - const obj = data[key] || {} - const month = String(key).split('-')?.[1] || '' + const arr = String(key).split('-') + const month = arr?.[1] || '' + // const year = arr?.[0] || '' + const obj = + data[+month < 4 ? +req.year + 1 + '-' + month : req.year + '-' + month] || {} Object.assign(csrSupplierObj.value[month], obj) return { key, @@ -173,19 +176,17 @@ getCsrSupplierTaskInfo()
{{ +it }}月
-