From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/resources/templates/exam/distributor/distributor.html | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/exam/distributor/distributor.html b/src/main/resources/templates/exam/distributor/distributor.html
index 8477e08..66860c4 100644
--- a/src/main/resources/templates/exam/distributor/distributor.html
+++ b/src/main/resources/templates/exam/distributor/distributor.html
@@ -35,13 +35,13 @@
<a class="btn btn-success" onclick="$.operate.addTab()" shiro:hasPermission="exam:distributor:add">
<i class="fa fa-plus"></i> [[#{basis.add}]]
</a>
- <a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="exam:distributor:edit">
+ <a class="btn single disabled" style="background-color: #7b76b7;border-color: #7b76b7;color: #FFFFFF" onclick="$.operate.editTab()" shiro:hasPermission="exam:distributor:edit">
<i class="fa fa-edit"></i> [[#{basis.edit}]]
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="exam:distributor:remove">
<i class="fa fa-remove"></i> [[#{basis.del}]]
</a>
- <a class="btn btn-warning single disabled" onclick="resetpwd()" shiro:hasPermission="exam:enterprise:resetpwd">
+ <a class="btn single disabled" style="background-color: #6fcef3;border-color: #6fcef3;color: #FFFFFF" onclick="resetpwd()" shiro:hasPermission="exam:enterprise:resetpwd">
<i class="fa fa-edit"></i> [[#{menu.user.resetpwd}]]
</a>
</div>
@@ -57,7 +57,9 @@
var editFlag = [[${@permission.hasPermi('exam:distributor:edit')}]];
var removeFlag = [[${@permission.hasPermi('exam:distributor:remove')}]];
var freeloginFlag = [[${@permission.hasPermi('exam:distributor:freelogin')}]];
+ var resetpwdFlag = [[${@permission.hasPermi('exam:extend:resetpwd')}]];
var prefix = ctx + "exam/distributor";
+ var paper_prefix = ctx + "exam/paper";
$(function() {
var options = {
@@ -97,10 +99,11 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="openEntr(\'' + row.userId + '\')"><i class="fa fa-list-ul"></i>'+[[#{dict.ic108}]]+'</a> ');
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.userId + '\')"><i class="fa fa-edit"></i>'+[[#{basis.edit}]]+'</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>'+[[#{basis.del}]]+'</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + freeloginFlag + '" href="javascript:void(0)" onclick="freelogin(\'' + row.userId + '\')"><i class="fa fa-eye"></i>'+[[#{basis.freelogin}]]+'</a>');
+ actions.push('<a class="btn btn-xs " style="background-color: #a87242;border-color: #a87242;color: #FFFFFF" href="javascript:void(0)" onclick="openEntr(\'' + row.userId + '\')"><i class="fa fa-list-ul"></i>'+[[#{dict.ic108}]]+'</a> ');
+ // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.userId + '\')"><i class="fa fa-edit"></i>'+[[#{basis.edit}]]+'</a> ');
+ // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>'+[[#{basis.del}]]+'</a> ');
+ actions.push('<a style="background-color: #b459d4;border-color: #b459d4;color: #FFFFFF" class="btn btn-xs ' + freeloginFlag + '" href="javascript:void(0)" onclick="freelogin(\'' + row.userId + '\')"><i class="fa fa-eye"></i>'+[[#{basis.freelogin}]]+'</a>');
+ actions.push('<a class="btn btn-success btn-xs ' + resetpwdFlag + '" href="javascript:void(0)" onclick="authUser(\'' + row.userId + '\')"><i class="fa fa-edit"></i>'+[[#{jsp.product.package.authorization}]]+'</a> ');
return actions.join('');
}
}]
@@ -176,6 +179,11 @@
});
}
+
+ function authUser(id) {
+ var url = paper_prefix + '/edit/' + id;
+ $.modal.open([[#{jsp.product.package.authorization}]], url);
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1