From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/resources/components/privilegePackage/privilege-group/privilegeGroup.html | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/WebService/src/main/resources/components/privilegePackage/privilege-group/privilegeGroup.html b/WebService/src/main/resources/components/privilegePackage/privilege-group/privilegeGroup.html
index d6fb616..ff35efa 100644
--- a/WebService/src/main/resources/components/privilegePackage/privilege-group/privilegeGroup.html
+++ b/WebService/src/main/resources/components/privilegePackage/privilege-group/privilegeGroup.html
@@ -1,4 +1,4 @@
-<div class="col-lg-3">
+<div class="col-lg-3" style="background:#FFFFFF">
<div class="ibox ">
<div class="ibox-content mailbox-content">
<div class="file-manager">
@@ -14,6 +14,10 @@
<i v-if="pGroup.storeId != '9999'" class="glyphicon glyphicon-remove-sign float-right"
style="color:#dc3545"
v-on:click.stop="openDeletePrivilegeGroupModel(pGroup)"></i>
+ <i v-if="pGroup.storeId != '9999'" class="glyphicon glyphicon-edit float-right"
+ style="color:#1ab394"
+ v-on:click.stop="openEditPrivilegeGroupModel(pGroup)"></i>
+
</a>
</li>
</ul>
@@ -22,6 +26,7 @@
</div>
<vc:create name="addPrivilegeGroup"></vc:create>
+ <vc:create name="editPrivilegeGroup"></vc:create>
<vc:create name="deletePrivilegeGroup"></vc:create>
</div>
</div>
--
Gitblit v1.8.0