Quellcode durchsuchen

增加按钮权限状态(自定义指令v-auth)

zuohuaijun vor 3 Jahren
Ursprung
Commit
be98e05884

+ 1 - 0
Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -58,6 +58,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=252885263002254, Pid=252885263002250, Title="职位删除", Permission="sysPos:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
             new SysMenu{ Id=252885263002254, Pid=252885263002250, Title="职位删除", Permission="sysPos:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
 
 
             new SysMenu{ Id=252885263002260, Pid=252885263002200, Title="修改密码", Path="/system/password", Name="sysPassword", Component="/system/password/index",Icon="ele-Hide", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=150 },
             new SysMenu{ Id=252885263002260, Pid=252885263002200, Title="修改密码", Path="/system/password", Name="sysPassword", Component="/system/password/index",Icon="ele-Hide", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=150 },
+            new SysMenu{ Id=252885263002261, Pid=252885263002260, Title="修改密码", Permission="sysPassword:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
 
 
             new SysMenu{ Id=252885263002300, Pid=0, Title="平台管理", Path="/platform", Name="platform", Component="Layout", Redirect="/platform/tenant", Icon="ele-Menu", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=200 },
             new SysMenu{ Id=252885263002300, Pid=0, Title="平台管理", Path="/platform", Name="platform", Component="Layout", Redirect="/platform/tenant", Icon="ele-Menu", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=200 },
 
 

+ 4 - 4
Web/src/views/system/config/index.vue

@@ -10,8 +10,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddConfig"> 新增 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysConfig:page'"> 查询 </el-button>
+					<el-button icon="ele-Plus" @click="openAddConfig" v-auth="'sysConfig:add'"> 新增 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>
@@ -34,8 +34,8 @@
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditConfig(scope.row)"> 编辑 </el-button>
-						<el-button icon="ele-Delete" size="small" text type="danger" @click="delConfig(scope.row)"> 删除 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditConfig(scope.row)" v-auth="'sysConfig:update'"> 编辑 </el-button>
+						<el-button icon="ele-Delete" size="small" text type="danger" @click="delConfig(scope.row)" v-auth="'sysConfig:delete'"> 删除 </el-button>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 			</el-table>
 			</el-table>

+ 5 - 5
Web/src/views/system/dict/index.vue

@@ -10,8 +10,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddDictType"> 新增 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysDict:page'"> 查询 </el-button>
+					<el-button icon="ele-Plus" @click="openAddDictType" v-auth="'sysDict:add'"> 新增 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>
@@ -32,9 +32,9 @@
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="210" fixed="right" align="center" show-overflow-tooltip>
 				<el-table-column label="操作" width="210" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditDictType(scope.row)"> 编辑 </el-button>
-						<el-button icon="ele-Memo" size="small" text type="primary" @click="openDictDataDialog(scope.row)"> 字典 </el-button>
-						<el-button icon="ele-Delete" size="small" text type="danger" @click="delDictType(scope.row)"> 删除 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditDictType(scope.row)" v-auth="'sysDict:update'"> 编辑 </el-button>
+						<el-button icon="ele-Memo" size="small" text type="primary" @click="openDictDataDialog(scope.row)" v-auth="'sysDict:page'"> 字典 </el-button>
+						<el-button icon="ele-Delete" size="small" text type="danger" @click="delDictType(scope.row)" v-auth="'sysDict:delete'"> 删除 </el-button>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 			</el-table>
 			</el-table>

+ 4 - 4
Web/src/views/system/file/index.vue

@@ -13,8 +13,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery">重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery">重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery">查询 </el-button>
-					<el-button icon="ele-UploadFilled" @click="openUploadDialog">上传 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysFile:page'">查询 </el-button>
+					<el-button icon="ele-UploadFilled" @click="openUploadDialog" v-auth="'sysFile:upload'">上传 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>
@@ -49,8 +49,8 @@
 				<el-table-column prop="createTime" label="创建时间" align="center" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="createTime" label="创建时间" align="center" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 					<template #default="scope">
-						<el-button icon="ele-Download" size="small" text type="primary" @click="downloadFile(scope.row)"> 下载 </el-button>
-						<el-button icon="ele-Delete" size="small" text type="danger" @click="delFile(scope.row)"> 删除 </el-button>
+						<el-button icon="ele-Download" size="small" text type="primary" @click="downloadFile(scope.row)" v-auth="'sysFile:download'"> 下载 </el-button>
+						<el-button icon="ele-Delete" size="small" text type="danger" @click="delFile(scope.row)" v-auth="'sysFile:delete'"> 删除 </el-button>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 			</el-table>
 			</el-table>

+ 2 - 2
Web/src/views/system/log/difflog/index.vue

@@ -10,8 +10,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog"> 清空 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysDifflog:page'"> 查询 </el-button>
+					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysDifflog:clear'"> 清空 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>

+ 2 - 2
Web/src/views/system/log/exlog/index.vue

@@ -10,8 +10,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog"> 清空 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysExlog:page'"> 查询 </el-button>
+					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysExlog:clear'"> 清空 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>

+ 3 - 3
Web/src/views/system/log/oplog/index.vue

@@ -10,8 +10,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog"> 清空 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysOplog:page'"> 查询 </el-button>
+					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysOplog:clear'"> 清空 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>
@@ -30,7 +30,7 @@
 				<el-table-column prop="createTime" label="操作时间" align="center" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="createTime" label="操作时间" align="center" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="110" align="center" fixed="right" show-overflow-tooltip>
 				<el-table-column label="操作" width="110" align="center" fixed="right" show-overflow-tooltip>
 					<template #default="scope">
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="viewDetail(scope.row)">详情 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="viewDetail(scope.row)" v-auth="'sysOplog:page'">详情 </el-button>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 			</el-table>
 			</el-table>

+ 2 - 2
Web/src/views/system/log/vislog/index.vue

@@ -10,8 +10,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog"> 清空 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysVislog:page'"> 查询 </el-button>
+					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysVislog:clear'"> 清空 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>

+ 4 - 4
Web/src/views/system/menu/index.vue

@@ -12,8 +12,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddMenu"> 新增 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysMenu:page'"> 查询 </el-button>
+					<el-button icon="ele-Plus" @click="openAddMenu" v-auth="'sysMenu:add'"> 新增 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>
@@ -46,8 +46,8 @@
 				<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip> </el-table-column>
 				<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip> </el-table-column>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditMenu(scope.row)"> 编辑 </el-button>
-						<el-button icon="ele-Delete" size="small" text type="danger" @click="delMenu(scope.row)"> 删除 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditMenu(scope.row)" v-auth="'sysMenu:update'"> 编辑 </el-button>
+						<el-button icon="ele-Delete" size="small" text type="danger" @click="delMenu(scope.row)" v-auth="'sysMenu:delete'"> 删除 </el-button>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 			</el-table>
 			</el-table>

+ 1 - 2
Web/src/views/system/onlineUser/index.vue

@@ -76,7 +76,7 @@ const connection = new SignalR.HubConnectionBuilder()
 	.withUrl(`${import.meta.env.VITE_API_URL}/hubs/onlineUser?access_token=${getToken()}`)
 	.withUrl(`${import.meta.env.VITE_API_URL}/hubs/onlineUser?access_token=${getToken()}`)
 	.withAutomaticReconnect({
 	.withAutomaticReconnect({
 		nextRetryDelayInMilliseconds: (a) => {
 		nextRetryDelayInMilliseconds: (a) => {
-			console.log(a)
+			console.log(a);
 			return 5000; // 每5秒重连一次
 			return 5000; // 每5秒重连一次
 		},
 		},
 	})
 	})
@@ -92,7 +92,6 @@ connection.start().then(() => {
 // 断开连接
 // 断开连接
 connection.onclose(async () => {
 connection.onclose(async () => {
 	console.log('断开连接');
 	console.log('断开连接');
-	state.onlineUserList = [];
 });
 });
 // 重连中
 // 重连中
 connection.onreconnecting(() => {
 connection.onreconnecting(() => {

+ 4 - 4
Web/src/views/system/org/index.vue

@@ -16,8 +16,8 @@
 						</el-form-item>
 						</el-form-item>
 						<el-form-item>
 						<el-form-item>
 							<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 							<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-							<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-							<el-button icon="ele-Plus" @click="openAddOrg"> 新增 </el-button>
+							<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysOrg:page'"> 查询 </el-button>
+							<el-button icon="ele-Plus" @click="openAddOrg" v-auth="'sysOrg:add'"> 新增 </el-button>
 						</el-form-item>
 						</el-form-item>
 					</el-form>
 					</el-form>
 				</el-card>
 				</el-card>
@@ -37,8 +37,8 @@
 						<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 						<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 						<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 						<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 							<template #default="scope">
 							<template #default="scope">
-								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditOrg(scope.row)">编辑 </el-button>
-								<el-button icon="ele-Delete" size="small" text type="danger" @click="delOrg(scope.row)">删除 </el-button>
+								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditOrg(scope.row)" v-auth="'sysOrg:update'">编辑 </el-button>
+								<el-button icon="ele-Delete" size="small" text type="danger" @click="delOrg(scope.row)" v-auth="'sysOrg:delete'">删除 </el-button>
 							</template>
 							</template>
 						</el-table-column>
 						</el-table-column>
 					</el-table>
 					</el-table>

+ 1 - 1
Web/src/views/system/password/index.vue

@@ -14,7 +14,7 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="reset" size="default">重 置</el-button>
 					<el-button icon="ele-Refresh" @click="reset" size="default">重 置</el-button>
-					<el-button icon="ele-Select" type="primary" @click="submit" size="default">确 定</el-button>
+					<el-button icon="ele-Select" type="primary" @click="submit" size="default" v-auth="'sysPassword:update'">确 定</el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>

+ 4 - 4
Web/src/views/system/pos/index.vue

@@ -10,8 +10,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddPos"> 新增 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysPos:page'"> 查询 </el-button>
+					<el-button icon="ele-Plus" @click="openAddPos" v-auth="'sysPos:add'"> 新增 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>
@@ -32,8 +32,8 @@
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditPos(scope.row)"> 编辑 </el-button>
-						<el-button icon="ele-Delete" size="small" text type="danger" @click="delPos(scope.row)"> 删除 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditPos(scope.row)" v-auth="'sysPos:update'"> 编辑 </el-button>
+						<el-button icon="ele-Delete" size="small" text type="danger" @click="delPos(scope.row)" v-auth="'sysPos:delete'"> 删除 </el-button>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 			</el-table>
 			</el-table>

+ 5 - 5
Web/src/views/system/role/index.vue

@@ -10,8 +10,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddRole"> 新增 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysRole:page'"> 查询 </el-button>
+					<el-button icon="ele-Plus" @click="openAddRole" v-auth="'sysRole:add'"> 新增 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>
@@ -41,7 +41,7 @@
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="110" fixed="right" align="center" show-overflow-tooltip>
 				<el-table-column label="操作" width="110" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditRole(scope.row)"> 编辑 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditRole(scope.row)" v-auth="'sysRole:update'"> 编辑 </el-button>
 						<el-dropdown>
 						<el-dropdown>
 							<span style="color: var(--el-color-primary); padding-top: 6px; padding-left: 12px">
 							<span style="color: var(--el-color-primary); padding-top: 6px; padding-left: 12px">
 								<el-icon>
 								<el-icon>
@@ -50,8 +50,8 @@
 							</span>
 							</span>
 							<template #dropdown>
 							<template #dropdown>
 								<el-dropdown-menu>
 								<el-dropdown-menu>
-									<el-dropdown-item icon="ele-OfficeBuilding" @click="openGrantData(scope.row)"> 数据范围 </el-dropdown-item>
-									<el-dropdown-item icon="ele-Delete" @click="delRole(scope.row)"> 删除角色 </el-dropdown-item>
+									<el-dropdown-item icon="ele-OfficeBuilding" @click="openGrantData(scope.row)" :v-auth="'sysRole:grantData'"> 数据范围 </el-dropdown-item>
+									<el-dropdown-item icon="ele-Delete" @click="delRole(scope.row)" :v-auth="'sysRole:delete'"> 删除角色 </el-dropdown-item>
 								</el-dropdown-menu>
 								</el-dropdown-menu>
 							</template>
 							</template>
 						</el-dropdown>
 						</el-dropdown>

+ 6 - 6
Web/src/views/system/tenant/index.vue

@@ -10,8 +10,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddTenant"> 新增 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysTenant:page'"> 查询 </el-button>
+					<el-button icon="ele-Plus" @click="openAddTenant" v-auth="'sysTenant:add'"> 新增 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>
@@ -31,7 +31,7 @@
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="110" fixed="right" align="center" show-overflow-tooltip>
 				<el-table-column label="操作" width="110" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditTenant(scope.row)"> 编辑 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditTenant(scope.row)" v-auth="'sysTenant:update'"> 编辑 </el-button>
 						<el-dropdown>
 						<el-dropdown>
 							<span style="color: var(--el-color-primary); padding-top: 6px; padding-left: 12px">
 							<span style="color: var(--el-color-primary); padding-top: 6px; padding-left: 12px">
 								<el-icon>
 								<el-icon>
@@ -40,9 +40,9 @@
 							</span>
 							</span>
 							<template #dropdown>
 							<template #dropdown>
 								<el-dropdown-menu>
 								<el-dropdown-menu>
-									<el-dropdown-item icon="ele-OfficeBuilding" @click="openGrantMenu(scope.row)"> 授权菜单 </el-dropdown-item>
-									<el-dropdown-item icon="ele-RefreshLeft" @click="resetTenantPwd(scope.row)"> 重置密码 </el-dropdown-item>
-									<el-dropdown-item icon="ele-Delete" @click="delTenant(scope.row)"> 删除租户 </el-dropdown-item>
+									<el-dropdown-item icon="ele-OfficeBuilding" @click="openGrantMenu(scope.row)" :v-auth="'sysTenant:grantMenu'"> 授权菜单 </el-dropdown-item>
+									<el-dropdown-item icon="ele-RefreshLeft" @click="resetTenantPwd(scope.row)" :v-auth="'sysTenant:resetPwd'"> 重置密码 </el-dropdown-item>
+									<el-dropdown-item icon="ele-Delete" @click="delTenant(scope.row)" :v-auth="'sysTenant:delete'"> 删除租户 </el-dropdown-item>
 								</el-dropdown-menu>
 								</el-dropdown-menu>
 							</template>
 							</template>
 						</el-dropdown>
 						</el-dropdown>

+ 4 - 4
Web/src/views/system/timer/index.vue

@@ -7,8 +7,8 @@
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
 					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddTimer"> 新增 </el-button>
+					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysTimer:page'"> 查询 </el-button>
+					<el-button icon="ele-Plus" @click="openAddTimer" v-auth="'sysTimer:add'"> 新增 </el-button>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
 		</el-card>
 		</el-card>
@@ -65,8 +65,8 @@
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 					<template #default="scope">
 					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditTimer(scope.row)"> 编辑 </el-button>
-						<el-button icon="ele-Delete" size="small" text type="danger" @click="delTimer(scope.row)"> 删除 </el-button>
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditTimer(scope.row)" v-auth="'sysTimer:update'"> 编辑 </el-button>
+						<el-button icon="ele-Delete" size="small" text type="danger" @click="delTimer(scope.row)" v-auth="'sysTimer:delete'"> 删除 </el-button>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 			</el-table>
 			</el-table>