|
|
@@ -163,13 +163,11 @@ class Lampcontrol extends Base_Controller {
|
|
|
$panelstatus = $this->config->item('panelstatus');
|
|
|
$lampstatus = $this->config->item('lampstatus');
|
|
|
$tempstatus = $this->config->item('tempstatus');
|
|
|
- $res = $this->Alarm_model->get_one_by_filter(array('lampid'=>$value['id'],'status'=>0),'stralarmtype');
|
|
|
$temp2 = array();
|
|
|
if (isset($batstatus[$value['batstatus']])) $temp2[] = $batstatus[$value['batstatus']];
|
|
|
if (isset($panelstatus[$value['panelstatus']])) $temp2[] = $panelstatus[$value['panelstatus']];
|
|
|
if (isset($lampstatus[$value['lampstatus']])) $temp2[] = $lampstatus[$value['lampstatus']];
|
|
|
if (isset($tempstatus[$value['tempstatus']])) $temp2[] = $tempstatus[$value['tempstatus']];
|
|
|
- $stralarmtype = trim($res['stralarmtype']);
|
|
|
if (!empty($temp2)) {
|
|
|
$value['isfaulted'] = implode(',', $temp2);
|
|
|
}else{
|
|
|
@@ -293,13 +291,11 @@ class Lampcontrol extends Base_Controller {
|
|
|
$panelstatus = $this->config->item('panelstatus');
|
|
|
$lampstatus = $this->config->item('lampstatus');
|
|
|
$tempstatus = $this->config->item('tempstatus');
|
|
|
- $res = $this->Alarm_model->get_one_by_filter(array('lampid'=>$value['id'],'status'=>0),'stralarmtype');
|
|
|
$temp2 = array();
|
|
|
if (isset($batstatus[$value['batstatus']])) $temp2[] = $batstatus[$value['batstatus']];
|
|
|
if (isset($panelstatus[$value['panelstatus']])) $temp2[] = $panelstatus[$value['panelstatus']];
|
|
|
if (isset($lampstatus[$value['lampstatus']])) $temp2[] = $lampstatus[$value['lampstatus']];
|
|
|
if (isset($tempstatus[$value['tempstatus']])) $temp2[] = $tempstatus[$value['tempstatus']];
|
|
|
- $stralarmtype = trim($res['stralarmtype']);
|
|
|
if (!empty($temp2)) {
|
|
|
$value['isfaulted'] = implode(',', $temp2);
|
|
|
}else{
|
