|
@@ -1318,7 +1318,7 @@ class CameraApiController extends BaseController
|
|
public function cameraSelect(Request $request){
|
|
public function cameraSelect(Request $request){
|
|
$result = '<select style="width:99%;" class="form-control" name="camera"><option value="0">-选择摄像头-</option>';
|
|
$result = '<select style="width:99%;" class="form-control" name="camera"><option value="0">-选择摄像头-</option>';
|
|
|
|
|
|
- $mine_list = DB::table('mine_list')->where('parent_id',6356)->where('deleted_at',null)->get();
|
|
|
|
|
|
+ $mine_list = DB::table('mine_list')->where('parent_id',6356)->where('id','!=',6492)->where('deleted_at',null)->get();
|
|
|
|
|
|
if(count($mine_list) > 0){
|
|
if(count($mine_list) > 0){
|
|
for($i=0;$i<count($mine_list);$i++){
|
|
for($i=0;$i<count($mine_list);$i++){
|
|
@@ -1328,7 +1328,7 @@ class CameraApiController extends BaseController
|
|
$result = $result . '<optgroup label="' . $mine_list[$i]->title . '">';
|
|
$result = $result . '<optgroup label="' . $mine_list[$i]->title . '">';
|
|
|
|
|
|
for($j=0;$j<count($camera_list);$j++){
|
|
for($j=0;$j<count($camera_list);$j++){
|
|
- $result = $result . '<option value="'.$camera_list[$j]->id.'|'.$mine_list[$i]->id.'|'.$camera_list[$j]->camera_name.'|'.$camera_list[$j]->camera_type.'">'.$camera_list[$j]->camera_name.'('.CameraEnum::CAMERA_TYPE_EXCHANGE[$camera_list[$j]->camera_type].')</option>';
|
|
|
|
|
|
+ $result = $result . '<option value="'.$camera_list[$j]->id.'|'.$mine_list[$i]->id.'|'.$camera_list[$j]->camera_name.'|'.$camera_list[$j]->camera_type.'">'.$camera_list[$j]->camera_name.'</option>';
|
|
}
|
|
}
|
|
|
|
|
|
$result = $result . '</optgroup>';
|
|
$result = $result . '</optgroup>';
|
|
@@ -1341,6 +1341,26 @@ class CameraApiController extends BaseController
|
|
return json_encode($result);
|
|
return json_encode($result);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //移动摄像头下拉列表
|
|
|
|
+ public function moveCameraSelect(Request $request){
|
|
|
|
+ $mine_id = 6492;
|
|
|
|
+
|
|
|
|
+ $camera = DB::table('camera_list')->where('mine_id',$mine_id)->where('deleted_at',null)->get();
|
|
|
|
+
|
|
|
|
+ $result = [];
|
|
|
|
+
|
|
|
|
+ if(count($camera) > 0){
|
|
|
|
+ for($i=0;$i<count($camera);$i++){
|
|
|
|
+ $result[$i] = [
|
|
|
|
+ 'name' => $camera[$i]->camera_name,
|
|
|
|
+ 'value' => $camera[$i]->id.'|'.$mine_id.'|'.$camera[$i]->camera_name.'|'.$camera[$i]->camera_type
|
|
|
|
+ ];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return json_encode($result);
|
|
|
|
+ }
|
|
|
|
+
|
|
//摄像头信息
|
|
//摄像头信息
|
|
public function cameraInfo(Request $request){
|
|
public function cameraInfo(Request $request){
|
|
$params = $request->all();
|
|
$params = $request->all();
|