diff --git a/views/admin/add.html b/views/admin/add.html index 5d1c13c..ec6c1ad 100644 --- a/views/admin/add.html +++ b/views/admin/add.html @@ -68,7 +68,7 @@ var $; var error_info = "{{.flash.error}}"; if(error_info){ - layer.msg(error_info,{icon: 2,shade:0.3},function () { + layer.msg(error_info,{icon: 2,shade:0.3,time:1000},function () { window.history.go(-1) }) return; @@ -91,7 +91,7 @@ var $; var form_data = $("form").serialize(); $.post('{{urlfor "AdminController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.location.reload() }) } else { diff --git a/views/admin/edit.html b/views/admin/edit.html index d8d848f..128c090 100644 --- a/views/admin/edit.html +++ b/views/admin/edit.html @@ -100,7 +100,7 @@ var $; var form_data = $("form").serialize(); $.post('{{urlfor "AdminController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.history.go(-1) }) } else { diff --git a/views/auth/list.html b/views/auth/list.html index 64bc1bc..ce4e9db 100644 --- a/views/auth/list.html +++ b/views/auth/list.html @@ -126,7 +126,7 @@ if (out.status == 0) { // layer.msg("操作成功") - layer.alert('你成功了', {icon: 1},function(index){ + layer.alert('你成功了', {icon: 1,shade:0.3,time:1000},function(index){ window.location.reload(); }); } else { diff --git a/views/ban/add.html b/views/ban/add.html index 11111fd..61d053b 100644 --- a/views/ban/add.html +++ b/views/ban/add.html @@ -39,7 +39,7 @@ var form_data = data.field; $.post('{{urlfor "BanController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.parent.layer.closeAll(); window.parent.location.reload(); }) diff --git a/views/ban/edit.html b/views/ban/edit.html index d642df4..9acf133 100644 --- a/views/ban/edit.html +++ b/views/ban/edit.html @@ -39,7 +39,7 @@ var form_data = data.field; $.post('{{urlfor "BanController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.parent.layer.closeAll(); window.parent.location.reload(); }) diff --git a/views/group/add.html b/views/group/add.html index c2c189a..338e163 100644 --- a/views/group/add.html +++ b/views/group/add.html @@ -45,7 +45,7 @@ var $; var form_data = $("form").serialize(); $.post('{{urlfor "GroupController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.history.go(-1) }) } else { diff --git a/views/group/edit.html b/views/group/edit.html index 6265d71..bc0efa6 100644 --- a/views/group/edit.html +++ b/views/group/edit.html @@ -45,7 +45,7 @@ var form_data = $("form").serialize(); $.post('{{urlfor "GroupController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.history.go(-1) }) } else { diff --git a/views/group/list.html b/views/group/list.html index 88d5365..6e162f3 100644 --- a/views/group/list.html +++ b/views/group/list.html @@ -78,7 +78,7 @@ var jsData = {'id':data.id} $.post('{{urlfor "GroupController.AjaxDel"}}', jsData, function (out) { if (out.status == 0) { - layer.alert('删除成功了', {icon: 1},function(index){ + layer.alert('删除成功了', {icon: 1,shade:0.3,time:1000},function(index){ layer.close(index); window.location.reload(); }); diff --git a/views/login/login.html b/views/login/login.html index b934dad..1aff0ff 100644 --- a/views/login/login.html +++ b/views/login/login.html @@ -2,7 +2,7 @@ - + {{.siteName}} 登录 @@ -35,14 +35,12 @@ diff --git a/views/role/add.html b/views/role/add.html index d2fb83a..d9115d7 100644 --- a/views/role/add.html +++ b/views/role/add.html @@ -143,7 +143,7 @@ var $,form; var data = {'role_name':role_name,'detail':detail,'nodes_data':nodes_data,'server_group_ids':server_group_ids,'task_group_ids':task_group_ids} $.post('{{urlfor "RoleController.AjaxSave"}}', data, function (out) { if (out.status == 0) { - layer.alert('保存成功了', {icon: 1},function(index){ + layer.alert('保存成功了', {icon: 1,shade:0.3,time:1000},function(index){ window.history.go(-1) }); } else { diff --git a/views/role/edit.html b/views/role/edit.html index c345a3d..ceda0be 100644 --- a/views/role/edit.html +++ b/views/role/edit.html @@ -146,7 +146,7 @@ var $,form; var data = {'role_name':role_name,'id':id,'detail':detail,'nodes_data':nodes_data,'server_group_ids':server_group_ids,'task_group_ids':task_group_ids} $.post('{{urlfor "RoleController.AjaxSave"}}', data, function (out) { if (out.status == 0) { - layer.alert('保存成功了', {icon: 1},function(index){ + layer.alert('保存成功了', {icon: 1,shade:0.3,time:1000},function(index){ layer.close(index); window.location.href="/role/list" }); diff --git a/views/role/list.html b/views/role/list.html index 3c0b90d..6d5860d 100644 --- a/views/role/list.html +++ b/views/role/list.html @@ -75,7 +75,7 @@ var jsData = {'id':data.id} $.post('{{urlfor "RoleController.AjaxDel"}}', jsData, function (out) { if (out.status == 0) { - layer.alert('删除成功了', {icon: 1},function(index){ + layer.alert('删除成功了', {icon: 1,shade:0.3,time:1000},function(index){ layer.close(index); window.location.reload(); }); diff --git a/views/server/add.html b/views/server/add.html index 253795c..f933d10 100644 --- a/views/server/add.html +++ b/views/server/add.html @@ -144,7 +144,7 @@ var form_data = $("form").serialize(); $.post('{{urlfor "ServerController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.history.go(-1) }) } else { diff --git a/views/server/copy.html b/views/server/copy.html index 3408b92..39aea81 100644 --- a/views/server/copy.html +++ b/views/server/copy.html @@ -142,7 +142,7 @@ var form_data = $("form").serialize(); $.post('{{urlfor "ServerController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.location.href = "/server/list" }) } else { diff --git a/views/server/edit.html b/views/server/edit.html index 4f29c2d..9208b20 100644 --- a/views/server/edit.html +++ b/views/server/edit.html @@ -143,7 +143,7 @@ var form_data = $("form").serialize(); $.post('{{urlfor "ServerController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.history.go(-1) }) } else { diff --git a/views/servergroup/add.html b/views/servergroup/add.html index 7ff5675..a1d4490 100644 --- a/views/servergroup/add.html +++ b/views/servergroup/add.html @@ -45,7 +45,7 @@ var $; var form_data = $("form").serialize(); $.post('{{urlfor "ServerGroupController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.history.go(-1) }) } else { diff --git a/views/servergroup/edit.html b/views/servergroup/edit.html index 04d0304..c948fb2 100644 --- a/views/servergroup/edit.html +++ b/views/servergroup/edit.html @@ -45,7 +45,7 @@ var form_data = $("form").serialize(); $.post('{{urlfor "ServerGroupController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.history.go(-1) }) } else { diff --git a/views/servergroup/list.html b/views/servergroup/list.html index 12a7b1b..099ebb1 100644 --- a/views/servergroup/list.html +++ b/views/servergroup/list.html @@ -78,7 +78,7 @@ var jsData = {'id':data.id} $.post('{{urlfor "ServerGroupController.AjaxDel"}}', jsData, function (out) { if (out.status == 0) { - layer.alert('删除成功了', {icon: 1},function(index){ + layer.alert('删除成功了', {icon: 1,shade:0.3,time:1000},function(index){ layer.close(index); window.location.reload(); }); diff --git a/views/task/add.html b/views/task/add.html index 73da3ee..2a2da8c 100644 --- a/views/task/add.html +++ b/views/task/add.html @@ -61,7 +61,7 @@
-
+
@@ -110,7 +110,7 @@ var form_data = data.field; $.post('{{urlfor "TaskController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.history.go(-1) }) } else { diff --git a/views/task/auditlist.html b/views/task/auditlist.html index 8411c74..cade66b 100644 --- a/views/task/auditlist.html +++ b/views/task/auditlist.html @@ -42,7 +42,7 @@ var element = layui.element; var error_info = "{{.flash.error}}"; if(error_info){ - layer.msg(error_info,{icon: 2,shade:0.3},function () { + layer.msg(error_info,{icon: 2,shade:0.3,time:1000},function () { window.history.go(-1) }) return; @@ -90,7 +90,7 @@ $.post('/task/ajaxdel', {id:data.id}, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { $('#reload').click(); }) } else { @@ -133,7 +133,7 @@ layer.load(); $.post('/task/ajax'+action, {"ids":ids}, function (out) { if (out.status == 0) { - layer.msg(msgok,{icon: 1},function () { + layer.msg(msgok,{icon: 1,shade:0.3,time:1000},function () { $('#reload').click(); }) } else { @@ -141,11 +141,7 @@ return } }, "json"); - setTimeout(function(){ - layer.closeAll('loading'); - }, 2000); - - + layer.closeAll('loading'); layer.close(index); }); return ; diff --git a/views/task/copy.html b/views/task/copy.html index cc21410..3ea3edc 100644 --- a/views/task/copy.html +++ b/views/task/copy.html @@ -62,7 +62,7 @@
-
+
@@ -110,8 +110,8 @@ var form_data = data.field; $.post('{{urlfor "TaskController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { - window.history.go(-1) + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { + self.location=document.referrer; }) } else { layer.msg(out.message) diff --git a/views/task/detail.html b/views/task/detail.html index b7181f8..567b78e 100644 --- a/views/task/detail.html +++ b/views/task/detail.html @@ -150,7 +150,7 @@ layer.load(); $.post('/task/ajaxrun', {id:id}, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.location.href="/tasklog/list?task_id="+id }) } else { @@ -166,7 +166,7 @@ }else if (event==='audit' || event==='start' || event==='pause' || event==="nopass"){ $.post('/task/ajax'+event, {id:id}, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.location.reload() }) } else { diff --git a/views/task/edit.html b/views/task/edit.html index 7c63e66..ea8973f 100644 --- a/views/task/edit.html +++ b/views/task/edit.html @@ -61,7 +61,7 @@
-
+
@@ -96,7 +96,7 @@ var error_info = "{{.flash.error}}"; if(error_info){ layer.msg(error_info,{icon: 2,shade:0.3},function () { - window.history.go(-1) + self.location=document.referrer; }) return; } @@ -108,16 +108,22 @@ }) form.on('submit(sub)', function(data){ + var isAdmin = "{{.isAdmin}}"; var msg = "编辑任务需要重新审核，是否确认需要编辑？"; + var okmsg = "操作成功，可去【任务审核】中查看该任务"; + + if (isAdmin==1){ + msg = "是否确认需要编辑？"; + okmsg = "操作成功"; + } layer.confirm(msg, {icon: 3, title:'提示'}, function(index){ layer.load(); var form_data = data.field; $.post('{{urlfor "TaskController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功，可去【任务审核】中查看该任务",{icon: 1},function () { - //window.location.href="/task/list" - window.history.go(-1) + layer.msg(okmsg,{icon: 1,shade:0.3,time:1000},function () { + self.location=document.referrer; }) } else { layer.msg(out.message) diff --git a/views/task/list.html b/views/task/list.html index b5493d5..bde2bb9 100644 --- a/views/task/list.html +++ b/views/task/list.html @@ -62,14 +62,13 @@ ,url: '/task/table' ,cols: [[ {checkbox: true, fixed: true}, - {field:'id', title: 'ID', align:'center',sort: true, width:100} + {field:'id', title: 'ID', align:'center', width:50,sort: true} ,{field:'task_name',width:300, title: '任务名称'} ,{field:'description',title: '任务说明'} - ,{field:'next_time', width:170,title: '下次执行时间'} - ,{field:'pre_time',width:170, title: '上次执行时间'} - ,{field:'execute_times', width:70,title: '次数'} - ,{fixed: 'right', width:200, align:'center', title:'操作', toolbar: '#bar'} + ,{field:'pre_time', title: '上次执行时间'} + ,{field:'execute_times', title: '次数'} + ,{fixed: 'right', width:150, align:'center', title:'操作', toolbar: '#bar'} ]] ,id: 'listReload' ,page: true @@ -107,7 +106,7 @@ layer.load(); $.post('/task/ajaxrun', {id:data.id}, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { window.location.href="/tasklog/list?task_id="+data.id }) } else { @@ -151,7 +150,7 @@ layer.load(); $.post('/task/ajax'+action, {"ids":ids}, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { $('#reload').click(); }) } else { diff --git a/views/tasklog/list.html b/views/tasklog/list.html index 5201731..d82464f 100644 --- a/views/tasklog/list.html +++ b/views/tasklog/list.html @@ -84,7 +84,7 @@ ids = ids.substr(0,ids.length-1) $.post('/tasklog/ajaxdel', {ids:ids}, function (out) { if (out.status == 0) { - layer.msg("操作成功",{icon: 1},function () { + layer.msg("操作成功",{icon: 1,shade:0.3,time:1000},function () { $('#reload').click(); }) } else { diff --git a/views/user/edit.html b/views/user/edit.html index 7690ac9..baf6de2 100644 --- a/views/user/edit.html +++ b/views/user/edit.html @@ -96,7 +96,7 @@ var form_data = $("form").serialize(); $.post('{{urlfor "UserController.AjaxSave"}}', form_data, function (out) { if (out.status == 0) { - layer.msg("操作成功,请重新登录",{icon: 1},function () { + layer.msg("操作成功,请重新登录",{icon: 1,shade:0.3,time:1000},function () { top.location.href="/login_out" }) } else {