From 7525c7418a9e5888c184dc0545fe8a35fc4f85fb Mon Sep 17 00:00:00 2001
From: Mrtangl <1807746833@qq.com>
Date: Fri, 15 Apr 2022 15:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AE=BE=E7=BD=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/auth.ts                         |   2 +-
 admin/src/api/user.ts                         |   3 +
 admin/src/core/hooks/pages.ts                 |   4 +-
 admin/src/layout/components/layout-header.vue |   5 +
 admin/src/router/modules/setting.ts           | 111 +++++++++---------
 admin/src/views/permission/role/edit.vue      |  15 ++-
 admin/src/views/permission/role/index.vue     |   2 +
 .../views/setting/personal/personal_data.vue  |   5 +-
 admin/src/views/setting/system/journal.vue    |  24 ++--
 9 files changed, 96 insertions(+), 75 deletions(-)

diff --git a/admin/src/api/auth.ts b/admin/src/api/auth.ts
index 2c4af26b..617e24bf 100644
--- a/admin/src/api/auth.ts
+++ b/admin/src/api/auth.ts
@@ -53,7 +53,7 @@ export function apiRoleDetail(params: any) {
 
 // 角色权限菜单
 export function apiConfigGetMenu() {
-    return request.get('/config/getMenu')
+    return request.get('/system/menu/lists')
 }
 
 // 角色权限
diff --git a/admin/src/api/user.ts b/admin/src/api/user.ts
index 44507b59..59a957b7 100644
--- a/admin/src/api/user.ts
+++ b/admin/src/api/user.ts
@@ -15,3 +15,6 @@ export function apiLogout() {
 export function apiUserInfo() {
     return request.get('/system/admin/self')
 }
+export function apiAdminUpInfo(params: any) {
+    return request.post('/system/admin/upInfo', params)
+}
diff --git a/admin/src/core/hooks/pages.ts b/admin/src/core/hooks/pages.ts
index 651d1855..ba595686 100644
--- a/admin/src/core/hooks/pages.ts
+++ b/admin/src/core/hooks/pages.ts
@@ -31,8 +31,8 @@ export function usePages(options: Options) {
         }
         pager.loading = true
         return callback({
-            page_no: pager.page,
-            page_size: pager.size,
+            pageNo: pager.page,
+            pageSize: pager.size,
             ...params
         })
             .then((res: any) => {
diff --git a/admin/src/layout/components/layout-header.vue b/admin/src/layout/components/layout-header.vue
index 439f586c..af5b9f5e 100644
--- a/admin/src/layout/components/layout-header.vue
+++ b/admin/src/layout/components/layout-header.vue
@@ -10,6 +10,11 @@
                         <el-icon class="el-icon--right"><arrow-down /></el-icon>
                     </div>
                     <template #dropdown>
+                        <el-dropdown-menu>
+                            <router-link to="/setting/personal/personal_data">
+                                <el-dropdown-item>个人设置</el-dropdown-item>
+                            </router-link>
+                        </el-dropdown-menu>
                         <el-dropdown-menu>
                             <el-dropdown-item command="logout">退出登录</el-dropdown-item>
                         </el-dropdown-menu>
diff --git a/admin/src/router/modules/setting.ts b/admin/src/router/modules/setting.ts
index 54f28b19..b7b78432 100644
--- a/admin/src/router/modules/setting.ts
+++ b/admin/src/router/modules/setting.ts
@@ -10,19 +10,19 @@ const routes: RouteRecordRaw = {
             path: '/setting/service',
             redirect: '/setting/service/online_service',
             component: RouterView,
-            meta: { 
-				title: '客服设置',
-				hidden: true,
-			},
+            meta: {
+                title: '客服设置',
+                hidden: true
+            },
             children: [
                 {
                     path: '/setting/service/online_service',
                     component: () => import('@/views/setting/service/online_service.vue'),
                     meta: {
-                        title: '在线客服',
-                    },
-                },
-            ],
+                        title: '在线客服'
+                    }
+                }
+            ]
         },
         {
             path: '/setting/website',
@@ -35,16 +35,16 @@ const routes: RouteRecordRaw = {
                     component: () => import('@/views/setting/website/information.vue'),
                     meta: {
                         title: '网站信息',
-                        permission: ['view'],
-                    },
+                        permission: ['view']
+                    }
                 },
                 {
                     path: '/setting/website/filing',
                     component: () => import('@/views/setting/website/filing.vue'),
                     meta: {
                         title: '备案信息',
-                        permission: ['view'],
-                    },
+                        permission: ['view']
+                    }
                 },
                 {
                     path: '/setting/website/protocol',
@@ -52,37 +52,37 @@ const routes: RouteRecordRaw = {
                     meta: {
                         title: '政策/协议',
                         permission: ['view'],
-						hidden: true,
-                    },
-                },
-            ],
+                        hidden: true
+                    }
+                }
+            ]
         },
         {
             path: '/setting/user',
             redirect: '/setting/user',
             component: RouterView,
-            meta: { 
-				title: '用户设置',
-				hidden: true,
-			},
+            meta: {
+                title: '用户设置',
+                hidden: true
+            },
             children: [
                 {
                     path: '/setting/user',
                     component: () => import('@/views/setting/user/index.vue'),
                     meta: {
                         title: '用户设置',
-                        permission: ['view'],
-                    },
+                        permission: ['view']
+                    }
                 },
                 {
                     path: '/setting/user/login',
                     component: () => import('@/views/setting/user/login.vue'),
                     meta: {
                         title: '登录注册',
-                        permission: ['view'],
-                    },
-                },
-            ],
+                        permission: ['view']
+                    }
+                }
+            ]
         },
         {
             path: '/setting/system',
@@ -95,37 +95,38 @@ const routes: RouteRecordRaw = {
                     component: () => import('@/views/setting/system/environment.vue'),
                     meta: {
                         title: '系统环境',
-                        permission: ['view'],
-                    },
+                        permission: ['view']
+                    }
                 },
-				{
-				    path: '/setting/website/journal',
-				    component: () => import('@/views/setting/system/journal.vue'),
-				    meta: {
-				        title: '系统日志',
-				        permission: ['view'],
-				    },
-				},
-				{
-				    path: '/setting/website/cache',
-				    component: () => import('@/views/setting/system/cache.vue'),
-				    meta: {
-				        title: '系统缓存',
-				        permission: ['view'],
-				    },
-				},
-            ],
+                {
+                    path: '/setting/website/journal',
+                    component: () => import('@/views/setting/system/journal.vue'),
+                    meta: {
+                        title: '系统日志',
+                        permission: ['view']
+                    }
+                },
+                {
+                    path: '/setting/website/cache',
+                    component: () => import('@/views/setting/system/cache.vue'),
+                    meta: {
+                        title: '系统缓存',
+                        permission: ['view']
+                    }
+                }
+            ]
         },
-		{
-		    // component: RouterView,
-			path: '/setting/personal/personal_data',
-			component: () => import('@/views/setting/personal/personal_data.vue'),
-			meta: {
-			    title: '个人设置',
-			    permission: ['view'],
-			},
-		},
-    ],
+        {
+            // component: RouterView,
+            path: '/setting/personal/personal_data',
+            component: () => import('@/views/setting/personal/personal_data.vue'),
+            meta: {
+                title: '个人设置',
+                permission: ['view'],
+                hidden: true
+            }
+        }
+    ]
 }
 
 export default routes
diff --git a/admin/src/views/permission/role/edit.vue b/admin/src/views/permission/role/edit.vue
index 382e16b6..b1dd9e27 100644
--- a/admin/src/views/permission/role/edit.vue
+++ b/admin/src/views/permission/role/edit.vue
@@ -26,6 +26,13 @@
                         :autosize="{ minRows: 4, maxRows: 6 }"
                     ></el-input>
                 </el-form-item>
+                <!-- 排序 -->
+                <el-form-item label="排序">
+                    <el-input v-model="formData.sort" placeholder="请输入" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="状态">
+                    <el-switch v-model="formData.isDisable" :active-value="0" :inactive-value="1" />
+                </el-form-item>
                 <!-- 权限 -->
                 <el-form-item label="权限" prop="auth_keys">
                     <div class="flex" style="margin-top: 3px">
@@ -40,8 +47,8 @@
                         default-expand-all
                         icon="ArrowRight"
                         :props="{
-                            children: 'sons',
-                            label: 'name'
+                            children: 'children',
+                            label: 'menuName'
                         }"
                         empty-text=""
                         show-checkbox
@@ -86,7 +93,9 @@ export default defineComponent({
                 formData: {
                     name: '', // 角色名称
                     remark: '', // 备注
-                    auth_keys: [] // 权限
+                    auth_keys: [], // 权限
+                    isDisable: 0,
+                    sort: ''
                 },
 
                 menu: {
diff --git a/admin/src/views/permission/role/index.vue b/admin/src/views/permission/role/index.vue
index d7ac59d2..96be8ef4 100644
--- a/admin/src/views/permission/role/index.vue
+++ b/admin/src/views/permission/role/index.vue
@@ -9,7 +9,9 @@
                     <el-table :data="pager.lists" size="medium">
                         <el-table-column prop="id" label="ID"></el-table-column>
                         <el-table-column prop="name" label="名称"></el-table-column>
+                        <el-table-column prop="sort" label="排序"></el-table-column>
                         <el-table-column prop="remark" label="备注"></el-table-column>
+                        <el-table-column prop="isDisable" label="状态"></el-table-column>
                         <el-table-column prop label="权限"></el-table-column>
                         <el-table-column prop="createTime" label="创建时间"></el-table-column>
                         <el-table-column prop label="操作">
diff --git a/admin/src/views/setting/personal/personal_data.vue b/admin/src/views/setting/personal/personal_data.vue
index 6af1ddaf..d46596b9 100644
--- a/admin/src/views/setting/personal/personal_data.vue
+++ b/admin/src/views/setting/personal/personal_data.vue
@@ -64,7 +64,7 @@ import type { ElForm } from 'element-plus'
 import MaterialSelect from '@/components/material-select/index.vue'
 import FooterBtns from '@/components/footer-btns/index.vue'
 import { apiAdminEdit, apiAdminDetail } from '@/api/auth'
-import { apiUserInfo } from '@/api/user'
+import { apiUserInfo, apiAdminUpInfo } from '@/api/user'
 import { ElMessage } from 'element-plus'
 import { useAdmin } from '@/core/hooks/app'
 
@@ -103,6 +103,7 @@ const rules = reactive<object>({
 // 获取个人设置
 const getAuthAdminMySelf = async (): Promise<void> => {
     formData.value = await apiUserInfo()
+    console.log(formData.value, 'formData')
 }
 
 // 设置个人设置
@@ -140,7 +141,7 @@ const setAuthAdminEditSelf = async (): Promise<void> => {
         }
     }
 
-    await apiAdminEdit({ ...formData.value })
+    await apiAdminUpInfo({ ...formData.value })
     getAuthAdminMySelf()
     store.dispatch('user/getUser')
 }
diff --git a/admin/src/views/setting/system/journal.vue b/admin/src/views/setting/system/journal.vue
index f99aab97..3ea1ff26 100644
--- a/admin/src/views/setting/system/journal.vue
+++ b/admin/src/views/setting/system/journal.vue
@@ -111,19 +111,19 @@ const visitType = ref<Array<any>>([
     {
         label: 'post',
         value: 'post'
-    },
-    {
-        label: 'put',
-        value: 'put'
-    },
-    {
-        label: 'delete',
-        value: 'delete'
-    },
-    {
-        label: 'option',
-        value: 'option'
     }
+    // {
+    //     label: 'put',
+    //     value: 'put'
+    // },
+    // {
+    //     label: 'delete',
+    //     value: 'delete'
+    // },
+    // {
+    //     label: 'option',
+    //     value: 'option'
+    // }
 ])
 
 const { pager, requestApi, resetParams, resetPage } = usePages({