diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index a3ddcdc..decbac0 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -26,7 +26,6 @@ import Layout from '@/layout' activeMenu: '/system/user' // 当路由设置了该属性,则会高亮相对应的侧边栏。 } */ - // 公共路由 export const constantRoutes = [ { @@ -65,20 +64,6 @@ export const constantRoutes = [ component: () => import('@/views/test/index'), hidden: true }, - // { - // path: '', - // component: Layout, - // redirect: 'index', - // children: [ - // { - // path: 'index', - // component: () => import('@/views/index'), - // name: 'Index', - // meta: { title: '首页', icon: 'dashboard', affix: true } - // } - // ] - // }, - { path: '/user', component: Layout, @@ -115,17 +100,16 @@ export const dynamicRoutes = [{ ] }, { - path: '/index', + path: '/transactionRecords', component: Layout, hidden: true, - redirect: 'list', permissions: ['system:user:edit'], children: [ { - path: 'list', + path: 'index', component: () => import('@/views/transaction/index'), - name: 'list', - meta: { title: '交易记录', icon: 'dashboard', affix: true, activeMenu: '/index' } + name: 'transactionRecords', + meta: { title: '交易记录', icon: 'null', affix: true, activeMenu: '/index' } } ] }, @@ -144,16 +128,16 @@ export const dynamicRoutes = [{ ] }, { - path: '/homepage', + path: '/task', component: Layout, hidden: true, permissions: ['system:user:edit'], children: [ { - path: 'home', + path: 'homepageage', component: () => import('@/views/homepage/index.vue'), - name: 'Index', - meta: { title: '首页', affix: true, activeMenu: '/training/List' } + name: 'homepageage', + meta: { title: '任务主页', affix: true, activeMenu: '/training/List' } } ] }, @@ -164,9 +148,9 @@ export const dynamicRoutes = [{ permissions: ['system:user:edit'], children: [ { - path: 'index', + path: 'homepagege', component: () => import('@/views/PracticeZone/index.vue'), - name: 'Index', + name: 'PracticeZone', meta: { title: '练习专区', affix: true, activeMenu: '/training/List' } } ] @@ -195,7 +179,7 @@ export const dynamicRoutes = [{ path: 'case', component: () => import('@/views/teachingpan/index.vue'), name: 'teachingPlan', - meta: { title: '实训教案', icon: 'teachingplan', affix: true, activeMenu: '/teachingPlan/case' } + meta: { title: '实训教案', icon: 'teachingplan', affix: true} } ] }, @@ -209,7 +193,7 @@ export const dynamicRoutes = [{ path: 'lowcore', component: () => import('@/views/quotation/index.vue'), name: 'lowcore', - meta: { title: '行情中心', icon: 'market', affix: true, activeMenu: '/teachingPlan/case' } + meta: { title: '行情中心', icon: 'market', affix: true} } ] }, @@ -282,10 +266,7 @@ export const dynamicRoutes = [{ meta: { title: '修改生成配置', activeMenu: '/tool/gen' } } ] -}, { - path: '*', - redirect: '/404' -} +}, { path: '*', redirect: '/404'} ] // 教师端路由 export const teacher = [ diff --git a/ruoyi-ui/src/store/modules/settings.js b/ruoyi-ui/src/store/modules/settings.js index 4dfa0c5..e193f1a 100644 --- a/ruoyi-ui/src/store/modules/settings.js +++ b/ruoyi-ui/src/store/modules/settings.js @@ -2,8 +2,8 @@ import defaultSettings from '@/settings' const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings // tagsView, -const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' -// const storageSetting = '' +// const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' +const storageSetting = '' const state = { title: '', theme: storageSetting.theme || '#409EFF', diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index b323c92..d51a795 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -1,13 +1,13 @@ import { login, logout, getInfo } from '@/api/login' -import { getToken, setToken, removeToken ,setname,getname,getschoolId,setschoolId,getmemberId,setroleId} from '@/utils/auth' +import * as cookie from '@/utils/auth' const user = { state: { - token: getToken(), - name: getname(), - schoolId: getschoolId(), + token: cookie.getToken(), + name: cookie.getname(), + schoolId: cookie.getschoolId(), classid: '', - memberId: getmemberId(), + memberId: cookie.getmemberId(), roles: [], permissions: [] }, @@ -42,10 +42,10 @@ const user = { const passwordEncode = userInfo.passwordEncode return new Promise((resolve, reject) => { login(username, passwordEncode).then(res => { - setToken(res.data.accessToken) - setname(res.data.name) - setschoolId(res.data.schoolId) - setroleId(res.data.roleId) + cookie.setToken(res.data.accessToken) + cookie.setname(res.data.name) + cookie.setschoolId(res.data.schoolId) + cookie.setroleId(res.data.roleId) const avatar = (user.avatar == '' || user.avatar == null) ? require('@/assets/images/profile.jpg') : process.env.VUE_APP_BASE_API + user.avatar commit('SET_TOKEN', res.data.accessToken) commit('SET_NAME', res.data.name) @@ -75,7 +75,6 @@ const user = { }) }) }, - // 退出系统 LogOut({ commit, state }) { return new Promise((resolve, reject) => { @@ -95,7 +94,15 @@ const user = { FedLogOut({ commit }) { return new Promise(resolve => { commit('SET_TOKEN', '') - removeToken() + cookie.removeToken() + // 删除username + cookie.removename() + // 删除schoolId + cookie.removeschoolId() + // 删除memberId + cookie.removememberId() + // 删除roleId + cookie.removeroleId() resolve() }) } diff --git a/ruoyi-ui/src/utils/auth.js b/ruoyi-ui/src/utils/auth.js index 6a82217..9a335ad 100644 --- a/ruoyi-ui/src/utils/auth.js +++ b/ruoyi-ui/src/utils/auth.js @@ -19,21 +19,37 @@ export function getname() { export function setname(name) { return Cookies.set(username, name) } +// 删除username +export function removename() { + return Cookies.remove(username) +} export function getschoolId() { return Cookies.get(schoolId) } export function setschoolId(id) { return Cookies.set(schoolId, id) } +// 删除schoolId +export function removeschoolId() { + return Cookies.remove(schoolId) +} export function getmemberId() { return Cookies.get(memberId) } export function setmemberId(id) { return Cookies.set(memberId, id) } +// 删除memberId +export function removememberId() { + return Cookies.remove(memberId) +} export function getroleId() { return Cookies.get(roleId) } export function setroleId(id) { return Cookies.set(roleId, id) -} \ No newline at end of file +} +// 删除roleId +export function removeroleId() { + return Cookies.remove(roleId) +} diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index 803be4d..42f3886 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -14,16 +14,17 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 - // baseURL: 'http://118.31.7.2:8800', + baseURL: 'http://118.31.7.2:8800', // baseURL: 'http://192.168.2.14:8800', - baseURL:"http://192.168.2.17:8800", + // baseURL:"http://192.168.2.17:8800", // baseURL: process.env.VUE_APP_BASE_API, // 超时 timeout: 200000 }) // request拦截器 - service.interceptors.request.use(config => { + //数组去重 用于去除重复的请求 + // 是否需要设置 token const isToken = (config.headers || {}).isToken === false // 是否需要防止数据重复提交