tj

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -37,15 +37,22 @@
             }
             getTeamClass(datap,function(data){
                 var newEvents = [];
+                
+                console.log(data);
 
-                // 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].end_time, end: data[i].end_time};//都以开始时间的日期为准
+                    var obj = '' ;
+                    if(data[i].class_type == 1){
+                        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+":02", end: data[i].end_time+":03"};
+                    }else if(data[i].class_type == 2){
+                        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+":01", end: data[i].end_time+":02"};
+                    }else{
+                        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+":03", end: data[i].end_time+":04"};
+                    }
                     newEvents.push(obj);
                 }
-
-                 // 这里轮训给每天都增加一个事件
                
+                 // 这里轮训给每天都增加一个事件
                 var date = getMonthByCondition(date_cursor,'first');//new Date();
                 var end_date = getMonthByCondition(date_cursor,'last');//new Date(getCurrentMonthLast2()) ;
                 if(data_param != undefined){
@@ -53,15 +60,12 @@
                     end_date = new Date(data_param.end_time) ;
                 }
 
-
                 for(var i =0;i<31;i++){
                     if( date.setDate(i+1) < end_date ){
-                        var obj =  {id:-1 ,desc:'详细排班' ,title: '+详细排班',  start:date.Format('yyyy-MM-dd'), end: date.Format('yyyy-MM-dd'),color:'#bd7b46'};
+                        var obj =  {id:-1 ,desc:'详细排班' ,title: '+详细排班',  start:date.Format('yyyy-MM-dd 00:00:05'), end: date.Format('yyyy-MM-dd 00:00:06'),color:'#bd7b46'};
                         newEvents.push(obj);
                     }
                 }
-
-              
                 calendar.addEvents(newEvents);
             })
         }
@@ -709,4 +713,6 @@
        $(".modal-title").html("添加班组-"+title);
    }
 
+   
+
    

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -178,5 +178,14 @@
 <script>
     $(document).ready(function() {
         initChargeTeamSchedule();
+
+        /**
+         * 变手 和添加排班
+         */
+        $(document).delegate(".cell-day.current-month","mouseenter",function(){
+            $(this).css("cursor","pointer");
+            $(this).attr("title","添加排班");
+        })
+
     })
 </script>

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

@@ -68,7 +68,7 @@
         <if test="dept_id != null">AND t.dept_id = #{dept_id}</if>
         <if test="start_time != null">AND t.work_date &gt;= #{start_time}</if>
         <if test="end_time != null">AND t.work_date &lt;= #{end_time}</if>
-        ORDER BY t.class_type asc,t.work_date ASC) tc WHERE tc.type =#{type}
+       ) tc WHERE tc.type =#{type}  ORDER BY tc.work_date ASC, tc.start_time ASC
     </select>
 
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.TeamClass" >