记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 02a6b5a3 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

parents 786288f7 90f24e79
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 29 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfTagController.java
View file @ 02a6b5a3
...@@ -39,7 +39,7 @@ public class GoblinSelfTagController extends BaseController { ...@@ -39,7 +39,7 @@ public class GoblinSelfTagController extends BaseController {
@Autowired @Autowired
IGoblinSelfTagService goblinSelfTagService; IGoblinSelfTagService goblinSelfTagService;
@GetMapping("tag") @GetMapping("")
public String tag() { public String tag() {
return prefix.concat("/tag"); return prefix.concat("/tag");
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/extag/extag.html
View file @ 02a6b5a3
...@@ -32,12 +32,15 @@ ...@@ -32,12 +32,15 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="#" shiro:hasPermission="goblin:extag:add"> <a class="btn btn-success" onclick="" shiro:hasPermission="goblin:extag:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="goblin:extag:rmv"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="goblin:extag:rmv">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="goblin:extag:export">
<i class="fa fa-download"></i> 导出
</a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
...@@ -54,6 +57,7 @@ ...@@ -54,6 +57,7 @@
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
removeUrl: prefix + "/rmv", removeUrl: prefix + "/rmv",
exportUrl: prefix + "/export",
sortName: "mid desc", sortName: "mid desc",
modalName: "音乐人标签库", modalName: "音乐人标签库",
columns: [{ columns: [{
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/tag/tag.html
View file @ 02a6b5a3
...@@ -6,37 +6,11 @@ ...@@ -6,37 +6,11 @@
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse">
<form id="role-form">
<div class="select-list">
<ul>
<li>
名称：<input type="text" name="tagName"/>
</li>
<li>
类型：<select name="tagType" th:with="type=${@dict.getType('zhengzai_store_cert_type')}">
<option value="">全部</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="" shiro:hasPermission="goblin:extag:add"> <a class="btn btn-success" onclick="" shiro:hasPermission="goblin:extag:add">
<i class="fa fa-plus"></i> 新增 <i class="fa fa-plus"></i> 新增
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="goblin:extag:rmv">
shiro:hasPermission="goblin:extag:rmv">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment