From 0dd4edec04e2ed1adfead0f1386b19aea7a87db8 Mon Sep 17 00:00:00 2001 From: ysn <2126564605@qq.com> Date: Tue, 26 May 2026 13:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/knowledge.js | 14 +-- src/api/login.js | 20 +--- src/layout/components/Navbar.vue | 4 +- src/store/modules/permission.js | 28 ++--- src/store/modules/user.js | 27 +++-- src/utils/request.js | 66 ++++++------ src/views/knowledge/index.vue | 179 +++++++++++++++++++++---------- src/views/login.vue | 62 +++-------- vue.config.js | 23 ++-- 10 files changed, 223 insertions(+), 204 deletions(-) diff --git a/.env.development b/.env.development index a0b0133..686d928 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ VUE_APP_TITLE = 信联 # 开发环境配置 ENV = 'development' -# 信联/开发环境 -VUE_APP_BASE_API = '/dev-api' +# 修改为你真实的接口前缀 +VUE_APP_BASE_API = '/api_admin/v1' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/knowledge.js b/src/api/knowledge.js index 25a06cf..433e1ab 100644 --- a/src/api/knowledge.js +++ b/src/api/knowledge.js @@ -1,13 +1,18 @@ import request from '@/utils/request' +// 获取知识库左侧分类列表 +export function getKnowledgeCateList(data) { + return request({ url: '/v1/knowledge/cate/list', method: 'post', data }) +} +// 获取知识库右侧列表 +export function getKnowledgeList(data) { + return request({ url: '/v1/knowledge/list', method: 'post', data }) +} export function createKnowledge(data) { return request({ url: '/api/v1/knowledge/create', method: 'post', data }) } -export function getKnowledgeList(data) { - return request({ url: '/api/v1/knowledge/list', method: 'post', data }) -} export function playKnowledge(data) { return request({ url: '/api/v1/knowledge/play', method: 'post', data }) @@ -33,6 +38,3 @@ export function deleteKnowledgeCate(data) { return request({ url: '/api/v1/knowledge/cate/delete', method: 'post', data }) } -export function getKnowledgeCateList(data) { - return request({ url: '/api/v1/knowledge/cate/list', method: 'post', data }) -} diff --git a/src/api/login.js b/src/api/login.js index 2165d2b..1caa271 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,19 +1,9 @@ import request from '@/utils/request' // 登录方法 -export function login(username, password, code, uuid) { - const data = { - username, - password, - code, - uuid - } +export function login(data) { return request({ - url: '/login', - headers: { - isToken: false, - repeatSubmit: false - }, + url: '/auth/login/access-token', method: 'post', data: data }) @@ -34,8 +24,8 @@ export function register(data) { // 获取用户详细信息 export function getInfo() { return request({ - url: '/getInfo', - method: 'get' + url: '/users/detail', + method: 'POST' }) } @@ -51,7 +41,7 @@ export function unlockScreen(password) { // 退出方法 export function logout() { return request({ - url: '/logout', + url: '/auth/logout', method: 'post' }) } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 31bb101..0feb973 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -60,13 +60,13 @@ icon="el-icon-circle-check" :underline="false" > - {{ selectDictLabel(dict.type.sys_normal_disable, status) || "-" }} + {{ status }} 所属单位 - {{ dept.deptName }} + {{ dept }} diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index b549ef0..9582cb1 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -33,20 +33,20 @@ const permission = { GenerateRoutes({ commit }) { return new Promise(resolve => { // 向后端请求路由数据 - getRouters().then(res => { - const sdata = JSON.parse(JSON.stringify(res.data)) - const rdata = JSON.parse(JSON.stringify(res.data)) - const sidebarRoutes = filterAsyncRouter(sdata) - const rewriteRoutes = filterAsyncRouter(rdata, false, true) - const asyncRoutes = filterDynamicRoutes(dynamicRoutes) - rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) - router.addRoutes(asyncRoutes) - commit('SET_ROUTES', rewriteRoutes) - commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes)) - commit('SET_DEFAULT_ROUTES', sidebarRoutes) - commit('SET_TOPBAR_ROUTES', sidebarRoutes) - resolve(rewriteRoutes) - }) + // getRouters().then(res => { + // const sdata = JSON.parse(JSON.stringify(res.data)) + // const rdata = JSON.parse(JSON.stringify(res.data)) + // const sidebarRoutes = filterAsyncRouter(sdata) + const rewriteRoutes = filterAsyncRouter([], false, true) + const asyncRoutes = filterDynamicRoutes(dynamicRoutes) + rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) + router.addRoutes(asyncRoutes) + commit('SET_ROUTES', rewriteRoutes) + commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(asyncRoutes)) + commit('SET_DEFAULT_ROUTES', asyncRoutes) + commit('SET_TOPBAR_ROUTES', asyncRoutes) + resolve(rewriteRoutes) + // }) }) } } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 9dafdcf..5ef6e3e 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -53,14 +53,11 @@ const user = { actions: { // 登录 Login({ commit }, userInfo) { - const username = userInfo.username.trim() - const password = userInfo.password - const code = userInfo.code - const uuid = userInfo.uuid return new Promise((resolve, reject) => { - login(username, password, code, uuid).then(res => { - setToken(res.token) - commit('SET_TOKEN', res.token) + login(userInfo).then(res => { + console.log(res) + setToken(res.data.token) + commit('SET_TOKEN', res.data.token) store.dispatch('lock/unlockScreen') resolve() }).catch(error => { @@ -73,7 +70,7 @@ const user = { GetInfo({ commit, state }) { return new Promise((resolve, reject) => { getInfo().then(res => { - const user = res.user + const user = res.data let avatar = user.avatar || "" if (!isHttp(avatar)) { avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar @@ -88,20 +85,20 @@ const user = { commit('SET_NAME', user.userName) commit('SET_NICK_NAME', user.nickName) commit('SET_AVATAR', avatar) - commit('SET_DEPT', user.dept) + commit('SET_DEPT', user.grp_name) commit('SET_STATUS', user.status) cache.session.set('pwrChrtype', res.pwdChrtype) /* 初始密码提示 */ - if(res.isDefaultModifyPwd) { - MessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { + if (res.isDefaultModifyPwd) { + MessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } }) - }).catch(() => {}) + }).catch(() => { }) } /* 过期密码提示 */ - if(!res.isDefaultModifyPwd && res.isPasswordExpired) { - MessageBox.confirm('您的密码已过期，请尽快修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { + if (!res.isDefaultModifyPwd && res.isPasswordExpired) { + MessageBox.confirm('您的密码已过期，请尽快修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } }) - }).catch(() => {}) + }).catch(() => { }) } resolve(res) }).catch(error => { diff --git a/src/utils/request.js b/src/utils/request.js index 8695801..bf8b3ce 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -29,7 +29,7 @@ service.interceptors.request.use(config => { // 间隔时间(ms)，小于此时间视为重复提交 const interval = (config.headers || {}).interval || 1000 if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + config.headers['x-token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 } // get请求映射params参数 if (config.method === 'get' && config.params) { @@ -68,46 +68,46 @@ service.interceptors.request.use(config => { } return config }, error => { - console.log(error) - Promise.reject(error) + console.log(error) + Promise.reject(error) }) // 响应拦截器 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') { - 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' - }) + // 未设置状态码则默认成功状态 + const code = res.data.code || 200 + // 获取错误信息 + const msg = errorCode[code] || res.data.message || errorCode['default'] + // 二进制数据则直接返回 + 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' + }) }).catch(() => { isRelogin.show = false }) } - return Promise.reject('无效的会话，或者会话已过期，请重新登录。') - } else if (code === 500) { - Message({ message: msg, type: 'error' }) - return Promise.reject(new Error(msg)) - } else if (code === 601) { - Message({ message: msg, type: 'warning' }) - return Promise.reject('error') - } else if (code !== 200) { - Notification.error({ title: msg }) - return Promise.reject('error') - } else { - return res.data - } - }, + return Promise.reject('无效的会话，或者会话已过期，请重新登录。') + } else if (code === 500 || code === 901) { + Message({ message: msg, type: 'error' }) + return Promise.reject(new Error(msg)) + } else if (code === 601) { + Message({ message: msg, type: 'warning' }) + return Promise.reject('error') + } else if (code !== 200) { + Notification.error({ title: msg }) + return Promise.reject('error') + } else { + return res.data + } +}, error => { console.log('err' + error) let { message } = error diff --git a/src/views/knowledge/index.vue b/src/views/knowledge/index.vue index 2a2fe1a..138f9f5 100644 --- a/src/views/knowledge/index.vue +++ b/src/views/knowledge/index.vue @@ -4,19 +4,20 @@ - + @@ -25,14 +26,14 @@
- {{ dept.label }} + {{ item.name }}
@@ -45,7 +46,7 @@ >
- {{ dept.label }} + {{ dept.name }}
- +