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/librarycode/librarycode.html | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/templates/exam/librarycode/librarycode.html b/src/main/resources/templates/exam/librarycode/librarycode.html
index 075b985..a3ede9a 100644
--- a/src/main/resources/templates/exam/librarycode/librarycode.html
+++ b/src/main/resources/templates/exam/librarycode/librarycode.html
@@ -49,7 +49,7 @@
<a class="btn btn-info" onclick="importExcel()" shiro:hasPermission="exam:librarycode:import">
<i class="fa fa-upload"></i> [[#{basis.import}]]
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="exam:librarycode:export">
+ <a class="btn btn-default" onclick="$.table.exportExcel()" shiro:hasPermission="exam:librarycode:export">
<i class="fa fa-download"></i> [[#{basis.export}]]
</a>
</div>
@@ -93,7 +93,7 @@
},
{
field: 'englistContent',
- title: [[#{jsp.exam.template.reportdict}]]
+ title: [[#{jsp.exam.librarycode.englishdictionarycontent}]]
},
{
field: 'chineseContent',
@@ -114,16 +114,17 @@
field: 'remark',
title: [[#{basis.remark}]]
},
- {
- title: [[#{basis.operate}]],
- 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.editTab(\'' + row.id + '\')"><i class="fa fa-edit"></i>[[#{menu.exam.distributor.edit}]]</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>[[#{menu.exam.distributor.remove}]]</a>');
- return actions.join('');
- }
- }]
+ // {
+ // title: [[#{basis.operate}]],
+ // 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.editTab(\'' + row.id + '\')"><i class="fa fa-edit"></i>[[#{menu.exam.distributor.edit}]]</a> ');
+ // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>[[#{menu.exam.distributor.remove}]]</a>');
+ // return actions.join('');
+ // }
+ // }
+ ]
};
$.table.init(options);
--
Gitblit v1.9.1