From 663cd7e2094eee1953554bfc995f3ab23d613bf5 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 23 Jan 2026 15:19:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/permissionManage/permissionUser/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/views/permissionManage/permissionUser/index.vue b/applications/drone-command/src/views/permissionManage/permissionUser/index.vue
index 268b45a..eaf8560 100644
--- a/applications/drone-command/src/views/permissionManage/permissionUser/index.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionUser/index.vue
@@ -42,11 +42,11 @@
</el-form>
<div class="command-table-toolbar">
- <el-button v-if="permission.user_add" :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">
+ <el-button v-if="permission.permissionUser_add" :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">
新增
</el-button>
<el-button
- v-if="permission.user_delete"
+ v-if="permission.permissionUser_remove"
:icon="Delete"
color="#1A2652"
type="primary"
@@ -69,9 +69,9 @@
<el-table-column prop="phone" show-overflow-tooltip width="120" label="手机号" />
<el-table-column label="操作" class-name="operation-btns" width="180">
<template v-slot="{ row }">
- <el-link v-if="permission.user_view" @click="handleView(row)">查看</el-link>
- <el-link v-if="permission.user_edit" @click="handleEdit(row)">编辑</el-link>
- <el-link v-if="permission.user_delete" type="danger" @click="handleDelete(row)">删除</el-link>
+ <el-link @click="handleView(row)">查看</el-link>
+ <el-link v-if="permission.permissionUser_edit" @click="handleEdit(row)">编辑</el-link>
+ <el-link v-if="permission.permissionUser_remove" type="danger" @click="handleDelete(row)">删除</el-link>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3