red-future/ppgo_job
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化操作流程界面，修改任务列表搜索和排序等

Browse Source
This commit is contained in:
george
2018-11-21 11:10:22 +08:00
parent 26637736ee
commit 1257371fe3
60 changed files with 378 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
views/admin/edit.html
View File

@@ -101,7 +101,7 @@ var $;
$.post('{{urlfor "AdminController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.history.go(-1)
window.location.reload()
})
} else {
layer.msg(out.message)

10
views/admin/list.html
View File

@@ -1,7 +1,7 @@
<div class="layui-layout layui-layout-admin" style="padding-left: 20px;">
<div class="layui-row" style="margin-top: 20px;">
<div class="layui-col-xs6">
<a class="layui-btn" data-type="tabAdd" href="/admin/add">新增</a>
<button class="layui-btn" data-type="tabAdd" id="add">新增</button>
</div>
<div class="layui-col-xs6 search_text">
<form class="layui-form" action="" onsubmit="javascript:return false;">
@@ -70,11 +70,17 @@
}
};
$("#add").on("click",function() {
window.parent.openTab("/admin/add",'新增用户',"admin_user_add-0",'fa-plus');
})
//监听工具条
table.on('tool(table_filter)', function(obj){
var data = obj.data;
var real_name = data.real_name;
if(obj.event === 'edit'){
window.location.href="/admin/edit?id="+data.id
// window.location.href="/admin/edit?id="+data.id
window.parent.openTab("/admin/edit?id="+data.id,real_name+' 用户编辑',"admin_user_edit-"+data.id,'fa-edit');
} else if(obj.event === 'status'){
acts = "禁用";

29
views/group/add.html
View File

@@ -1,9 +1,5 @@
<div class="layui-layout layui-layout-admin" style="padding-left: 40px;margin-top: 20px;">
<div style="margin: 10px 0px">
<blockquote class="layui-elem-quote">
说明：新建任务分组
</blockquote>
</div>
<form class="layui-form" action="" method="post" >
<div class="layui-form-item">
<label class="layui-form-label">分组名称</label>
@@ -15,7 +11,7 @@
<div class="layui-form-item">
<label class="layui-form-label">分组说明</label>
<div class="layui-input-inline" style="min-width: 400px;">
<div class="layui-input-inline" style="min-width: 300px;">
<textarea name="description" id="description" placeholder="请输入内容" class="layui-textarea"></textarea>
</div>
@@ -30,14 +26,14 @@
</form>
</div>
<script>
var $;
layui.use(['form','element','layer','jquery'],function(){
var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
var $ = layui.jquery;
var error_info = "{{.flash.error}}";
if(error_info){
layer.msg(error_info,{icon: 2,shade:0.3},function () {
window.history.go(-1)
layer.msg(error_info,{icon: 2},function () {
window.parent.layer.closeAll();
window.parent.location.reload();
})
return;
}
@@ -45,8 +41,9 @@ var $;
var form_data = $("form").serialize();
$.post('{{urlfor "GroupController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.history.go(-1)
layer.msg("操作成功",{icon: 1,shade:0.5,time:1000},function () {
window.parent.layer.closeAll();
window.parent.location.reload();
})
} else {
layer.msg(out.message)
@@ -54,9 +51,9 @@ var $;
}, "json");
return false;
});
//但是，如果你的HTML是动态生成的，自动渲染就会失效
//因此你需要在相应的地方，执行下述方法来手动渲染，跟这类似的还有 element.init();
form.render();
});
//但是，如果你的HTML是动态生成的，自动渲染就会失效
//因此你需要在相应的地方，执行下述方法来手动渲染，跟这类似的还有 element.init();
form.render();
});
</script>

20
views/group/edit.html
View File

@@ -1,9 +1,5 @@
<div class="layui-layout layui-layout-admin" style="padding-left: 40px;margin-top: 20px;">
<div style="margin: 10px 0px">
<blockquote class="layui-elem-quote">
说明：编辑任务分组
</blockquote>
</div>
<form class="layui-form" action="" method="post" >
<div class="layui-form-item">
<label class="layui-form-label">分组名称</label>
@@ -15,7 +11,7 @@
<div class="layui-form-item">
<label class="layui-form-label">分组说明</label>
<div class="layui-input-inline" style="min-width: 400px;">
<div class="layui-input-inline" style="min-width: 300px;">
<textarea name="description" id="description" placeholder="请输入内容" class="layui-textarea">{{.group.description}}</textarea>
</div>
@@ -36,8 +32,10 @@
var $ = layui.jquery;
var error_info = "{{.flash.error}}";
if(error_info){
layer.msg(error_info,{icon: 2,shade:0.3},function () {
window.history.go(-1)
layer.msg(error_info,{icon: 2},function () {
// window.history.go(-1)
window.parent.layer.closeAll();
window.parent.location.reload();
})
return;
}
@@ -45,8 +43,10 @@
var form_data = $("form").serialize();
$.post('{{urlfor "GroupController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.history.go(-1)
layer.msg("操作成功",{icon: 1,shade:0.5,time:1000},function () {
// window.history.go(-1)
window.parent.layer.closeAll();
window.parent.location.reload();
})
} else {
layer.msg(out.message)

19
views/group/list.html
View File

@@ -1,7 +1,7 @@
<div class="layui-layout layui-layout-admin" style="padding-left: 20px;">
<div class="layui-row" style="margin-top: 20px;">
<div class="layui-col-xs6">
<a class="layui-btn" data-type="tabAdd" href="/group/add">新增</a>
<button class="layui-btn" data-type="tabAdd" id="add">新增</button>
</div>
<div class="layui-col-xs6 search_text">
<form class="layui-form" action="" onsubmit="javascript:return false;">
@@ -67,11 +67,26 @@
}
};
$("#add").on("click",function() {
layer.open({
title:'添加分组',
type: 2,
area: ['560px', '300px'],
content: ["/group/add",'no'],
});
})
//监听工具条
table.on('tool(table_filter)', function(obj){
var data = obj.data;
if(obj.event === 'edit'){
window.location.href="/group/edit?id="+data.id
// window.location.href="/group/edit?id="+data.id
layer.open({
title:'编辑分组',
type: 2,
area: ['560px', '300px'],
content: ["/group/edit?id="+data.id,'no'],
});
} else if(obj.event === 'del'){
layer.confirm('真的删除【'+data.group_name+'】分组么', function(index){

26
views/public/layout.html
View File

@@ -12,17 +12,21 @@
<link rel="stylesheet" href="/static/admin/css/app.css?t=2">
<link rel="stylesheet" href="/static/font-awesome/css/font-awesome.min.css" media="all">
</head>
<style>
.modal-hide{
display: none;
}
</style>
<body>
<!-- 公共头部 start-->
<div class="nav-title">
<div class="nav-title {{if .hideTop}} modal-hide {{end}}">
<div class="tl fl">
<a onclick="javascript:history.go(-1);" style="font-size: 14px;"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
<i class="fa fa-clock-o fa-spin" style="font-size: 18px;" aria-hidden="true"></i>
{{.pageTitle}}
</div>
<div class="tr fr">
<button class="layui-btn layui-btn-radius layui-btn-primary layui-btn-xs" onclick="javascript:history.go(-1);"><i class="fa fa-arrow-left" aria-hidden="true"></i></button>
<button class="layui-btn layui-btn-radius layui-btn-primary layui-btn-xs" onclick="javascript:window.location.reload();"><i class="fa fa-refresh" aria-hidden="true"></i></button>
</div>
</div>
<!-- 公共头部 end-->
@@ -30,16 +34,16 @@
{{.LayoutContent}}
<script>
{{/*<script>*/}}
layui.use(['table','form','element'], function(){
var table = layui.table;
var form = layui.form;
var element = layui.element;
{{/*layui.use(['table','form','element'], function(){*/}}
{{/*var table = layui.table;*/}}
{{/*var form = layui.form;*/}}
{{/*var element = layui.element;*/}}
});
{{/*});*/}}
</script>
{{/*</script>*/}}
</body>

55
views/public/main.html
View File

@@ -52,7 +52,7 @@
{{range $i, $e := $.SideMenu2}}
{{if eq $e.Pid $elem.Id}}
<dd>
<a data-url="{{$e.AuthUrl}}" data-icon="&#xe715;" data-title="{{$e.AuthName}}" class="pointer" data-id="{{$e.Id}}">
<a data-url="{{$e.AuthUrl}}" data-icon="{{$e.Icon}}" data-title="{{$e.AuthName}}" class="pointer" data-id="{{$e.Id}}">
<i class="fa {{$e.Icon}}"></i> &nbsp;&nbsp;<span>{{$e.AuthName}}</span>
</a>
</dd>
@@ -91,13 +91,59 @@
<script>
//JavaScript代码区域
var $;
var element;
var width,height;
function delHtmlTag(str){
return str.replace(/<[^>]+>/g,"");//去掉所有的html标记
}
function getDelimiterLastString(str,delimiter) {
arr = str.split(delimiter);
if (arr.length>1){
return arr[arr.length-1];
}
return str;
}
function openTab(url,title,id,icon){
if (!url || !title || !id) {
return;
}
if (!icon) {
icon = " fa-clock-o ";
}
//判断是否存在
var is_exist = 0;
$(".layui-tab-title").find("li").each(function(){
var nav_id = $(this).attr("lay-id");
if (nav_id==id) {
is_exist = 1
}
})
if (is_exist==1) {
element.tabChange("main_tab", id);
}else{
var content = '<iframe src="'+url+'" scrolling="yes" width="'+width+'" height="'+height+'" frameborder="0"></iframe>';
title = '<i class="fa '+icon+' back_space1"></i>'+title;
element.tabAdd('main_tab', {
title: title
,content: content //支持传入html
,id: id
});
element.tabChange("main_tab", id);
}
}
layui.use(['element','jquery','layer'], function(){
var element = layui.element;
element = layui.element;
$ = layui.jquery;
var layer = layui.layer;
var width,height;
//frame大小适应开始
resizeFrame();
window.onresize = function(){
@@ -143,6 +189,7 @@
var title = elem.attr('data-title');
var id = elem.attr('data-id');
var icon = elem.attr('data-icon');
if (!url || !title || !id) {
return;
}

4
views/role/add.html
View File

@@ -85,6 +85,7 @@ var $,form;
if(error_info){
layer.msg(error_info,{icon: 2,shade:0.3},function () {
window.history.go(-1)
// window.location.reload();
})
return;
}
@@ -144,7 +145,8 @@ var $,form;
$.post('{{urlfor "RoleController.AjaxSave"}}', data, function (out) {
if (out.status == 0) {
layer.alert('保存成功了', {icon: 1,shade:0.3,time:1000},function(index){
window.history.go(-1)
// window.history.go(-1)
window.location.reload();
});
} else {
layer.msg(out.message)

7
views/role/edit.html
View File

@@ -148,9 +148,10 @@ var $,form;
// return;
$.post('{{urlfor "RoleController.AjaxSave"}}', data, function (out) {
if (out.status == 0) {
layer.msg('保存成功了', {icon: 1,shade:0.3,time:1000},function(index){
layer.close(index);
window.location.href="/role/list"
layer.msg('保存成功了,去列表页查看', {icon: 1,shade:0.3,time:1000},function(index){
// layer.close(index);
// window.location.href="/role/list"
window.location.reload()
});
} else {
layer.msg(out.message)

9
views/role/list.html
View File

@@ -1,7 +1,7 @@
<div class="layui-layout layui-layout-admin" style="padding-left: 20px;">
<div class="layui-row" style="margin-top: 20px;">
<div class="layui-col-xs6">
<a class="layui-btn" data-type="tabAdd" href="/role/add">新增</a>
<button class="layui-btn" data-type="tabAdd" id="add">新增</button>
</div>
<div class="layui-col-xs6 search_text">
<form class="layui-form" action="" onsubmit="javascript:return false;">
@@ -65,9 +65,14 @@
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
$("#add").on("click",function() {
window.parent.openTab("/role/add",'新增角色',"admin_role_add-0",'fa-plus');
})
//监听工具条
table.on('tool(table_filter)', function(obj){
var data = obj.data;
var role_name = data.role_name;
if(obj.event === 'detail'){
//layer.msg('ID：'+ data.id + ' 的查看操作');
} else if(obj.event === 'del'){
@@ -87,7 +92,7 @@
layer.close(index);
});
} else if(obj.event === 'edit'){
window.location.href="/role/edit?id="+data.id
window.parent.openTab("/role/edit?id="+data.id,role_name+' 角色编辑',"admin_role-"+data.id,'fa-edit');
}
});
});

3
views/server/add.html
View File

@@ -145,7 +145,8 @@
$.post('{{urlfor "ServerController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.history.go(-1)
// window.history.go(-1)//
window.location.reload()
})
} else {
layer.msg(out.message)

3
views/server/copy.html
View File

@@ -143,7 +143,8 @@
$.post('{{urlfor "ServerController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.location.href = "/server/list"
//window.location.href = "/server/list"
windwo.location.reload();
})
} else {
layer.msg(out.message)

3
views/server/edit.html
View File

@@ -144,7 +144,8 @@
$.post('{{urlfor "ServerController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.history.go(-1)
// window.history.go(-1)
window.location.reload()
})
} else {
layer.msg(out.message)

12
views/server/list.html
View File

@@ -1,7 +1,7 @@
<div class="layui-layout layui-layout-admin" style="padding-left: 20px;">
<div class="layui-row" style="margin-top: 20px;">
<div class="layui-col-xs6">
<a class="layui-btn" data-type="tabAdd" href="/server/add">新增</a>
<button class="layui-btn" data-type="tabAdd" id="add">新增</button>
</div>
<div class="layui-col-xs6 search_text">
<form class="layui-form" action="" onsubmit="javascript:return false;">
@@ -68,11 +68,16 @@
}
};
$("#add").on("click",function() {
window.parent.openTab("/server/add",'新增资源',"admin_server_add-0",'fa-plus');
})
//监听工具条
table.on('tool(table_filter)', function(obj){
var data = obj.data;
var server_name = data.server_name
if(obj.event === 'edit'){
window.location.href="/server/edit?id="+data.id
window.parent.openTab("/server/edit?id="+data.id,server_name+'编辑',"admin_server_edit-"+data.id,'fa-edit');
} else if(obj.event === 'del'){
layer.confirm('真的删除【'+data.server_name+'】服务器资源么', function(index){
var jsData = {'id':data.id}
@@ -91,7 +96,8 @@
})
} else if(obj.event === 'copy'){
window.location.href="/server/copy?id="+data.id
window.parent.openTab("/server/copy?id="+data.id,server_name+'复制',"admin_server_copy-"+data.id,'fa-copy');
// window.location.href="/server/copy?id="+data.id
}else{
layer.msg('操作不存在');
}

18
views/servergroup/add.html
View File

@@ -1,9 +1,5 @@
<div class="layui-layout layui-layout-admin" style="padding-left: 40px;margin-top: 20px;">
<div style="margin: 10px 0px">
<blockquote class="layui-elem-quote">
说明：新建资源分组
</blockquote>
</div>
<form class="layui-form" action="" method="post" >
<div class="layui-form-item">
<label class="layui-form-label">分组名称</label>
@@ -15,7 +11,7 @@
<div class="layui-form-item">
<label class="layui-form-label">分组说明</label>
<div class="layui-input-inline" style="min-width: 400px;">
<div class="layui-input-inline" style="min-width: 300px;">
<textarea name="description" id="description" placeholder="请输入内容" class="layui-textarea"></textarea>
</div>
@@ -36,8 +32,9 @@ var $;
var $ = layui.jquery;
var error_info = "{{.flash.error}}";
if(error_info){
layer.msg(error_info,{icon: 2,shade:0.3},function () {
window.history.go(-1)
layer.msg(error_info,{icon: 2,shade:0.5},function () {
window.parent.layer.closeAll();
window.parent.location.reload();
})
return;
}
@@ -45,8 +42,9 @@ var $;
var form_data = $("form").serialize();
$.post('{{urlfor "ServerGroupController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.history.go(-1)
layer.msg("操作成功",{icon: 1,shade:0.5,time:1000},function () {
window.parent.layer.closeAll();
window.parent.location.reload();
})
} else {
layer.msg(out.message)

17
views/servergroup/edit.html
View File

@@ -1,9 +1,4 @@
<div class="layui-layout layui-layout-admin" style="padding-left: 40px;margin-top: 20px;">
<div style="margin: 10px 0px">
<blockquote class="layui-elem-quote">
说明：新建资源分组
</blockquote>
</div>
<form class="layui-form" action="" method="post" >
<div class="layui-form-item">
<label class="layui-form-label">分组名称</label>
@@ -15,7 +10,7 @@
<div class="layui-form-item">
<label class="layui-form-label">分组说明</label>
<div class="layui-input-inline" style="min-width: 400px;">
<div class="layui-input-inline" style="min-width: 300px;">
<textarea name="description" id="description" placeholder="请输入内容" class="layui-textarea">{{.group.description}}</textarea>
</div>
@@ -36,8 +31,9 @@
var $ = layui.jquery;
var error_info = "{{.flash.error}}";
if(error_info){
layer.msg(error_info,{icon: 2,shade:0.3},function () {
window.history.go(-1)
layer.msg(error_info,{icon: 2,shade:0.5},function () {
window.parent.layer.closeAll();
window.parent.location.reload();
})
return;
}
@@ -45,8 +41,9 @@
var form_data = $("form").serialize();
$.post('{{urlfor "ServerGroupController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.history.go(-1)
layer.msg("操作成功",{icon: 1,shade:0.5,time:1000},function () {
window.parent.layer.closeAll();
window.parent.location.reload();
})
} else {
layer.msg(out.message)

17
views/servergroup/list.html
View File

@@ -1,7 +1,7 @@
<div class="layui-layout layui-layout-admin" style="padding-left: 20px;">
<div class="layui-row" style="margin-top: 20px;">
<div class="layui-col-xs6">
<a class="layui-btn" data-type="tabAdd" href="/servergroup/add">新增</a>
<button class="layui-btn" data-type="tabAdd" id="add">新增</button>
</div>
<div class="layui-col-xs6 search_text">
<form class="layui-form" action="" onsubmit="javascript:return false;">
@@ -67,11 +67,24 @@
}
};
$("#add").on("click",function() {
layer.open({
title:'添加资源分组',
type: 2,
area: ['560px', '300px'],
content: ["/servergroup/add",'no'],
});
})
//监听工具条
table.on('tool(table_filter)', function(obj){
var data = obj.data;
if(obj.event === 'edit'){
window.location.href="/servergroup/edit?id="+data.id
layer.open({
title:'编辑资源分组',
type: 2,
area: ['560px', '300px'],
content: ["/servergroup/edit?id="+data.id,'no'],
});
} else if(obj.event === 'del'){
layer.confirm('真的删除【'+data.group_name+'】分组么', function(index){

4
views/task/add.html
View File

@@ -172,8 +172,10 @@
$.post('{{urlfor "TaskController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.history.go(-1)
// window.history.go(-1)
window.location.reload();
})
} else {
layer.msg(out.message)
}

5
views/task/auditlist.html
View File

@@ -78,12 +78,15 @@
//监听工具条
table.on('tool(table_filter)', function(obj){
var data = obj.data;
var task_name = window.parent.delHtmlTag(data.task_name)
task_name = window.parent.getDelimiterLastString(task_name,"-")
if(obj.event === 'edit'){
window.location.href="/task/edit?id="+data.id
} else if(obj.event === 'log'){
window.location.href="/tasklog/list?task_id="+data.id;
}else if (obj.event==='detail'){
window.location.href='/task/detail?id='+data.id;
// window.location.href='/task/detail?id='+data.id;
window.parent.openTab('/task/detail?id='+data.id,task_name+'详情',"admin_task_audit_detail-"+data.id,'fa-folder-open-o');
}else if (obj.event==='del'){
layer.confirm("确认要删除这条任务吗？", {icon: 3, title:'提示'}, function(index){
layer.load();

5
views/task/copy.html
View File

@@ -171,8 +171,9 @@
var form_data = data.field;
$.post('{{urlfor "TaskController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
self.location=document.referrer;
layer.msg("复制成功!，请到列表中查看",{icon: 1,shade:0.3,time:1000},function () {
//self.location=document.referrer;
window.location.reload();
})
} else {
layer.msg(out.message)

13
views/task/detail.html
View File

@@ -157,26 +157,31 @@
})
return;
}
var task_name = "{{.task.TaskName}}";
$('.layui-btn-container button').on('click',function () {
var event = $(this).attr('lay-filter');
if (event==='edit'){
var status =" {{.task.Status}}";
if(status==1){
layer.msg("运行状态无法编辑任务，请先暂停任务");
return;
}
window.location.href="/task/edit?id="+id
window.parent.openTab("/task/edit?id="+id,task_name+' 编辑',"admin_task_edit-"+id,'fa-edit');
}else if(event==='log'){
window.location.href="/tasklog/list?task_id="+id;
window.parent.openTab("/tasklog/list?task_id="+id,task_name+'日志',"admin_log-"+id,'');
}else if(event==='copy'){
window.location.href="/task/copy?id="+id;
window.parent.openTab("/task/copy?id="+id,task_name+' 复制',"admin_task_copy-"+id,'fa-copy');
}else if (event==='run'){
layer.confirm("测试执行任务，注意不要超时，请确认执行", {icon: 3, title:'提示'}, function(index){
layer.load();
$.post('/task/ajaxrun', {id:id}, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.location.href="/tasklog/list?task_id="+id
window.parent.openTab("/tasklog/list?task_id="+id,task_name+' 日志',"admin_task_log-"+id,'');
})
} else {
layer.msg(out.message)

4
views/task/edit.html
View File

@@ -184,8 +184,10 @@
$.post('{{urlfor "TaskController.AjaxSave"}}', form_data, function (out) {
if (out.status == 0) {
layer.msg(okmsg,{icon: 1,shade:0.3,time:1000},function () {
self.location=document.referrer;
// self.location=document.referrer;
window.location.reload();
})
} else {
layer.msg(out.message)
return

53
views/task/list.html
View File

@@ -2,33 +2,29 @@
<div class="layui-row" style="margin-top: 20px;">
<div class="layui-col-xs6">
<div class="layui-btn-group">
<a class="layui-btn" data-type="tabAdd" href="/task/add">新增</a>
<button class="layui-btn" data-type="tabAdd" id="add">新增</button>
<button class="layui-btn batch" data-type="batchstart" >启动</button>
<button class="layui-btn layui-btn-danger batch" data-type="batchpause" >暂停</button>cron
</div>
</div>
<div class="layui-col-xs6 search_text">
<div class="layui-col-xs6 search_text" style="text-align: right;">
<form class="layui-form" action="" onsubmit="javascript:return false;">
<div class="demoTable">
<div class="layui-inline" style="width: 40%">
{{/*<label class="layui-form-label">搜索选择框</label>*/}}
<div class="layui-input-inline" style="text-align: left">
<select name="modules" lay-verify="required" lay-filter="select_group" id="group_id" lay-search="">
<option value="0">全部</option>
{{range $k, $v := .taskGroup}}
<option value="{{$k}}" {{if eq $k $.groupId}} selected {{end}}>{{$v}}</option>
{{end}}
</select>
</div>
{{/*<input class="layui-input" name="taskName" id="taskName" autocomplete="off" placeholder="任务名称" >*/}}
<input class="layui-input" name="task_name" id="task_name" autocomplete="off" placeholder="任务名称" >
</div>
<button class="layui-btn" data-type="reload" id="reload" style="display: none">查询</button>
<div class="layui-inline pp-search" style="width: 20%;text-align: left;">
<select name="modules" lay-verify="required" lay-filter="select_group" id="group_id" lay-search="">
<option value="0">全部</option>
{{range $k, $v := .taskGroup}}
<option value="{{$k}}" {{if eq $k $.groupId}} selected {{end}}>{{$v}}</option>
{{end}}
</select>
</div>
<button class="layui-btn" data-type="reload" id="reload"><i class="fa fa-search"></i>查询</button>
</div>
</form>
</div>
</div>
@@ -82,32 +78,39 @@
table.reload('listReload', {
where: {
group_id: $('#group_id').val(),
task_name:$('#task_name').val(),
}
});
}
};
form.on('select(select_group)', function(data){
$("#reload").click()
form.render('select'); //刷新select选择框渲染
});
$("#add").on("click",function() {
window.parent.openTab("/task/add",'新增任务',"admin_task_add-0",'fa-plus');
})
// form.on('select(select_group)', function(data){
// $("#reload").click()
// form.render('select'); //刷新select选择框渲染
// });
//监听工具条
table.on('tool(table_filter)', function(obj){
var data = obj.data;
var task_name = window.parent.delHtmlTag(data.task_name)
task_name = window.parent.getDelimiterLastString(task_name,"-")
if(obj.event === 'edit'){
window.location.href="/task/edit?id="+data.id
window.parent.openTab("/task/edit?id="+data.id,task_name+' 编辑',"admin_task_edit-"+data.id,'fa-edit');
} else if(obj.event === 'log'){
window.location.href="/tasklog/list?task_id="+data.id;
window.parent.openTab("/tasklog/list?task_id="+data.id,task_name+'日志',"admin_log-"+data.id,'');
}else if (obj.event==='detail'){
window.location.href='/task/detail?id='+data.id;
window.parent.openTab('/task/detail?id='+data.id,task_name+'详情',"admin_task_detail-"+data.id,'fa-folder-open-o');
}else if (obj.event==='run'){
layer.confirm("测试执行任务，注意不要超时，请确认执行", {icon: 3, title:'提示'}, function(index){
layer.load();
$.post('/task/ajaxrun', {id:data.id}, function (out) {
if (out.status == 0) {
layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () {
window.location.href="/tasklog/list?task_id="+data.id
window.parent.openTab("/tasklog/list?task_id="+data.id,task_name+'运行日志',"admin_task_log-"+data.id,'');
})
} else {
layer.msg(out.message)