优化弹出框,减少等待时间

This commit is contained in:
郝大全
2018-07-25 23:27:45 +08:00
parent 41e948276c
commit 28f56d2a8c
27 changed files with 55 additions and 55 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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();
})

View File

@@ -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();
})

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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();
});

View File

@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<link rel="shortcut icon" href="/static/img/favicon.ico">
<link rel="shortcut icon" href="/static/admin/images/favicon.ico">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>{{.siteName}} 登录</title>
@@ -35,14 +35,12 @@
<script src="/static/layui/layui.js?t=1504439386550" charset="utf-8"></script>
<!-- <script src="https://cdn.bootcss.com/jquery/1.8.3/jquery.js"></script>-->
<script type="text/javascript">
layui.use(['layer','form'], function(){
var $ = layui.$;
var form = layui.form;
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;
@@ -51,7 +49,7 @@
var form_data = $("form").serialize();
$.post('{{urlfor "LoginController.LoginIn"}}', 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="/home"
})
} else {

View File

@@ -4,6 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>{{.siteName}}</title>
<link rel="shortcut icon" href="/static/admin/images/favicon.ico">
<link rel="stylesheet" href="/static/layui/css/layui.css">
<link rel="stylesheet" href="/static/admin/css/main.css?t=10">
<link rel="stylesheet" href="/static/font-awesome/css/font-awesome.min.css" media="all">
@@ -11,13 +12,13 @@
<body class="layui-layout-body">
<div class="layui-layout layui-layout-admin">
<div class="layui-header">
<div class="layui-logo">{{.siteName}}<font style="font-size: 12px"> {{.version}}</font></div>
<div class="layui-logo">&nbsp;&nbsp;&nbsp;<img src="/static/admin/images/logo.png" width="20" height="20"/> &nbsp;{{.siteName}}<font style="font-size: 12px"> {{.version}}</font></div>
<!-- 头部区域可配合layui已有的水平导航 -->
<ul class="layui-nav layui-layout-left">
</ul>
<ul class="layui-nav layui-layout-right pp-nav-item" >
{{/*<li class="layui-nav-item"><a href="http://ppgojob.haodaquan.com/index.html">使用手册</a></li>*/}}
<li class="layui-nav-item"><a href="http://www.haodaquan.com/127" target="_blank">文档说明</a></li>
<li class="layui-nav-item pp-nav-item" >
<a href="javascript:;">
<img src="/static/admin/images/header.jpg" class="layui-nav-img"> {{.loginUserName}}
@@ -83,7 +84,7 @@
<div class="layui-footer" style="border-top: 2px solid #e4e4e4">
<!-- 底部固定区域 -->
© Power by PPGo_Job V2.0
© Power by <a href="http://www.haodaquan.com/" target="_blank">PPGo_Job V2.0 </a>
</div>
</div>
<script src="/static/layui/layui.js"></script>

View File

@@ -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 {

View File

@@ -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"
});

View File

@@ -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();
});

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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();
});

View File

@@ -61,7 +61,7 @@
<div class="layui-input-inline mw400">
<input type="text" name="cron_spec" id="cron_spec" lay-verify="required" autocomplete="off" placeholder="时间表达式" class="layui-input" value="">
</div>
<div class="layui-form-mid layui-word-aux"><a href="/help" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
<div class="layui-form-mid layui-word-aux"><a href="http://www.haodaquan.com/129" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
</div>
<div class="layui-form-item">
@@ -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 {

View File

@@ -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 ;

View File

@@ -62,7 +62,7 @@
<div class="layui-input-inline mw400">
<input type="text" name="cron_spec" id="cron_spec" lay-verify="required" autocomplete="off" placeholder="时间表达式" class="layui-input" value="{{.task.CronSpec}}">
</div>
<div class="layui-form-mid layui-word-aux"><a href="/help" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
<div class="layui-form-mid layui-word-aux"><a href="http://www.haodaquan.com/129" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
</div>
<div class="layui-form-item">
@@ -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)

View File

@@ -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 {

View File

@@ -61,7 +61,7 @@
<div class="layui-input-inline mw400">
<input type="text" name="cron_spec" id="cron_spec" lay-verify="required" autocomplete="off" placeholder="时间表达式" class="layui-input" value="{{.task.CronSpec}}">
</div>
<div class="layui-form-mid layui-word-aux"><a href="/help" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
<div class="layui-form-mid layui-word-aux"><a href="http://www.haodaquan.com/129" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
</div>
<div class="layui-form-item">
@@ -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)

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {