|
@@ -2075,6 +2075,8 @@ class Lampcontrol extends Base_Controller {
|
|
|
$temp = [];
|
|
|
$data['maxcurrent'] = 0;
|
|
|
$data['mincurrent'] = 0;
|
|
|
+ $data['maxpower'] = 0;
|
|
|
+ $data['minpower'] = 0;
|
|
|
foreach ($list as $value) {
|
|
|
$temp['battvoltage'][] = $value['battvoltage'];
|
|
|
$temp['updatetime'][] = date_change($value['updatetime'],0,$timezone);
|
|
@@ -2090,12 +2092,26 @@ class Lampcontrol extends Base_Controller {
|
|
|
}else{
|
|
|
$data['maxcurrent'] = $batterycurrent > $data['maxcurrent'] ? $batterycurrent : $data['maxcurrent'];
|
|
|
}
|
|
|
+
|
|
|
+ if (!isset($data['maxpower'])) {
|
|
|
+ $data['maxpower'] = round($batterypower,2);
|
|
|
+ }else{
|
|
|
+ $data['maxpower'] = $batterypower > $data['maxpower'] ? round($batterypower,2) : round($data['maxpower'],2);
|
|
|
+ }
|
|
|
+
|
|
|
}elseif ($value['battstatus'] == 1) {
|
|
|
if (!isset($data['mincurrent'])) {
|
|
|
$data['mincurrent'] = $batterycurrent;
|
|
|
}else{
|
|
|
$data['mincurrent'] = $batterycurrent > $data['mincurrent'] ? $batterycurrent : $data['mincurrent'];
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ if (!isset($data['minpower'])) {
|
|
|
+ $data['minpower'] = round($batterypower,2);
|
|
|
+ }else{
|
|
|
+ $data['minpower'] = $batterypower > $data['minpower'] ? round($batterypower,2) : round($data['minpower'],2);
|
|
|
+ }
|
|
|
}else{
|
|
|
|
|
|
}
|
|
@@ -2121,16 +2137,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
}else{
|
|
|
$data['minbatttemper'] = $value['batttemper'] < $data['minbatttemper'] ? $value['batttemper'] : $data['minbatttemper'];
|
|
|
}
|
|
|
- if (!isset($data['maxpower'])) {
|
|
|
- $data['maxpower'] = round($batterypower,2);
|
|
|
- }else{
|
|
|
- $data['maxpower'] = $batterypower > $data['maxpower'] ? round($batterypower,2) : round($data['maxpower'],2);
|
|
|
- }
|
|
|
- if (!isset($data['minpower'])) {
|
|
|
- $data['minpower'] = round($batterypower,2);
|
|
|
- }else{
|
|
|
- $data['minpower'] = $batterypower < $data['minpower'] ? round($batterypower,2) : round($data['minpower'],2);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
}
|
|
|
$list = $temp;
|