From 208d7f4cabf57d7ed68b9dcbc243cc434789f167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=89=E5=AE=89=E5=90=9B?= <2746727141@qq.com> Date: Wed, 27 Mar 2024 22:32:53 +0800 Subject: [PATCH] =?UTF-8?q?feat=20commit=20=E4=BC=81=E4=B8=9A=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/main.js | 3 + src/store/modules/user.js | 8 +++ src/utils/request.js | 2 +- src/views/system/dept/index.vue | 104 +++++++++++++++++++++++++++++++- src/views/system/user/index.vue | 9 +-- 6 files changed, 119 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 6a46cc5..c7a4c09 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "fuse.js": "6.4.3", "highlight.js": "9.18.5", "js-beautify": "1.13.0", - "js-cookie": "3.0.1", + "js-cookie": "^3.0.1", "jsencrypt": "3.0.0-rc.1", "nprogress": "0.2.0", "quill": "1.3.7", diff --git a/src/main.js b/src/main.js index 546f125..239603c 100644 --- a/src/main.js +++ b/src/main.js @@ -38,6 +38,9 @@ import VueMeta from 'vue-meta' // 字典数据组件 import DictData from '@/components/DictData' + +Vue.prototype.$cookies = Cookies; // 注入到Vue原型链上 + // 全局方法挂载 Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 6c109a6..3f7e8a4 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,5 +1,6 @@ import {getInfo, login, logout, refreshToken} from '@/api/login' import {getToken, removeToken, setExpiresIn, setToken} from '@/utils/auth' +import Cookies from "js-cookie"; const user = { state: { @@ -7,6 +8,7 @@ const user = { id: '', name: '', avatar: '', + companySign: '', roles: [], permissions: [] }, @@ -32,6 +34,9 @@ const user = { }, SET_PERMISSIONS: (state, permissions) => { state.permissions = permissions + }, + SET_COMPANY: (state, companySign) => { + Cookies.set('companySign', companySign) } }, @@ -60,6 +65,7 @@ const user = { GetInfo({commit, state}) { return new Promise((resolve, reject) => { getInfo().then(res => { + debugger const user = res.data.user const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar; if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 @@ -70,6 +76,8 @@ const user = { } commit('SET_ID', user.userId) commit('SET_NAME', user.userName) + let de = user.dept + commit('SET_COMPANY',de.companySign) commit('SET_AVATAR', avatar) resolve(res) }).catch(error => { diff --git a/src/utils/request.js b/src/utils/request.js index 47d1bcb..beb9f3a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -73,7 +73,7 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { - debugger + // debugger // 未设置状态码则默认成功状态 const code = res.data.code || 200; // 获取错误信息 diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 56df582..b0dc6d1 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -1,7 +1,15 @@