Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system

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

@@ -865,10 +865,7 @@
         <div class="layui-input-block">
             @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 }}"/>
+                              @if((isset($item['is_hak']) && $item['is_hak'] == $k)) checked @endif title="{{ $col }}"/>
                 </label>
             @endforeach
         </div>

Modules/Mine/Http/Controllers/MineController.php

@@ -53,7 +53,7 @@ class MineController extends BaseController
         $formObj->tree_select('parent_id', '父级矿区单位', $titleList);
         $formObj->input('title', '矿区单位名称');
         $formObj->input('sort', '排序', 1);
-        $formObj->radio('is_hak', '视频服务器类型', [MineEnum::IS_HAK_YES => '海康',MineEnum::IS_HAK_TD => '天地伟业',MineEnum::IS_HAK_NO => '其它', ], 0);
+        $formObj->radio('is_hak', '视频服务器类型', [MineEnum::IS_HAK_YES => '海康',MineEnum::IS_HAK_TD => '天地伟业',MineEnum::IS_HAK_NO => '其它', ], 1);
         $formObj->input('ip', 'ip地址');
         $formObj->input('port', '端口');
         $formObj->input('key', '请求key');
@@ -138,6 +138,10 @@ class MineController extends BaseController
         }
         $mineService->edit($request->all());
 
+        if ($request->input('is_hak') == MineEnum::IS_HAK_NO) {//其他
+            MineServices::editMineListExt($request->input('id'), $request->all());
+        }
+
         if ($request->input('is_hak') == MineEnum::IS_HAK_YES) {//海康
             if (!$request->input('ip') || !$request->input('port')
                 || !$request->input('key') || !$request->input('secret')

Modules/Mine/Services/MineServices.php

@@ -228,7 +228,7 @@ class MineServices{
                         $res = '海康';
                     }elseif($query->is_hak == MineEnum::IS_HAK_TD){
                         $res = '天地伟业';
-                    }elseif($query->is_hak == MineEnum::IS_HAK_NO){
+                    }else{
                         $res = '其它';
                     }
                     $arr[$num]['ip']     = $query->ip;