Merge branch 'master-v32-lushangqing' into 'master'

活动告警页面表格tip展示优化



See merge request !337

@@ -637,22 +637,24 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     field: 'alarmNo', title: '告警编号', align: 'center', width: 140, sort: true,
                     field: 'alarmNo', title: '告警编号', align: 'center', width: 140, sort: true,
                 }
                 }
                 , {
                 , {
-                    field: 'resName', title: '资源名称', width: 230, sort: true,
+                    field: 'resName', title: '资源名称', width: 250, sort: true,
                     templet:`
                     templet:`
                     <div>
                     <div>
+                        <div style="display: flex;align-items: center;">
                         {{# if (d.confirmStatus == 0 || d.confirmStatus == null) {  }} 
                         {{# if (d.confirmStatus == 0 || d.confirmStatus == null) {  }} 
                             <i lay-tips="新的告警未确认，告警确认后消失！" class="shake iconfont" style="color: red;font-size: 28px;">&#xe68b;</i>
                             <i lay-tips="新的告警未确认，告警确认后消失！" class="shake iconfont" style="color: red;font-size: 28px;">&#xe68b;</i>
                         {{# }  }}
                         {{# }  }}
                          {{# if(d.isBus == 'N'){ }}
                          {{# 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}}" 
+                            <span lay-tips="{{ d.resName }}" style="margin:0 5px;max-width: 160px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;" 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>
                             data-resname="{{d.resName}}" data-pingenable="{{d.pingEnable}}"  class="layui-table-link">{{d.resName}}</span>
                          {{# }else{  }}
                          {{# }else{  }}
-                            <span data-isBus="{{d.isBus}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-warn-zymc="{{d.id}}" data-ip="{{d.ip}}" 
+                            <span lay-tips="{{ d.resName }}" style="margin:0 5px;max-width: 160px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;" 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>
                             data-resname="{{d.resName}}" data-pingenable="{{d.pingEnable}}" >{{d.resName}}</span>
                          {{# }  }}
                          {{# }  }}
                         <a class="layui-icon  reslist-view-topo hide" data-resid="{{d.resId}}" lay-tips="查看资源拓扑"><i class="iconfont" style="font-size: 20px;
                         <a class="layui-icon  reslist-view-topo hide" data-resid="{{d.resId}}" lay-tips="查看资源拓扑"><i class="iconfont" style="font-size: 20px;
     color: #FEB61E;"></i></a>
     color: #FEB61E;"></i></a>
                         </div>
                         </div>
+                    </div>
                     `
                     `
                 }
                 }
                 , {
                 , {