Authored by xwx

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

@@ -2288,7 +2288,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -2288,7 +2288,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
2288 * @param resId 2288 * @param resId
2289 */ 2289 */
2290 renderActiveAlarms: function (tableId, resId) { 2290 renderActiveAlarms: function (tableId, resId) {
2291 - $('#'+tableId).prev().text('实时告警Top5') 2291 + $('#'+tableId).prev().text('实时告警')
2292 var alarmlist = table.render({ 2292 var alarmlist = table.render({
2293 elem: '#' + tableId 2293 elem: '#' + tableId
2294 , url: common.domainName + '/api-web/home/alarm/alarmListPage' 2294 , url: common.domainName + '/api-web/home/alarm/alarmListPage'
@@ -2298,7 +2298,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -2298,7 +2298,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
2298 } 2298 }
2299 , height: 'auto' 2299 , height: 'auto'
2300 , page: { 2300 , page: {
2301 - layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] 2301 + layout: ['count', 'prev', 'page', 'next', 'skip']
2302 ,theme: '#1E9FFF' 2302 ,theme: '#1E9FFF'
2303 } 2303 }
2304 , limit: 5 2304 , limit: 5