diff --git a/src/Manager/components/Role.vue b/src/Manager/components/Role.vue
index 1671434..4ca175f 100644
--- a/src/Manager/components/Role.vue
+++ b/src/Manager/components/Role.vue
@@ -44,32 +44,26 @@
>
-
-
- {{ record.role_name }}
+
+ {{ record.roleName }}
-
- {{record.role_id}}
+
+ {{record.displayName}}
-
-
- {{ tag.toUpperCase() }}
-
+
+ {{record.id}}
{{record.createdAt}}
@@ -103,10 +97,10 @@ const roleid = ref('');
const AddDiaLog = ref(false);
const DeleteDiaLog = ref(false);
const editDiaLog = ref(false);
-const token = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxNiIsImV4cCI6MTcwNzA0OTQxM30.E5c9_3_PTAKUpCTXmgX7PCN5giV9zp66b1JUesxXURM'
+const token = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxNiIsImV4cCI6MTcwNzk3NDM1MH0.pi7yFk4RMrUuAhfIz7DEtSahOWwNi55A4vCXimf4Eyo'
const states = reactive({
data:[]
-})
+});
const updateData = reactive({
id: 0,
name: '',
@@ -159,6 +153,8 @@ const addData = reactive({
function showAddDiaLog(){
AddDiaLog.value = true;
+ addData.name = '';
+ addData.displayName = '';
}
function addOk () {
@@ -271,18 +267,18 @@ function searchRole(){
const columns = [
{
title: '角色名称',
- dataIndex: 'role_name',
- key: 'role_name',
+ dataIndex: 'roleName',
+ key: 'roleName',
+ },
+ {
+ title: '角色备注',
+ dataIndex: 'displayName',
+ key:'displayName',
},
{
title: '排序',
- dataIndex: 'role_id',
- key: 'role_id',
- },
- {
- title: '角色状态',
- dataIndex: 'role_state',
- key: 'role_state',
+ dataIndex: 'id',
+ key: 'id',
},
{
title: '创建时间',
diff --git a/src/Manager/components/User.vue b/src/Manager/components/User.vue
index 8a7385d..9c98c55 100644
--- a/src/Manager/components/User.vue
+++ b/src/Manager/components/User.vue
@@ -208,7 +208,7 @@ const EditDiaLog = ref(false);
let dataSource = ref([]);
let data = ref([]);
const dataLoaded = ref(false);
-const token = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxNiIsImV4cCI6MTcwNzA0OTQxM30.E5c9_3_PTAKUpCTXmgX7PCN5giV9zp66b1JUesxXURM"
+const token = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxNiIsImV4cCI6MTcwNzk3NDM1MH0.pi7yFk4RMrUuAhfIz7DEtSahOWwNi55A4vCXimf4Eyo"
const requestBody = {
"page": null,
"limit": null,
@@ -523,7 +523,7 @@ async function fetchData() {
search: null,
role: null
},
- "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxNiIsImV4cCI6MTcwNzA0OTQxM30.E5c9_3_PTAKUpCTXmgX7PCN5giV9zp66b1JUesxXURM"
+ "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxNiIsImV4cCI6MTcwNzk3NDM1MH0.pi7yFk4RMrUuAhfIz7DEtSahOWwNi55A4vCXimf4Eyo"
);
console.log(queryData.data); // 访问数据
dataSource.value = queryData.data.data;