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

快照详情页密码过期剩余时间从不过期不展示天数



See merge request !984

@@ -392,11 +392,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                             ar.kpiName = ar.kpiName + tips;
                             menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
                         }
+                        let unit='';
+                        if(ar.kpiValue.indexOf('从不过期') == -1){
+                            unit=ar.unit;
+                        }
                         var $html = addIconByValue(valueStr);
                         var resStyle = obj.alarmEleMatchStyle(ar.flag, ar.kpiId);
                         span += ' <span  ' + menuId + '  style="text-align:left;width:40%">' + ar.kpiName + '</span>' +
                             '<span title="' + titleStr + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
-                            + $html + valueStr +(ar.unit?ar.unit:'')+ '</span>';
+                            + $html + valueStr +unit+ '</span>';
                         //补充空白区域
                         if (v.length < cols) {
                             var l = cols - v.length;