统计优化

VisualInspection/js/statistics/check_workload_statistics.js

@@ -45,6 +45,7 @@ $(function(){
 				"user_id":user_id,
 				"queryType":1,
 				"check_status": cur_status,
+				"score_flag":$(".score-select").val()
 		}
 		if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA) || roleContains('STATION')) {
 			hide = true;
@@ -53,13 +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: 100,height:60, text: '任务名称', flex: true,colClass: 'text-center',field:'check_task_name' },
-					{width: 100,height:60, text: '时间段', flex: true,colClass: 'text-center',field:'check_task_time_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: 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: 100,height:60, text: '扣分凭证', type: 'imagedd', flex: true,field:'pics'},
+					{width: 90,height:60, text: '扣分凭证', type: 'imagedd', flex: true,field:'pics'},
 		];
 		if(cur_status==12 || cur_status==13){
 			data.check_status_arr = [12,13];
@@ -170,6 +172,11 @@ $(function(){
 				}else{
 					$(".check_score_avg").text(0);
 				}
+				if(data.checked_num!='' && data.checked_num!=undefined){
+				    $(".checked_num").text(data.checked_num);
+				}else{
+					$(".checked_num").text(0);
+				}
             }else{
 				$(".all_check_personal").text(0);
 				$(".all_check_task").text(0);
@@ -177,6 +184,7 @@ $(function(){
 				$(".all_checkman").text(0);
 				$(".all_check_score").text(0);
 				$(".check_score_avg").text(0);
+				$(".checked_num").text(0);
             }
         },function(error){
         	return "" ;

VisualInspection/js/statistics/personal_data_statistics.js

@@ -39,7 +39,8 @@ $(function(){
 			"start_date":start_date,
 				"end_date":end_date,
 				"user_id":user_id,
-				"queryType":0
+				"queryType":0,
+				"score_flag":$(".score-select").val()
 		}
 		if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA) || roleContains('STATION')) {
 			hide = true;
@@ -49,6 +50,7 @@ $(function(){
 					{width: 50, text: '序号', flex: true, colClass: 'text-center',field:'num'},
 					{width: 100, text: '时间段', flex: true,colClass: 'text-center',field:'check_task_time_name' },
 					{width: 60, text: '扣分数',  flex: true, colClass: 'text-center',field:'score'},
+					{width: 100, text: '考核类型',  flex: true, colClass: 'text-center',sort: 'down',field:'parent_name'},
 					{width: 100, text: '考核项',  flex: true, colClass: 'text-center',sort: 'down',field:'name'},
 					{width: 100, text: '扣分凭证', type: 'imagedd', flex: true, hide:hide,field:'pics'},
 		];
@@ -95,6 +97,7 @@ $(function(){
 		// 加载图配置
 		echart();
 	});
+
     /**
 	 * 初始化图一
 	 * @param {*} url 
@@ -119,7 +122,7 @@ $(function(){
 		var param = {
 			"start_date":start_date,
 			"end_date":end_date,
-			"user_id":user_id,
+			"user_id":user_id
 		}
 		initRqueset(url,param,2);
 	}

VisualInspection/view/statistics/check_workload_statistics.html

@@ -11,6 +11,10 @@
             <div class="div-start"><input placeholder="请选择考核开始时间"></input></div>
             <div class="div-to"><label>-</label></div>
             <div class="div-end"><input placeholder="请选择考核结束时间"></input></div>
+            <div class="div-select" style="margin-left:25px;"><select class="score-select">
+                    <option value="">全部</option><option value="1" selected>扣分</option><option value="0">不扣分</option>
+                </select>
+            </div>
             <div class="query div-button"><button>查询</button></div>
 
             <div style="margin-right:30px;float:right;" class="div-button"><button id="export-check-info">导出</button></div>
@@ -19,8 +23,8 @@
 
     <div class="row-3">
        <table class="table table-bordered" style="text-align:center;">
-           <tr><td>总稽查人数</td><td>总稽查任务数</td><td>总稽查时长</td><td>考核人员数量</td><td>总扣分数</td><td>平均人次扣分数</td></tr>
-           <tr><td class="all_check_personal"></td><td class="all_check_task"></td><td class="all_check_minute"></td>
+           <tr><td>总稽查人数</td><td>总稽查任务数</td><td>总稽查时长</td><td>稽查扣分次数</td><td>考核人员数量</td><td>总扣分数</td><td>平均人次扣分数</td></tr>
+           <tr><td class="all_check_personal"></td><td class="all_check_task"></td><td class="all_check_minute"></td><td class="checked_num"></td>
                <td class="all_checkman"></td><td class="all_check_score"></td><td class="check_score_avg"></td></tr>
        </table>
     </div>

VisualInspection/view/statistics/personal_data_statistics.html

@@ -14,6 +14,10 @@
             <div class="div-start"><input placeholder="请选择考核开始时间"></input></div>
             <div class="div-to"><label>-</label></div>
             <div class="div-end"><input placeholder="请选择考核结束时间"></input></div>
+            <div class="div-select"><select class="score-select">
+                    <option value="">全部</option><option value="1" selected>扣分</option><option value="0">不扣分</option>
+                </select>
+            </div>
             <div class="query div-button"><button>查询</button></div>
             <!--<div class="export div-button"><button>导出</button></div>-->
         </div>