diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 485eca7..3d774e6 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -21,7 +21,8 @@ function hasPermission(roles, route) { */ export function filterAsyncRoutes(routes, roles) { const res = [] - const data = JSON.parse(getLoginData())?.menuRole || 1 + const loginData = getLoginData() + const data = loginData?.menuRole || 1 routes.forEach(route => { const tmp = { ...route } if (hasPermission(roles, tmp)) { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index e268f8c..da6f9bc 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -20,6 +20,7 @@ const mutations = { }, SET_LOGIN_DATA: (state, data) => { state.loginData = data + console.log(state, data.udpPage) setLoginData(data) }, SET_KEY: (state, key) => { diff --git a/src/utils/auth.js b/src/utils/auth.js index e7ed8ca..5ec8143 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -15,11 +15,14 @@ export function setToken(token) { } export function getLoginData() { - return Cookies.get(LoginData) + const data = Cookies.get(LoginData) + return data ? JSON.parse(data) : null + // return Cookies.get(LoginData) } export function setLoginData(data) { - return Cookies.set(LoginData, data) + // return Cookies.set(LoginData, data) + return Cookies.set(LoginData, JSON.stringify(data)) } export function getKey() { diff --git a/src/views/agreement/index.vue b/src/views/agreement/index.vue index 043ed6a..284a744 100644 --- a/src/views/agreement/index.vue +++ b/src/views/agreement/index.vue @@ -4,15 +4,19 @@ {{ $t("route.agreement") }}
- + { if (res.code === 200) { this.$message({ @@ -611,6 +614,9 @@ export default { }) } }) + }, + changeTab(item, index) { + console.log(item, index) } } } diff --git a/src/views/firmwareUpdate/index.vue b/src/views/firmwareUpdate/index.vue index 9263e74..adeea2e 100644 --- a/src/views/firmwareUpdate/index.vue +++ b/src/views/firmwareUpdate/index.vue @@ -103,7 +103,7 @@ export default { }) return } - if (files.size / 1024 / 1024 > 5) { + if (files.size / 1024 / 1024 > 30) { this.$message({ type: 'error', message: this.$i18n.t('table.fileSizeTip') diff --git a/src/views/program/index.vue b/src/views/program/index.vue index 400d471..d44e810 100644 --- a/src/views/program/index.vue +++ b/src/views/program/index.vue @@ -14,42 +14,42 @@
{{ $t("table.upload") }} @@ -255,7 +255,7 @@ export default { }) return } - if (files.size / 1024 / 1024 > 5) { + if (files.size / 1024 / 1024 > 30) { this.$message({ type: 'error', message: this.$i18n.t('table.fileSizeTip')