no message

app/Camip.php

+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class camip extends Model
+{
+    //cam的資料表
+    protected $table = 'camip';
+    public $timestamps = false;
+    //
+    
+}

app/Http/Controllers/AttendanceController.php

@@ -36,7 +36,7 @@ class AttendanceController extends Controller
         $response_off = json_decode($res_off_work->getBody()->__toString(), true);
         $response_go = json_decode($res_go_out->getBody()->__toString(), true);
         $response_back = json_decode($res_come_back->getBody()->__toString(), true);
-dd($response_off);
+// dd($response_off);
         // dd($response_back);
         $maxcount=max(count($response_emp['results'][0]['series'][0]['values']),count($response_on['results'][0]['series'][0]['values']),count($response_off['results'][0]['series'][0]['values']),
         count($response_go['results'][0]['series'][0]['values']),count($response_back['results'][0]['series'][0]['values']));
@@ -179,7 +179,7 @@ dd($response_off);
                 $contents[$replace_datego[0]]=array($result_content[$name] => array("goout" =>$replace_goout[1]));
             }
         }
-dd($contents);
+// dd($contents);
         $back_count=count($response_back['results'][0]['series'][0]['values']);
         // dd($response[0]['Ports']);
         for($i=0;$i<$back_count;$i++){

public/css/bootstrap.css

@@ -3438,7 +3438,7 @@ input[type="button"].btn-block {
   -ms-flex: 1 1 auto;
   flex: 1 1 auto;
   width: 1%;
-  margin-bottom: 0;
+  margin-left: 4px;
 }
 
 .input-group > .form-control + .form-control,
@@ -3468,14 +3468,14 @@ input[type="button"].btn-block {
 
 .input-group > .form-control:not(:last-child),
 .input-group > .custom-select:not(:last-child) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+  /* border-top-right-radius: 0; */
+  /* border-bottom-right-radius: 0; */
 }
 
 .input-group > .form-control:not(:first-child),
 .input-group > .custom-select:not(:first-child) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+  /* border-top-left-radius: 0; */
+  /* border-bottom-left-radius: 0; */
 }
 
 .input-group > .custom-file {

resources/views/docker/new.blade.php

@@ -24,7 +24,9 @@
                     <select id="module" class="form-control" name="identify_module">
                     <option value="none" selected="">請選擇一個模組</option>
                     @foreach($docker_tag as $tag)
-                        <option value="{{$tag['RepoTags'][0]}}">{{$tag['RepoTags'][0]}}</option>
+                        @if(isset($tag['Labels']['is']))
+                            <option value="{{$tag['RepoTags'][0]}}">{{$tag['RepoTags'][0]}}</option>
+                        @endif
                     @endforeach
                     </select>
                 </div>
@@ -134,25 +136,29 @@ $("#module").change(function(){
             str+=("</div>");
             str+=("</div>");
 
-            str+=("<div class=\"form-group row\" id=\"channel\" >");
-            str+=("<label class=\"col-sm-2 col-form-label\" >"+"channel"+"</label>");
-            str+=("<div class=\"col-sm-10\" >");
-            str+=("<input name=\"channel\" class=\"form-control\" type=\"text\" value=\"mmout\" required=\"\">");
-            str+=("</div>");
-            str+=("</div>");
-
             str+=("<div class=\"form-group row\" id=\"tsdbserver\" >");
             str+=("<label class=\"col-sm-2 col-form-label\" >"+"TSDBSERVER"+"</label>");
             str+=("<div class=\"col-sm-10\" >");
-            str+=("<input name=\"TSDBSERVER\" class=\"form-control\" type=\"text\" value=\"192.168.5.17\" required=\"\">");
+            str+=("<input name=\"TSDBSERVER\" class=\"form-control\" type=\"text\" value=\"192.168.5.17:8086\" disabled>");
             str+=("</div>");
             str+=("</div>");
 
-            str+=("<div class=\"form-group row\" id=\"tsdbport\" >");
-            str+=("<label class=\"col-sm-2 col-form-label\" >"+"TSDBPORT"+"</label>");
+            str+=("<div class=\"form-group row\" id=\"channel\" >");
+            str+=("<label class=\"col-sm-2 col-form-label\" >"+"channel"+"</label>");
             str+=("<div class=\"col-sm-10\" >");
-            str+=("<input name=\"TSDBPORT\" class=\"form-control\" type=\"text\" value=\"8086\" required=\"\">");
+            str+=("<input name=\"channel\" class=\"form-control\" type=\"text\" value=\"mmout\" required=\"\">");
+            str+=("</div>");
             str+=("</div>");
+
+            str+=("<div class=\"input-group mb-3\" id=\"roi\" >");
+            str+=("<label class=\"col-sm-2 col-form-label\" >"+"ROI"+"</label>");
+            // str+=("<div class=\"col-sm-10\" >");
+            str+=("<input name=\"ROI\" class=\"form-control\" type=\"text\" value=\"0\" required=\"\">");
+            str+=("<input name=\"ROI\" class=\"form-control\" type=\"text\" value=\"0\" required=\"\">");
+            str+=("<input name=\"ROI\" class=\"form-control\" type=\"text\" value=\"0\" required=\"\">");
+            str+=("<input name=\"ROI\" class=\"form-control\" type=\"text\" value=\"0\" required=\"\">");
+
+            // str+=("</div>");
             str+=("</div>");
             $( ".add" ).append(str);
 
@@ -183,14 +189,36 @@ $("#module").change(function(){
             $( ".add" ).append(str);
         break;
 
+        case 'ffmpeg-rtmp:latest': 
+            $( ".add" ).empty();
+            var str='';
+            var total_stream=<?php echo json_encode($total_stream); ?>;
+
+            str+=("<div class=\"form-group row\" id=\"origin\">");
+            str+=("<label class=\"col-sm-2 col-form-label\" >"+"來源串流"+"</label>");
+            str+=("<div class=\"col-sm-10\">");
+            str+=("<select class=\"form-control\" name=\"origin_stream\">");
+            // for(var i=0; i<total_stream.length; i++){
+            //     str+=("<option>"+total_stream[i]['path']+"</option>");
+            // }
+            str+=("<option>rtsp://admin:Ecom84253675@120.108.24.89:554/onvif/profile2/media.smp</option>");
+
+            str+=("</select>");
+            str+=("</div>");
+            str+=("</div>");
+
+            str+=("<div class=\"form-group row\" id=\"dis\" >");
+            str+=("<label class=\"col-sm-2 col-form-label\" >"+"目的串流"+"</label>");
+            str+=("<div class=\"col-sm-10\" >");
+            str+=("<input name=\"dis_stream\" class=\"form-control\" type=\"text\" placeholder=\"請輸入英文或數字共3個字以上\" value=\"rtmp://192.168.5.17/live/out\" required=\"\">");
+            str+=("</div>");
+            str+=("</div>");
+            $( ".add" ).append(str);
+        break;
+
         default:
         $( ".add" ).empty();
-        // $( "#channel" ).remove();
-        // $( "#tsdbserver" ).remove();
-        // $( "#tsdbport" ).remove();
-        // $( "#origin" ).remove();
-        // $( "#dis" ).remove();
-        
+        $( ".add" ).append("str");   
 
         }
 });

resources/views/smart_parking/camera.blade.php

@@ -210,10 +210,18 @@
             player.play();
             stream="outer";
         }
-
+        function switch_stream(channel) {
+            // document.getElementById("AreaBox").innerHTML='出口';
+            // document.getElementById("RtmpName").innerHTML='Rtmp-Play1';
+            let player=videojs("my-video");
+            player.src(channel.replace("rtmp", "http")+".flv");
+            player.play();
+            stream="outer";
+            // console.log(channel);
+        }
 
     $("#stream_option").change(function(){
-        outer_stream();
+        switch_stream($(this).val());
     });
     </script>
 @stop
\ No newline at end of file

routes/web.php

@@ -116,6 +116,19 @@ Route::group(['middleware'=>'auth'],function (){
 
 });
 
+///////////////////////////////////insert_campage
+Route::get('cam', "CanvasController@loadcam");
+
+Route::post('caminsert', "CanvasController@caminsert");
+
+Route::post('camupdate', "CanvasController@camupdate");
+
+Route::post('camdelete', "CanvasController@camdelete");
+
+Route::post('canvas_set', "CanvasController@canvas_set");
+
+
+
 Route::get('tt',function(){
     return view('tt');
 });