Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection/js/mytask/check.js

VisualInspection/js/mytask/check.js

@@ -1,17 +1,21 @@
 function initCheck() {
     addBreadMenu("/view/mytask/check.html", "视频稽查");
-    $('#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({
@@ -51,28 +55,121 @@ 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 setfastorslow(type, speed) {
+    if (type == 0) {
+        $("#fast_info").html("");
+        $("#slow_info").html("");
+        if ($("#full_fast_info")) {
+            $("#full_fast_info").html("");
+            $("#full_slow_info").html("");
+        }
+    }
+    if (type == 1) {
+        $("#fast_info").html(speed + "x");
+        $("#slow_info").html("");
+        if ($("#full_fast_info")) {
+            $("#full_fast_info").html(speed + "x");
+            $("#full_slow_info").html("");
+        }
+    }
+    if (type == 2) {
+        $("#slow_info").html(speed + "x");
+        $("#fast_info").html("");
+        if ($("#full_fast_info")) {
+            $("#full_fast_info").html("");
+            $("#full_slow_info").html(speed + "x");
+        }
+    }
+
+}
+
+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><span id=\"full_fast_info\"></span></button>' +
+        '                                        <button type="button" class="btn btn-info" onclick="doAction(\'slow\')"><span id=\"full_slow_info\"></span><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_fast_info").html($("#fast_info").html());
+            $("#full_slow_info").html($("#slow_info").html());
+    
+
+            $("#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();
@@ -86,13 +183,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();
@@ -101,7 +198,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
     }
@@ -141,8 +238,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) {
@@ -154,7 +251,7 @@ function saveEdit(){
         var param = {
             'id': editScoreId,
             'pics': picsStr
-        };       
+        };
         editScoreId = null;
         $("#saveEditBtn").hide();
         no_return_common_service("/score/update", param, function (data) {
@@ -172,16 +269,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);
@@ -189,13 +286,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();
@@ -213,27 +310,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;
 }
@@ -250,23 +347,23 @@ 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="showBigImg(\'' + pic+ '\')">'
+                + '<a class="card" href="javascript:void(0)" onclick="showBigImg(\'' + pic + '\')">'
                 + '<img src="' + pic + '" alt="" style="height:100px;width:90px;">'
                 + '<div class="card-heading"><strong>' + name + '</strong></div>'
                 + '<div class="card-actions">'
-                +     '<button type="button" class="btn btn-mini btn-danger" onclick="changePerson(\'' + data[i].id + '\')">选择</button>'
-                +  '</div>'
+                + '<button type="button" class="btn btn-mini btn-danger" onclick="changePerson(\'' + data[i].id + '\')">选择</button>'
+                + '</div>'
                 + '</a>'
                 + '</div>';
             userStr += str;
@@ -277,23 +374,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 showBigImg(src){
-    $('#userBigImg').attr("src",src);
+function showBigImg(src) {
+    $('#userBigImg').attr("src", src);
     layer.open({
-        offset:'r',
+        offset: 'r',
         type: 1,
         title: false,
         closeBtn: 1,
@@ -307,8 +405,8 @@ function showBigImg(src){
 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) {
@@ -316,24 +414,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() {
@@ -441,7 +539,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,
@@ -481,7 +579,7 @@ function showPre(id) {
 function showInvalid() {
     invalidLayer = showPopup4Common('申请无效', function () {
         saveValidReason();
-    }, ['400px', '500px'], '#invalid_div','r');
+    }, ['400px', '500px'], '#invalid_div', 'r');
 
 }
 function submitCheck4Appeal() {
@@ -532,14 +630,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({
 
@@ -547,7 +646,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/teamClass/charge_team_schedule.js

@@ -6,7 +6,7 @@
 //    })
 
    function initChargeTeamSchedule(){
-        //  $("#main_content_title").html("收费人员排班")
+         $("#main_content_title").html("收费人员排班")
 
         var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
 
@@ -345,6 +345,19 @@
             var end_time = $("#end_time").val() ;
             var name = $("#team_info_ti").find("option:selected").text(); 
             
+            if(start_time >= end_time){
+                tip("时间设置不合理，开始时间不能大于结束时间");
+                return ;
+            }
+
+            // 这边需要判断一下，时间不能重叠
+            for(var i=0;i<bind_data.length;i++){
+                if(!(start_time >= bind_data[i].end_time || end_time <= bind_data[i].start_time)){
+                    tip("设置的时间不能重叠");
+                    return ;
+                }
+            }
+
             if( id !="" && start_time !='' && end_time !=''){
                 bind_data.push({"user_name":name , "start_time":start_time , "end_time": end_time,"id":id});
               

VisualInspection/js/teamClass/check_team_schedule.js

@@ -1,7 +1,6 @@
-    
-   $(document).ready(function() {
+    $(document).ready(function() {
 
-        //  $("#main_content_title").html("稽查人员排班")
+         $("#main_content_title").html("稽查人员排班")
 
         var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
         // console.log(user );
@@ -14,7 +13,25 @@
         // 日期游标
         var date_cursor = 0 ;
 
+        // 选择下拉框
+        var role_selectinput ;
 
+        var team_stuffs = [] ;
+
+        selectInitInput(team_stuffs);
+
+        function selectInitInput(objs){
+            $("#relash").empty();
+            $("#relash").append('<input type="text" class="form-control class_team_41" id="team_detail" >');
+            role_selectinput = $('#relash #team_detail').comboTree({
+                source: objs,
+                isMultiple: true
+            });
+        }
+
+        function getSelectInputValue(){
+            return  role_selectinput.getSelectedItemsId();
+        }
 
         $('#calendar').calendar();
         var calendar = $('#calendar').data('zui.calendar');
@@ -115,7 +132,7 @@
             setAddTermTitle(date.format("yyyy-MM-dd"));
             // 保存当前日期
             $("#save_term_class").data("date",date.format("yyyy-MM-dd"));
-             $("#team_detail").html("");
+             $("#team_detail").val("");
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":date.format("yyyy-MM-dd 00:00:00"),
@@ -127,12 +144,34 @@
                 for(var i=0;i<$("select[id*='_term']").length;i++){
                     $("select[id*='_term']").eq(i).val("");
                 }
+               
                 if(data.length > 0){
+                  
                     $("#save_term_class").data("modify_flag",1);
                     for(var i=0;i<data.length;i++){
                         $(".class_team_"+data[i].class_type).val(data[i].team_id);
                     }
-                    $("#team_detail").html(data[0].user_ids_name);
+
+                    var user_ids_name = data[0].user_ids_name ;
+                    var user_ids = data[0].user_ids;
+                    // 请求班组下人员信息
+                    var dataObj ={ "id": data[0].team_id };
+                    post_common_service( "team/getDetailById",dataObj,function(data){
+                        get_input_data(data) ;    
+                        // $("#team_detail").val(user_ids_name.substring(0,user_ids_name.length-1));
+                        var user_id = user_ids.split(",");
+                        var user_name = user_ids_name.substring(0,data.user_ids_name.length-1).split(',');
+                        var team_temp_stuffs = [];
+                        for(var i=0; i< user_id.length ;i++ ){
+                            $('span[data-id="'+ user_id[i] +'"] input').attr("checked",true);
+                            var zdataItem = {};
+                            zdataItem["id"] =user_id[i] ;
+                            zdataItem["title"] = user_name[i];
+                            team_temp_stuffs.push(zdataItem);
+                        }
+                        role_selectinput._selectedItems = team_temp_stuffs ;
+                        role_selectinput.refreshInputVal();
+                    },function(error){})
                 }else{
                      $("#save_term_class").data("modify_flag",0);
                 }
@@ -180,6 +219,17 @@
 
         $("#save_term_class").click(function(){
             var data = [];
+            var user_ids = getSelectInputValue();
+            var str_user_ids = '';
+            if(user_ids!=false){
+                for(var i=0;i<user_ids.length;i++){
+                    str_user_ids = str_user_ids + ((i!=0)?(','+user_ids[i]):user_ids[i]);
+                }
+            }
+           if(str_user_ids == ''){
+               tip("请选择值班人员");
+               return ;
+           }
             for(var i=0;i<$("select[id*='_term']").length;i++){
                 if($("select[id*='_term']").eq(i).val()!=""){
                     var obj = {
@@ -189,18 +239,20 @@
                         "start_time": $("#save_term_class").data("date")+" 00:00:00",
                         "end_time": $("#save_term_class").data("date")+" 00:00:00",
                         "dept_id": user_dept_id,
-                        "user_ids":  $("#team_detail").data("user_ids")      
+                        "user_ids":  str_user_ids    
                     };
                     data.push(obj);
                 }
             }
+
             if(data.length == 0 ){
-                tip("请增加排班!");
+                tip("请填写排班信息!");
                 return ;
             }
             if( $("#save_term_class").data("modify_flag") != 1){
                 post_common_service("teamClass/add/list",data,function(data){
                     updateCalendar();
+                    tip("今日排班成功!");
                     $('#myModal').modal('hide');
                 },function(error){
                     $('#myModal').modal('hide');
@@ -208,6 +260,7 @@
             }else{
                 post_common_service("teamClass/update/list",data,function(data){
                     updateCalendar();
+                     tip("今日排班成功!");
                     $('#myModal').modal('hide');
                 },function(error){
                     $('#myModal').modal('hide');
@@ -235,34 +288,51 @@
             },function(error){})
         }
 
-   })
 
-   $("#all_term").change(function(){
+    $("#all_term").change(function(){
        if($(this).val() !="" ){
            // 请求班组下人员信息
            var data ={ "id": $(this).val() };
            post_common_service( "team/getDetailById",data,function(data){
-                $("#team_detail").html(data.user_ids_name); 
-                $("#team_detail").data("user_ids",data.user_ids);            
+               
+                get_input_data(data)         
            },function(error){})
        }else{
-            $("#team_detail").html("");   
+            $("#team_detail").val();   
        }
    })
 
-   // 根据class_type 获取班次名称
-   function getTeamName(class_type){
-       if(class_type == 1){
-           return "早班";
-       }else if(class_type == 2){
-            return "中班";
-       }else if(class_type == 3){
-           return "夜班";
-       }else if(class_type == 4){
-           return "全班";
-       }
-   }
+    function get_input_data(data){
+        if(data.user_ids.length > 0){
+            var user_name = data.user_ids_name.substring(0,data.user_ids_name.length-1).split(',');
+            var user_id = data.user_ids.split(",");
+            team_stuffs = [] ;
+            for(var i =0;i< user_name.length;i++){
+                var zdataItem = {};
+                zdataItem["id"] =user_id[i] ;
+                zdataItem["title"] = user_name[i];
+                team_stuffs.push(zdataItem);
+            }
+            selectInitInput(team_stuffs);
+        }
+    }
+
+
+    // 根据class_type 获取班次名称
+    function getTeamName(class_type){
+        if(class_type == 1){
+            return "早班";
+        }else if(class_type == 2){
+                return "中班";
+        }else if(class_type == 3){
+            return "夜班";
+        }else if(class_type == 4){
+            return "全班";
+        }
+    }
+
+    function setAddTermTitle(title){
+        $(".modal-title").html("添加班组-"+title);
+    }
 
-   function setAddTermTitle(title){
-       $(".modal-title").html("添加班组-"+title);
-   }
+   })

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,17 +63,26 @@ 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){
     // console.log(value);
     var vv = value*100/maxVV;
-    callFunc("setcurrenplayttime", parseInt(vv));
+    if(!isNaN(vv) && parseInt(vv).toString() != "NaN") {
+          callFunc("setcurrenplayttime", parseInt(vv)); 
+    }else{
+
+    }
+    
 }
 
 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,24 +46,26 @@
                                     <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>
-                                        <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-info" onclick="doAction('fast')"><i class="icon icon-forward icon-2x"></i><span id="fast_info"></span></button>
+                                        <button type="button" class="btn btn-info" onclick="doAction('slow')"><span id="slow_info"></span><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>
+                                </div> 
                                 <!--<hr>-->
 
                             </div>

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -104,7 +104,7 @@
     </div>
 </div>
 
-<div id="add_detail_info" style="width:700px;">
+<div id="add_detail_info" style="width:700px;display:none;">
     <div id="lists">
          <div class="datatable" style="padding-left:20px;padding-top:10px;"></div>
          <div class="form-group">

VisualInspection/view/term_management/check_stuff_schedule.html

@@ -33,8 +33,8 @@
                     </div>
                     <div class="form-group">
                         <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">人员详情</label>
-                        <div class="col-md-6 col-sm-8">
-                            <div class="form-control class_team_4" id="team_detail" style="height:auto;min-height:32px;"></div>
+                        <div class="col-md-6 col-sm-8 cc" id="relash">
+                            <input type="text" class="form-control" id="team_detail" >
                         </div>
                     </div>
                     <hr>
@@ -52,10 +52,14 @@
 </div>
 </div>
 <!--对话框 结束-->
+
+<link rel="stylesheet" type="text/css" href="/css/user/userManager.css?__inline">
+
+<script type="text/javascript" src="/js/lib/combotree/icontains.js?__inline"></script>
+<script type="text/javascript" src="/js/lib/combotree/comboTreePlugin.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">   
 <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
 <script src="/js/teamClass/check_team_schedule.js"></script>
-
 <style type="text/css" >
     span.time{
         display: none !important ;

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/TeamClassDao.java

@@ -17,6 +17,7 @@ public interface TeamClassDao  {
     public List<TeamClass> getClassList(TeamClass teamClass);
     public void insert(TeamClass teamClass);
     public void update(TeamClass teamClass);
+    public void updateUserIds(TeamClass teamClass);
     public void delete(Long id);
     public void deleteByDeptWorkdate(TeamClass teamClass);
     

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/TeamClassMapper.xml

@@ -55,17 +55,30 @@
     <update id="update" parameterType="com.xintong.visualinspection.bean.TeamClass" >
         UPDATE
         sys_team_class
-        SET
-        <if test="work_date != null">work_date = #{work_date},</if>
-        <if test="dept_id != null">dept_id = #{dept_id},</if>
-        <if test="user_ids != null">user_ids = #{user_ids},</if>
-        <if test="class_type != null">class_type = #{class_type},</if>
-        <if test="team_id != null">team_id = #{team_id},</if>
-        <if test="start_time != null">start_time = #{start_time},</if>
-        <if test="end_time != null">end_time = #{end_time}</if>
+        SET id=id 
+        <if test="work_date != null">,work_date = #{work_date}</if>
+        <if test="dept_id != null">,dept_id = #{dept_id}</if>
+        <if test="user_ids != null">,user_ids = #{user_ids}</if>
+        <if test="class_type != null">,class_type = #{class_type}</if>
+        <if test="team_id != null">,team_id = #{team_id},</if>
+        <if test="start_time != null">,start_time = #{start_time}</if>
+        <if test="end_time != null">,end_time = #{end_time}</if>
         WHERE
         id = #{id}
     </update>
+    
+     <update id="updateUserIds" parameterType="com.xintong.visualinspection.bean.TeamClass" >
+        UPDATE
+        sys_team_class
+        SET id=id 
+        <if test="dept_id != null">,dept_id = #{dept_id}</if>
+        <if test="user_ids != null">,user_ids = #{user_ids}</if>
+        <if test="class_type != null">,class_type = #{class_type}</if>
+        <if test="start_time != null">,start_time = #{start_time}</if>
+        <if test="end_time != null">,end_time = #{end_time}</if>
+        WHERE
+        team_id = #{team_id} and work_date = #{work_date}
+    </update>
 
     <delete id="delete" parameterType="java.lang.Long" >
         DELETE FROM

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserClassServiceImpl.java

@@ -8,9 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.mysql.jdbc.StringUtils;
+import com.xintong.visualinspection.bean.TeamClass;
 import com.xintong.visualinspection.bean.UnregularUserClass;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.bean.UserClass;
+import com.xintong.visualinspection.dao.master.TeamClassDao;
 import com.xintong.visualinspection.dao.master.UserClassDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.UserClassService;
@@ -28,12 +30,31 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
     @Autowired
     UserClassDao userClassDao ;
     
+    @Autowired
+    TeamClassDao teamClassDao;
+    
 	@Override
 	public void insertList(List<UserClass> list) {
 		// TODO Auto-generated method stub
+		StringBuffer nightClassStuff = new StringBuffer();
+		StringBuffer middleClassStuff = new StringBuffer();
+		StringBuffer mooringClassStuff = new StringBuffer();
+		Long mooringTeamId = 0L , middleTeamId =0L , nightTeamId =0L;
 		for(int i=0;i<list.size();i++){
-			if(list.get(i).getList()!=null && list.get(i).getList().size()>0 )
-				list.get(i).setClass_flag(1);
+			if(list.get(i).getList()!=null && list.get(i).getList().size()>0 ){
+				list.get(i).setClass_flag(1);				
+			}
+			UserClass objTemp = list.get(i);
+			if(objTemp.getClass_type() ==1){
+				mooringTeamId = objTemp.getTeam_id();
+				mooringClassStuff.append(objTemp.getUser_id()+",");
+			}else if(objTemp.getClass_type() ==2){
+				middleTeamId = objTemp.getTeam_id();
+				middleClassStuff.append(objTemp.getUser_id()+",");
+			}else if(objTemp.getClass_type() ==3){
+				nightTeamId = objTemp.getTeam_id();
+				nightClassStuff.append(objTemp.getUser_id()+",");
+			}
 			userClassDao.insert(list.get(i));
 			List<UnregularUserClass> obj = list.get(i).getList() ;
 			if(obj!=null && obj.size()>0){
@@ -49,17 +70,58 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 				userClassDao.insert_detail(obj);
 			}
 		}
+		if(nightClassStuff.toString()!=""){
+			// 更新晚班人员
+			TeamClass teamClass = new TeamClass();
+			teamClass.setTeam_id(nightTeamId);
+			teamClass.setWork_date(list.get(0).getWork_date());
+			teamClass.setUser_ids(nightClassStuff.toString());
+			teamClassDao.updateUserIds(teamClass);
+		}
+		if(middleClassStuff.toString()!=""){
+			TeamClass teamClass = new TeamClass();
+			teamClass.setTeam_id(middleTeamId);
+			teamClass.setWork_date(list.get(0).getWork_date());
+			teamClass.setUser_ids(middleClassStuff.toString());
+			teamClassDao.updateUserIds(teamClass);
+		}
+		if(mooringClassStuff.toString()!=""){
+			TeamClass teamClass = new TeamClass();
+			teamClass.setTeam_id(mooringTeamId);
+			teamClass.setWork_date(list.get(0).getWork_date());
+			teamClass.setUser_ids(mooringClassStuff.toString());
+			teamClassDao.updateUserIds(teamClass);
+		}
 	}
-
+	
 	@Override
 	public void updateList(List<UserClass> list) {
 		userClassDao.delete(list.get(0));
 		userClassDao.deleteDetail(list.get(0));
+		
+		StringBuffer nightClassStuff = new StringBuffer();
+		StringBuffer middleClassStuff = new StringBuffer();
+		StringBuffer mooringClassStuff = new StringBuffer();
+		Long mooringTeamId = 0L , middleTeamId =0L , nightTeamId =0L;
+		
 		for(int i=0;i<list.size();i++){
-			if(list.get(i).getList()!=null && list.get(i).getList().size() >0 )
-				list.get(i).setClass_flag(1);
-			else
-				list.get(i).setClass_flag(0);
+			if(list.get(i).getList()!=null && list.get(i).getList().size() >0 ){
+				list.get(i).setClass_flag(1);				
+			}
+			else{
+				list.get(i).setClass_flag(0);				
+			}
+			UserClass objTemp = list.get(i);
+			if(objTemp.getClass_type() ==1){
+				mooringTeamId = objTemp.getTeam_id();
+				mooringClassStuff.append(objTemp.getUser_id()+",");
+			}else if(objTemp.getClass_type() ==2){
+				middleTeamId = objTemp.getTeam_id();
+				middleClassStuff.append(objTemp.getUser_id()+",");
+			}else if(objTemp.getClass_type() ==3){
+				nightTeamId = objTemp.getTeam_id();
+				nightClassStuff.append(objTemp.getUser_id()+",");
+			}
 			userClassDao.insert(list.get(i));
 			List<UnregularUserClass> obj = list.get(i).getList() ;
 			if(obj!=null && obj.size() > 0){
@@ -75,6 +137,28 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 				userClassDao.insert_detail(obj);
 			}
 		}
+		if(nightClassStuff.toString()!=""){
+			// 更新晚班人员
+			TeamClass teamClass = new TeamClass();
+			teamClass.setWork_date(list.get(0).getWork_date());
+			teamClass.setTeam_id(nightTeamId);
+			teamClass.setUser_ids(nightClassStuff.toString());
+			teamClassDao.updateUserIds(teamClass);
+		}
+		if(middleClassStuff.toString()!=""){
+			TeamClass teamClass = new TeamClass();
+			teamClass.setWork_date(list.get(0).getWork_date());
+			teamClass.setTeam_id(middleTeamId);
+			teamClass.setUser_ids(middleClassStuff.toString());
+			teamClassDao.updateUserIds(teamClass);
+		}
+		if(mooringClassStuff.toString()!=""){
+			TeamClass teamClass = new TeamClass();
+			teamClass.setWork_date(list.get(0).getWork_date());
+			teamClass.setTeam_id(mooringTeamId);
+			teamClass.setUser_ids(mooringClassStuff.toString());
+			teamClassDao.updateUserIds(teamClass);
+		}
 	}
 
 	@Override