finish dashboard/account

frontend/vben/src/router/menus/modules/dashboard.ts

@@ -11,14 +11,14 @@ const menu: MenuModule = {
         path: 'analysis',
         name: t('routes.dashboard.analysis'),
       },
-      {
-        path: 'account',
-        name: t('routes.dashboard.account'),
-      },
       {
         path: 'workbench',
         name: t('routes.dashboard.workbench'),
       },
+      {
+        path: 'account',
+        name: t('routes.dashboard.account'),
+      },
     ],
   },
 }

frontend/vben/src/router/routes/modules/dashboard.ts

@@ -25,6 +25,14 @@ const dashboard: AppRouteModule = {
         roles: [RoleEnum.SUPER],
       },
     },
+    {
+      path: 'workbench',
+      name: 'Workbench',
+      component: () => import('/@/views/dashboard/workbench/index.vue'),
+      meta: {
+        title: t('routes.dashboard.workbench'),
+      },
+    },
     {
       path: 'account',
       name: 'Account',
@@ -35,14 +43,6 @@ const dashboard: AppRouteModule = {
         roles: [RoleEnum.SUPER],
       },
     },
-    {
-      path: 'workbench',
-      name: 'Workbench',
-      component: () => import('/@/views/dashboard/workbench/index.vue'),
-      meta: {
-        title: t('routes.dashboard.workbench'),
-      },
-    },
   ],
 }
 

frontend/vben/src/views/dashboard/account/AccountModal.vue

@@ -16,6 +16,20 @@
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const rowId = ref('')
+      const roles = [
+        {
+          roleName: '课程组长',
+          value: 'super',
+        },
+        {
+          roleName: '归档代理',
+          value: 'filemgr',
+        },
+        {
+          roleName: '课程组员',
+          value: 'user',
+        },
+      ]
 
       const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
         labelWidth: 100,
@@ -27,20 +41,7 @@
             component: 'ApiSelect',
             componentProps: {
               api: () => {
-                return [
+                return roles
-                  {
-                    roleName: '课程组长',
-                    value: 'super',
-                  },
-                  {
-                    roleName: '归档代理',
-                    value: 'filemgr',
-                  },
-                  {
-                    roleName: '课程组员',
-                    value: 'user',
-                  },
-                ]
               },
               labelField: 'roleName',
               valueField: 'value',
@@ -75,17 +76,19 @@
         })
       })
 
+      const nick2id = { 课程组长: 1, super: 1, 归档代理: 2, filemgr: 2, 课程组员: 3, user: 3 }
+
       async function handleSubmit() {
         try {
           const values = await validate()
           setModalProps({ confirmLoading: true })
           closeModal()
           await setOthersInfoApi({ id: Number(rowId.value), nick: values.nick, desc: values.desc })
-          if (useUserStore().getUserInfo.userId != Number(rowId.value))
+          if (useUserStore().getUserInfo.userId != Number(rowId.value)) {
-            await setRole(
+            const rid = nick2id[values.role]
-              Number(rowId.value),
+            await setRole(Number(rowId.value), rid)
-              { 课程组长: 1, 归档代理: 2, 课程组员: 3 }[values.role],
+            values.role = roles[rid - 1].roleName
-            )
+          }
           emit('success', { values: { ...values, id: rowId.value } })
         } finally {
           setModalProps({ confirmLoading: false })