Merge branch 'master-500-dev-xwx' into 'master-500-dev'
快照详情页-【无】-基本信息添加非空判断 See merge request !990
Showing
1 changed file
with
1 additions
and
1 deletions
@@ -393,7 +393,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele | @@ -393,7 +393,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele | ||
393 | menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'"; | 393 | menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'"; |
394 | } | 394 | } |
395 | let unit=''; | 395 | let unit=''; |
396 | - if(ar.kpiValue != null && ar.kpiValue.indexOf('从不过期') == -1){ | 396 | + if(ar.unit != null && ar.kpiValue != null && ar.kpiValue.indexOf('从不过期') == -1){ |
397 | unit=ar.unit; | 397 | unit=ar.unit; |
398 | } | 398 | } |
399 | var $html = addIconByValue(valueStr); | 399 | var $html = addIconByValue(valueStr); |
-
Please register or login to post a comment