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

【1015】 告警概览：告警趋势折线图优化：线上提示文字，X轴文字样式



See merge request !875

@@ -326,18 +326,41 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
                         show: true,
                         show: true,
                         interval: 0,
                         interval: 0,
                         rotate: 15,
                         rotate: 15,
+                        padding:[10,10,0,0],
                         formatter: val => {
                         formatter: val => {
                             // 一行字数
                             // 一行字数
                             const max = 6
                             const max = 6
                             // 标签长度
                             // 标签长度
-                            const valLength = val.length
-                            // 换行数
-                            const rowNum = valLength / 6
-                            if (valLength > 6) {
-                                return val.slice(0,5) + '...';
-                            } else {
-                                return val
+                            const valLength = val.length;
+                            //lsq x轴文字超出6个字符，两行 省略 2022-08-19
+                            let newParamsName='';
+                            // 总行数
+                            const rowNum=Math.ceil(valLength/max)
+                            if(valLength>max){
+                                for(let p=0;p<rowNum;p++){
+                                    let tempStr='';
+                                    let start=p*max;
+                                    let end=start+max;
+                                    if(p == rowNum-1){
+                                        tempStr=val.substring(start,valLength);
+                                    }else{
+                                        if(p>1){
+                                            tempStr="...";
+                                            newParamsName+=tempStr;
+                                            break;
+                                        }else{
+                                            tempStr=val.substring(start,end);
+                                            if(p<1){
+                                                tempStr+="\n";
+                                            }
+                                        }
+                                    }
+                                    newParamsName+=tempStr;
+                                }
+                            }else {
+                                newParamsName = val;
                             }
                             }
+                            return newParamsName
                         }
                         }
                     },
                     },
                     axisLine: {
                     axisLine: {