diff --git a/app/Services/DeviceWarningService.php b/app/Services/DeviceWarningService.php index 454f8b6..ab18d3e 100644 --- a/app/Services/DeviceWarningService.php +++ b/app/Services/DeviceWarningService.php @@ -136,12 +136,12 @@ class DeviceWarningService if(strpos($column, ',')){//看是否是并联条件 $_columns = explode(',',$column); foreach($_columns as $cc){ - $msg.= $fieldNameMap[$cc].'达到'.$log->$cc.$fieldUnitMap[$cc].'值,且'; + $msg.= $fieldNameMap[$cc].'达到'.($log->$cc ?? 0).$fieldUnitMap[$cc].'值,且'; } $msg = mb_substr($msg, 0, -2); }else{ - $msg = $fieldNameMap[$column].'达到'.$log->$column.$fieldUnitMap[$column].'值'; + $msg = $fieldNameMap[$column].'达到'.($log->$column ?? 0).$fieldUnitMap[$column].'值'; } $notices[] = [ diff --git a/public/admin/agricultural-map.png b/public/admin/agricultural-map.png new file mode 100644 index 0000000..01a5f3a Binary files /dev/null and b/public/admin/agricultural-map.png differ diff --git a/public/admin/dashboard-map.png b/public/admin/dashboard-map-old.png similarity index 100% rename from public/admin/dashboard-map.png rename to public/admin/dashboard-map-old.png