From 33faa4621bed573b9077843923540c60464e7a48 Mon Sep 17 00:00:00 2001 From: liaoboping <344114999@qq.com> Date: Mon, 20 Oct 2025 16:40:31 +0800 Subject: [PATCH] coding --- public/index.html | 2 +- src/config/defaultSettings.js | 2 +- src/config/router.config.js | 2 +- src/store/modules/user.js | 117 +++++++++++++++------------- src/views/subsystem/model/index.vue | 2 +- src/views/user/Login.vue | 2 +- src/views/user/Welcome.vue | 2 + 7 files changed, 69 insertions(+), 60 deletions(-) diff --git a/public/index.html b/public/index.html index 1625d89..21b42ec 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - 某仿真分析方法工具 + 基于大数据的智能化后装保障链仿真分析方法工具 diff --git a/src/config/defaultSettings.js b/src/config/defaultSettings.js index df3d8ee..061ae60 100644 --- a/src/config/defaultSettings.js +++ b/src/config/defaultSettings.js @@ -23,7 +23,7 @@ export default { menu: { locale: true }, - title: '某仿真分析方法工具', + title: '基于大数据的智能化后装保障链仿真分析方法工具', pwa: false, iconfontUrl: '', production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true' diff --git a/src/config/router.config.js b/src/config/router.config.js index 010faf1..4b67e36 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -18,7 +18,7 @@ export const constantRouterMap = [ path: '/', name: 'index', component: RouteView, - meta: { title: '某仿真分析方法工具' }, + meta: { title: '基于大数据的智能化后装保障链仿真分析方法工具' }, redirect: '/user/welcome', }, { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 7f8be0d..c7222ba 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -10,7 +10,7 @@ const user = { welcome: '', avatar: '', roles: [], - info: {} + info: {}, }, mutations: { @@ -29,75 +29,82 @@ const user = { }, SET_INFO: (state, info) => { state.info = info - } + }, }, actions: { // 登录 - Login ({ commit }, userInfo) { + Login({ commit }, userInfo) { return new Promise((resolve, reject) => { - login(userInfo).then(response => { - console.log(response) - const result = response.data - storage.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) - commit('SET_TOKEN', result.token) - resolve() - }).catch(error => { - reject(error) - }) + login(userInfo) + .then((response) => { + console.log(response) + const result = response.data + storage.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) + commit('SET_TOKEN', result.token) + resolve() + }) + .catch((error) => { + reject(error) + }) }) }, // 获取用户信息 - GetInfo ({ commit }) { + GetInfo({ commit }) { return new Promise((resolve, reject) => { - getInfo().then(response => { - const result = response.data - if (result && result.id) { - localStorage.setItem('userId',result.id) - localStorage.setItem('uRealName', result.nickName) - } - if (result.roles && result.permissions.length > 0) { - const role = result.roles - role.permissions = result.permissions.filter(item => item) - role.permissions.map(per => { - if (per.actionEntitySet != null && per.actionEntitySet.length > 0) { - const action = per.actionEntitySet.map(action => { return action.action }) - per.actionList = action - } - }) - // role.permissionList = role.permissions.map(permission => { return permission }) - commit('SET_ROLES', result.roles) - commit('SET_INFO', result) - } else { - reject(new Error('getInfo: roles must be a non-null array !')) - } - commit('SET_NAME', { name: result.name, welcome: welcome() }) - commit('SET_AVATAR', result.avatar) - resolve(response) - }).catch(error => { - reject(error) - }) + getInfo() + .then((response) => { + const result = response.data + if (result && result.id) { + localStorage.setItem('userId', result.id) + localStorage.setItem('uRealName', result.nickName) + } + if (result.roles && result.permissions.length > 0) { + const role = result.roles + role.permissions = result.permissions.filter((item) => item) + role.permissions.map((per) => { + if (per.actionEntitySet != null && per.actionEntitySet.length > 0) { + const action = per.actionEntitySet.map((action) => { + return action.action + }) + per.actionList = action + } + }) + // role.permissionList = role.permissions.map(permission => { return permission }) + commit('SET_ROLES', result.roles.length === 0 ? ['bfa9086508284827b6a967d126dabeb'] : result.roles) + commit('SET_INFO', result) + } else { + reject(new Error('getInfo: roles must be a non-null array !')) + } + commit('SET_NAME', { name: result.name, welcome: welcome() }) + commit('SET_AVATAR', result.avatar) + resolve(response) + }) + .catch((error) => { + reject(error) + }) }) }, // 登出 - Logout ({ commit, state }) { + Logout({ commit, state }) { return new Promise((resolve) => { - logout(state.token).then(() => { - commit('SET_TOKEN', '') - commit('SET_ROLES', []) - storage.remove(ACCESS_TOKEN) - resolve() - }).catch((err) => { - console.log('logout fail:', err) - // resolve() - }).finally(() => { - }) + logout(state.token) + .then(() => { + commit('SET_TOKEN', '') + commit('SET_ROLES', []) + storage.remove(ACCESS_TOKEN) + resolve() + }) + .catch((err) => { + console.log('logout fail:', err) + // resolve() + }) + .finally(() => {}) }) - } - - } + }, + }, } -export default user \ No newline at end of file +export default user diff --git a/src/views/subsystem/model/index.vue b/src/views/subsystem/model/index.vue index b6fe91f..f14e11d 100644 --- a/src/views/subsystem/model/index.vue +++ b/src/views/subsystem/model/index.vue @@ -298,7 +298,7 @@ export default { if (item.children && item.children.length > 0) { this.getTree(newChildren, item.children, showKeys) } - if (newChildren.length > 0 || showKeys.includes(item.key)) { + if (newChildren.length > 0 || showKeys.includes(+item.key)) { target.push({ ...item, children: newChildren }) } }) diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 298e5f8..aa16368 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -1,6 +1,6 @@