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/testMember/testMember.html | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/exam/testMember/testMember.html b/src/main/resources/templates/exam/testMember/testMember.html
index 697eda5..c360842 100644
--- a/src/main/resources/templates/exam/testMember/testMember.html
+++ b/src/main/resources/templates/exam/testMember/testMember.html
@@ -23,7 +23,7 @@
<input type="text" id="testIdSh" name="testIdSh" readonly th:value="${packageTestName}">
</li>
<li>
- <p>[[#{basis.name}]]</p>
+ <p>[[#{jsp.testPackage.name}]]</p>
<input type="text" name="memberName"/>
</li>
<!--<li>
@@ -69,7 +69,8 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="exam:testMember:add">
<i class="fa fa-plus"></i> [[#{basis.add}]]
</a>
- <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+ <a style="background-color: #7b76b7;border-color: #7b76b7;color: #FFFFFF"
+ class="btn single disabled" onclick="$.operate.edit()"
shiro:hasPermission="exam:testMember:edit">
<i class="fa fa-edit"></i> [[#{basis.edit}]]
</a>
@@ -77,7 +78,8 @@
shiro:hasPermission="exam:testMember:remove">
<i class="fa fa-remove"></i> [[#{basis.del}]]
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="exam:testMember:export">
+ <a style="background-color: #a87242;border-color: #a87242;color: #FFFFFF"
+ class="btn" onclick="$.table.exportExcel()" shiro:hasPermission="exam:testMember:export">
<i class="fa fa-download"></i> [[#{basis.export}]]
</a>
<a class="btn btn-info" onclick="importExcel()" shiro:hasPermission="exam:testMember:batchimport">
@@ -249,9 +251,9 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.memberId + '\')"><i class="fa fa-edit"></i>' + [[#{basis.edit}]] + '</a> ');
- actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="openMemberReport(' + row.memberId + "," + row.testId + ')"><i class="fa fa-edit"></i>[[#{view.report}]]</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.memberId + '\')"><i class="fa fa-remove"></i>' + [[#{basis.del}]] + '</a>');
+ // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.memberId + '\')"><i class="fa fa-edit"></i>' + [[#{basis.edit}]] + '</a> ');
+ actions.push('<a style="background-color: #b459d4;border-color: #b459d4;color: #FFFFFF" class="btn btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="openMemberReport(' + row.memberId + "," + row.testId + ')"><i class="fa fa-edit"></i>[[#{view.report}]]</a> ');
+ // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.memberId + '\')"><i class="fa fa-remove"></i>' + [[#{basis.del}]] + '</a>');
return actions.join('');
}
}]
--
Gitblit v1.9.1