diff --git a/src/assets/images/grayAddIcon.png b/src/assets/images/grayAddIcon.png new file mode 100644 index 0000000..4b2a651 Binary files /dev/null and b/src/assets/images/grayAddIcon.png differ diff --git a/src/assets/images/login-background1.png b/src/assets/images/login-background1.png new file mode 100644 index 0000000..1ebb2d3 Binary files /dev/null and b/src/assets/images/login-background1.png differ diff --git a/src/assets/images/loginBg.png b/src/assets/images/loginBg.png new file mode 100644 index 0000000..2150428 Binary files /dev/null and b/src/assets/images/loginBg.png differ diff --git a/src/assets/images/loginSpliteLine.png b/src/assets/images/loginSpliteLine.png new file mode 100644 index 0000000..f0167b6 Binary files /dev/null and b/src/assets/images/loginSpliteLine.png differ diff --git a/src/assets/images/systemLogo1.png b/src/assets/images/systemLogo1.png new file mode 100644 index 0000000..b2dd54b Binary files /dev/null and b/src/assets/images/systemLogo1.png differ diff --git a/src/assets/images/systemLogo2.png b/src/assets/images/systemLogo2.png new file mode 100644 index 0000000..ca57558 Binary files /dev/null and b/src/assets/images/systemLogo2.png differ diff --git a/src/layout/components/Navbar copy.vue b/src/layout/components/Navbar copy.vue index cab43c5..402a1dc 100644 --- a/src/layout/components/Navbar copy.vue +++ b/src/layout/components/Navbar copy.vue @@ -95,7 +95,7 @@ function logout() { type: 'warning' }).then(() => { userStore.logOut().then(() => { - location.href = '/index' + location.href = '/qualification/myQualifications' }) }).catch(() => { }) } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 70364aa..e87912b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -109,7 +109,7 @@ function logout() { type: 'warning' }).then(() => { userStore.logOut().then(() => { - location.href = '/index' + location.href = '/qualification/myQualifications' }) }).catch(() => { }) } diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index ad2b8ca..1fc5847 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -101,7 +101,7 @@ function isAffix(tag) { function isFirstView() { try { - return selectedTag.value.fullPath === '/index' || selectedTag.value.fullPath === visitedViews.value[1].fullPath + return selectedTag.value.fullPath === '/qualification/myQualifications' || selectedTag.value.fullPath === visitedViews.value[1].fullPath } catch (err) { return false } diff --git a/src/permission.js b/src/permission.js index 7e3b5bf..c7853d1 100644 --- a/src/permission.js +++ b/src/permission.js @@ -11,7 +11,7 @@ import usePermissionStore from '@/store/modules/permission' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register'] +const whiteList = ['/login', '/register', '/forgetPassword'] const isWhiteList = (path) => { return whiteList.some(pattern => isPathMatch(pattern, path)) @@ -23,7 +23,7 @@ router.beforeEach((to, from, next) => { to.meta.title && useSettingsStore().setTitle(to.meta.title) /* has token*/ if (to.path === '/login') { - next({ path: '/' }) + next({ path: '/qualification/myQualifications' }) NProgress.done() } else if (isWhiteList(to.path)) { next() @@ -45,7 +45,7 @@ router.beforeEach((to, from, next) => { }).catch(err => { useUserStore().logOut().then(() => { ElMessage.error(err) - next({ path: '/' }) + next({ path: '/qualification/myQualifications' }) }) }) } else { @@ -58,7 +58,9 @@ router.beforeEach((to, from, next) => { // 在免登录白名单,直接进入 next() } else { - next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + console.log('sdfaf', to.fullPath) + // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next(`/login?redirect=/qualification/myQualifications`) NProgress.done() } } diff --git a/src/router/index.js b/src/router/index.js index f4f108f..c3a505b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -47,6 +47,11 @@ export const constantRoutes = [ component: () => import('@/views/register'), hidden: true }, + { + path: '/forgetPassword', + component: () => import('@/views/forgetPassword'), + hidden: true + }, { path: "/:pathMatch(.*)*", component: () => import('@/views/error/404'), @@ -64,7 +69,7 @@ export const constantRoutes = [ children: [ { path: '/index', - component: () => import('@/views/index'), + component: () => import('@/views/qualification/myQualifications/index'), name: 'Index', meta: { title: '首页', icon: 'dashboard', affix: true } }, @@ -242,6 +247,21 @@ export const dynamicRoutes = [ } ] }, + + { + path: '/system/userApproval/userApprovalDetail', + component: Layout, + hidden: true, + permissions: ['system:userApproval:approval'], + children: [ + { + path: '', + component: () => import('@/views/system/userApproval/userApprovalDetail'), + name: 'userApprovalDetail', + meta: { title: '新用户审批', activeMenu: '/system/userApproval' } + } + ] + }, { path: '/system/user-auth', component: Layout, diff --git a/src/utils/request.js b/src/utils/request.js index e2e7e49..911e08b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -87,7 +87,7 @@ service.interceptors.response.use(res => { ElMessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { isRelogin.show = false useUserStore().logOut().then(() => { - location.href = '/index' + location.href = '/qualification/myQualifications' }) }).catch(() => { isRelogin.show = false diff --git a/src/views/error/404.vue b/src/views/error/404.vue index f205303..82b0bb1 100644 --- a/src/views/error/404.vue +++ b/src/views/error/404.vue @@ -17,7 +17,7 @@
对不起,您正在寻找的页面不存在。尝试检查URL的错误,然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
- + 返回首页 diff --git a/src/views/forgetPassword.vue b/src/views/forgetPassword.vue new file mode 100644 index 0000000..71fddec --- /dev/null +++ b/src/views/forgetPassword.vue @@ -0,0 +1,240 @@ + + + + + diff --git a/src/views/login.vue b/src/views/login.vue index 8b64e6b..c212ca8 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,74 +1,104 @@ diff --git a/src/views/safetyReview/dashboard/index.vue b/src/views/safetyReview/dashboard/index.vue index 1c8d445..dddbdb8 100644 --- a/src/views/safetyReview/dashboard/index.vue +++ b/src/views/safetyReview/dashboard/index.vue @@ -2,7 +2,7 @@
-
+
@@ -98,9 +98,9 @@ const resetQuery = () => { handleQuery() } onMounted(() => { - initQualificationPer(); - initQualificationBar(); - initVehicleTrainBar(); + // initQualificationPer(); + // initQualificationBar(); + // initVehicleTrainBar(); }); const dataCake = [ { value: 2562, name: 'SH', percentage: '15.86%' }, diff --git a/src/views/safetyReview/examinerTasks/addTaskForm.vue b/src/views/safetyReview/examinerTasks/addTaskForm.vue index 0d51849..d762e40 100644 --- a/src/views/safetyReview/examinerTasks/addTaskForm.vue +++ b/src/views/safetyReview/examinerTasks/addTaskForm.vue @@ -16,81 +16,114 @@ 新增
- +
基本信息
- + - + - + - + - + - + - + + + + - + + + + - + + + + - + + + + - - - + + + +
问题追踪
+
+ + + {{ item }} + + +
- - - +
+ + - + + - + + + + - + + + + + + + 新增 +
@@ -106,6 +139,7 @@ + + \ No newline at end of file diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index 4869f94..9260aa8 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -1,129 +1,96 @@