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

…eb into master-500-dev-lzc

@@ -148,7 +148,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                                         }else{
                                             layTips='lay-tips="点击修改/删除"'
                                         }
-                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                             templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">
@@ -295,7 +295,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                                         }else{
                                             layTips='lay-tips="点击修改/删除"'
                                         }
-                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                             templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">

@@ -62,7 +62,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
                     , {field: 'resTypeName', title: '资源类型', align: 'center', width: '15%'}
                     , {
                         field: 'resName', title: '资源名称', minWidth: 200, align: 'center', width: '25%',
-                        templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
+                        templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restypename="{{d.resTypeName}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
                     }
                     // , {field: 'kpiName', title: '指标', align: 'left'}
                     , {field: 'flag', title: '标识', align: 'center', width: '15%'}
@@ -82,7 +82,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
                     , {field: 'resTypeName', title: '资源类型', align: 'center'}
                     , {
                         field: 'resName', title: '资源名称', minWidth: 200, align: 'center',
-                        templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
+                        templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restypename="{{d.resTypeName}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
                     }
                     , {field: 'kpiName', title: '指标', align: 'left'}
                     , {field: 'flag', title: '标识', align: 'center'}
@@ -116,10 +116,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
                     $('[data-zymc]').unbind().bind('click', function () {
                         var resId = $(this).data("resid");
                         var resType = $(this).data("restype");
-                        var ip = $(this).data("ip");
-                        var resName = $(this).data("resname");
-                        var resTypeName = $(this).data("");
-                        var title = resName + '|' + resTypeName + '|' + ip;//名称，类型，及ip
+                        //lsq 优化详情页的title出现undefined 2022-08-31
+                        var ip = $(this).data("ip") && $(this).data("ip")!=undefined && $(this).data("ip")!='undefined'?$(this).data("ip"):'';
+                        var resName = $(this).data("resname") && $(this).data("resname")!=undefined && $(this).data("resname")!='undefined'?$(this).data("resname"):'';
+                        var resTypeName = $(this).data("resTypeName") && $(this).data("resTypeName")!=undefined && $(this).data("resTypeName")!='undefined'?$(this).data("resTypeName"):'';
+                        var title = resName + (resTypeName?'|' + resTypeName:'') + (ip?'|' + ip:'');//名称，类型，及ip
                         commonDetail.openDetail(resId, resType, title);
                     });
 

@@ -219,11 +219,11 @@ layui.define(['sessions', 'form', 'common'], function (exports) {
                                 async: false,
                                 success: function (data) {
                                     sessionStorage.setItem("isNewPwd", data.isNewPwd);
-                                    var roles = $.map(data.sysRoles, function (e) {
-                                        return e.code;
+                                    var roles = data.sysRoles.map(item=> {
+                                        return item.code
                                     })
                                     sessionStorage.setItem('permissions', data.permissions);
-                                    sessionStorage.setItem('roles', roles);
+                                    sessionStorage.setItem('roles', roles.join(','));
                                     sessionStorage.setItem('user_id', data.id);  //保存用户id  joke add 20211206
                                     localStorage.setItem('user_id', data.id);  //保存用户id  lsq add 2022-03-31
                                     // Start Wang 2022/2/8 15:37 用户登录后，获取用户信息时，增加获取用户扩展信息

@@ -319,7 +319,8 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
 
         var resourceHealthTips;
         function baseInfoHover(){
-            $(".detail_base_info").hover(function () {
+            //lsq 悬浮提示重叠优化 2022-08-31
+            $(".index-banner-title .detail_base_info").hover(function () {
                 openMsg();
             }, function () {
                 layer.close(resourceHealthTips);

@@ -46,6 +46,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         form.render();
 
         getChartData();
+        userList();
         //渲染表格
         var noticeTable = table.render({
             elem: '#noticeSearchTable'
@@ -152,6 +153,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             strict: false,
                             indent: 20
                         },
+                        toolbar: {
+                            show: true,
+                            list: ['CLEAR']
+                        },
                         model: {
                             label: {
                                 type: 'text'
@@ -171,7 +176,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             reloadData();
                         }
                     });
-                }else {
+                } else {
                     $('#notice_user_list_div').hide();
                 }
                 if (userSelect) {
@@ -209,13 +214,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                                 type: 'text'
                             }
                         },
+                        toolbar: {
+                            show: true,
+                            list: ['CLEAR']
+                        },
                         prop: {
                             name: 'busTypeName',
                             value: 'busId'
                         },
                         data: busTypeList,
                         on: function (data) {
-                            if (data.isAdd) {
+                            if (data.arr && data.arr.length > 0) {
                                 busId = data.arr[0].busId;
                             } else {
                                 busId = '';
@@ -263,6 +272,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             strict: false,
                             indent: 20
                         },
+                        toolbar:{
+                            show: true,
+                            list: ['CLEAR']
+                        },
                         model: {
                             label: {
                                 type: 'text'
@@ -271,7 +284,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         height: '170px',
                         data: resTypeList,
                         on: function (data) {
-                            if (data.isAdd) {
+                            if (data.arr && data.arr.length > 0) {
                                 resType = data.arr[0].resTypeCode;
                             } else {
                                 resType = '';
@@ -292,6 +305,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             }
         });
 
+        function userList() {
+            let roles = sessionStorage.getItem("roles");
+            if (roles.indexOf('ADMIN') == -1){
+                $('#notice_user_list_div').hide();
+            }
+        }
+
         //刷新表格
         function reloadTable() {
             noticeTable.reload({

@@ -858,7 +858,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
                                 }else{
                                     layTips='lay-tips="点击修改/删除"'
                                 }
-                                cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                     templet:` <div>
                                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">

@@ -121,11 +121,12 @@ layui.define(['laytpl', 'layer'], function (exports) {
                 }
                 //其它异常
                 else {
-                    var error = [
-                        '<cite>Error：</cite> ' + (res[response.msgName] || '返回状态码异常')
-                        , debug()
-                    ].join('');
-                    view.error(error);
+                    // var error = [
+                    //     '<cite>Error：</cite> ' + (res[response.msgName] || '返回状态码异常')
+                    //     , debug()
+                    // ].join('');
+                    // view.error(error);
+                    console.log(error)
                 }
 
                 //只要 http 状态码正常，无论 response 的 code 是否正常都执行 success

@@ -20,7 +20,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label textarea-label">备注</label>
             <div class="layui-input-block">
-                <textarea class="layui-textarea" name="remark" placeholder="请输入备注"></textarea>
+                <textarea maxlength="225" class="layui-textarea" name="remark" placeholder="请输入备注"></textarea>
             </div>
         </div>
         <!--start lsq 搜索按钮位置调整 2022-06-07-->

@@ -56,8 +56,8 @@
                                     <div class="layui-input-inline">
                                         <select id="bizlink_state" lay-filter="bizlink_state" name="label">
                                             <option value="">=连接状态=</option>
-                                            <option value="normal">成功</option>
-                                            <option value="unnormal">失败</option>
+                                            <option value="1">成功</option>
+                                            <option value="0">失败</option>
                                             <option value="9">未监控</option>
                                         </select>
                                     </div>
@@ -338,9 +338,9 @@
             <i></i>
             <label>连接状态</label>
             <div class="num">
-                <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="bizlink_state"
+                <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="bizlink_state"
                       id="linksuccess_biz">0</span>/
-                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="bizlink_state"
+                <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="bizlink_state"
                       id="linkfail_biz">0</span>/
                 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="bizlink_state"
                       id="linkNone_biz">0</span>

@@ -38,8 +38,8 @@
                                         <select id="biz_reslist_link_state" lay-filter="biz_reslist_link_state"
                                                 name="label">
                                             <option value="">=连接状态=</option>
-                                            <option value="normal">成功</option>
-                                            <option value="unnormal">失败</option>
+                                            <option value="1">成功</option>
+                                            <option value="0">失败</option>
                                             <option value="9">未监控</option>
                                         </select>
                                     </div>
@@ -255,9 +255,9 @@
             <i></i>
             <label>连接状态</label>
             <div class="num">
-                <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="biz_reslist_link_state"
+                <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="biz_reslist_link_state"
                       data-field="linksuccess">0</span>/
-                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="biz_reslist_link_state"
+                <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="biz_reslist_link_state"
                       data-field="linkfail">0</span>/
                 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="biz_reslist_link_state"
                       data-field="linkNone">0</span>

@@ -74,8 +74,8 @@
                                     <div class="layui-input-inline">
                                         <select id="domainlink_state" lay-filter="domainlink_state" name="label">
                                             <option value="">=连接状态=</option>
-                                            <option value="normal">成功</option>
-                                            <option value="unnormal">失败</option>
+                                            <option value="1">成功</option>
+                                            <option value="0">失败</option>
                                             <option value="9">未监控</option>
                                         </select>
                                     </div>
@@ -523,9 +523,9 @@
             <i></i>
             <label>连接状态</label>
             <div class="num">
-                <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="domainlink_state"
+                <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="domainlink_state"
                       id="linksuccess_domain"></span>/
-                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="domainlink_state"
+                <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="domainlink_state"
                       id="linkfail_domain"></span>/
                 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="domainlink_state"
                       id="linkNone_domain">0</span>

@@ -71,9 +71,9 @@
                         data-serious="{{item.serious}}" data-important="{{item.important}}"
                         data-normal="{{item.normal}}" lay-filter="layadmin-app">
                         <!--lsq 右上角点击跳转到活动告警 2022-08-31-->
-                        <a href="javascript:;" lay-href="{{ '/alarm/activewarning/restype=' + item.resType }}">{{item.resTypeName}}
-                            {{# if(alarmCount!=0){ }}<span
-                                class="layui-badge">{{alarmCount}}</span>
+                        <a href="javascript:;" lay-href="{{ '/biz/list/restype=' + item.resType }}">{{item.resTypeName}}
+                            {{# if(alarmCount!=0){ }}
+                            <a href="javascript:;" lay-href="{{'/alarm/activewarning/restype=' + item.resType}}"><span  class="layui-badge" >{{alarmCount}}</span></a>
                             {{# } }}
                         </a>
                     </li>

@@ -107,8 +107,8 @@
                                     <div class="layui-input-inline">
                                         <select id="link_state" lay-filter="link_state" name="label">
                                             <option value="">=连接状态=</option>
-                                            <option value="normal">成功</option>
-                                            <option value="unnormal">失败</option>
+                                            <option value="1">成功</option>
+                                            <option value="0">失败</option>
                                             <option value="9">未监控</option>
                                         </select>
                                     </div>
@@ -429,9 +429,9 @@
             <i></i>
             <label>连接状态</label>
             <div class="num">
-                <span class="green" lay-tips="连接状态：成功" data-value="normal" data-target="link_state"
+                <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="link_state"
                       id="linksuccess_res">0</span>/
-                <span class="red" lay-tips="连接状态：失败" data-value="unnormal" data-target="link_state"
+                <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="link_state"
                       id="linkfail_res">0</span>/
                 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="bizlink_state"
                       id="linkNone_res">0</span>

@@ -467,7 +467,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
                                         }else{
                                             layTips='lay-tips="点击修改/删除"'
                                         }
-                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                             templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">
@@ -619,7 +619,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
                                         }else{
                                             layTips='lay-tips="点击修改/删除"'
                                         }
-                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                             templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">
@@ -746,7 +746,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
                                         }else{
                                             layTips='lay-tips="点击修改/删除"'
                                         }
-                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                             templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">
@@ -886,7 +886,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
                                         }else{
                                             layTips='lay-tips="点击修改/删除"'
                                         }
-                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                             templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">

@@ -231,7 +231,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                                             }else{
                                                 layTips='lay-tips="点击修改/删除"'
                                             }
-                                            cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                            cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                                 templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">
@@ -872,7 +872,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                                         }else{
                                             layTips='lay-tips="点击修改/删除"'
                                         }
-                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                             templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">
@@ -1121,7 +1121,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                                         }else{
                                             layTips='lay-tips="点击修改/删除"'
                                         }
-                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                             templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">
@@ -1292,7 +1292,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                                         }else{
                                             layTips='lay-tips="点击修改/删除"'
                                         }
-                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
+                                        cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
                                             templet:` <div>
                                         <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
                                          data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`"  data-resid="{{d.resId}}">