稽查人员统计改为根据稽查完成时间统计

VisualInspection/js/lib/mytable.js

@@ -151,7 +151,7 @@
                                     src = src.split('.mp4')[0] + "_screen_0.png"
                                     ispic = false;
                                 }
-                                var pic =  (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="width:60px;height:50px;">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="width:60px;height:50px;">') 
+                                var pic =  (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="width:60px;height:50px;float:left;">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="width:60px;height:50px;">') 
                                     + '<img class="pic-class  img-thumbnail" style="width:60px;height:50px;" src="' + src + '" alt="">'+ (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 10px;left: 15px;color: white;"></i>') 
                                     + '</a>';
                                 picStr += pic;
@@ -191,7 +191,7 @@
             function clearTable(cols, options, element) {
                 var checkable = options.checkable;
                 var sortable = options.sortable
-                 $(element).find('.my_table').datatable( {
+                $(element).find('.my_table').datatable( {
                     checkable:checkable,
                     sortable:sortable,
                     data: {
@@ -210,6 +210,8 @@
                         console.log(element.tt_checkedIds);
                     }
                 });
+                $(element).find('.table .table-datatable .table-hover').html("");
+                console.log("执行清空");
             }
         },
         setPager: function (data) {
@@ -246,11 +248,9 @@
                     return new mytable(this, options, true);
             }
         } else {
-            return this.each(function () {
-                // var $this = $(this);
+            // return this.each(function () {
                 new mytable(this, options);
-                //  $(this).attr('tableData',mytable.tableData);
-            });
+            // });
         }
     };
 

VisualInspection/js/statistics/assess_ranking.js

@@ -686,7 +686,7 @@ function setVisit(){
 		$("#center-manager").attr("disabled","disabled");
 		$("#fsList").attr("disabled","disabled");
 	}
-	if(roleContains("ROAD_MANAGER")){
-		$("#center-manager").attr("disabled","disabled");
-	}
+	// if(roleContains("ROAD_MANAGER")){
+	// 	$("#center-manager").attr("disabled","disabled");
+	// }
 }

VisualInspection/js/statistics/check_workload_statistics.js

@@ -54,14 +54,14 @@ $(function(){
 		var cols = [
 					{width: 40,height:60, text: '序号', flex: true, colClass: 'text-center',field:'num'},
                     {width: 40,height:60, text: '稽查人员', flex: true,colClass: 'text-center',field:'checkman_name' },
-                    {width: 90,height:60, text: '任务名称', flex: true,colClass: 'text-center',field:'check_task_name' },
-					{width: 90,height:60, text: '时间段', flex: true,colClass: 'text-center',field:'check_task_time_name' },
+                    {width: 50,height:60, text: '任务名称', flex: true,colClass: 'text-center',field:'check_task_name' },
+					{width: 60,height:60, text: '时间段', flex: true,colClass: 'text-center',field:'check_task_time_name' },
                     {width: 40,height:60, text: '考核人员', flex: true,colClass: 'text-center',field:'checked_name' },
                     {width: 60,height:60, text: '考核部门', flex: true,colClass: 'text-center',field:'feeStationName' },
 					{width: 40,height:60, text: '扣分数',  flex: true, colClass: 'text-center',field:'score'},
 					{width: 60,height:60, text: '考核类型',  flex: true, colClass: 'text-center',field:'parent_name'},
 					{width: 100,height:60, text: '考核项',  flex: true, colClass: 'text-center',field:'name'},
-					{width: 90,height:60, text: '扣分凭证', type: 'imagedd', flex: true,field:'pics'},
+					{width: 200,height:60, text: '扣分凭证', type: 'imagedd', flex: true,field:'pics'},
 		];
 		if(cur_status==12 || cur_status==13){
 			data.check_status_arr = [12,13];

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -90,7 +90,7 @@
         function getStation(){
             get_common_service( "dept/getFsByDept","",function(data){
                 if(data != null){
-                    $(".thread_charge").append("<th>"+data.name+"</th>");
+                    $(".thread_charge").append("<th width='100px;'>"+data.name+"</th>");
                     $(".thread_charge").append("<th>值班班长</th>");
                     $(".thread_charge").append("<th>收费班长</th>");
                     $(".thread_charge").append("<th>值班室</th>");
@@ -229,10 +229,10 @@
 
             var now_date = moment(nowStr).toDate();//new Date();
             now_date.setDate(now_date.getDate()-1);
-            // if(now_date.Format('yyyy-MM-dd') >= $("#save_user_class").data("work_date").trim() ){
-            //     tip("不能生成过期的排班");
-            //     return ;
-            // }
+            if(now_date.Format('yyyy-MM-dd') >= $("#save_user_class").data("work_date").trim() ){
+                tip("不能生成过期的排班");
+                return ;
+            }
             // if($("#save_user_class").data("work_date").trim() >'2017-06-25'){
             //     tip("只能生成6月份排班");// tip("不能生成过期的排班");
             //     return ;
@@ -489,7 +489,7 @@
                            
                           
 
-                            var selectv = "<select class='form-control select-self' style='width:100px;'>"
+                            var selectv = "<select class='form-control select-self' style='width:90px;'>"
                             selectv += ("<option value=''>请选择</option>");
                              selectv += ("<option value='0'>临时开道</option>");
                             for(var j=0;j<data[i].users.length;j++){
@@ -664,10 +664,10 @@
             // 判断当前时间和待添加班组时间判断
             var now_date = moment(nowStr).toDate();//new Date();
             now_date.setDate(now_date.getDate()-1);
-            // if(now_date.Format('yyyy-MM-dd') >= $("#save_term_class").data("date").trim() ){
-            //     tip("不能生成过期的排班");
-            //     return ;
-            // }
+            if(now_date.Format('yyyy-MM-dd') >= $("#save_term_class").data("date").trim() ){
+                tip("不能生成过期的排班");
+                return ;
+            }
 
             // if($("#save_term_class").data("date").trim() >'2017-06-25'){
             //     tip("只能生成6月份排班");// tip("不能生成过期的排班");

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -71,14 +71,15 @@
     <div class="modal-body">
             <!-- 添加对话框 -->
             <div class="container-fluid" style="margin:0px;padding:0px;">
-                    <div class="row scrollbar" style="width:1180px;overflow:scroll;margin:0px;padding-bottom:10px;margin-bottom:10px;">
+                    <div class="row scrollbar" style="width:1150px;overflow:scroll;margin:0px;padding-bottom:10px;margin-bottom:10px;">
                         <style>
                            th{
                                text-align: center;
                            }
 
                         </style>
-                        <table class="table" style="margin:0px;text-align:center;width:1750px;">
+                        <div style="margin:0px;text-align:center;width:1550px;">
+                        <table class="table" style="margin:0px;text-align:center;width:100%;">
                             <thead class="thread_charge" style="padding:3px;font-size:14px;background:#F8F8F8;">
                                
                             </thead>
@@ -94,7 +95,7 @@
                                 </tr>
                             </tbody>
                         </table>
-
+                        </div>
                     </div>
                   
                     <div class="form-group">

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

@@ -297,7 +297,7 @@
      
      <select id="selectOneCheckedDetailInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
      	SELECT t.name AS check_task_name , t.start_time AS start_date , t.end_time AS end_date,cs.check_item_score AS score , ci.name AS name,ci.parent_name, cs.pics ,t.checkman AS checkman_id,
-     	t.checked_person AS user_id ,t.checked_dept AS dept_id FROM check_task t 
+     	t.checked_person AS user_id ,t.checked_dept AS dept_id FROM v_check_task t 
      		LEFT JOIN check_score cs ON t.id = cs.task_id 
      		LEFT JOIN (SELECT ci.* ,cp.name AS parent_name FROM check_item  ci LEFT JOIN check_item cp ON ci.parent_id = cp.id) ci ON ci.id = cs.check_item_id  
      		where   t.check_status !=22
@@ -308,7 +308,7 @@
      			AND  t.checkman = #{user_id}
      		</if>
      		<if test="start_date !=null and end_date !=null and queryType ==1">
-     			AND t.create_time >= #{start_date} AND t.create_time &lt;= #{end_date}
+     			AND t.check_time >= #{start_date} AND t.check_time &lt;= #{end_date}
      		</if>
      		<if test="start_date !=null and queryType == 0">
 				AND  t.start_time >= #{start_date}
@@ -335,7 +335,7 @@
 				COUNT(DISTINCT(t.checked_person)) AS all_checked_num,
 				SUM(cs.check_item_score) AS all_checked_score
 			FROM
-					check_task t
+					v_check_task t
 				LEFT JOIN check_score cs ON t.id = cs.task_id
 				WHERE
 				t.check_status != 22 
@@ -343,10 +343,10 @@
 					AND t.checkman = #{checkman_id}				
 				</if>
 				<if test="start_date !=null">
-					AND  t.start_time >= #{start_date}
+					AND  t.check_time >= #{start_date}
 				</if>
 				<if test="end_date !=null">
-					AND t.end_time &lt;= #{end_date}
+					AND t.check_time &lt;= #{end_date}
 				</if>
     </select>