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

快照详情页-【无】-基本信息添加非空判断



See merge request !990

@@ -393,7 +393,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                             menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
                         }
                         let unit='';
-                        if(ar.kpiValue != null && ar.kpiValue.indexOf('从不过期') == -1){
+                        if(ar.unit != null && ar.kpiValue != null && ar.kpiValue.indexOf('从不过期') == -1){
                             unit=ar.unit;
                         }
                         var $html = addIconByValue(valueStr);