|
|
@@ -202,13 +202,13 @@ class Home extends Base_Controller {
|
|
|
$join[] = ['table'=>'(select w1.* from history_info_log as w1 join (select lampid,max(updatetime) as maxTime from history_info_log group by lampid) as w2 on w1.lampid = w2.lampid AND w1.updatetime = w2.maxTime) as RI','cond'=>'L.id = RI.lampid','type'=>'inner'];
|
|
|
$res = $this->Lamp_model->get_list_by_multi_join($where, 'sum(RI.totaldischarah) as discharge,sum(RI.totalchargeah) as charge',NULL, NULL, $join, NULL, NUll, 'L', true);
|
|
|
}
|
|
|
- $data['electricity'] = $res['discharge'];
|
|
|
- $data['CO2_reduction'] = $res['discharge'];
|
|
|
- $data['SO2_reduction'] = $res['discharge'];
|
|
|
- $data['TCE_reduction'] = $res['discharge'];
|
|
|
- $data['CO2_reduction'] = round($res['charge']*0.977, 3);
|
|
|
- $data['SO2_reduction'] = round($res['charge']*0.977/2620*8.5*1000, 3);
|
|
|
- $data['TCE_reduction'] = round($res['charge']*0.977/2620*1000, 3);
|
|
|
+ $data['electricity'] = round($res['discharge']/1000,1);
|
|
|
+ // $data['CO2_reduction'] = $res['discharge'];
|
|
|
+ // $data['SO2_reduction'] = $res['discharge'];
|
|
|
+ // $data['TCE_reduction'] = $res['discharge'];
|
|
|
+ $data['CO2_reduction'] = round($res['charge']*0.977/1000, 1);
|
|
|
+ $data['SO2_reduction'] = round($res['charge']*0.977/2620*8.5, 1);
|
|
|
+ $data['TCE_reduction'] = round($res['charge']*0.977/2620, 1);
|
|
|
|
|
|
exit(json_result('0000',$this->response['0000'],$data));
|
|
|
}
|
