From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/resource/oss.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/resource/oss.vue b/Source/UBCS-WEB/src/views/resource/oss.vue
index 17dd807..54bd5e2 100644
--- a/Source/UBCS-WEB/src/views/resource/oss.vue
+++ b/Source/UBCS-WEB/src/views/resource/oss.vue
@@ -23,7 +23,7 @@
size="small"
icon="el-icon-delete"
plain
- v-if="permission.oss_delete"
+ v-if="permissionList.delBtn"
@click="handleDelete">鍒� 闄�
</el-button>
</template>
@@ -31,13 +31,13 @@
<el-button type="text"
icon="el-icon-video-play"
size="small"
- v-if="userInfo.role_name.includes('admin')"
+ v-if="permissionList.debugBtn"
@click="handleDebug(scope.row)">璋冭瘯
</el-button>
<el-button type="text"
icon="el-icon-circle-check"
size="small"
- v-if="permission.oss_enable"
+ v-if="permissionList.enableBtn"
@click.stop="handleEnable(scope.row)">鍚敤
</el-button>
</template>
@@ -78,8 +78,9 @@
},
selectionList: [],
option: {
+ columnBtn:false,
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -257,10 +258,12 @@
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.oss_add),
- viewBtn: this.vaildData(this.permission.oss_view),
- delBtn: this.vaildData(this.permission.oss_delete),
- editBtn: this.vaildData(this.permission.oss_edit)
+ addBtn: this.vaildData(this.permission.resource_oss.oss_add,false),
+ viewBtn: this.vaildData(this.permission.resource_oss.oss_view,false),
+ delBtn: this.vaildData(this.permission.resource_oss.oss_delete,false),
+ editBtn: this.vaildData(this.permission.resource_oss.oss_edit,false),
+ debugBtn: this.vaildData(this.permission.resource_oss.oss_debug,false),
+ enableBtn: this.vaildData(this.permission.resource_oss.oss_enable,false)
};
},
ids() {
--
Gitblit v1.9.3