Merge branch 'master-500-dev-LH' into 'master-500-dev'

角色管理 授权提示======域配置悬浮提示样式修改



See merge request !436

@@ -83,11 +83,12 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                         if (domainIps && domainIps.length > 0){
                         if (domainIps && domainIps.length > 0){
                             tips = '该域下所有IP段为:';
                             tips = '该域下所有IP段为:';
                             $.each(domainIps,function (i,e) {
                             $.each(domainIps,function (i,e) {
-                                tips += '<br/>'+e.ip;
+                                tips +='&nbsp;,'+e.ip;
                             })
                             })
                         }
                         }
                         if (tips){
                         if (tips){
-                            return '<div><span lay-tips="'+tips+'">'+d.addr+'</span></div>';
+                            var html="<div style='width:230px;margin:auto;height:auto;overflow:visible;text-overflow:inherit;white-space:normal;word-break: break-all;'>"+tips+"</div>"
+                            return '<div><span lay-tips="'+html+'">'+d.addr+'</span></div>';
                         }else{
                         }else{
                             return '<div><span>'+d.addr+'</span></div>';
                             return '<div><span>'+d.addr+'</span></div>';
                         }
                         }

@@ -29,7 +29,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','xmSelect','laydat
                 data : JSON.stringify(bean),
                 data : JSON.stringify(bean),
                 success : function(res) {
                 success : function(res) {
                     layer.close(loading);
                     layer.close(loading);
-                    layer.msg(res.resp_msg, {
+                    layer.msg(res.resp_msg+"【功能点已全部授权】", {
                         offset: '15px'
                         offset: '15px'
                         , icon: res.resp_code == 0?1:7
                         , icon: res.resp_code == 0?1:7
                         , time: 2000
                         , time: 2000