minitiger пре 8 година
родитељ
комит
35a0c3c4e4
2 измењених фајлова са 12 додато и 12 уклоњено
  1. 1 1
      VisualInspection/js/main.js
  2. 11 11
      VisualInspection/js/teamClass/charge_team_schedule.js

+ 1 - 1
VisualInspection/js/main.js

@@ -29,7 +29,7 @@ $(document).ready(function () {
     }
 
     var offset = "auto";
-    if(true) {
+    if(ISCLIENT) {
         offset ="t";
     }
     $("#login_out_btn").on("click", function () {

+ 11 - 11
VisualInspection/js/teamClass/charge_team_schedule.js

@@ -44,7 +44,7 @@
 
                 // console.log(data);
                 for(var i=0;i<data.length;i++){
-                    var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].start_time, end: data[i].start_time};//都以开始时间的日期为准
+                    var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].end_time, end: data[i].end_time};//都以开始时间的日期为准
                     newEvents.push(obj);
                 }
                
@@ -218,13 +218,13 @@
                 if(cache) {
                     for(var i=0;i<lans+1;i++){
                         if($(".tr-"+j+" td select").eq(i).val()!='' ){
-
-
-                        
-
                             var start_time = $("#save_user_class").data("work_date")+ classCode[j].start_time+":00" ;
+                            if(j==3) {
+                                var date = new Date($("#save_user_class").data("work_date").replace(/-/,"/"));
+                                date.setDate(date.getDate()-1);
+                                start_time =  date.Format("yyyy-MM-dd")+" "+classCode[j].start_time+":00";
+                            }    
                             var end_time =  $("#save_user_class").data("work_date")+classCode[j].end_time+":00";
-
                             var obj = { "work_date":work_date,"dept_id":cache.dept_id,"user_id": $(".tr-"+j+" td select").eq(i).val() , "class_type":j,"team_id":cache.team_id,"start_time":start_time, "end_time":end_time,"lane":$(".tr-"+j+" td select").eq(i).parent().attr('tag') };
                             dutyList.push(obj);
                         }
@@ -464,18 +464,18 @@
             var data = [];
             for(var i=0;i<$("select[id*='_term']").length;i++){
                 if($("select[id*='_term']").eq(i).val()!=""){
-                    var end_time = $("#save_term_class").data("date")+" "+classCode[i+1].end_time+":00";
+                    var start_time = $("#save_term_class").data("date")+" "+classCode[i+1].start_time+":00";
                     if(i+1==3){
                         var date = new Date($("#save_term_class").data("date").replace(/-/,"/"));
-                        date.setDate(date.getDate()+1);
-                        end_time = date.Format("yyyy-MM-dd")+" "+classCode[i+1].end_time+":00";
+                        date.setDate(date.getDate()-1);
+                        start_time = date.Format("yyyy-MM-dd")+" "+classCode[i+1].start_time+":00";
                     }
                     var obj = {
                         "class_type":i+1,
                         "team_id":$("select[id*='_term']").eq(i).val(),
                         "work_date": $("#save_term_class").data("date")+" 00:00:00",
-                        "start_time": $("#save_term_class").data("date")+" "+ classCode[i+1].start_time+":00" ,
-                        "end_time": end_time,
+                        "start_time": start_time,
+                        "end_time": $("#save_term_class").data("date")+" "+classCode[i+1].end_time+":00",
                         "dept_id":user_dept_id
                     };
                     console.log(obj);