Merge branch 'master-500-dev-xwx' into 'master-500-dev'
快照管理业务top5资源名称过长优化 See merge request !757
Showing
1 changed file
with
22 additions
and
6 deletions
| @@ -27,21 +27,20 @@ export default { | @@ -27,21 +27,20 @@ export default { | ||
| 27 | label: '资源类型', | 27 | label: '资源类型', |
| 28 | sortable: true, | 28 | sortable: true, |
| 29 | align: 'center', | 29 | align: 'center', |
| 30 | - width: '120', | 30 | + width: '200', |
| 31 | }, | 31 | }, |
| 32 | { | 32 | { |
| 33 | prop: 'resName', | 33 | prop: 'resName', |
| 34 | label: '资源名称', | 34 | label: '资源名称', |
| 35 | sortable: true, | 35 | sortable: true, |
| 36 | - align: 'center', | ||
| 37 | - width: '360' | 36 | + align: 'center' |
| 38 | }, | 37 | }, |
| 39 | { | 38 | { |
| 40 | prop: 'ip', | 39 | prop: 'ip', |
| 41 | label: 'IP地址', | 40 | label: 'IP地址', |
| 42 | sortable: true, | 41 | sortable: true, |
| 43 | align: 'center', | 42 | align: 'center', |
| 44 | - width: '150' | 43 | + width: '130' |
| 45 | }, { | 44 | }, { |
| 46 | prop: 'admin', | 45 | prop: 'admin', |
| 47 | label: '负责人', | 46 | label: '负责人', |
| @@ -53,7 +52,7 @@ export default { | @@ -53,7 +52,7 @@ export default { | ||
| 53 | label: '所属业务系统', | 52 | label: '所属业务系统', |
| 54 | sortable: true, | 53 | sortable: true, |
| 55 | align: 'center', | 54 | align: 'center', |
| 56 | - width: '420' | 55 | + width: '280' |
| 57 | }, | 56 | }, |
| 58 | { | 57 | { |
| 59 | prop: 'nickname', | 58 | prop: 'nickname', |
| @@ -74,7 +73,7 @@ export default { | @@ -74,7 +73,7 @@ export default { | ||
| 74 | label: '快照创建时间', | 73 | label: '快照创建时间', |
| 75 | sortable: true, | 74 | sortable: true, |
| 76 | align: 'center', | 75 | align: 'center', |
| 77 | - width: '200' | 76 | + width: '170' |
| 78 | }, | 77 | }, |
| 79 | ] | 78 | ] |
| 80 | }) | 79 | }) |
| @@ -195,6 +194,23 @@ export default { | @@ -195,6 +194,23 @@ export default { | ||
| 195 | type: 'category', | 194 | type: 'category', |
| 196 | data: [], | 195 | data: [], |
| 197 | axisTick:false, | 196 | axisTick:false, |
| 197 | + axisLabel: { | ||
| 198 | + // x轴文本换行 | ||
| 199 | + formatter: function (params,index) { | ||
| 200 | + if (params.length>10){ | ||
| 201 | + var newParamsName = '' // 最终拼接成的字符串 | ||
| 202 | + let end1 = Math.ceil(params.length / 2); | ||
| 203 | + let end2 = params.length-end1; | ||
| 204 | + let str1 = params.substr(0,end1); | ||
| 205 | + let str2 = params.substr(end1+1,end2); | ||
| 206 | + newParamsName = str1+'\n'+str2; | ||
| 207 | + return newParamsName | ||
| 208 | + }else { | ||
| 209 | + return params | ||
| 210 | + } | ||
| 211 | + } | ||
| 212 | + } | ||
| 213 | + | ||
| 198 | }, | 214 | }, |
| 199 | yAxis: { | 215 | yAxis: { |
| 200 | type: 'value', | 216 | type: 'value', |
-
Please register or login to post a comment