温红权 7 anos atrás
pai
commit
fa5a04112a

+ 3 - 1
VisualInspection/js/mytask/check.js

@@ -90,6 +90,7 @@ function initCheck() {
         queryCheckScores();
         queryCheckScores();
         //查询录像播放列表
         //查询录像播放列表
         var videos = $.checkTask.video_id.split(',');
         var videos = $.checkTask.video_id.split(',');
+        console.log(videos);
         if (videos[0]) {
         if (videos[0]) {
             curVideo = videos[0];
             curVideo = videos[0];
             queryVideoList();
             queryVideoList();
@@ -657,6 +658,7 @@ function showChangeUser() {
             userStr += str;
             userStr += str;
         }
         }
         $("#user_container").html(userStr);
         $("#user_container").html(userStr);
+        // console.log($("#user_container").html());
     })
     })
 }
 }
 
 
@@ -968,7 +970,7 @@ function showInvalidView() {
     }, ['400px', '500px'], '#invalid_div', 'r');
     }, ['400px', '500px'], '#invalid_div', 'r');
 
 
     $('#apply_reason').tagsInput({ 'defaultText': '添加原因' });
     $('#apply_reason').tagsInput({ 'defaultText': '添加原因' });
-    getTags("/checkApply/getTopReason", "#top_reason_div", '#apply_reason', 'apply_reason');
+    getTags("checkApply/getTopReason", "#top_reason_div", '#apply_reason', 'apply_reason');
 }
 }
 
 
 
 

+ 37 - 15
VisualInspection/view/mytask/check.html

@@ -33,23 +33,45 @@
                         <div class="panel" data-id="1">
                         <div class="panel" data-id="1">
 
 
                             <div class="panel-body" style="padding:0 0 5px 0">
                             <div class="panel-body" style="padding:0 0 5px 0">
-                                <ul class="nav nav-secondary" id="tabController">
-                                    <li class="active"><a id="videoController" data-tab href="#videoDiv" onclick="changeButton(1)">视频</a></li>
-                                  </ul>                                  
+                                <ul class="nav nav-secondary">
+                                    <li class="tab_lane" class="active"><a data-tab href="#tabContent1" bbb="0">收费亭</a></li>
+                                    <li class="tab_lane"><a data-tab href="#tabContent2" bbb="1">车道</a></li>
+                                    <li class="tab_lane"><a data-tab href="#tabContent3" bbb="2">广场</a></li>
+                                    <li class="tab_not_lane"><a data-tab href="#tabContent4" bbb="3">值机室</a></li>
+                                    <li class="tab_not_lane"><a data-tab href="#tabContent5" bbb="4">值机室1</a></li>
+                                </ul>
+
+
                                 <div id="video_content">
                                 <div id="video_content">
-                                    <div class="tab-content" id="tabcontent" style="height:400px;text-align: center;background:black;" ondblclick="dbclick()">
-                                        <div id="videoDiv" class="video tab-pane active" style="width:100%;height:100%;"></div>
-                                    <div class="row" style="padding:10px 5px 0px 5px;text-align:center;margin:0px">
-                                        <div id="videoButton" class="col-md-6 " style="padding-left:0;text-align: left">
-                                            <label>视屏列表:</label> <select id="videoslist" onchange="onvideoselect(this)"></select>
-                                        </div>
-                                        <div class="btn-group1" style="float:right;" id="buttonVideo">
-                                            <button type="button" class="btn btn-info1 " style="width:41px;height:41px" id="video_btn_start" onclick="videorecordstart('video_start')"><img id="video_btn_start_img" style="width:30px" src="/images/video.png"></img></button>
-                                            <button type="button" class="btn btn-info1 hidden" style="width:41px;height:41px" id="video_btn_stop" onclick="videorecordstart('video_stop')"><i class="icon icon-stop icon-2x"></i></button>
-                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" id="pic_button" onclick="videorecordstart('screenshot')"><i class="icon icon-camera icon-2x"></i></button>
+                                    <div class="tab-content" id="tabcontent" style="height:400px;text-align: center;background:black;">
+                                        <p style="padding-top:180px;font-size:20px">加载中...</p>
+                                        <!--<i class="icon icon-spin icon-spinner  icon-5x" style="margin-top:100px"></i>-->
+                                    </div>
+                                    <div class="row" class="col-md-12" style="padding:5px 10px 25px 10px;text-align:center;margin:0px">
+                                        <input id="ex1" class="col-md-12" type="text" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="0" />
+                                        <br/>
+                                        <span id="ex1_span" style="position: absolute;left: 25px;">2017-06-12 23:00:00</span>
+                                    </div>
+                                    <div class="row" style="padding:0px 5px 0px 5px;text-align:center;margin:0px">
+                                        <select class="form-control" id="video_list" style="width:200px;float:left;display:none"></select>
+                                        <div class="col-md-4 " style="padding-left:0">
+                                            <div class="input-group" style="padding-left:0">
+                                                <input type="text" id="video_pos" style="height:42px" class="form-control" placeholder="时间偏移值">
+                                                <span class="input-group-btn">
+                                                <button class="btn btn-default" style="height:42px" onclick="setVideoPos()" type="button">校正</button>
+                                             </span>
+                                            </div>
                                         </div>
                                         </div>
-                                        <div class="btn-group1" style="float:right;display: none" id="buttonPics">          
-                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" id="pic_button" onclick="addPics()"><i class="icon icon-camera icon-2x"></i></button>
+                                        <div class="btn-group1" style="float:right;">
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('start')"><i class="icon icon-play-circle icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('stop')"><i class="icon icon-pause icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('fast')"><i class="icon icon-forward icon-2x"></i><span id="fast_info"></span></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('slow')"><span id="slow_info"></span><i class="icon icon-backward icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1 " style="width:41px;height:41px" id="video_btn_start" onclick="doAction('video_start')"><img id="video_btn_start_img" style="width:30px" src="/images/video.png"></img></button>
+                                            <button type="button" class="btn btn-info1 hidden" style="width:41px;height:41px" id="video_btn_stop" onclick="doAction('video_stop')"><i class="icon icon-stop icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('screenshot')"><i class="icon icon-camera icon-2x"></i></button>
+
+
                                         </div>
                                         </div>
 
 
                                     </div>
                                     </div>