天地伟业后台参数修改

Modules/Camera/Resources/views/mine_add.blade.php

@@ -863,21 +863,18 @@
     <div class="layui-form-item">
         <div class="layui-form-label">视频服务器类型</div>
         <div class="layui-input-block">
-                <label><input type="radio" name="is_hak" lay-filter="is_hak" value="1" title="海康" @if((isset($item['is_hak']) && $item['is_hak'] == 1) ||
-                                      old('is_hak') === 1 ||
-                                      (isset($column['default']) && $column['default'] === 1)) checked
-                            @endif/></label>
-                <label><input type="radio" name="is_hak" lay-filter="is_hak" value="2" title="天地伟业" @if((isset($item['is_hak']) && $item['is_hak'] == 2) ||
-                                      old('is_hak') === 2 ||
-                                      (isset($column['default']) && $column['default'] === 2)) checked
-                            @endif/></label>
-                <label><input type="radio" name="is_hak" lay-filter="is_hak" value="0" title="其他" @if((isset($item['is_hak']) && $item['is_hak'] == 0) ||
-                                      old('is_hak') === 0 ||
-                                      (isset($column['default']) && $column['default'] === 0)) checked
-                            @endif/></label>
+            @foreach($columns['is_hak']['options'] as $k => $col)
+                <label><input type="radio" name="is_hak" lay-filter="is_hak" value="{{ $k }}"
+                              @if((isset($item['is_hak']) && $item['is_hak'] == $k) ||
+                              old('is_hak') === $k ||
+                              (isset($columns['is_hak']['default']) && $columns['is_hak']['default'] === $k)) checked
+                              @endif title="{{ $col }}"/>
+                </label>
+            @endforeach
         </div>
     </div>
 
+
     <div class="layui-form-item">
         <label class="layui-form-label">排序</label>
         <div class="layui-input-block">
@@ -961,7 +958,7 @@
         document.getElementById("secret_name").innerHTML = "请求secret";
         document.getElementById("kongbai").style.display = 'none';
     }
-    if($('input:radio[name="is_hak"]:checked').val() == 2){//天地伟业
+    if($('input:radio[name="is_hak"]:checked').val() == 4){//天地伟业
         document.getElementById("ip").style.display = 'block';
         document.getElementById("port").style.display = 'block';
         document.getElementById("key").style.display = 'block';
@@ -996,7 +993,7 @@
                 document.getElementById("key_name").innerHTML = "请求key";
                 document.getElementById("secret_name").innerHTML = "请求secret";
                 document.getElementById("kongbai").style.display = 'none';
-            }else if(val == 2){
+            }else if(val == 4){
                 document.getElementById("ip").style.display = 'block';
                 document.getElementById("port").style.display = 'block';
                 document.getElementById("key").style.display = 'block';

Modules/Mine/Enum/MineEnum.php

@@ -13,5 +13,7 @@ class MineEnum
     //是否使用海康视频服务器
     const IS_HAK_NO  = 0;  //其他
     const IS_HAK_YES = 1;  //海康
-    const IS_HAK_TD = 2;  //天地伟业
+    const IS_HAK_DH = 2;  //大华
+    const IS_HAK_YS = 3;  //宇视
+    const IS_HAK_TD = 4;  //天地伟业
 }

Modules/Mine/Http/Controllers/MineController.php

@@ -115,7 +115,7 @@ class MineController extends BaseController
         $formObj->tree_select('parent_id', '父级矿区单位', $titleList, $titleOne->parent_id);
         $formObj->input('title', '矿区单位名称');
         $formObj->input('sort', '排序', 10);
-        $formObj->radio('is_hak', '是否使用海康视频服务器', [MineEnum::IS_HAK_NO => '否', MineEnum::IS_HAK_YES => '是'], 0);
+        $formObj->radio('is_hak', '视频服务器类型', [MineEnum::IS_HAK_YES => '海康',MineEnum::IS_HAK_TD => '天地伟业',MineEnum::IS_HAK_NO => '其它', ], 0);
         $formObj->input('ip', 'id地址');
         $formObj->input('port', '端口');
         $formObj->input('key', '请求key');

app/Console/Commands/UpdateHkList.php

@@ -9,6 +9,7 @@ use Modules\Camera\Services\CameraServices;
 use Modules\Camera\Http\Controllers\Api\TdwyController;
 use Modules\Mine\Entities\MineList;
 use Modules\Mine\Entities\MineListExt;
+use Modules\Mine\Enum\MineEnum;
 use Modules\Mine\Services\MineServices;
 use Illuminate\Support\Facades\DB;
 
@@ -116,7 +117,7 @@ class UpdateHkList extends Command
             ->select('mine_list_ext.*','mine_list.parent_id')
             ->leftJoin('mine_list','mine_list.id','=','mine_list_ext.mine_id')
             ->where('mine_list.parent_id',0)
-            ->where('mine_list_ext.is_hak',2)
+            ->where('mine_list_ext.is_hak',MineEnum::IS_HAK_TD)
             ->where('mine_list_ext.ip','!=','')
             ->where('mine_list_ext.port','!=','')
             ->where('mine_list_ext.key','!=','')