Merge branch 'master-mj-joke' into 'master-mj'

feat:采集器、域管理、指标过滤、ip视图、trap页面集成(可以打开，具体功能未测试) feat:采集器、域管理、指标过滤、ip视图、trap页面集成(可以打开，具体功能未测试) See merge request !1094

Merge branch 'master-mj-joke' into 'master-mj'
feat:采集器、域管理、指标过滤、ip视图、trap页面集成(可以打开，具体功能未测试) feat:采集器、域管理、指标过滤、ip视图、trap页面集成(可以打开，具体功能未测试) See merge request !1094
王涛
Commit eb103fb0bf56fdcdef068c6e402bbc40c7894c3d 2 parents de886131 dd384bd2
Showing 8 changed files with 230 additions and 75 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/collectorlist.js
hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
hg-monitor-web-base/src/main/resources/static/src/controller/domainManageIndex.js
hg-monitor-web-base/src/main/resources/static/src/controller/domainaddAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/domainupdAdd.js
hg-monitor-web-base/src/main/resources/static/src/controller/filterKpi.js
hg-monitor-web-base/src/main/resources/static/src/controller/ipIndex.js
hg-monitor-web-base/src/main/resources/static/src/controller/trapoidIndex.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/collectorlist.js
View file @eb103fb
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/collectorlist.js
View file @eb103fb
@@ -203,8 +203,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
             done: function (res) {
                 // 编辑事件
                 $('.link-collector-edit').unbind('click').click(function () {
-                    if ($.inArray('back:collector:update', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:collector:update')){
                         return;
                     }
                     var collector = JSON.parse(JSON.stringify(res.data[$(this).data('index')]));
@@ -217,8 +216,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
                 // 查看资源列表事件(绑定资源)
                 $('.link-collector-reslist').unbind('click').click(function () {
-                    if ($.inArray('back:collector:addResources', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:collector:addResources')){
                         return;
                     }
                     collectorId = $(this).data('collectorid');
@@ -239,8 +237,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
                 });
                 //下载采集器
                 $("[collector-data-download]").unbind('click').on("click", function () {
-                    if ($.inArray('back:collector:download', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:collector:download')){
                         return;
                     }
                     var collectorId = $(this).attr("collector-data-download");
@@ -277,8 +274,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
                 // 同步事件
                 $('button[collector-data-sync]').unbind('click').on('click', function () {
-                    if ($.inArray('back:collector:synchronization', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:collector:synchronization')){
                         return;
                     }
                     var collector = JSON.parse(JSON.stringify(res.data[$(this).attr('collector-data-sync')]));
@@ -360,8 +356,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
                         }
                     });
                     $(this).parents('tr').eq(0).addClass("tbody-tr-background-color");
-                    if ($.inArray('back:collector:copy', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:collector:copy')){
                         return;
                     }
                     if (common.copyText($(this).attr('collector-data-copy'), 'collector-query-form')) {
@@ -395,8 +390,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
                 });
                 // 部署采集器
                 $('button[collector-data-deploy]').unbind('click').on('click', function () {
-                    if ($.inArray('back:collector:deploy', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:collector:deploy')){
                         return;
                     }
                     var collectorId = $(this).attr('collector-data-deploy');
@@ -404,8 +398,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
                 });
                 // 启动采集器
                 $('button[collector-data-start]').unbind('click').on('click', function () {
-                    if ($.inArray('back:collector:start', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:collector:start')){
                         return;
                     }
                     var collectorId = $(this).attr('collector-data-start');
@@ -464,8 +457,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
                 // 停止采集器
                 $('button[collector-data-stop]').unbind('click').on('click', function () {
-                    if ($.inArray('back:collector:stop', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:collector:stop')){
                         return;
                     }
                     var collectorId = $(this).attr('collector-data-stop');
@@ -474,8 +466,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
                 // 解绑全部资源
                 $('button[collector-data-unbindRes]').unbind('click').on('click',function (){
-                    if ($.inArray('back:collector:start', checkList) == -1) {
-                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    if (!common.hasPermission('back:collector:start')){
                         return;
                     }
                     let collectorId = $(this).attr('collector-data-unbindRes');
@@ -562,16 +553,14 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
         // 新增按钮事件
         $('#btn-collector-add').unbind('click').click(function () {
-            if ($.inArray('back:collector:save', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:collector:save')){
                 return;
             }
             saveCollector('insert', '新增');
         });
         // 创建采集器
         $('#btn-collector-generate').unbind('click').click(function () {
-            if ($.inArray('back:collector:generate', checkList) === -1) {
-                layer.msg('暂无权限!', {icon: 0});
+            if (!common.hasPermission('back:collector:generate')){
                 return;
             }
             common.openWin("/baseconfig/collector/generate", '<a class="layui-icon layui-icon-edit win_title_icon"></a>创建采集器', null, ['创建', '取消'], function () {
@@ -594,8 +583,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
         // 删除按钮事件
         $('#btn-collector-delete').unbind('click').click(function () {
-            if ($.inArray('back:collector:delete', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:collector:delete')){
                 return;
             }
             var checks = getSelectedCollectorData();
@@ -632,8 +620,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
         // 批量同步
         $('#btn-collector-sync').unbind('click').on('click', function () {
-            if ($.inArray('back:collector:synchronization', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:collector:synchronization')){
                 return;
             }
             var $btn = $(this);
@@ -710,8 +697,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
         // 发送采集器（部署）
         $('#btn-collector-deploy').unbind('click').on('click', function () {
-            if ($.inArray('back:collector:deploy', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:collector:deploy')){
                 return;
             }
             var checks = getSelectedCollectorData();
@@ -799,8 +785,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
         // 上传采集器模板
         $('#btn-collector-upload').unbind('click').on('click', function () {
-            if ($.inArray('back:collector:uploading', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:collector:uploading')){
                 return;
             }
             layer.prompt({
@@ -845,8 +830,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
         // 启动采集器
         $('#btn-collector-start').unbind('click').on('click', function () {
-            if ($.inArray('back:collector:start', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:collector:start')){
                 return;
             }
             var $btn = $(this);
@@ -923,8 +907,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload', 
         // 停止采集器
         $('#btn-collector-stop').unbind('click').on('click', function () {
-            if ($.inArray('back:collector:stop', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:collector:stop')){
                 return;
             }
             var checks = getSelectedCollectorData();
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @eb103fb
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @eb103fb
@@ -4382,6 +4382,16 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
             // ,function () {
             //         layer.close(detailTips);
             //     }
+        },
+        openResDetail: function(resId, name) {
+            //统一平台详情页
+            let win = window.parent;
+            if (win) {
+                window.parent.postMessage({
+                    type: 'resDetail',
+                    message: {'params':{'resId':resId},'title':name}
+                }, '*')
+            }
         }
     };
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/domainManageIndex.js
View file @eb103fb
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/domainManageIndex.js
View file @eb103fb
@@ -30,8 +30,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
         });
         //新增
         $("#adddomainManage").unbind().on("click", function () {
-            if ($.inArray('back:menus:save', checkList) == -1) {
-                layer.msg('暂无权限!', {icon: 7, time: 3000});
+            if (!common.hasPermission('back:menus:save')){
                 return;
             }
             openAddHtml();
@@ -130,10 +129,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
         function setDefaultMenu(domainManageId) {
             var setIndex = layer.load(2);
-            $.ajax({
+            admin.req({
                 type: 'get',
-                url: domainName + '/api-user/menus/findDefaultMenusBydomainManageId/' + domainManageId + '?access_token=' + accessToken,
-                success: function (data) {
+                url: domainName + '/api-user/menus/findDefaultMenusBydomainManageId/' + domainManageId,
+            }).done(function (data) {
                 layer.close(setIndex);
                 var _html = "<div style='text-align:center;height: 120px;width: 500px;position: relative;color: black;'>" +
                     "<div style='margin: 40px auto'>" +
@@ -171,30 +170,87 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
                         layer.close(index);
                     }
                 });
-                },
-                error: function (xhr, exp) {
+            }).error(function (error) {
                 layer.close(setIndex);
                 layer.msg("接口请求异常!", {icon: 7, time: 3000});
-                }
             });
+            // $.ajax({
+            //     type: 'get',
+            //     url: domainName + '/api-user/menus/findDefaultMenusBydomainManageId/' + domainManageId + '?access_token=' + accessToken,
+            //     success: function (data) {
+            //         layer.close(setIndex);
+            //         var _html = "<div style='text-align:center;height: 120px;width: 500px;position: relative;color: black;'>" +
+            //             "<div style='margin: 40px auto'>" +
+            //             "   <select style='text-align: center;text-align-last: center;height: 40px;width: 80%' id='selectFlow'>";
+            //         _html += '<option value ="">=默认首页=</option>';
+            //         if (data && data.data) {
+            //             var result = data.data;
+            //             var defaultMenu = data.object;
+            //             var defaultMenuId = '';
+            //             if (defaultMenu != null) {
+            //                 defaultMenuId = defaultMenu.id;
+            //             }
+            //             $.each(result, function (i, e) {
+            //                 if (e.id === defaultMenuId) {
+            //                     _html += '<option style="height: 100px" value ="' + e.id + '" selected = "selected">' + e.name + '</option>';
+            //                 } else {
+            //                     _html += '<option style="height: 100px" value ="' + e.id + '">' + e.name + '</option>';
+            //                 }
+            //             })
+            //         }
+            //         _html += "</select></div></div>";
+            //         layer.open({
+            //             type: 1,
+            //             title: "设置默认首页",  //标题
+            //             area: ['auto', 'auto'], //宽高
+            //             content: _html,
+            //             btn: ['确定', '取消']
+            //             , yes: function (index) {
+            //                 var menuId = $('#selectFlow').val();
+            //                 if (menuId === '') {
+            //                     layer.msg("请选择默认首页", {icon: 7, time: 3000});
+            //                     return;
+            //                 }
+            //                 saveDefaultMenu(domainManageId, menuId);
+            //                 layer.close(index);
+            //             }
+            //         });
+            //     },
+            //     error: function (xhr, exp) {
+            //         layer.close(setIndex);
+            //         layer.msg("接口请求异常!", {icon: 7, time: 3000});
+            //     }
+            // });
         }
         function saveDefaultMenu(domainManageId, menuId) {
             var loadIndex = layer.load(2);
-            $.ajax({
+            admin.req({
                 type: 'get',
-                url: domainName + '/api-user/menus/saveOrUpdateDefaultMenu?access_token=' + accessToken + '&domainManageId=' + domainManageId + '&menuId=' + menuId,
-                success: function (data) {
+                url: domainName + '/api-user/menus/saveOrUpdateDefaultMenu?domainManageId=' + domainManageId + '&menuId=' + menuId,
+            }).done(function (data) {
                 layer.close(loadIndex);
                 if (data) {
                     layer.msg(data.msg);
                 }
-                },
-                error: function (xhr, ex) {
+            }).error(function (error) {
                 layer.msg('操作失败');
                 layer.close(loadIndex);
-                }
             });
+            // $.ajax({
+            //     type: 'get',
+            //     url: domainName + '/api-user/menus/saveOrUpdateDefaultMenu?access_token=' + accessToken + '&domainManageId=' + domainManageId + '&menuId=' + menuId,
+            //     success: function (data) {
+            //         layer.close(loadIndex);
+            //         if (data) {
+            //             layer.msg(data.msg);
+            //         }
+            //     },
+            //     error: function (xhr, ex) {
+            //         layer.msg('操作失败');
+            //         layer.close(loadIndex);
+            //     }
+            // });
         }
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/domainaddAdd.js
View file @eb103fb
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/domainaddAdd.js
View file @eb103fb
@@ -80,12 +80,12 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
             bean['options'] = optionsSelect;
             delete bean.select;
             var loading = layer.load(2);
-            $.ajax({
+            admin.req({
                 type: 'post',
-                url: common.domainName + '/api-web/manage/domain/save?access_token=' + accessToken,
+                url: common.domainName + '/api-web/manage/domain/save',
                 contentType: "application/json; charset=utf-8",
                 data: JSON.stringify(bean),
-                success: function (res) {
+            }).done(function (data) {
                 layer.close(loading);
                 layer.msg(res.msg, {
                     offset: '15px'
@@ -97,8 +97,29 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
                         table.reload('domainManage_table', {});
                     }
                 })
-                }
+            }).error(function (error) {
+                layer.close(loading);
+                console.error(error);
             });
+            // $.ajax({
+            //     type: 'post',
+            //     url: common.domainName + '/api-web/manage/domain/save?access_token=' + accessToken,
+            //     contentType: "application/json; charset=utf-8",
+            //     data: JSON.stringify(bean),
+            //     success: function (res) {
+            //         layer.close(loading);
+            //         layer.msg(res.msg, {
+            //             offset: '15px'
+            //             , icon: 1
+            //             , time: 2000
+            //         }, function () {
+            //             if (res.success === true) {
+            //                 layer.closeAll();
+            //                 table.reload('domainManage_table', {});
+            //             }
+            //         })
+            //     }
+            // });
             return false;
         })
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/domainupdAdd.js
View file @eb103fb
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/domainupdAdd.js
View file @eb103fb
@@ -61,10 +61,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
             }
         });
         if (id) {
-            $.ajax({
-                url: common.domainName + '/api-web/manage/domain/findById?id=' + id + '&access_token=' + accessToken,
-                type: 'get',
-                success: function (res) {
+            admin.req({
+                    url: common.domainName + '/api-web/manage/domain/findById?id=' + id
+                , success: function (res) {
                     var bean = res.object;
                     var $form = $("#domainupdAddForm");
                     $form.find("input[name='id']").val(bean.id)
@@ -83,7 +82,30 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
                     }
                     form.render();
                 }
-            })
+            });
+            // $.ajax({
+            //     url: common.domainName + '/api-web/manage/domain/findById?id=' + id + '&access_token=' + accessToken,
+            //     type: 'get',
+            //     success: function (res) {
+            //         var bean = res.object;
+            //         var $form = $("#domainupdAddForm");
+            //         $form.find("input[name='id']").val(bean.id)
+            //         $form.find("input[name='domainName']").val(bean.domainName)
+            //         // $form.find("input[name='options']").val(bean.options)
+            //         $form.find("input[name='addr']").val(bean.addr)
+            //         $form.find("input[name='sort']").val(bean.sort)
+            //         //下拉框回选
+            //         domainView.setValue([bean.options]);
+            //         if (res.data && res.data.length > 0) {
+            //             var tips = '域下IP段为：';
+            //             $.each(res.data, function (i, e) {
+            //                 tips += '</br>' + e.ip
+            //             })
+            //             $('input[name="addr"]').attr('lay-tips', tips);
+            //         }
+            //         form.render();
+            //     }
+            // })
         }
         form.on('submit(domainupd-add-submit)', function (data) {
             var bean = data.field;
@@ -104,12 +126,12 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
             }
             delete bean.select;
             var loading = layer.load(2);
-            $.ajax({
+            admin.req({
                 type: 'post',
-                url: common.domainName + '/api-web/manage/domain/save?access_token=' + accessToken,
                 contentType: "application/json; charset=utf-8",
                 data: JSON.stringify(bean),
-                success: function (res) {
+                url: common.domainName + '/api-web/manage/domain/save'
+                , success: function (res) {
                     layer.close(loading);
                     layer.msg(res.msg, {
                         offset: '15px'
@@ -123,6 +145,25 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
                     })
                 }
             });
+            // $.ajax({
+            //     type: 'post',
+            //     url: common.domainName + '/api-web/manage/domain/save?access_token=' + accessToken,
+            //     contentType: "application/json; charset=utf-8",
+            //     data: JSON.stringify(bean),
+            //     success: function (res) {
+            //         layer.close(loading);
+            //         layer.msg(res.msg, {
+            //             offset: '15px'
+            //             , icon: 1
+            //             , time: 2000
+            //         }, function () {
+            //             if (res.success === true) {
+            //                 layer.closeAll();
+            //                 table.reload('domainManage_table', {});
+            //             }
+            //         })
+            //     }
+            // });
         })
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/filterKpi.js
View file @eb103fb
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/filterKpi.js
View file @eb103fb
@@ -121,7 +121,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
                         var resName = $(this).data("resname") && $(this).data("resname")!=undefined && $(this).data("resname")!='undefined'?$(this).data("resname"):'';
                         var resTypeName = $(this).data("resTypeName") && $(this).data("resTypeName")!=undefined && $(this).data("resTypeName")!='undefined'?$(this).data("resTypeName"):'';
                         var title = resName + (resTypeName?'|' + resTypeName:'') + (ip?'|' + ip:'');//名称，类型，及ip
-                        commonDetail.openDetail(resId, resType, title);
+                        // commonDetail.openDetail(resId, resType, title);
+                        commonDetail.openResDetail(resId,resName);
                     });
                     $('[filter-data-delete]').unbind().bind('click', function () {
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/ipIndex.js
View file @eb103fb
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/ipIndex.js
View file @eb103fb
@@ -196,13 +196,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
             } else {  //否则进入监控详情页面
                 // commonDetail.openDetail(resId, resType, name);
                 //统一平台详情页
-                let win = window.parent;
-                if (win) {
-                    window.parent.postMessage({
-                        type: 'resDetail',
-                        message: {'params':{'resId':resId},'title':name}
-                    }, '*')
-                }
+                commonDetail.openResDetail(resId,name);
             }
         }
     });
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/trapoidIndex.js
View file @eb103fb
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/trapoidIndex.js
View file @eb103fb
@@ -200,9 +200,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                     form.on('submit(edit-trapoid-submit)', function (data) {
                         var bean = data.field;
                         loading = layer.load(2);
-                        $.ajax({
-                            url: domainName + '/api-web/trapoid/saveOrUpdate?access_token=' + accessToken,
-                            type: 'post',
+                        admin.req({
+                            url: domainName + '/api-web/trapoid/saveOrUpdate',
+                            method: 'post',
                             data: JSON.stringify(bean),
                             contentType: "application/json;charset=utf-8",
                             success: function (res) {
@@ -220,14 +220,41 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                                             return false;
                                         })
                                 }
-
                             },
-                            error: function (err) {
+                            error: function () {
                                 layer.closeAll();
                                 console.log(JSON.stringify(err));
                                 return false;
                             }
                         })
+                        // $.ajax({
+                        //     url: domainName + '/api-web/trapoid/saveOrUpdate?access_token=' + accessToken,
+                        //     type: 'post',
+                        //     data: JSON.stringify(bean),
+                        //     contentType: "application/json;charset=utf-8",
+                        //     success: function (res) {
+                        //         layer.closeAll();
+                        //         if (res) {
+                        //             var iconNum = 2;
+                        //             if (res.success) {
+                        //                 iconNum = 1;
+                        //             }
+                        //             layer.msg(res.msg, {offset: '15px', icon: iconNum, time: 2000},
+                        //                 function () {
+                        //                     if (res.success) {
+                        //                         reloadTable();
+                        //                     }
+                        //                     return false;
+                        //                 })
+                        //         }
+                        //
+                        //     },
+                        //     error: function (err) {
+                        //         layer.closeAll();
+                        //         console.log(JSON.stringify(err));
+                        //         return false;
+                        //     }
+                        // })
                     });
                 }
                 , yes(index, dom) {
@@ -308,8 +335,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
             }
             layer.confirm('删除后不可恢复，请确认', {icon: 3}, function (index) {
                 layer.load(2);
-                $.ajax({
-                    url: common.domainName + '/api-web/trapoid/deleteByIds?access_token=' + accessToken,
+                admin.req({
+                    url: common.domainName + '/api-web/trapoid/deleteByIds',
                     type: 'POST',
                     data: JSON.stringify(ids),
                     contentType: "application/json;charset=UTF-8",
@@ -324,8 +351,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                             });
                         }
+                    },
+                    error: function () {
+                        layer.closeAll();
+                        console.log(JSON.stringify(err));
                     }
                 })
+                // $.ajax({
+                //     url: common.domainName + '/api-web/trapoid/deleteByIds?access_token=' + accessToken,
+                //     type: 'POST',
+                //     data: JSON.stringify(ids),
+                //     contentType: "application/json;charset=UTF-8",
+                //     success: function (res) {
+                //         layer.closeAll("loading")
+                //         if (res.success) {
+                //             layer.msg('操作成功', {offset: '15px', icon: 1, time: 2000}, function () {
+                //                 reloadTable();
+                //             });
+                //         } else {
+                //             layer.msg("操作失败", {offset: '15px', icon: 2, time: 2000}, function () {
+                //
+                //             });
+                //         }
+                //     }
+                // })
             });
         }