3 лет назад · b901f35dff
--- a/Modules/Camera/Enum/CameraEnum.php
+++ b/Modules/Camera/Enum/CameraEnum.php
@@ -47,6 +47,8 @@ class CameraEnum
 
				     const CAMERA_TYPE_WORK     = 3;      //工作面
			
 
				     const CAMERA_TYPE_MATERIAL = 4;      //物资
			
 
				     const CAMERA_TYPE_COALYARD = 5;      //煤场
			
 
				+    const CAMERA_TYPE_RISK = 6;      //高风险作业
			
 
				+    const CAMERA_TYPE_PLACE = 7;      //培训场所
			
 
				 
			
 
				     const CAMERA_TYPE_EXCHANGE = [
			
 
				         self::CAMERA_TYPE_NORMAL   => '普通摄像头',
			
@@ -54,6 +56,8 @@ class CameraEnum
 
				         self::CAMERA_TYPE_WORK     => '工作面监控',
			
 
				         self::CAMERA_TYPE_MATERIAL => '物资监控',
			
 
				         self::CAMERA_TYPE_COALYARD => '煤场监控',
			
 
				+        self::CAMERA_TYPE_RISK => '高风险作业',
			
 
				+        self::CAMERA_TYPE_PLACE => '培训场所',
			
 
				     ];
			
 
				 
			
 
				     //调取海康接口类型
			
--- a/Modules/Camera/Http/Controllers/Api/CameraApiController.php
+++ b/Modules/Camera/Http/Controllers/Api/CameraApiController.php
@@ -183,6 +183,16 @@ class CameraApiController extends BaseController
 
				         return self::successResponse($result);
			
 
				     }
			
 
				 
			
 
				+    //回放列表
			
 
				+    public function getPlaybackList(){
			
 
				+        return 111;
			
 
				+    }
			
 
				+
			
 
				+    //回放URL
			
 
				+    public function getPlaybackUrl(){
			
 
				+        return 222;
			
 
				+    }
			
 
				+
			
 
				     /**
			
 
				      * 作者: qiuzijian
			
 
				      * 注释: 获取编码设备信息
			
--- a/Modules/Camera/Http/Controllers/CameraController.php
+++ b/Modules/Camera/Http/Controllers/CameraController.php
@@ -613,6 +613,7 @@ class CameraController extends BaseController
 
				         $data['footBtns']   = $formObj->footBtns;
			
 
				         $data['colWidth']   = $formObj->colWidth;
			
 
				         $data['playback']   = $playback;
			
 
				+        $data['camera_name']   = $camera->camera_name;
			
 
				         return $this->view('camera::playback_edit', $data);
			
 
				     }
			
 
				 
			
--- a/Modules/Camera/Resources/views/playback_edit.blade.php
+++ b/Modules/Camera/Resources/views/playback_edit.blade.php
@@ -10,7 +10,7 @@
 
				 <body>
			
 
				     <form class="layui-form" id="form-unify" method="post" action="/admin/camera/list/playback" style="padding:20px;">
			
 
				         @csrf
			
 
				-        <h2 class="uk-modal-title">摄像头回放</h2>
			
 
				+        <h2 class="uk-modal-title">摄像头回放({{ $camera_name }})</h2>
			
 
				         @if(isset($item[$primaryKey]))
			
 
				             <input type="hidden" name="{{ $primaryKey }}" value="{{ $item[$primaryKey] }}">
			
 
				         @endif
			
--- a/Modules/Camera/Routes/api.php
+++ b/Modules/Camera/Routes/api.php
@@ -21,6 +21,8 @@ Route::middleware('auth:api')->namespace('Api')->group(function () {
 
				     Route::post('camera/lake/getlist', 'CameraApiController@getSouthLakeCamera');
			
 
				     Route::post('camera/surface/getlist', 'CameraApiController@getWorkSurfaceCamera');
			
 
				     Route::post('camera/get_hik_rtsp', 'CameraApiController@getHikRtsp');//海康获取rtsp流
			
 
				+    Route::get('camera/playback/getlist', 'CameraApiController@getPlaybackList');//回放时间段列表
			
 
				+    Route::get('camera/playback/geturl', 'CameraApiController@getPlaybackUrl');//回放url
			
 
				 
			
 
				     //海康视频接口
			
 
				     Route::get('haikang/monitor/regions/list', 'HaiKangController@getRegionsList');
			
--- a/Modules/Camera/Services/CameraServices.php
+++ b/Modules/Camera/Services/CameraServices.php
@@ -337,6 +337,7 @@ class CameraServices
 
				                 'camera_name',
			
 
				                 'cover_picture',
			
 
				                 'camera_status',
			
 
				+                'playback',
			
 
				             ]
			
 
				         )->get()->toArray();