diff --git a/src/views/usermanage/role/dialog.vue b/src/views/usermanage/role/dialog.vue
index b39d6fa..40e2253 100644
--- a/src/views/usermanage/role/dialog.vue
+++ b/src/views/usermanage/role/dialog.vue
@@ -5,7 +5,7 @@
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="角色名称">
-							<el-input v-model="state.ruleForm.roleName" placeholder="请输入角色名称" clearable></el-input>
+							<el-input v-model="state.ruleForm.name" placeholder="请输入角色名称" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -15,22 +15,22 @@
 									<span>角色标识</span>
 								</el-tooltip>
 							</template>
-							<el-input v-model="state.ruleForm.roleSign" placeholder="请输入角色标识" clearable></el-input>
+							<el-input v-model="state.ruleForm.acgroup" placeholder="请输入角色标识" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="排序">
-							<el-input-number v-model="state.ruleForm.sort" :min="0" :max="999" controls-position="right" placeholder="请输入排序" class="w100" />
+							<el-input-number v-model="state.ruleForm.id" :min="0" :max="999" controls-position="right" placeholder="请输入排序" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="角色状态">
-							<el-switch v-model="state.ruleForm.status" inline-prompt active-text="启" inactive-text="禁"></el-switch>
+							<el-switch v-model="state.ruleForm.state" inline-prompt active-text="启" inactive-text="禁"></el-switch>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="角色描述">
-							<el-input v-model="state.ruleForm.describe" type="textarea" placeholder="请输入角色描述" maxlength="150"></el-input>
+							<el-input v-model="state.ruleForm.description" type="textarea" placeholder="请输入角色描述" maxlength="150"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -54,17 +54,17 @@
 import { reactive, ref } from 'vue';
 
 // 定义子组件向父组件传值/事件
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(['reset']);
 
 // 定义变量内容
 const roleDialogFormRef = ref();
 const state = reactive({
 	ruleForm: {
-		roleName: '', // 角色名称
-		roleSign: '', // 角色标识
-		sort: 0, // 排序
-		status: true, // 角色状态
-		describe: '', // 角色描述
+		name: '', // 角色名称
+		acgroup: '', // 角色标识
+		id: 0, // 排序
+		state: true, // 角色状态
+		description: '', // 角色描述
 	},
 	menuData: [] as TreeType[],
 	menuProps: {
@@ -80,7 +80,7 @@ const state = reactive({
 });
 
 // 打开弹窗
-const openDialog = (type: string, row: RowRoleType) => {
+const openDialog = (type: string, row: any) => {
 	if (type === 'edit') {
 		state.ruleForm = row;
 		state.dialog.title = '修改角色';
@@ -107,7 +107,7 @@ const onCancel = () => {
 // 提交
 const onSubmit = () => {
 	closeDialog();
-	emit('refresh');
+	emit('reset');
 	// if (state.dialog.type === 'add') { }
 };
 // 获取菜单结构数据
diff --git a/src/views/usermanage/role/index.vue b/src/views/usermanage/role/index.vue
index 7f303fe..5e321d0 100644
--- a/src/views/usermanage/role/index.vue
+++ b/src/views/usermanage/role/index.vue
@@ -18,23 +18,23 @@
 			</div>
 			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
 				<el-table-column type="index" label="序号" width="60" />
-				<el-table-column prop="roleName" label="角色名称" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="roleSign" label="角色标识" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="sort" label="排序" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="status" label="角色状态" show-overflow-tooltip>
+				<el-table-column prop="name" label="角色名称" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="acgroup" label="角色标识" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="id" label="排序" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="state" label="角色状态" show-overflow-tooltip>
 					<template #default="scope">
-						<el-tag type="success" v-if="scope.row.status">启用</el-tag>
+						<el-tag type="success" v-if="scope.row.state">启用</el-tag>
 						<el-tag type="info" v-else>禁用</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="describe" label="角色描述" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="description" label="角色描述" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="createtime" label="创建时间" :formatter="dateFormatter" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="100">
 					<template #default="scope">
-						<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary" @click="onOpenEditRole('edit', scope.row)"
+						<el-button :disabled="scope.row.name === '管理员'" size="small" text type="primary" @click="onOpenEditRole('edit', scope.row)"
 							>修改</el-button
 						>
-						<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
+						<el-button :disabled="scope.row.name === '管理员'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -52,17 +52,20 @@
 			>
 			</el-pagination>
 		</div>
-		<RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
+		<RoleDialog ref="roleDialogRef" @reset="reset" />
 	</div>
 </template>
 
 <script setup lang="ts" name="systemRole">
 import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
-import { ElMessageBox, ElMessage } from 'element-plus';
+import { ElMessageBox, ElMessage,TableColumnCtx } from 'element-plus';
+import { RoleApi } from '/@/api/role';
 
 // 引入组件
 const RoleDialog = defineAsyncComponent(() => import('/@/views/usermanage/role/dialog.vue'));
 
+const roleapi = RoleApi();
+
 // 定义变量内容
 const roleDialogRef = ref();
 const state = reactive<SysRoleState>({
@@ -78,24 +81,39 @@ const state = reactive<SysRoleState>({
 	},
 });
 // 初始化表格数据
-const getTableData = () => {
+const getTableData = async() => {
 	state.tableData.loading = true;
-	const data = [];
-	for (let i = 0; i < 20; i++) {
-		data.push({
-			roleName: i === 0 ? '超级管理员' : '普通用户',
-			roleSign: i === 0 ? 'admin' : 'common',
-			describe: `测试角色${i + 1}`,
-			sort: i,
-			status: true,
-			createTime: new Date().toLocaleString(),
-		});
+	// const data = [];
+	// for (let i = 0; i < 20; i++) {
+	// 	data.push({
+	// 		roleName: i === 0 ? '超级管理员' : '普通用户',
+	// 		roleSign: i === 0 ? 'admin' : 'common',
+	// 		describe: `测试角色${i + 1}`,
+	// 		sort: i,
+	// 		status: true,
+	// 		createTime: new Date().toLocaleString(),
+	// 	});
+	// }
+	// state.tableData.data = data;
+	// state.tableData.total = state.tableData.data.length;
+	
+	try{
+		const res = await roleapi.getRoleList(state.tableData.param);
+		// console.log(res.data);
+		if(res?.success){
+			state.tableData.data = res.data.records;
+			state.tableData.total = res.data.total;
+			// console.log(state.tableData.data);
+		}else{
+      ElMessage.error('角色列表获取失败！');
+    }
+	}catch(error){
+		console.error(error);
+	}finally{
+		setTimeout(() => {
+				state.tableData.loading = false;
+			}, 500);
 	}
-	state.tableData.data = data;
-	state.tableData.total = state.tableData.data.length;
-	setTimeout(() => {
-		state.tableData.loading = false;
-	}, 500);
 };
 // 打开新增角色弹窗
 const onOpenAddRole = (type: string) => {
@@ -106,18 +124,49 @@ const onOpenEditRole = (type: string, row: Object) => {
 	roleDialogRef.value.openDialog(type, row);
 };
 // 删除角色
-const onRowDel = (row: RowRoleType) => {
-	ElMessageBox.confirm(`此操作将永久删除角色名称：“${row.roleName}”，是否继续?`, '提示', {
+const onRowDel = (row: any) => {
+	ElMessageBox.confirm(`此操作将永久删除角色名称：“${row.name}”，是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',
 	})
-		.then(() => {
-			getTableData();
-			ElMessage.success('删除成功');
+		.then(async() => {
+			// getTableData();
+			// ElMessage.success('删除成功');
+			try{
+				state.tableData.loading = true;
+				const res = await roleapi.deleteRole(row.id);
+				if(res?.success){
+					reset();
+					ElMessage.success('角色删除成功！');
+
+				} else ElMessage.error('角色删除失败！');
+			}catch(error){
+				ElMessage.error('处理失败！');
+			}finally{
+				state.tableData.loading = false;
+			}
 		})
-		.catch(() => {});
 };
+
+// 重置
+const reset = (index = 0) =>{
+  state.tableData.param = {
+    // moduleid:moduleList.value
+    pageNum: index ? state.tableData.param.pageNum : 1,
+    pageSize: 10,
+  },
+  console.log(index,state.tableData.param);
+  getTableData();
+};
+
+
+// 日期格式化
+const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
+  let date = new Date(row.createtime);
+  return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
+};
+
 // 分页改变
 const onHandleSizeChange = (val: number) => {
 	state.tableData.param.pageSize = val;