Merge branch 'master-V32-XuHaoJie' into 'master'

天津-订阅管理-订阅对象（资源订阅）页面添加采集协议列



See merge request !306

@@ -661,7 +661,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                             if(res.data && res.data.length > 0){
                             if(res.data && res.data.length > 0){
                                 $.each(res.data,function (i,v){
                                 $.each(res.data,function (i,v){
                                     trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
                                     trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
-                                                        <td>${v.resTypeName}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
+                                                        <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
                                 });
                                 });
                             }
                             }
 
 
@@ -677,7 +677,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                         var trs = '';
                         var trs = '';
                         $.each(res.data,function (i,v){
                         $.each(res.data,function (i,v){
                             trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
                             trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
-                                        <td>${v.resTypeName}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
+                                        <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
                         });
                         });
                         var tb = `
                         var tb = `
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form">
                         <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form">
@@ -685,7 +685,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                 <div class="layui-inline">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline layui-input-inline--long">
                                     <div class="layui-input-inline layui-input-inline--long">
                                         <input type="text" id="condition-resType-keyword" placeholder="输入名称，回车搜索" autocomplete="off"
                                         <input type="text" id="condition-resType-keyword" placeholder="输入名称，回车搜索" autocomplete="off"
-                                           lay-tips="关键字检索包含： </br>IP地址</br>资源名称</br>负责人"
+                                           lay-tips="关键字检索包含： </br>IP地址</br>资源名称</br>负责人</br>采集协议"
                                            class="layui-input">
                                            class="layui-input">
                                     </div>
                                     </div>
                                     <div class="layui-input-inline layui-input-inline--long multi-query" id="dyglResListBusType">
                                     <div class="layui-input-inline layui-input-inline--long multi-query" id="dyglResListBusType">
@@ -699,7 +699,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                         
                         
                           <table class="layui-table">
                           <table class="layui-table">
                             <thead>
                             <thead>
-                              <tr> <th>序号</th><th>资源名称</th><th>IP地址</th><th>负责人</th><th>资源类型</th><th>操作</th></tr> 
+                              <tr> <th>序号</th><th>资源名称</th><th>IP地址</th><th>负责人</th><th>资源类型</th><th>采集协议</th><th>操作</th></tr> 
                             </thead>
                             </thead>
                             <tbody> ${trs} </tbody>
                             <tbody> ${trs} </tbody>
                           </table>
                           </table>