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/demographyParam/demographyParam.html | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/templates/exam/demographyParam/demographyParam.html b/src/main/resources/templates/exam/demographyParam/demographyParam.html
index 17b6110..cd5a0b3 100644
--- a/src/main/resources/templates/exam/demographyParam/demographyParam.html
+++ b/src/main/resources/templates/exam/demographyParam/demographyParam.html
@@ -45,13 +45,15 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="exam:demographyParam:add">
<i class="fa fa-plus"></i> [[#{basis.add}]]
</a>
- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="exam:demographyParam:edit">
+ <a style="background-color: #7b76b7;border-color: #7b76b7;color: #FFFFFF"
+ class="btn single disabled" onclick="$.operate.edit()" shiro:hasPermission="exam:demographyParam:edit">
<i class="fa fa-edit"></i> [[#{basis.edit}]]
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="exam:demographyParam:remove">
<i class="fa fa-remove"></i> [[#{basis.del}]]
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="exam:demographyParam:export">
+ <a style="background-color: #a87242;border-color: #a87242;color: #FFFFFF"
+ class="btn" onclick="$.table.exportExcel()" shiro:hasPermission="exam:demographyParam:export">
<i class="fa fa-download"></i> [[#{basis.export}]]
</a>
</div>
@@ -145,16 +147,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.edit(\'' + row.paramId + '\')"><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.paramId + '\')"><i class="fa fa-remove"></i>'+[[#{basis.del}]]+'</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.edit(\'' + row.paramId + '\')"><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.paramId + '\')"><i class="fa fa-remove"></i>'+[[#{basis.del}]]+'</a>');
+ // return actions.join('');
+ // }
+ // }
+ ]
};
$.table.init(options);
});
--
Gitblit v1.9.1