Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【404】【告警概览】资源类型告警统计字段丢失 #1



See merge request !674

@@ -167,6 +167,18 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
             var generalList = chartData.generalList;
             var generalList = chartData.generalList;
             var importantList = chartData.importantList;
             var importantList = chartData.importantList;
             var seriousList = chartData.seriousList;
             var seriousList = chartData.seriousList;
+            //start lsq 处理x轴标签如果值为null则显示为空 2022-06-20
+            let arr=[];
+            if(nameList && nameList.length>0){
+                nameList.map(item=>{
+                    if(item==null || item=='null'){
+                        item='';
+                    }
+                    arr.push(item)
+                })
+            }
+            nameList=arr;
+            //end lsq 2022-06-20
             var barSeries = [{
             var barSeries = [{
                 name: '一般告警',
                 name: '一般告警',
                 data: generalList,
                 data: generalList,