Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-joke

@@ -181,7 +181,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
                     title: '操作',
                     align: 'center',
                     fixed: 'right',
-                    minWidth: 270,
+                    minWidth: 300,
                     templet: function (d) {
                         var str = '<div>' +
                             '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-tips="下载采集器" collector-data-download="' + d.collectorId + '"><i class="layui-icon layui-icon-download-circle"></i></button>' +
@@ -194,6 +194,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
                         if (d.collType === 'collType_trap') {
                             str += '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-tips="绑定资源" collector-data-bindRes="' + d.collectorId + '"><i class="layui-icon">&#xe630;</i></button>';
                         }
+                        str += '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-tips="解绑全部资源" collector-data-unbindRes="' + d.collectorId + '"><i class="layui-icon layui-icon-unlink"></i></button>'
                         str += '</div>';
                         return str;
                     }
@@ -470,6 +471,34 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
                     var collectorId = $(this).attr('collector-data-stop');
                     stopCollector([collectorId]);
                 });
+
+                // 解绑全部资源
+                $('button[collector-data-unbindRes]').unbind('click').on('click',function (){
+                    if ($.inArray('back:collector:start', checkList) == -1) {
+                        layer.msg('暂无权限!', {icon: 7, time: 3000});
+                        return;
+                    }
+                    let collectorId = $(this).attr('collector-data-unbindRes');
+                    admin.req({
+                        url:domainName + '/api-web/trapoid/unbind',
+                        data:{
+                            collectorId:collectorId,
+                            resIdList:"",
+                        },
+                        success(response){
+                            if (response && response.success) {
+                                layer.msg('解绑成功', {icon: 1});
+                                reloadCollectorTable();
+                            }else{
+                                this.error();
+                            }
+                        },
+                        error(){
+                            layer.closeAll('loading');
+                            layer.msg('解绑失败', {icon: 2});
+                        }
+                    })
+                })
             }
         });
 

@@ -6,11 +6,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
     var xmSelect = layui.table;
     var common = layui.common;
     var resListSelectIds = [];
+    var admin = layui.admin;
     //对外暴露的接口
     exports('reslist', function (data) {
         var sessions = layui.sessions;
         var router = layui.router();
         var accessToken = sessions.getToken().access_token;
+        var domainName = common.domainName;
         var resType = (data && common.isNotEmpty(data.resType)) ? data.resType : '';
         var table_data = [];
         // 业务类型Id
@@ -133,6 +135,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 , {field: 'adminName', title: '负责人', align: 'center'}
                 , {field: 'resTypeName', title: '资源类型', align: 'center'}
                 , {field: 'healthDesc', title: '资源状态', align: 'center'}
+                , {
+                    title: "操作",
+                    align: "center",
+                    fixed: 'right',
+                    hide: (trapCollectorId || collectorId)?false:true,  // 绑定资源的时候掩藏操作列，解绑的时候显示
+                    templet: function (d){
+                        let str = '<div>' +
+                            '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-tips="资源解绑" collector-data-unbindRes="' + d.resId + '"><i class="layui-icon layui-icon-unlink"></i></button>'
+                            '</div>'
+                        return str
+                    }
+                }
             ]],
             done: function (res) {
                 table_data = res.data;
@@ -144,7 +158,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         }
                     })
                 })
-
                 //回显
                 if (data && data.oldData) {
                     resListSelectIds = data.oldData;
@@ -157,6 +170,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         })
                     })
                 }
+
+                //  资源解绑(事件委托)
+                $('body').on('click','button[collector-data-unbindRes]',function (){
+                    let resId = $(this).attr('collector-data-unbindRes');
+                    let collId;
+                    if (trapCollectorId && trapCollectorId!=''){
+                        collId = trapCollectorId;
+                    }else if(collectorId && collectorId!=''){
+                        collId = collectorId;
+                    }
+                    admin.req({
+                        url:domainName + '/api-web/trapoid/unbind',
+                        data:{
+                            collectorId:collId,
+                            resIdList:resId,
+                        },
+                        success(response){
+                            if (response && response.success) {
+                                layer.msg('解绑成功', {icon: 1});
+                                reloadTable(resType);
+                            }else{
+                                this.error();
+                            }
+                        },
+                        error(){
+                            layer.closeAll('loading');
+                            layer.msg('解绑失败', {icon: 2});
+                        }
+                    })
+                })
             }
         });