|
|
@@ -398,13 +398,13 @@ class Lampcontrol extends Base_Controller {
|
|
|
$data['total_data']['fault_rate'] .= '%';
|
|
|
// $data['total_data']['network_num'] = $this->Network_model->get_count(['projectid'=>$project_id,'type'=>1]);
|
|
|
|
|
|
- $res = $this->Lamp_model->get_list_by_multi_join($filter, 'count(*) total',$limit, $offset, $join, "L.number ASC", NUll, 'L',true);
|
|
|
- $result = !empty($pid_arr) ? $this->Lamp_model->get_count(['projectid'=>$pid_arr]) : array();
|
|
|
+ // $res = $this->Lamp_model->get_list_by_multi_join($filter, 'count(*) total',$limit, $offset, $join, "L.number ASC", NUll, 'L',true);
|
|
|
+ // $result = !empty($pid_arr) ? $this->Lamp_model->get_count(['projectid'=>$pid_arr]) : array();
|
|
|
|
|
|
$result = $this->Lamp_model->get_count(['projectid'=>$pid_arr]);
|
|
|
- $data['total'] = $res['total'];
|
|
|
+ $data['total'] = $result;
|
|
|
$data['count'] = $result;
|
|
|
- $data['fault'] = $res['total'];
|
|
|
+ // $data['fault'] = $res['total'];
|
|
|
exit(json_result('0000', $this->response['0000'], $data));
|
|
|
}
|
|
|
|
