diff --git a/src/assets/img/choicepart/factory-back.png b/src/assets/img/choicepart/factory-back.png new file mode 100644 index 0000000..6c5087d Binary files /dev/null and b/src/assets/img/choicepart/factory-back.png differ diff --git a/src/assets/img/choicepart/factory-model.png b/src/assets/img/choicepart/factory-model.png new file mode 100644 index 0000000..b029736 Binary files /dev/null and b/src/assets/img/choicepart/factory-model.png differ diff --git a/src/components/baseContainer/index.vue b/src/components/baseContainer/index.vue new file mode 100644 index 0000000..f3ea65f --- /dev/null +++ b/src/components/baseContainer/index.vue @@ -0,0 +1,143 @@ + + + + + + diff --git a/src/components/baseTable.vue b/src/components/baseTable.vue new file mode 100644 index 0000000..72c5573 --- /dev/null +++ b/src/components/baseTable.vue @@ -0,0 +1,176 @@ + + + + diff --git a/src/icons/svg/home-old.svg b/src/icons/svg/home-old.svg new file mode 100644 index 0000000..4e97c20 --- /dev/null +++ b/src/icons/svg/home-old.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/home.svg b/src/icons/svg/home.svg index 4e97c20..44052d2 100644 --- a/src/icons/svg/home.svg +++ b/src/icons/svg/home.svg @@ -1 +1,13 @@ - \ No newline at end of file + + + 首页 + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/logout-old.svg b/src/icons/svg/logout-old.svg new file mode 100644 index 0000000..5a5ca14 --- /dev/null +++ b/src/icons/svg/logout-old.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/logout.svg b/src/icons/svg/logout.svg index 5a5ca14..d09a3ac 100644 --- a/src/icons/svg/logout.svg +++ b/src/icons/svg/logout.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + 退出 + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/material.svg b/src/icons/svg/material.svg new file mode 100644 index 0000000..06f206b --- /dev/null +++ b/src/icons/svg/material.svg @@ -0,0 +1,14 @@ + + + 物料信息 + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/signal-error.svg b/src/icons/svg/signal-error.svg new file mode 100644 index 0000000..e8af75c --- /dev/null +++ b/src/icons/svg/signal-error.svg @@ -0,0 +1,28 @@ + + + 通信备份 2 + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/signal-warning.svg b/src/icons/svg/signal-warning.svg new file mode 100644 index 0000000..734dcc3 --- /dev/null +++ b/src/icons/svg/signal-warning.svg @@ -0,0 +1,28 @@ + + + 通信备份 + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/signal.svg b/src/icons/svg/signal.svg new file mode 100644 index 0000000..e7533ab --- /dev/null +++ b/src/icons/svg/signal.svg @@ -0,0 +1,28 @@ + + + 通信 + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/store/modules/user.js b/src/store/modules/user.js index e51be17..b274b42 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,6 +1,6 @@ import { login, getUserInfo } from '@/api/user' import { getToken, setToken, removeToken } from '@/utils/auth' -import router, { resetRouter } from '@/router' +import router from '@/router' import Cookies from 'js-cookie' const state = { @@ -49,6 +49,8 @@ const actions = { commit('SET_TOKEN', token) commit('SET_USERNAME', name) Cookies.set('username', name) + Cookies.set('account', username) + Cookies.set('password', password) setToken(token) resolve() } else { @@ -93,13 +95,14 @@ const actions = { logout({ commit, state, dispatch }) { return new Promise((resolve, reject) => { removeToken() - resetRouter() dispatch('tagsView/delAllViews', null, { root: true }) commit('SET_TOKEN', '') commit('SET_ROLES', []) commit('SET_MENUS', []) commit('SET_USERNAME') Cookies.set('username', '') + Cookies.set('account', '') + Cookies.set('password', '') localStorage.clear() resolve() // logout(state.token).then(() => { @@ -139,8 +142,6 @@ const actions = { const { roles } = await dispatch('getInfo') - resetRouter() - // generate accessible routes map based on roles const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true }) diff --git a/src/views/factory.vue b/src/views/factory.vue index 3f74738..5813229 100644 --- a/src/views/factory.vue +++ b/src/views/factory.vue @@ -9,17 +9,36 @@ 合 肥 新 能 源 数 字 工 厂 - {{ time }} + + {{ time }} + + + + + + + + + + + + @@ -115,6 +123,15 @@ export default { position: relative; right: 84px; font-size: 32px; + span { + position: relative; + .item-icon { + position: absolute; + top: 0; + right: -56px; + cursor: pointer; + } + } } .navbar-title { .navbar-title-icon { diff --git a/src/views/login.vue b/src/views/login.vue index 6809aef..ad3f4dc 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -96,8 +96,6 @@