视屏bug修改

VisualInspection/js/mytask/check.js

@@ -1,16 +1,21 @@
 function initCheck() {
-    $('#ex1').slider({tooltip: 'hide'});
-    $("#ex1").on("slideStop", function(slideEvt) {
+    $('#ex1').slider({ tooltip: 'hide' });
+    $("#ex1").on("slideStop", function (slideEvt) {
         setVideoProcess(slideEvt.value);
     });
 
+
+    $("#tabcontent").css("height", ($("#video_content").height() - 80) + "px");
+
+
+
     event = document.createEvent('MessageEvent');
     var origin = window.location.protocol + '//' + window.location.host;
-    event.initMessageEvent('setvideoposition', true, true, getVideoPosition(), origin, 1234, window, null);
+    event.initMessageEvent('setvideoposition', true, true, getVideoPosition(null), origin, 1234, window, null);
     document.dispatchEvent(event);
 
 
-    
+
 
     // 仅选择日期
     $("#start-time").datetimepicker({
@@ -50,28 +55,88 @@ function initCheck() {
         //查询评分情况
         queryCheckScores();
         //查询录像播放列表
-        var videos = $.checkTask.video_id.split(','); 
-        if(videos[0]){
-            curVideo = videos[0]; 
+        var videos = $.checkTask.video_id.split(',');
+        if (videos[0]) {
+            curVideo = videos[0];
             queryVideoList();
-         }else{
-              callFunc("showvideoview", "false");
+        } else {
+            callFunc("showvideoview", "false");
             layer.msg('该处暂无视屏！', {
-                    time: 2000, //20s后自动关闭
+                time: 2000, //20s后自动关闭
             });
-             callFunc("stop", "");
-         }
+            callFunc("stop", "");
+        }
     }
-     $("select#video_list").change(function(){
+    $("select#video_list").change(function () {
         playVideo($(this).val());
     });
+
+}
+
+function normalscreen() {
+    if (layer_full) {
+        layer.close(layer_full)
+    }
+
+}
+var layer_full = null;
+
+function fullscreen() {
+    var height = window.innerWidth * 0.8 * 1 / 2.0 + 90
+    
+    var contenthtml = ' <div class="tab-content" id="full_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 5px 10px;text-align:center;margin:0px">'+
+'                                    <input id="full_ex1" class="col-md-12" type="text" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="0"'+
+'                                    />'+
+'                                </div>'+
+'                                <div class="row" style="padding:0px 5px 0px 5px;text-align:center;margin:0px">'+
+'                                    <select class="form-control" id="full_video_list" style="width:200px;float:left;display:none;"></select>'+
+'                                    <div class="btn-group" style="float:right;">'+
+'                                        <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>';
+
+
+    layer_full = layer.open({
+        area: ['80%', height + "px"],
+        type: 1,
+        title: false,
+        anim: -1,
+        closeBtn: 0,
+        shadeClose: false,
+        content: "<div id='layer_content' >" + contenthtml + "</div>",
+        success: function (layero, index) {
+
+             $('#full_ex1').slider({ tooltip: 'hide' });
+            $("#full_ex1").on("slideStop", function (slideEvt) {
+                setVideoProcess(slideEvt.value);
+            });
+            $("#full_ex1").val($("#ex1").value)
+            $("#full_ex1").slider({step: 5, min: 0, max: maxVV});
+
+            $("#full_tabcontent").css("height", (height - 90) + "px");
+            $("#full_tabcontent").css("width", "100%");
+            setTimeout(function () {
+                callFunc("setvideoposition", getVideoPosition($("#full_tabcontent")))
+            }, 800)
+
+        }
+    });
+
 }
 
 function initInfo() {
 
 }
-function initCheckAppealBtns(){
-    if($.checkTask.appeal) {
+function initCheckAppealBtns() {
+    if ($.checkTask.appeal) {
         $("#btn_appeal_task").show();
         $("#btn_task").hide();
         $("#appeal_div").show();
@@ -85,13 +150,13 @@ function initCheckAppealBtns(){
             closeBtn: 1,
             shade: false,
             shadeClose: true,
-            offset:'rb',
+            offset: 'rb',
             content: $('#appeal_div'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
-            yes: function(index){
+            yes: function (index) {
                 layer.close(index);
             }
         });
-    }else{
+    } else {
         $("#appeal_div").hide();
         $("#btn_appeal_task").hide();
         $("#btn_task").show();
@@ -100,7 +165,7 @@ function initCheckAppealBtns(){
 // 使用data参数更新数据：
 function queryCheckScores() {
     //$('#score_datatable').score_datatable("");
-    console.log("任务id："+$.checkTask.id);
+    console.log("任务id：" + $.checkTask.id);
     var data = {
         "task_id": $.checkTask.id
     }
@@ -140,8 +205,8 @@ function showEditCheckScore(id) {
     editScoreId = id;
 }
 var editScoreId;
-function saveEdit(){
-    if(editScoreId) {
+function saveEdit() {
+    if (editScoreId) {
         var imgArr = $("#img_container .pic-class");
         var picsStr = "";
         if (imgArr && imgArr.length > 0) {
@@ -153,7 +218,7 @@ function saveEdit(){
         var param = {
             'id': editScoreId,
             'pics': picsStr
-        };       
+        };
         editScoreId = null;
         $("#saveEditBtn").hide();
         no_return_common_service("/score/update", param, function (data) {
@@ -171,16 +236,16 @@ function deleteCheckScore(id) {
     deleteItem4Common(id, "/score/delete/", queryCheckScores, 'r');
 }
 
-function setVideoList(videos){
+function setVideoList(videos) {
     var videoArr;
-    if(videos){
+    if (videos) {
         videoArr = videos.split("|");
-        var selectStr="";
-        for(var i in videoArr){
-            if(i==0)
-                selectStr += '<option value="'+videoArr[i]+'" selected="selected">视频'+(videoArr[i]+1)+'</option>'
+        var selectStr = "";
+        for (var i in videoArr) {
+            if (i == 0)
+                selectStr += '<option value="' + videoArr[i] + '" selected="selected">视频' + (videoArr[i] + 1) + '</option>'
             else
-                selectStr += '<option value="'+videoArr[i]+'">视频'+(videoArr[i]+1)+'</option>';
+                selectStr += '<option value="' + videoArr[i] + '">视频' + (videoArr[i] + 1) + '</option>';
         }
     }
     $('#video_list').html(selectStr);
@@ -188,13 +253,13 @@ function setVideoList(videos){
 
 function addPic(pic) {
     if (pic) {
-        var i=0;
+        var i = 0;
         // var imgArr = $("#img_container .pic-class");
         // if(imgArr && imgArr.length>0) i = imgArr.length;
-        
-        if(pic.startWith("http"))
-		    pic= pic.replace(base_image_server_url,"/"); 
-        
+
+        if (pic.startWith("http"))
+            pic = pic.replace(base_image_server_url, "/");
+
         var picStr = genPicstr(pic);
         $('#img_container').append(picStr);
         $('a.lightbox-toggle').lightbox();
@@ -212,27 +277,27 @@ function showPics(pics, divId) {
             picStr += pic;
         }
         $(divId).html(picStr);
-        $('a.lightbox-toggle').lightbox();     
+        $('a.lightbox-toggle').lightbox();
     }
 }
 
-function genPicstr(imgSrc){
+function genPicstr(imgSrc) {
     var src = imgSrc;
-    if(!src.startWith("http"))
-		src= base_image_server_url+src;
+    if (!src.startWith("http"))
+        src = base_image_server_url + src;
     var pic = '<div class="img_item" style="width:100px;height:90px;float:left;">'
-                + '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
-                + '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">'
-                + '<img class="pic-class img-thumbnail" path="'+imgSrc+'" style="width:100px;height:70px;" src="' + src + '" alt="">'
-                + '</a>'
-                + '</div>';
-    if(ISCLIENT) {
+        + '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
+        + '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">'
+        + '<img class="pic-class img-thumbnail" path="' + imgSrc + '" style="width:100px;height:70px;" src="' + src + '" alt="">'
+        + '</a>'
+        + '</div>';
+    if (ISCLIENT) {
         pic = '<div class="img_item" style="width:100px;height:90px;float:left;">'
-                + '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
-                + '<a class="card" onclick="showClientImg(\''+src +'\')" href="javascript:void(0)" style="position:absolute">'
-                + '<img class="pic-class img-thumbnail" path="'+imgSrc+'" style="width:100px;height:70px;" src="' + src + '" alt="">'
-                + '</a>'
-                + '</div>';
+            + '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
+            + '<a class="card" onclick="showClientImg(\'' + src + '\')" href="javascript:void(0)" style="position:absolute">'
+            + '<img class="pic-class img-thumbnail" path="' + imgSrc + '" style="width:100px;height:70px;" src="' + src + '" alt="">'
+            + '</a>'
+            + '</div>';
     }
     return pic;
 }
@@ -249,16 +314,16 @@ function showChangeUser() {
     var param = {
         'organid': $.checkTask.checked_dept
     };
-   
+
     post_common_service("/user/getUserList/", param, function (data) {
-        changePersonLayer = showPopup4Common('更改人员', null, ['550px','600px'],null,'r');
+        changePersonLayer = showPopup4Common('更改人员', null, ['550px', '600px'], null, 'r');
         $("#user_container").empty();
         var userStr = "";
         for (var i in data) {
             var name = data[i].truename;
-            if (data[i].workno) name = name+" "+data[i].workno.substr(data[i].workno.length-3);
+            if (data[i].workno) name = name + " " + data[i].workno.substr(data[i].workno.length - 3);
             var pic = "../../images/body-bg.png";
-            if (data[i].pic) pic = base_image_server_url+data[i].pic;
+            if (data[i].pic) pic = base_image_server_url + data[i].pic;
             str = '<div style="width:90px;float:left;margin:5px;">'
                 + '<a class="card" href="javascript:void(0)" onclick="changePerson(\'' + data[i].id + '\')">'
                 + '<img src="' + pic + '" alt="" style="height:100px;width:90px;">'
@@ -273,23 +338,24 @@ function showChangeUser() {
 
 function changePerson(id) {
     // $('#checked_person').html(id);
-    var param = {"id": $.checkTask.id,
-                 "checked_person": id,
-                }
-    no_return_common_service("task/update/", param, function(data) {
+    var param = {
+        "id": $.checkTask.id,
+        "checked_person": id,
+    }
+    no_return_common_service("task/update/", param, function (data) {
         get_common_service('user/getUserById/' + id, null, function (data) {
-        changePersonContent(data);
-    })
-    layer.close(changePersonLayer);
-    }, function(error) {
+            changePersonContent(data);
+        })
+        layer.close(changePersonLayer);
+    }, function (error) {
         alert(error);
-    });  
+    });
 }
 function resetUserImgInfo() {
     $("#user_img_container").empty();
     var str = '<a id="person_img" href="../../images/img4.jpg" class="lightbox-toggle">'
-                +'<img src="../../images/img4.jpg" class="img-thumbnail" style="width:50px;height:50px;margin-top:-10px;"></a>'
-                 +   '<label id="checked_person"></label>';
+        + '<img src="../../images/img4.jpg" class="img-thumbnail" style="width:50px;height:50px;margin-top:-10px;"></a>'
+        + '<label id="checked_person"></label>';
     $("#user_img_container").html(str);
 }
 function changePersonContent(data) {
@@ -297,24 +363,24 @@ function changePersonContent(data) {
     var name = data.truename;
     if (data.workno) name = data.workno + " " + data.truename;
     $("#checked_person").html(name);
-    var imgSrc = base_image_server_url+data.pic;
+    var imgSrc = base_image_server_url + data.pic;
     $("#person_img > img").attr("src", imgSrc);
-    if(ISCLIENT) {
+    if (ISCLIENT) {
         $("#person_img").attr("href", "javascript:void(0)");
         $("#person_img").removeClass("lightbox-toggle");
-        $("#person_img").click(function(){
+        $("#person_img").click(function () {
             showClientImg(imgSrc);
         });
         $("#person_img > img").attr("src", imgSrc);
         return;
-    }else {       
+    } else {
         $("#person_img").attr("href", imgSrc);
         $('a.lightbox-toggle').lightbox();
     }
 }
 var scoreLayer;
 function showScore() {
-    scoreLayer = showPopup4Common('选择考核项', null, ['400px', '500px'], '#items-div','r');
+    scoreLayer = showPopup4Common('选择考核项', null, ['400px', '500px'], '#items-div', 'r');
     buildTree();
 }
 function buildTree() {
@@ -422,7 +488,7 @@ function zTreeOnClick(event, treeId, treeNode) {
         'task_id': $.checkTask.id,
         'pics': picsStr,
         'name': treeNode.value,
-        'check_item_score':treeNode.score,
+        'check_item_score': treeNode.score,
         'content': treeNode.value,
         'check_item_id': treeNode.id,
         'checkman': treeNode.id,
@@ -456,13 +522,13 @@ function submitCheck() {
 function showPre(id) {
     // $('#myModal').modal({name:"dd"});
     //预览提交把任务状态改为待提交
-    no_return_common_service('/task/update', {"id":$.checkTask.id,"check_status":3})
+    no_return_common_service('/task/update', { "id": $.checkTask.id, "check_status": 3 })
     changePage("/view/mytask/taskDetail.html");
 }
 function showInvalid() {
     invalidLayer = showPopup4Common('申请无效', function () {
         saveValidReason();
-    }, ['400px', '500px'], '#invalid_div','r');
+    }, ['400px', '500px'], '#invalid_div', 'r');
 
 }
 function submitCheck4Appeal() {
@@ -481,7 +547,7 @@ function submitCheck4Appeal() {
 function showPre4Appeal(id) {
     // $('#myModal').modal({name:"dd"});
     //预览提交把任务状态改为待提交
-    no_return_common_service('/task/update', {"id":$.checkTask.id,"check_status":13})
+    no_return_common_service('/task/update', { "id": $.checkTask.id, "check_status": 13 })
     changePage("/view/mytask/taskDetail.html");
 }
 function saveValidReason() {
@@ -513,14 +579,15 @@ function agreeApply() {
 }
 
 
-function getVideoPosition() {
-    var X = $('#tabcontent').offset().top;
-    var Y = $('#tabcontent').offset().left;
-    var width = $('#tabcontent').width();
-    var height = $('#tabcontent').height();
+function getVideoPosition(obj) {
+    if (obj == null) obj = $('#tabcontent');
+    var X = obj.offset().top;
+    var Y = obj.offset().left;
+    var width = obj.width();
+    var height = obj.height();
     return parseInt(Y) + "|" + parseInt(X) + "|" + parseInt(width) + "|" + parseInt(height);
 }
-function initUpLoad(){
+function initUpLoad() {
 
     var uploader = WebUploader.create({
 
@@ -528,7 +595,7 @@ function initUpLoad(){
         swf: 'lib/webuploader/js/Uploader.swf',
 
         // 文件接收服务端。
-        server: base_image_server_url+'/filesSrver/'+FILE_UPLOAD,
+        server: base_image_server_url + '/filesSrver/' + FILE_UPLOAD,
 
         // 选择文件的按钮。可选。
         // 内部根据当前运行是创建，可能是input元素，也可能是flash.

VisualInspection/js/util/video.js

@@ -16,10 +16,21 @@ function queryVideoList(){
         var startTime = new Date(s1).getTime()/1000;
         s1 = $.checkTask.end_time.replace(/-/g,"/");
         var endTime = new Date(s1).getTime()/1000;
+        //获取当前的index
+        var index = 0;
+
+        for(var i = 0;i<videos.length;i++){
+              
+             if(parseInt(videos[i])==parseInt(curVideo)){
+                index = i;
+                break;
+             }
+        }
+      
         //获取摄像头信息
         VideoGetById(curVideo,function(data){
             if(data!=null && typeof(data)!="undefined"){
-                var str = curVideo+'|'+startTime+'|'+endTime+'|'+data.cameratype+'|'+data.playtype;
+                var str = curVideo+'|'+startTime+'|'+endTime+'|'+data.cameratype+'|'+data.playtype+'|'+index;
                 callFunc("findvideolist",str);
             }
         },function(error){
@@ -38,10 +49,13 @@ function playVideo(id){
 }
 var maxVV;
 function setProcessValue(maxValue){
-    // alert(maxValue);
+     //alert(maxValue);
     // console.log(max);
     maxVV = maxValue;
     $("#ex1").slider({step: 5, min: 0, max: maxValue});
+    if($("#full_ex1")){
+         $("#full_ex1").slider({step: 5, min: 0, max: maxValue});
+    }
 }
 
 function setCurrentProcessValue(value){
@@ -49,7 +63,11 @@ function setCurrentProcessValue(value){
     // console.log(value);
     
     var vv =maxVV*(value/100)
+
     $("#ex1").slider('setValue',parseInt(vv));
+     if($("#full_ex1")){
+         $("#full_ex1").slider('setValue',parseInt(vv));
+    }
 }
 
 function setVideoProcess(value){
@@ -59,7 +77,7 @@ function setVideoProcess(value){
 }
 
 function callFunc(func, param){
-    event = document.createEvent('MessageEvent');
+    var event = document.createEvent('MessageEvent');
     var origin = window.location.protocol + '//' + window.location.host;
     event.initMessageEvent (func, true, true, param, origin, 1234, window, null);
     document.dispatchEvent (event);

VisualInspection/view/mytask/check.html

@@ -23,6 +23,7 @@
                 <div class="col-sm-1">
                     <button class="btn btn-primary " type="button" onclick="showChangeUser()">更改考核人员</button>
                 </div>
+           
             </div>
         </form>
     </div>
@@ -45,16 +46,17 @@
                                     <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>
                                 </ul>
-                                <div class="tab-content" id="tabcontent" style="height:400px;text-align: center;background:rgba(ff,ff,ff,0.0);">
-                                    <p style="padding-top:100px;font-size:20px">加载中...</p>
+                                <div id="video_content" >
+                                <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;margin-top:5px;text-align:center">
+                                <div class="row" class="col-md-12" style="padding:5px 10px 5px 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"
                                     />
                                 </div>
-                                <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="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="btn-group" style="float:right;">
                                         <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>
@@ -63,6 +65,7 @@
                                         <button type="button" class="btn btn-success" onclick="doAction('screenshot')"><i class="icon icon-camera icon-2x"></i></button>
                                     </div>
                                 </div>
+                                </div> 
                                 <!--<hr>-->
 
                             </div>

VisualInspection_server/src/main/resources/application.properties

@@ -11,7 +11,7 @@ master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/yanhai?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -57,7 +57,7 @@ spring.redis.host=10.112.0.199
 #spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
 #spring.redis.port=6380
-spring.redis.port=6379 
+spring.redis.port=7003 
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
 # \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09
@@ -73,11 +73,10 @@ spring.redis.timeout=0
 
 
 
-logging.level.root=INFO
+logging.level.root=DEBUG
 logging.level.org.springframework.web=DEBUG
 logging.level.org.springframework.data=DEBUG
 logging.level.org.springframework.security=DEBUG
-logging.level.org.mybites=INFO