Merge branch 'feature-dgy-后台新功能批量处理' into feature-dgy-后台测试

Areas/Admin/Views/MainServer/SysTools/CancelMerAgent.cshtml

@@ -67,8 +67,7 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script
-        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
@@ -90,7 +89,12 @@
                             layer.msg("取消成功");
                             window.location.reload();
                         } else {
-                            layer.msg(data);
+                            @* layer.msg(data); *@
+                            layer.msg(data, {
+                                time: 1500
+                            }, function () {
+                                table.reload('LAY-list-manage'); //数据刷新
+                            });
                         }
                     }
                 });