修改

catch/alarm/controller/AlarmReport.php

@@ -99,7 +99,7 @@ class AlarmReport extends CatchController
             $end_date = $request->param('end_date');
         }
         // 查出告警类型
-        $alarm_types = $this->sysDictDataModel->getTypesByCode('AlarmType');
+        $alarm_types = $this->sysDictDataModel->getTypesByCode('AlarmReason');
 
         $datas = [];
         while ($start_date <= $end_date) {

catch/alarm/database/migrations/20210527112040_alarm_records.php

@@ -32,6 +32,7 @@ class AlarmRecords extends Migrator
         $table = $this->table('alarm_records', ['engine' => 'InnoDB',  'comment' => '' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
         $table->addColumn('device_number', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '设备编号',])
             ->addColumn('alarm_reason', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '告警原因',])
+            ->addColumn('alarm_type', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '告警类型',])
 			->addColumn('handler_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '处理人ID',])
 			->addColumn('start_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '开始时间',])
 			->addColumn('end_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '结束时间',])

catch/alarm/model/AlarmRecords.php

@@ -26,6 +26,7 @@ class AlarmRecords extends Model
         'end_time',
         // 告警状态
         'state',
+        'alarm_type',
         // 备注
         'comment',
         // 处理结果

catch/alarm/model/get/AlarmRecordsGet.php

@@ -58,7 +58,7 @@ trait AlarmRecordsGet
      */
     public function getReasonTextAttr($value)
     {
-        return $this->getDictValue('AlarmType',$this->alarm_reason);
+        return $this->getDictValue('AlarmReason',$this->alarm_reason);
     }
     /**
      * 获取告警状态
@@ -76,4 +76,11 @@ trait AlarmRecordsGet
     
        return (new SysDictData())->getValueByCode($typeCode,$value);
    }
+    /**
+     * 获取告警类型名称
+     */
+    public function getAlarmTypeAttr($value)
+    {
+        return $this->getDictValue('AlarmType', $value);
+    }
 }

catch/alarm/model/get/AlarmReportGet.php

@@ -17,7 +17,7 @@ trait AlarmReportGet
         if (is_null($type)) {
             return '';
         }
-        return $this->getDictValue('AlarmType', $type);
+        return $this->getDictValue('AlarmReason', $type);
     }
     
    

catch/logs/model/WxPushResultLog.php

@@ -75,7 +75,7 @@ class WxPushResultLog extends Model
         if (is_null($type)) {
             return '';
         }
-        return $this->getDictValue('AlarmType', $type);
+        return $this->getDictValue('AlarmReason', $type);
     }
 
     /*

catch/screen/controller/Preview.php

@@ -143,7 +143,7 @@ class Preview extends CatchController
                             ->where('alarm_time','>',$time)
                             ->whereIn('alarm_type','fence_in,fence_out')
                             ->select()->toArray();
-        $type_id = Db::table("sys_dict_type")->where('code','AlarmType')->value('id');
+        $type_id = Db::table("sys_dict_type")->where('code','AlarmReason')->value('id');
         
         $scrollData=[];
         foreach($alarm_list as $val){