From 6786420cfd7a77808bddf5eda7c147467134421b Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 13 十二月 2023 16:05:58 +0800
Subject: [PATCH] 菜单配置
---
src/layout/components/Sidebar/menu.js | 15 +++++++++++++++
src/views/safetyReview/expertManage/applyRecords/index.vue | 5 +++--
src/views/safetyReview/expertManage/experts/index.vue | 5 +++--
src/layout/components/Navbar.vue | 12 ++++++------
src/views/components/loginForm.vue | 14 ++++++++++++--
5 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 7f3f305..13dc1d8 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -18,9 +18,9 @@
<screenfull id="screenfull" class="right-menu-item hover-effect" />
- <el-tooltip content="布局大小" effect="dark" placement="bottom">
- <size-select id="size-select" class="right-menu-item hover-effect" />
- </el-tooltip>
+<!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">-->
+<!-- <size-select id="size-select" class="right-menu-item hover-effect" />-->
+<!-- </el-tooltip>-->
</template>
<div class="avatar-container">
<el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
@@ -31,9 +31,9 @@
</div>
<template #dropdown>
<el-dropdown-menu>
- <router-link to="/user/profile">
- <el-dropdown-item>个人中心</el-dropdown-item>
- </router-link>
+<!-- <router-link to="/user/profile">-->
+<!-- <el-dropdown-item>个人中心</el-dropdown-item>-->
+<!-- </router-link>-->
<!-- <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">-->
<!-- <span>布局设置</span>-->
<!-- </el-dropdown-item>-->
diff --git a/src/layout/components/Sidebar/menu.js b/src/layout/components/Sidebar/menu.js
index 740cd71..7a0d0c2 100644
--- a/src/layout/components/Sidebar/menu.js
+++ b/src/layout/components/Sidebar/menu.js
@@ -84,6 +84,21 @@
]
},
+ ],
+ agencyMenu: [
+ {
+ path: '/userManage',
+ redirect: '/userManage/supervise',
+ meta: { title: '用户管理',icon: 'form'},
+ children: [
+ {
+ path: 'expertUsers',
+ name: 'expertUsers',
+ meta: { title: '专家用户管理',icon: 'form'}
+ } ,
+ ]
+ },
]
+
}
export default menu;
diff --git a/src/views/components/loginForm.vue b/src/views/components/loginForm.vue
index 51eddfd..0310923 100644
--- a/src/views/components/loginForm.vue
+++ b/src/views/components/loginForm.vue
@@ -148,12 +148,22 @@
// return acc;
// }, {});
const userInfo = JSON.parse(Cookies.get('userInfo'))
- if(userInfo.identity === 0 || userInfo.identity === 1 ) {
+ if(userInfo.identity === 0 ) {
sidebarRouters.value = menu.adminMenu
Cookies.set('routers',JSON.stringify(sidebarRouters.value))
+ }else if(userInfo.identity === 1) {
+ sidebarRouters.value = menu.agencyMenu
+ Cookies.set('routers',JSON.stringify(sidebarRouters.value))
}
+ let path = ""
+ if(sidebarRouters.value[0].children && sidebarRouters.value[0].children.length > 0){
+ path = sidebarRouters.value[0].path + '/'+ sidebarRouters.value[0].children[0].path
+ }else {
+ path = sidebarRouters.value[0].path
+ }
+
router.push({
- path: sidebarRouters.value[0].path
+ path: path
})
// router.push({ path: redirect.value || "/", query: otherQueryParams });
}).catch(() => {
diff --git a/src/views/safetyReview/expertManage/applyRecords/index.vue b/src/views/safetyReview/expertManage/applyRecords/index.vue
index 0da6ec7..339b230 100644
--- a/src/views/safetyReview/expertManage/applyRecords/index.vue
+++ b/src/views/safetyReview/expertManage/applyRecords/index.vue
@@ -3,6 +3,7 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="专业类别">
<el-cascader
+ clearable
v-model="classiFy"
:options="expertTypes"
:props="{ expandTrigger: 'hover', value: 'id',label: 'classifyName'}"
@@ -164,11 +165,11 @@
const handleQuery=()=> {
data.queryParams.pageNum = 1
- if(data.classiFy.length>0){
+ if(data.classiFy && data.classiFy.length>0){
data.queryParams.bigClassify = data.classiFy[0]
data.queryParams.smallClassify = data.classiFy[1]
}
- if(data.searchTime.length>0){
+ if(data.searchTime && data.searchTime.length>0){
data.queryParams.params.startTime = data.searchTime[0]
data.queryParams.params.endTime = data.searchTime[1]
}
diff --git a/src/views/safetyReview/expertManage/experts/index.vue b/src/views/safetyReview/expertManage/experts/index.vue
index ff3e984..01c8308 100644
--- a/src/views/safetyReview/expertManage/experts/index.vue
+++ b/src/views/safetyReview/expertManage/experts/index.vue
@@ -3,6 +3,7 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="专业类别">
<el-cascader
+ clearable
v-model="classiFy"
:options="expertTypes"
:props="{ expandTrigger: 'hover', value: 'id',label: 'classifyName'}"
@@ -138,11 +139,11 @@
const handleQuery=()=> {
data.queryParams.pageNum = 1
- if(data.classiFy.length>0){
+ if(data.classiFy && data.classiFy.length>0){
data.queryParams.bigClassify = data.classiFy[0]
data.queryParams.smallClassify = data.classiFy[1]
}
- if(data.searchTime.length>0){
+ if(data.searchTime && data.searchTime.length>0){
data.queryParams.params.startTime = data.searchTime[0]
data.queryParams.params.endTime = data.searchTime[1]
}
--
Gitblit v1.9.2