浏览代码

log: role type

sunhongyao341504 2 年之前
父节点
当前提交
514d89de55

+ 1 - 1
mock/login/info.ts

@@ -8,7 +8,7 @@ const info = {
   desc: '',
   password: '',
   token: '2d255659-ff5d-4d66-b856-385702672c21',
-  role_type: '10',
+  roleType: '10',
   permissions: [
     {
       label: '系统管理',

+ 2 - 2
mock/user/user.ts

@@ -49,7 +49,7 @@ const adminInfo = {
   desc: 'manager',
   password: Random.string('upper', 4, 16),
   token,
-  role_type: 1, // 1 超级管理员 2 普通管理员
+  roleType: 1, // 1 超级管理员 2 普通管理员
   permissions: [], // 权限集合
 };
 
@@ -92,7 +92,7 @@ export default [
       //const randomNum = Math.floor(Math.random() * 2 + 1);
       const randomNum = 1;
       adminInfo.permissions = (randomNum === 1 ? adminPermissions : ordinaryPermissions) as never[];
-      adminInfo.role_type = randomNum;
+      adminInfo.roleType = randomNum;
       return resultSuccess(adminInfo);
     },
   },

+ 2 - 2
src/views/system/role/CreateDrawer.vue

@@ -94,7 +94,7 @@
 
   const defaultValueRef = () => ({
     roleId: null,
-    role_type: null,
+    roleType: null,
     roleName: '',
     roleCode: '',
     remark: '',
@@ -185,7 +185,7 @@
           closeDrawer();
         });
       } else {
-        formParams.value.role_type = 2;
+        formParams.value.roleType = 2;
         addAdminRole(formParams.value).then((_) => {
           message.success('添加成功');
           emit('change');

+ 2 - 2
src/views/system/role/CreateUserDrawer.vue

@@ -320,7 +320,7 @@
           remark: formParams.value.remark,
           roleName: formParams.value.roleName,
           roleCode: formParams.value.roleCode,
-          role_type: 3,
+          roleType: 3,
           roleId: formParams.value.roleId,
         };
         updateRole(updateData).then((_) => {
@@ -335,7 +335,7 @@
           remark: formParams.value.remark,
           roleName: formParams.value.roleName,
           roleCode: formParams.value.roleCode,
-          role_type: 3,
+          roleType: 3,
         };
         addRole(addData).then((_) => {
           message.success('添加成功');

+ 2 - 2
src/views/system/role/columns.ts

@@ -9,13 +9,13 @@ export const columns: BasicColumn[] = [
   },
   {
     label: '角色类型',
-    prop: 'role_type',
+    prop: 'roleType',
     render(record) {
       return h(
         'span',
         {},
         {
-          default: () => roleTypeNames[record.row.role_type],
+          default: () => roleTypeNames[record.row.roleType],
         },
       );
     },

+ 4 - 4
src/views/system/role/role.vue

@@ -152,9 +152,9 @@
 
   function handleEdit(record: Recordable) {
     console.log('点击了编辑', record);
-    console.log('record.role_type', record.role_type);
+    console.log('record.roleType', record.roleType);
     drawerTitle.value = '编辑角色';
-    if (record.role_type === 1 || record.role_type === 2) {
+    if (record.roleType === 1 || record.roleType === 2) {
       const { openDrawer } = createDrawerRef.value;
       openDrawer(record.roleId);
     } else {
@@ -164,12 +164,12 @@
   }
 
   function handleDelete(record: Recordable) {
-    console.log('record.role_type', record.role_type);
+    console.log('record.roleType', record.roleType);
     if (userStore.getRoleTypes.includes(String(record.roleId))) {
       message.error('不能删除自己的角色');
       return;
     }
-    if (record.role_type === 1 || record.role_type === 2) {
+    if (record.roleType === 1 || record.roleType === 2) {
       delAdminRole({ roleId: record.roleId }).then(() => {
         message.success('删除成功');
         reloadTable();

+ 1 - 1
src/views/system/role/types/index.ts

@@ -1,6 +1,6 @@
 export interface formParamsType {
   roleId?: number | null;
-  role_type?: number | null;
+  roleType?: number | null;
   roleName: string;
   roleCode: string;
   remark: string;