From 6bea47f42861ce681bcbb8c656c1772c6e525ecf Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Wed, 13 Nov 2024 16:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/layout/components/Sidebar/menu.js |   83 ++++++++++++++++++++++++++---------------
 1 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/src/layout/components/Sidebar/menu.js b/src/layout/components/Sidebar/menu.js
index 20c8ce0..cd8694b 100644
--- a/src/layout/components/Sidebar/menu.js
+++ b/src/layout/components/Sidebar/menu.js
@@ -7,88 +7,98 @@
             meta: { title: '项目管理',icon: 'form',affix: true }
         },
         {
+            path: '/projectSupplement',
+            name: 'projectSupplement',
+            meta: { title: '项目补录',icon: 'form',affix: true }
+        },
+        {
             path: '/institution',
             name: 'Institution',
-            meta: { title: '机构公示',icon: 'form',affix: true }
+            meta: { title: '机构公示',icon: 'chart',affix: true }
         },
         {
             path: '/notice',
             name: 'Notice',
-            meta: { title: '公告发布',icon: 'form', affix: true }
+            meta: { title: '公告发布',icon: 'email', affix: true }
         },
         {
             path: '/law',
             name: 'Law',
-            meta: { title: '法律法规',icon: 'form', affix: true }
+            meta: { title: '法律法规',icon: 'excel', affix: true }
         },
         {
             path: '/userManage',
             redirect: '/userManage/supervise',
-            meta: { title: '用户管理',icon: 'form'},
+            meta: { title: '用户管理',icon: 'peoples'},
             children: [
                 {
                     path: 'supervise',
                     name: 'supervise',
-                    meta: { title: '监管用户管理',icon: 'form'}
+                    meta: { title: '监管用户管理',icon: 'monitor'}
                 },
                 {
                     path: 'institutionUser',
                     name: 'institutionUser',
-                    meta: { title: '机构用户管理',icon: 'form'}
+                    meta: { title: '机构用户管理',icon: 'list'}
                 },
                 {
                     path: 'expertUsers',
                     name: 'expertUsers',
-                    meta: { title: '专家用户管理',icon: 'form'}
+                    meta: { title: '专家用户管理',icon: 'logininfor'}
                 }
             ]
         },
         {
             path: '/expertManage',
             redirect: '/expertManage/experts',
-            meta: { title: '厅专家库管理',icon: 'form'},
+            meta: { title: '厅专家库管理',icon: 'post'},
             children: [
                 {
                     path: 'experts',
                     name: 'experts',
-                    meta: { title: '厅专家库',icon: 'form'}
+                    meta: { title: '厅专家库',icon: 'server'}
                 },
                 {
                     path: 'applyRecords',
                     name: 'applyRecords',
-                    meta: { title: '专家申请记录',icon: 'form'}
+                    meta: { title: '专家申请记录',icon: 'skill'}
                 }
             ]
         },
         {
-            path: '/baseSet',
-            redirect: '/baseSet/evaluate',
-            meta: { title: '基础设置',icon: 'form'},
+            path: '/postEvaluation',
+            name: '/postEvaluation',
+            meta: { title: '事后考评',icon: 'post'}
+        },
+        {
+            path: '/evaluateRecord',
+            name: '/evaluateRecord',
+            meta: { title: '专家考评记录',icon: 'post'}
+        },
+        {
+            path: '/system',
+            redirect: '/system/dept',
+            meta: { title: '系统设置',icon: 'dict'},
             children: [
                 {
-                    path: 'evaluate',
-                    name: 'evaluate',
-                    meta: { title: '评价类型管理',icon: 'form'}
+                    path: 'dept',
+                    name: 'dept',
+                    meta: { title: '部门处室管理',icon: 'build'}
                 },
                 {
                     path: 'expertsType',
                     name: 'expertsType',
-                    meta: { title: '专家类型管理',icon: 'form'}
+                    meta: { title: '专业领域管理',icon: 'clipboard'}
                 },
                 {
-                    path: 'business',
-                    name: 'business',
-                    meta: { title: '业务范围管理',icon: 'form'}
+                    path: 'evaluate',
+                    name: 'evaluate',
+                    meta: { title: '考评项目管理',icon: 'build'}
                 },
                 {
-                    path: 'area',
-                    name: 'area',
-                    meta: { title: '地区维护管理',icon: 'form'}
-                },
-                {
-                    path: 'major',
-                    name: 'major',
-                    meta: { title: '专业方向管理',icon: 'form'}
+                    path: 'openApply',
+                    name: 'openApply',
+                    meta: { title: '专家申请设置',icon: 'cascader'}
                 }
 
             ]
@@ -102,17 +112,30 @@
             meta: { title: '项目管理',icon: 'form',affix: true }
         },
         {
+            path: '/projectSupplement',
+            name: 'projectSupplement',
+            meta: { title: '项目补录',icon: 'form',affix: true }
+        },
+
+        {
             path: '/userManage',
             redirect: '/userManage/supervise',
-            meta: { title: '用户管理',icon: 'form'},
+            meta: { title: '用户管理',icon: 'peoples'},
             children: [
                 {
                     path: 'expertUsers',
                     name: 'expertUsers',
-                    meta: { title: '专家用户管理',icon: 'form'}
+                    meta: { title: '专家用户管理',icon: 'logininfor'}
                 } ,
             ]
         },
+    ],
+    noMenu: [
+        {
+            path: '/noMenu',
+            name: 'noMenu',
+            meta: { title: '提示',icon: 'form',affix: true }
+        },
     ]
 
 }

--
Gitblit v1.9.2