Merge branch 'master-v32-joke' into 'master'

详情页活动告警分页优化，强制每页5条，去除每页条数选择

详情页活动告警分页优化，强制每页5条，去除每页条数选择

See merge request !523

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