修改和优化

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -84,6 +84,8 @@
 
 
         var lans = 0;
+        var entrance_number = 0;
+        var exit_number = 0;
 
         // 获取收费站信息
         function getStation(){
@@ -91,10 +93,19 @@
                 if(data != null){
                     $(".thread_charge").append("<th>"+data.name+"</th>");
                     $(".thread_charge").append("<th>值班室</th>");
+                    console.log(data);
                     lans = data.lanes_number;
-                    for(var i=0;i<data.lanes_number;i++){
+                    entrance_number = data.entrance_numer ;
+                    exit_number = data.exit_numer ;
+                    // for(var i=0;i<data.lanes_number;i++){
+                    //     $(".thread_charge").append("<th>进口车道"+(i+1)+"</th>");
+                    // }
+                    for(var i=0;i<entrance_number;i++){
                         $(".thread_charge").append("<th>进口车道"+(i+1)+"</th>");
                     }
+                    for(var i=0;i<exit_number;i++){
+                         $(".thread_charge").append("<th>出口车道"+(i+1)+"</th>");
+                    }
                 }
             },function(error){
                 return "" ;
@@ -165,8 +176,10 @@
 
                 if(cache) {
                     for(var i=0;i<lans+1;i++){
-                        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":work_date, "end_time":work_date,"lane":i };
-                        dutyList.push(obj);
+                        if($(".tr-"+j+" td select").eq(i).val()!='' ){
+                            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":work_date, "end_time":work_date,"lane":$(".tr-"+j+" td select").eq(i).parent().attr('tag') };
+                            dutyList.push(obj);
+                        }
                     }
                 }
             }
@@ -219,40 +232,67 @@
                             $(".tr-1").append("<td>早班 6:00 - 12:00</td>");
                             var selectv = "<select class='form-control'>"
                                     // console.log(data[i]);
+                            selectv += ("<option value=''>请选择人员</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                     var obj = data[i].users[j];
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
                             }
                             selectv += "</select>";
-                            for(var z=0;z<lans+1;z++){
-                                 $(".tr-1").append("<td>"+ selectv +"</td>")
+                            // for(var z=0;z<lans+1;z++){
+                            //      $(".tr-1").append("<td>"+ selectv +"</td>")
+                            // }
+                            $(".tr-1").append("<td class='c-1-0' tag='0'>"+ selectv +"</td>")
+                            for(var z=0;z<entrance_number;z++){
+                                $(".tr-1").append("<td class='c-1-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv +"</td>")
+                            }
+                            for(var z=0;z<exit_number;z++){
+                               $(".tr-1").append("<td class='c-1--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv +"</td>")
                             }
+
+
                         }else if(data[i].class_type == 2){
                              $(".tr-2").append("<td>中班 12:00 - 20:00</td>");
                               $(".tr-2").data("cache",data[i]);
                             var selectv2 = "<select class='form-control'>"
+                            selectv2 += ("<option value=''>请选择人员</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)
                                 selectv2 += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>")
                             }
                             selectv2 += "</select>";
 
-                            for(var z=0;z<lans+1;z++){
-                                 $(".tr-2").append("<td>"+ selectv2 +"</td>")
+                            // for(var z=0;z<lans+1;z++){
+                            //      $(".tr-2").append("<td>"+ selectv2 +"</td>")
+                            // }
+                             $(".tr-2").append("<td class='c-2-0' tag='0'>"+ selectv2 +"</td>")
+                            for(var z=0;z<entrance_number;z++){
+                                $(".tr-2").append("<td class='c-2-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv2 +"</td>")
+                            }
+                            for(var z=0;z<exit_number;z++){
+                               $(".tr-2").append("<td class='c-2--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv2 +"</td>")
                             }
                         }else if(data[i].class_type == 3){
                             $(".tr-3").append("<td>晚班 20:00 - 6:00</td>");
                              $(".tr-3").data("cache",data[i]);
                             var selectv3 = "<select class='form-control'>"
+                            selectv3 += ("<option value=''>请选择人员</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)
                                 selectv3 += "<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>"
                             }
                             selectv3 += "</select>";
 
-                            for(var z=0;z<lans+1;z++){
-                                 $(".tr-3").append("<td>"+ selectv3 +"</td>")
+                             $(".tr-3").append("<td class='c-3-0' tag='0'>"+ selectv3 +"</td>")
+                            for(var z=0;z<entrance_number;z++){
+                                $(".tr-3").append("<td class='c-3-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv3 +"</td>")
                             }
+                            for(var z=0;z<exit_number;z++){
+                               $(".tr-3").append("<td class='c-3--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv3 +"</td>")
+                            }
+
+                            // for(var z=0;z<lans+1;z++){
+                            //      $(".tr-3").append("<td>"+ selectv3 +"</td>")
+                            // }
                         }
                     }
                      if(data.length ==0){
@@ -266,7 +306,7 @@
                          var cache = $(".tr-1").data("cache");
                          var work_date = $("#save_user_class").data("work_date");
                          var param = {
-                            'dept_id':cache.dept_id,
+                            'dept_id':user_dept_id,
                             'work_date':work_date
                         }
 
@@ -280,16 +320,11 @@
                                      $("#save_user_class").html("生成今日值班");
                                       $("#save_user_class").data("modify_flag",false);
                                 }
-                                console.log(data);
+                                // console.log(data);
                                 for(var i=0;i<data.length;i++){
-                                    // if(data[i].class_type == 1){
-
-                                    // }else if(data[i].class_type == 2){
-
-                                    // }else if(data[i].class_type == 3){
-
-                                    // }
-                                    $(".table .tr-"+data[i].class_type+" select").eq(i%(lans+1)).val(data[i].user_id);
+                                   
+                                   $(".c-"+data[i].class_type+"-"+data[i].lane+" select").val(data[i].user_id);
+                                    // $(".table .tr-"+data[i].class_type+" select").eq(i%(lans+1)).val(data[i].user_id);
                                 }
                             },function(error){
                                 return "" ;

VisualInspection/js/teamClass/check_team_schedule.js

@@ -33,12 +33,12 @@
             }
             getTeamClass(data,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].start_time, end: data[i].end_time};
                     newEvents.push(obj);
                 }
-                console.log(newEvents)
+                // console.log(newEvents)
                 calendar.addEvents(newEvents);
             })
         }

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/User.java

@@ -67,7 +67,7 @@ public class User implements UserDetails {
 	// 性别
 	private String sex;
 	// 工号
-	private Integer workno;
+	private String workno;
 	// 身份证号
 	private String idno;
 	

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -17,8 +17,8 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="name" property="name" jdbcType="VARCHAR" />
         <result column="lanes_number" property="lanes_number" jdbcType="INTEGER" />
-        <result column="exit_numer" property="exit_numer" jdbcType="VARCHAR" />
-        <result column="entrance_numer" property="entrance_numer" jdbcType="VARCHAR" />
+        <result column="exit_number" property="exit_numer" jdbcType="INTEGER" />
+        <result column="entrance_number" property="entrance_numer" jdbcType="INTEGER" />
         <result column="exit_etc" property="exit_etc" jdbcType="VARCHAR" />
         <result column="entrance_etc" property="entrance_etc" jdbcType="VARCHAR" />
         <result column="organ_id" property="deptid" jdbcType="VARCHAR" />