|
|
@@ -1850,13 +1850,13 @@ class Lampcontrol extends Base_Controller {
|
|
|
// }else{
|
|
|
|
|
|
// }
|
|
|
- $alarmData = $this->Alarm_model->get_one_by_filter(array('lampid'=>$lamp_id,'status'=>0),'stralarmtype');
|
|
|
- $version = $this->session->userdata('version');
|
|
|
- if (empty($version)) {
|
|
|
- $res['isfaulted'] = empty($alarmData['stralarmtype']) ? '正常' : $alarmData['stralarmtype'];
|
|
|
- }else{
|
|
|
- $res['isfaulted'] = empty($alarmData['stralarmtype']) ? 'Normal' : alarm_translate($alarmData['stralarmtype']);
|
|
|
- }
|
|
|
+ // $alarmData = $this->Alarm_model->get_one_by_filter(array('lampid'=>$lamp_id,'status'=>0),'stralarmtype');
|
|
|
+ // $version = $this->session->userdata('version');
|
|
|
+ // if (empty($version)) {
|
|
|
+ // $res['isfaulted'] = empty($alarmData['stralarmtype']) ? '正常' : $alarmData['stralarmtype'];
|
|
|
+ // }else{
|
|
|
+ // $res['isfaulted'] = empty($alarmData['stralarmtype']) ? 'Normal' : alarm_translate($alarmData['stralarmtype']);
|
|
|
+ // }
|
|
|
|
|
|
$timezone = $this->Project_model->get_timezone_by_projectid($res['projectid']);
|
|
|
$res["updatetime"] = date_change($res["updatetime"],8,$timezone['value']);
|
