修正

app/admin/controller/Databases.php

@@ -273,8 +273,8 @@ class Databases extends AuthController
     public function import(){
         $data = Util::postMore([
             ['key',''],
-            ['part',''],
-            ['start',''],
+            ['part',null],
+            ['start',null],
         ]);
         if(is_numeric($data['key']) && is_null($data['part']) && is_null($data['start'])){ //初始化
             //获取备份文件信息
@@ -294,9 +294,9 @@ class Databases extends AuthController
             $last = end($list);
             if(count($list) === $last[0]){
                 session('backup_list', $list); //缓存备份列表
-                return app("json")->success("初始化完成",'code');
+                return app("json")->success("初始化完成",array('part' => 1, 'start' => 0));
             } else {
-                return app("json")->fail("备份文件可能已经损坏，请检查",'code');
+                return app("json")->fail("备份文件可能已经损坏，请检查");
             }
         } elseif(is_numeric($data['part']) && is_numeric($data['start'])) {
             $list  = session('backup_list');
@@ -313,7 +313,7 @@ class Databases extends AuthController
                     return app("json")->success("正在还原...#{$data['part']}",'code');
                 } else {
                     session('backup_list', null);
-                    return app("json")->success("还原完成",'code');
+                    return app("json")->success("还原完成");
                 }
             } else {
                 $data = array('part' => $data['part'], 'start' => $data['start'][0]);

app/admin/view/databases/import.html

@@ -73,12 +73,12 @@
             events: {
                 'click .btn-import': function (event, value, row, index) {
                     var self = this, status = ".";
-                    $.get("/admin/databases/import", success, "json");
+                    $.post("/admin/databases/import", {"key":row.key}, success, "json");
                     window.onbeforeunload = function(){ return "正在还原数据库，请不要关闭！" }
                     return false;
-
                     function success(data){
-                        if(data.code){
+                        if(data.status){
+                            console.log(data)
                             if(data.gz){
                                 data.msg += status;
                                 if(status.length === 5){
@@ -87,10 +87,15 @@
                                     status += ".";
                                 }
                             }
-                            $(self).parent().prev().text(data.msg);
+                            $('#tb_departments').bootstrapTable('updateRow',{
+                                index: index,
+                                row: {
+                                    status: data.msg,
+                                }
+                            })
                             if(data.data.part){
-                                $.get(self.href,
-                                    {"part" : data.data.part, "start" : data.data.start},
+                                $.post("/admin/databases/import",
+                                    {"key":row.key,"part" : data.data.part, "start" : data.data.start},
                                     success,
                                     "json"
                                 );
@@ -98,7 +103,8 @@
                                 window.onbeforeunload = function(){ return null; }
                             }
                         } else {
-                            top.layer.msg(data.msg?data.msg:'操作失败',{icon: 2,time:data.wait*1000});
+                            parent.lightyear.notify(data.msg?data.msg:'操作失败', 'danger', 3000, 'mdi mdi-emoticon-happy', 'top', 'center');
+                            return false;
                         }
                     }
                 },