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

杭州-活动告警-业务告警不可点击



See merge request !207

@@ -616,8 +616,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                         {{# if (d.confirmStatus == 0 || d.confirmStatus == null) {  }} 
                             <i lay-tips="新的告警未确认，告警确认后消失！" class="shake iconfont" style="color: red;font-size: 28px;">&#xe68b;</i>
                         {{# }  }}
-                        <span data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-warn-zymc="{{d.id}}" data-ip="{{d.ip}}" 
-                        data-resname="{{d.resName}}" data-pingenable="{{d.pingEnable}}"  class="layui-table-link">{{d.resName}}</span>
+                         {{# if(d.isBus == 'N'){ }}
+                            <span data-isBus="{{d.isBus}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-warn-zymc="{{d.id}}" data-ip="{{d.ip}}" 
+                            data-resname="{{d.resName}}" data-pingenable="{{d.pingEnable}}"  class="layui-table-link">{{d.resName}}</span>
+                         {{# }else{  }}
+                            <span data-isBus="{{d.isBus}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-warn-zymc="{{d.id}}" data-ip="{{d.ip}}" 
+                            data-resname="{{d.resName}}" data-pingenable="{{d.pingEnable}}" >{{d.resName}}</span>
+                         {{# }  }}
                         <a class="layui-icon layui-icon-picture reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"></a>
                     </div>
                     `