src/views/photos/index.vue

@@ -49,9 +49,9 @@
 						<el-image lazy :src="jpgFormatter(scope.row)" preview-teleported="true" :preview-src-list="[jpgFormatter(scope.row)]"/>
 					</template>
 				</el-table-column>
-				<el-table-column prop="moduleName" label="模块"  show-overflow-tooltip width="220px" align="center"></el-table-column>		
+				<el-table-column prop="moduleName" label="模块"  show-overflow-tooltip width="200px" align="center"></el-table-column>		
 				<el-table-column prop="labelName" label="标签"  show-overflow-tooltip width="200px" align="center"></el-table-column>		
-				<el-table-column prop="uploadName" label="上传者"  show-overflow-tooltip width="210px" align="center"></el-table-column>		
+				<el-table-column prop="uploadName" label="上传者"  show-overflow-tooltip width="200px" align="center"></el-table-column>		
 				<el-table-column prop="createtime" label="创建时间" :formatter="dateFormatter" show-overflow-tooltip width="200px" align="center"></el-table-column>
 				<el-table-column label="操作" width="250" align="center">
 					<template #default="scope">

src/views/usermanage/role/index.vue

@@ -30,10 +30,10 @@
 				<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 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 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>
@@ -125,6 +125,15 @@ const getTableData = async() => {
 	}
 };
 
+//查询角色
+const getroleDetail = async() =>{
+	try{
+		const res = await roleapi.getRoleDetail();
+	}catch(error){
+		console.error(error)
+	}
+};
+
 // 打开新增角色弹窗
 const onOpenAddRole = (type: string) => {