修正备份

This commit is contained in:
liyukun 2021-10-31 13:56:10 +08:00
parent 999f462663
commit ea845ed9f8
2 changed files with 15 additions and 14 deletions

View File

@ -255,7 +255,7 @@ class Databases extends AuthController
session('backup_tables', null); session('backup_tables', null);
session('backup_file', null); session('backup_file', null);
session('backup_config', null); session('backup_config', null);
return app("json")->success("备份完成",'code'); return app("json")->success("备份完成");
} }
} else { } else {
$tab = array('id' => $data['id'], 'start' => $data['start'][0]); $tab = array('id' => $data['id'], 'start' => $data['start'][0]);

View File

@ -153,32 +153,32 @@
} }
$("#btn-export").click(function () { $("#btn-export").click(function () {
var checkID = ""; var checkID = [];
var selectedItem = $('#tb_departments').bootstrapTable('getAllSelections'); var selectedItem = $('#tb_departments').bootstrapTable('getAllSelections');
if (selectedItem=="") return lightyear.notify("没有选中项", 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center'); if (selectedItem=="") return lightyear.notify("没有选中项", 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center');
for (var i = 0 ; i< selectedItem.length; i++) for (var i = 0 ; i< selectedItem.length; i++)
{ {
checkID += selectedItem[i]['name']+","; checkID.push(selectedItem[i]['name']);
} }
if (checkID=="") return lightyear.notify("没有选中项", 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center'); if (checkID.length == 0 ) return lightyear.notify("没有选中项", 'danger', 3000, 'mdi mdi-emoticon-neutral', 'top', 'center');
loadIndex = parent.layer.open({ loadIndex = layer.open({
type: 1, type: 1,
title:'', title:'',
area:'440px', area:'440px',
skin: 'layui-layer-demo', //样式类名 skin: 'layui-layer-demo', //样式类名
closeBtn: 0, //不显示关闭按钮 closeBtn: 0, //不显示关闭按钮
anim: 2, anim: 2,
content: '<div id="div-backdata" class="div-backdata"><i class="layui-icon layui-icon-loading layui-icon layui-anim layui-anim-rotate layui-anim-loop"></i><div class="content">正在备份数据库,请稍等...</div></div>' content: '<div id="div-backdata" class="div-backdata"><span class="mdi mdi-36px mdi-spin mdi-loading"></span><div class="content">正在备份数据库,请稍等...</div></div>'
}); });
$.post("/admin/databases/export",data={ids:checkID},function (res) { $.post("/admin/databases/export",data={ids:checkID.join(',')},function (res) {
if (res.status == 200) { if (res.status == 200) {
updateBackDataInfo("开始备份,请不要关闭本页面!"); updateBackDataInfo("开始备份,请不要关闭本页面!");
backup(res.data.tab); backup(res.data.tab);
window.onbeforeunload = function(){ return "正在备份数据库,请不要关闭!" } window.onbeforeunload = function(){ return "正在备份数据库,请不要关闭!" }
} else{ } else{
parent.layer.close(loadIndex); layer.close(loadIndex);
parent.layer.msg(res.msg?res.msg:'操作失败',{icon: 2,time:3*1000}); layer.msg(res.msg?res.msg:'操作失败',{icon: 2,time:3*1000});
} }
},"json") },"json")
return false; return false;
@ -192,16 +192,17 @@
$.get("/admin/databases/export", tab, function(res){ $.get("/admin/databases/export", tab, function(res){
if(res.status == 200){ if(res.status == 200){
updateBackDataInfo(res.msg); updateBackDataInfo(res.msg);
if(!res.data){ if(res.data.length == 0){
parent.layer.close(loadIndex); console.log(res.msg,res.data)
parent.layer.msg(res.msg?res.msg:'操作成功',{icon: 1,time:3*1000}); layer.close(loadIndex);
layer.msg(res.msg?res.msg:'操作成功',{icon: 1,time:3*1000});
window.onbeforeunload = function(){ return null } window.onbeforeunload = function(){ return null }
return; return;
} }
backup(res.data.tab); backup(res.data.tab);
} else { } else {
parent.layer.close(loadIndex); layer.close(loadIndex);
parent.layer.msg(res.msg?res.msg:'操作失败',{icon: 2,time:3*1000}); layer.msg(res.msg?res.msg:'操作失败',{icon: 2,time:3*1000});
} }
}, "json"); }, "json");
} }