视频逻辑

VisualInspection/js/mytask/check.js

@@ -1,5 +1,4 @@
 function initCheck() {
-    setVideoList("1|2|4");
     event = document.createEvent('MessageEvent');
     var origin = window.location.protocol + '//' + window.location.host;
     event.initMessageEvent('setvideoposition', true, true, getVideoPosition(), origin, 1234, window, null);
@@ -39,7 +38,12 @@ function initCheck() {
         })
         //查询评分情况
         queryScores();
+        //查询录像播放列表
+        queryVideoList();
     }
+     $("select#video_list").change(function(){
+        playVideo($(this).val());
+    });
 }
 
 function initInfo() {

VisualInspection/js/mytask/unchecked.js

@@ -194,7 +194,8 @@ function queryDispatchedTask(){
                 {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person_name'},
                 {width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
                 {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: '',field: 'checkman_name'},
-                {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'start_time'},
+                {width: 100, text: '开始时间', type: 'string', flex: true, sort: 'down',field: 'start_time'},
+                {width: 100, text: '结束时间', type: 'string', flex: true, sort: 'down',field: 'end_time'},
                 {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
                 {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
                     oper:[

VisualInspection/js/util/service.js

@@ -207,7 +207,7 @@ function uploadFile(file, name, successfunc, errorfunc) {
     var dataurl = base_image_server_url+"/fileServer" + FILE_UPLOAD
     var form = new FormData();
     form.append(name, file);
-    form.append('parantPath','tt');
+    form.append('parentPath','tt');
     $.ajax({
         url: dataurl,
         type: "POST",

VisualInspection/js/util/video.js

@@ -3,12 +3,26 @@ function setProgress(percent){
     $('input[type="range"]').val(percent).change();
 }
 
+function doAction(func){
+    callFunc(func, '');
+}
 
+function queryVideoList(){
+    s1 = $.checkTask.start_time.replace(/-/g,"/");
+    var startTime = new Date(s1).getTime()/1000;
+    s1 = $.checkTask.end_time.replace(/-/g,"/");
+    var endTime = new Date(s1).getTime()/1000;
+    var str = $.checkTask.video_id+'|'+startTime+'|'+endTime;
+    callFunc("findvideolist",str);
+}
 
+function playVideo(id){
+    callFunc("playvideo",id);
+}
 
-function doAction(func){
+function callFunc(func, param){
     event = document.createEvent('MessageEvent');
     var origin = window.location.protocol + '//' + window.location.host;
-    event.initMessageEvent (func, true, true, '', origin, 1234, window, null);
+    event.initMessageEvent (func, true, true, param, origin, 1234, window, null);
     document.dispatchEvent (event);
 }

VisualInspection/view/mytask/check.html

@@ -56,25 +56,15 @@
                         <div class="row" style="padding:0 10px;margin-top:5px;text-align:center">
                             <select class="form-control" id="video_list" style="width:200px;float:left;"></select>
                             <div class="btn-group" style="float:right;">
-                                <button type="button" class="btn btn-info" onclick="doAction('start')">播放</button>
-                                <button type="button" class="btn btn-primary" onclick="doAction('stop')">停止</button>
-                                <button type="button" class="btn btn-warning" onclick="doAction('fast')">快进</button>
-                                <button type="button" class="btn btn-danger" onclick="doAction('slow')">快退</button>
-                                <button type="button" class="btn btn-success" onclick="doAction('screenshot')">抓图</button>
+                                <button type="button" class="btn btn-info" onclick="doAction('start')"><i class="icon icon-play-circle icon-2x"></i></button>
+                                <button type="button" class="btn btn-info" onclick="doAction('stop')"><i class="icon icon-pause icon-2x"></i></button>
+                                <button type="button" class="btn btn-info" onclick="doAction('fast')"><i class="icon icon-forward icon-2x"></i></button>
+                                <button type="button" class="btn btn-info" onclick="doAction('slow')"><i class="icon icon-backward icon-2x"></i></button>
+                                <button type="button" class="btn btn-success" onclick="doAction('screenshot')"><i class="icon icon-camera icon-2x"></i></button>
                             </div>
                         </div>
                         <hr>
-                        <div class="row">
-                            <div id="img_container" class="cards cards-borderless col-sm-11">
-                            </div>
-                            <div class="col-sm-1">
-                                <br>
-                                <button class="btn btn-primary" type="button" onclick="clearAllImg()">清空</button>
-                                <br>
-                                <br>
-                                <button class="btn btn-primary" type="button"  onclick="showScore()">评分</button>
-                            </div>
-                        </div>
+                       
                         </div>
                     </div>
                     </div>
@@ -83,7 +73,33 @@
             
         </div>
         <div class="col-sm-6">
-            <div id="score_datatable" style="height:490px;" data-checkable="true" data-sortable="true"></div>
+            <div id="score_datatable" style="height:350px;" data-checkable="true" data-sortable="true"></div>
+            <div class="row">
+                <div id="dashboard" class="dashboard dashboard-draggable" data-height="300">
+            <section class="row">
+                <div class="col-md-12">
+                <div class="panel" data-id="1">
+                    <!--<div class="panel-heading">
+                    <i class="icon icon-list"></i>
+                    <span class="title">面板标题</span>
+                    </div>-->
+                    
+                    <div class="panel-body" style="padding:5px;">
+                        <div id="img_container" class="cards cards-borderless col-sm-11">
+                        </div>
+                        <div class="col-sm-1">
+                            <br>
+                            <button class="btn btn-primary" type="button" onclick="clearAllImg()">清空</button>
+                            <br>
+                            <br>
+                            <button class="btn btn-primary" type="button"  onclick="showScore()">评分</button>
+                        </div>
+                    </div>
+                    </div>
+                </section>
+            </div>
+                
+            </div>
             <div class="row" style="margin-top:5px;">
                 <div class="col-sm-10">
                     <button class="btn btn-primary" type="button" onclick="submitCheck()">直接提交</button>

VisualInspection/view/user/login.html

@@ -13,7 +13,7 @@
 
     <div id="main" class="container-fluid main">
         <div class="row">
-            <div class="col-md-6"></div>
+            <div class="col-md-5"></div>
             <div class="col-md-4">
                 <div class="panel">
                     <div class="panel-heading">