Merge branch 'master-V32-LH' into 'master'

arms 详情页 echars 双折线重叠问题



See merge request !475

@@ -2288,6 +2288,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'

@@ -81,7 +81,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
                         $.each(response.map.y, function (i, v) {
                         $.each(response.map.y, function (i, v) {
                             var item = {
                             var item = {
                                 name: dataList.legend[i],
                                 name: dataList.legend[i],
-                                stack: 'Total',
+                                // stack: 'Total',
                                 type: 'line',
                                 type: 'line',
                                 emphasis: {
                                 emphasis: {
                                     focus: 'series'
                                     focus: 'series'