From 1de7127ecc95d7a17ee1f02d1ef44f7a7ad419a2 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Wed, 17 Dec 2025 14:26:18 +0800 Subject: [PATCH] =?UTF-8?q?chore:[=E5=8F=8C=E8=AF=AD=E8=B0=83=E6=95=B4]=20?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=A1=B5=E9=9D=A2=E5=8F=8C=E8=AF=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/components/Breadcrumb/index.vue | 6 +- src/lang/en.js | 16 ++- src/lang/zh.js | 16 ++- src/layout/components/Navbar.vue | 12 +-- src/router/index.js | 9 +- src/utils/request.js | 210 ++++++++++++++++++++++-------------- src/views/login.vue | 8 +- 8 files changed, 177 insertions(+), 102 deletions(-) diff --git a/public/index.html b/public/index.html index 925455c..ec7ae48 100644 --- a/public/index.html +++ b/public/index.html @@ -201,7 +201,7 @@
-
正在加载系统资源，请耐心等待
+
Loding
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 080595a..48e1c7b 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -46,9 +46,9 @@ export default { matched = router.matched.filter(item => item.meta && item.meta.title) } // 判断是否为首页 - if (!this.isDashboard(matched[0])) { - matched = [{ path: "/index", meta: { title: "首页" } }].concat(matched) - } + // if (!this.isDashboard(matched[0])) { + // matched = [{ path: "/index", meta: { title: "首页1" } }].concat(matched) + // } this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) }, findPathNum(str, char = "/") { diff --git a/src/lang/en.js b/src/lang/en.js index 13a9c2a..195433f 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -1,12 +1,26 @@ export default { title: 'HXHQ', + system: { + tip: 'prompt', + logOut: 'Are you sure to log out and exit the system?' + }, + btn: { + confirm: 'confirm', + cancel: 'cancel' + }, login: { title: 'Login Form', logIn: 'Login in', username: 'Username', + usernameRequired: 'Please Enter Username', password: 'Password', + passwordRequired: 'Please Enter Password', code: 'Code', - rememberMe: 'Remember Me' + codeRequired: 'Please Enter Code', + rememberMe: 'Remember Me', + loginIng: 'Loging...', + logOut: 'logOut', + profile: 'profile' }, tagsView: { refresh: 'Refresh', diff --git a/src/lang/zh.js b/src/lang/zh.js index 40635a6..6a37e95 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1,12 +1,26 @@ export default { title: '华西海圻管理系统', + system: { + tip: '提示', + logOut: '确定注销并退出系统吗？' + }, + btn: { + confirm: '确定', + cancel: '取消' + }, login: { title: '华西海圻管理系统', logIn: '登录', username: '账号', + usernameRequired: '请输入您的账号', password: '密码', + passwordRequired: '请输入您的密码', code: '验证码', - rememberMe: '记住密码' + codeRequired: '请输入验证码', + rememberMe: '记住密码', + loginIng: '登 录 中...', + logOut: '退出登录', + profile: '个人中心' }, tagsView: { refresh: '刷新', diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b03b998..cab8d24 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -26,10 +26,10 @@ - 个人中心 + {{ $t('login.profile') }} - 退出登录 + {{ $t('login.logOut') }} @@ -89,13 +89,13 @@ export default { this.$emit('setLayout') }, logout() { - this.$confirm('确定注销并退出系统吗？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('system.logOut'), this.$t('system.tip'), { + confirmButtonText: this.$t('btn.confirm'), + cancelButtonText: this.$t('btn.cancel'), type: 'warning' }).then(() => { this.$store.dispatch('LogOut').then(() => { - location.href = '/index' + location.href = '/user/work' }) }).catch(() => {}) } diff --git a/src/router/index.js b/src/router/index.js index bbfd237..e8299ad 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -64,7 +64,7 @@ export const constantRoutes = [ { path: '', component: Layout, - redirect: 'index', + redirect: '/user/work', children: [ { path: 'index', @@ -72,7 +72,8 @@ export const constantRoutes = [ name: 'Index', meta: { title: '首页', icon: 'dashboard', affix: true } } - ] + ], + hidden: true }, { path: '/user', @@ -169,11 +170,11 @@ let routerPush = Router.prototype.push let routerReplace = Router.prototype.replace // push Router.prototype.push = function push(location) { - return routerPush.call(this, location).catch(err => err) + return routerPush.call(this, location).catch((err) => err) } // replace Router.prototype.replace = function push(location) { - return routerReplace.call(this, location).catch(err => err) + return routerReplace.call(this, location).catch((err) => err) } export default new Router({ diff --git a/src/utils/request.js b/src/utils/request.js index 7150ecb..a7c724d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,7 +3,7 @@ import { Notification, MessageBox, Message, Loading } from 'element-ui' import store from '@/store' import { getToken } from '@/utils/auth' import errorCode from '@/utils/errorCode' -import { tansParams, blobValidate } from "@/utils/ruoyi" +import { tansParams, blobValidate } from '@/utils/ruoyi' import cache from '@/plugins/cache' import { saveAs } from 'file-saver' @@ -21,78 +21,112 @@ const service = axios.create({ }) // request拦截器 -service.interceptors.request.use(config => { - // 是否需要设置 token - const isToken = (config.headers || {}).isToken === false - // 是否需要防止数据重复提交 - const isRepeatSubmit = (config.headers || {}).repeatSubmit === false - if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - } - // get请求映射params参数 - if (config.method === 'get' && config.params) { - let url = config.url + '?' + tansParams(config.params) - url = url.slice(0, -1) - config.params = {} - config.url = url - } - if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) { - const requestObj = { - url: config.url, - data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data, - time: new Date().getTime() +service.interceptors.request.use( + (config) => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + // 是否需要防止数据重复提交 + const isRepeatSubmit = (config.headers || {}).repeatSubmit === false + if (getToken() && !isToken) { + config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 } - const requestSize = Object.keys(JSON.stringify(requestObj)).length // 请求数据大小 - const limitSize = 5 * 1024 * 1024 // 限制存放数据5M - if (requestSize >= limitSize) { - console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。') - return config + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let url = config.url + '?' + tansParams(config.params) + url = url.slice(0, -1) + config.params = {} + config.url = url } - const sessionObj = cache.session.getJSON('sessionObj') - if (sessionObj === undefined || sessionObj === null || sessionObj === '') { - cache.session.setJSON('sessionObj', requestObj) - } else { - const s_url = sessionObj.url // 请求地址 - const s_data = sessionObj.data // 请求数据 - const s_time = sessionObj.time // 请求时间 - const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交 - if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { - const message = '数据正在处理，请勿重复提交' - console.warn(`[${s_url}]: ` + message) - return Promise.reject(new Error(message)) - } else { + if ( + !isRepeatSubmit && + (config.method === 'post' || config.method === 'put') + ) { + const requestObj = { + url: config.url, + data: + typeof config.data === 'object' + ? JSON.stringify(config.data) + : config.data, + time: new Date().getTime() + } + const requestSize = Object.keys(JSON.stringify(requestObj)).length // 请求数据大小 + const limitSize = 5 * 1024 * 1024 // 限制存放数据5M + if (requestSize >= limitSize) { + console.warn( + `[${config.url}]: ` + + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。' + ) + return config + } + const sessionObj = cache.session.getJSON('sessionObj') + if ( + sessionObj === undefined || + sessionObj === null || + sessionObj === '' + ) { cache.session.setJSON('sessionObj', requestObj) + } else { + const s_url = sessionObj.url // 请求地址 + const s_data = sessionObj.data // 请求数据 + const s_time = sessionObj.time // 请求时间 + const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交 + if ( + s_data === requestObj.data && + requestObj.time - s_time < interval && + s_url === requestObj.url + ) { + const message = '数据正在处理，请勿重复提交' + console.warn(`[${s_url}]: ` + message) + return Promise.reject(new Error(message)) + } else { + cache.session.setJSON('sessionObj', requestObj) + } } } - } - return config -}, error => { + return config + }, + (error) => { console.log(error) Promise.reject(error) -}) + } +) // 响应拦截器 -service.interceptors.response.use(res => { +service.interceptors.response.use( + (res) => { // 未设置状态码则默认成功状态 const code = res.data.code || 200 // 获取错误信息 const msg = errorCode[code] || res.data.msg || errorCode['default'] // 二进制数据则直接返回 - if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { + if ( + res.request.responseType === 'blob' || + res.request.responseType === 'arraybuffer' + ) { return res.data } if (code === 401) { if (!isRelogin.show) { isRelogin.show = true - MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { - isRelogin.show = false - store.dispatch('LogOut').then(() => { - location.href = '/index' + MessageBox.confirm( + '登录状态已过期，您可以继续留在该页面，或者重新登录', + '系统提示', + { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + } + ) + .then(() => { + isRelogin.show = false + store.dispatch('LogOut').then(() => { + location.href = '/user/work' + }) }) - }).catch(() => { - isRelogin.show = false - }) - } + .catch(() => { + isRelogin.show = false + }) + } return Promise.reject('无效的会话，或者会话已过期，请重新登录。') } else if (code === 500) { Message({ message: msg, type: 'error' }) @@ -107,15 +141,15 @@ service.interceptors.response.use(res => { return res.data } }, - error => { + (error) => { console.log('err' + error) 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) + "异常" + 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({ message: message, type: 'error', duration: 5 * 1000 }) return Promise.reject(error) @@ -124,29 +158,41 @@ service.interceptors.response.use(res => { // 通用下载方法 export function download(url, params, filename, config) { - downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", }) - return service.post(url, params, { - transformRequest: [(params) => { return tansParams(params) }], - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - responseType: 'blob', - ...config - }).then(async (data) => { - const isBlob = blobValidate(data) - if (isBlob) { - const blob = new Blob([data]) - saveAs(blob, filename) - } else { - const resText = await data.text() - const rspObj = JSON.parse(resText) - const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] - Message.error(errMsg) - } - downloadLoadingInstance.close() - }).catch((r) => { - console.error(r) - Message.error('下载文件出现错误，请联系管理员！') - downloadLoadingInstance.close() + downloadLoadingInstance = Loading.service({ + text: '正在下载数据，请稍候', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' }) + return service + .post(url, params, { + transformRequest: [ + (params) => { + return tansParams(params) + } + ], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + responseType: 'blob', + ...config + }) + .then(async (data) => { + const isBlob = blobValidate(data) + if (isBlob) { + const blob = new Blob([data]) + saveAs(blob, filename) + } else { + const resText = await data.text() + const rspObj = JSON.parse(resText) + const errMsg = + errorCode[rspObj.code] || rspObj.msg || errorCode['default'] + Message.error(errMsg) + } + downloadLoadingInstance.close() + }) + .catch((r) => { + console.error(r) + Message.error('下载文件出现错误，请联系管理员！') + downloadLoadingInstance.close() + }) } export default service diff --git a/src/views/login.vue b/src/views/login.vue index 8830c86..b379f3b 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -48,7 +48,7 @@ @click.native.prevent="handleLogin" > {{ $t('login.logIn') }} - 登 录 中... + {{ $t('login.loginIng') }}
立即注册 @@ -86,12 +86,12 @@ export default { }, loginRules: { username: [ - { required: true, trigger: "blur", message: "请输入您的账号" } + { required: true, trigger: "blur", message: this.$t('login.usernameRequired') } ], password: [ - { required: true, trigger: "blur", message: "请输入您的密码" } + { required: true, trigger: "blur", message: this.$t('login.passwordRequired') } ], - code: [{ required: true, trigger: "change", message: "请输入验证码" }] + code: [{ required: true, trigger: "change", message: this.$t('login.codeRequired') }] }, loading: false, // 验证码开关