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

…eb into master-500-dev-xwx

@@ -2363,6 +2363,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
          * @param resId
          * @param resId
          */
          */
         renderActiveAlarms: function (tableId, resId) {
         renderActiveAlarms: function (tableId, resId) {
+            $('#'+tableId).prev().text('实时告警Top5')
             var alarmlist = table.render({
             var alarmlist = table.render({
                 elem: '#' + tableId
                 elem: '#' + tableId
                 , url: common.domainName + '/api-web/home/alarm/alarmListPage'
                 , url: common.domainName + '/api-web/home/alarm/alarmListPage'

@@ -723,7 +723,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
             var targetId = 'slt_res_manage_superior';
             var targetId = 'slt_res_manage_superior';
             var optons = "<option value=''>=上级=</option>"
             var optons = "<option value=''>=上级=</option>"
             if (targetId && searchType) {
             if (targetId && searchType) {
-                var url = "/api-web/home/res-list/" + resType + "?page=1&limit=50";
+                var url = "/api-web/home/res-list/" + resType + "?page=1&limit=50&pageName=resmanage";
                 admin.req({
                 admin.req({
                     url: common.domainName + url
                     url: common.domainName + url
                 }).done(function (res) {
                 }).done(function (res) {
@@ -826,7 +826,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
                     busId: $("#resManageIndexForm").find("input[name='busId']").val(),
                     busId: $("#resManageIndexForm").find("input[name='busId']").val(),
                     state: $("#resManageIndexForm").find("select[name='state']").val(),
                     state: $("#resManageIndexForm").find("select[name='state']").val(),
                     parentId: $("#resManageIndexForm").find("select[name='parentId']").val(),
                     parentId: $("#resManageIndexForm").find("select[name='parentId']").val(),
-                    collectionState: $("#resManageIndexForm").find("select[name='collectionState']").val()
+                    collectionState: $("#resManageIndexForm").find("select[name='collectionState']").val(),
+                    pageName:'resmanage'
                 }
                 }
                 , height: 'full-200'
                 , height: 'full-200'
                 , cellMinWidth: 80
                 , cellMinWidth: 80
@@ -1698,7 +1699,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
                     state: $("#resManageIndexForm").find("select[name='state']").val(),
                     state: $("#resManageIndexForm").find("select[name='state']").val(),
                     parentId: $("#resManageIndexForm").find("select[name='parentId']").val(),
                     parentId: $("#resManageIndexForm").find("select[name='parentId']").val(),
                     collectionState: $("#resManageIndexForm").find("select[name='collectionState']").val(),
                     collectionState: $("#resManageIndexForm").find("select[name='collectionState']").val(),
-                    sortKey: sortKey
+                    sortKey: sortKey,
+                    pageName:'resmanage'
+
                 }
                 }
             })
             })
         }
         }

@@ -93,7 +93,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
                 protocolFlag:protocolFlag,
                 protocolFlag:protocolFlag,
                 protocol:protocol,
                 protocol:protocol,
                 editMode: 'true',
                 editMode: 'true',
-                resCategory: 'resources'
+                resCategory: 'resources',
+                pageName:'reslist'
             }
             }
             , height: 'full-350'
             , height: 'full-350'
             , cellMinWidth: 80
             , cellMinWidth: 80
@@ -242,4 +243,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
 
 
         return { getData: getCheckData,getAllCheckData: getAllCheckData, reloadResTable: reloadTable};
         return { getData: getCheckData,getAllCheckData: getAllCheckData, reloadResTable: reloadTable};
     });
     });
-});
+});

@@ -84,6 +84,9 @@
                     <i class="layui-icon layui-icon-refresh-3"></i>
                     <i class="layui-icon layui-icon-refresh-3"></i>
                 </a>
                 </a>
             </li>
             </li>
+            <li class="layui-nav-item layui-hide-xs" lay-tips="全局搜索">
+                <a href="javascript:;" layadmin-event="globalSearch"><i><img src="/src/style/img/search.png"/></i></a>
+            </li>
             <li class="layui-nav-item layui-hide-xs" lay-unselect>
             <li class="layui-nav-item layui-hide-xs" lay-unselect>
                 <a href="javascript:;" layadmin-event="fullscreen">
                 <a href="javascript:;" layadmin-event="fullscreen">
                     <i class="layui-icon layui-icon-screen-full"></i>
                     <i class="layui-icon layui-icon-screen-full"></i>

@@ -186,6 +186,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     layer.msg(msg, {icon: 7, time: 3000});
                     layer.msg(msg, {icon: 7, time: 3000});
                     return;
                     return;
                 }
                 }
+                $('td[data-field="alarmNo"]').css('color','black');
                 layer.prompt({title: '恢复说明(必填)', formType: 2}, function (text, index) {
                 layer.prompt({title: '恢复说明(必填)', formType: 2}, function (text, index) {
                     admin.req({
                     admin.req({
                         url: common.domainName + '/api-web/home/alarm/resume'
                         url: common.domainName + '/api-web/home/alarm/resume'
@@ -205,7 +206,23 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                     reloadTable();
                                     reloadTable();
                                 });
                                 });
                             } else {
                             } else {
-                                layer.msg('告警恢复失败，请与管理员联系！', {icon: 7, time: 3000});
+                                var msg = "告警恢复失败，请与管理员联系！";
+                                let arr = res.data;
+                                if(arr && arr.length > 0){
+                                    msg = "自动消除的告警不能进行恢复！";
+                                    var tds = $('td[data-field="alarmNo"]');
+                                    for (const index in arr) {
+                                        for (let i = 0; i < tds.length; i++) {
+                                            var td = tds.eq(i)
+                                            if(td.text() == arr[index]){
+                                                td.css('color','red');
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+                                layer.close(index);
+                                layer.msg(msg, {icon: 7, time: 3000});
                             }
                             }
                         }
                         }
                     });
                     });
@@ -664,4 +681,4 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
 
 
     });
     });
 
 
-});
+});