From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
platform/src/views/system/role.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/platform/src/views/system/role.vue b/platform/src/views/system/role.vue
index 779e53f..45cab31 100644
--- a/platform/src/views/system/role.vue
+++ b/platform/src/views/system/role.vue
@@ -45,12 +45,8 @@
min-width="270"
fixed="right"
>
-<<<<<<< HEAD
<!-- v-if="isAdmin || (row.code !== adminCode && userInfo.roles.findIndex(code => code === row.code) === -1)"-->
<template slot-scope="{row}">
-=======
- <template v-if="isAdmin || (row.code !== adminCode && userInfo.roles.findIndex(code => code === row.code) === -1)" slot-scope="{row}">
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
<el-button type="text" @click="$refs.operaRoleWindow.open('缂栬緫瑙掕壊', row)" icon="el-icon-edit" v-permissions="['system:role:update']">缂栬緫</el-button>
<el-button type="text" @click="$refs.permissionConfigWindow.open(row)" v-permissions="['system:role:createRolePermission']">閰嶇疆鏉冮檺</el-button>
<el-button type="text" @click="$refs.menuConfigWindow.open(row)" icon="el-icon-menu" v-permissions="['system:role:createRoleMenu']">鎺堟潈鑿滃崟</el-button>
--
Gitblit v1.9.3