DESKTOP-9JTA2JJ\HP 5 年 前
コミット
c024f802d7
1 ファイル変更7 行追加7 行削除
  1. 7 7
      api/application/controllers/Lampcontrol.php

+ 7 - 7
api/application/controllers/Lampcontrol.php

@@ -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']);