wangjianguo 8 лет назад
Родитель
Сommit
ea7b46edcc

+ 0 - 16
VisualInspection/js/statistics/check_workload_statistics.js

@@ -13,7 +13,6 @@ $(function(){
 	function initAppealPage(start_date,end_date,user_id) {
 		
 		initQueryParams();
-		initTableRowBtn(); 
 		queryAppeal(start_date,end_date,user_id);
     }
 
@@ -51,21 +50,6 @@ $(function(){
 		}
 	}
 
-		//初始化表行按钮
-	function initTableRowBtn() {
-		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: 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: 100,height:60, text: '考核项',  flex: true, colClass: 'text-center',field:'name'},
-					{width: 100,height:60, text: '扣分凭证', type: 'imagedd', flex: true, hide:hide,field:'pics'},
-		];
-	}
-
 	function queryAppeal(start_date,end_date,user_id){
 		
 		var data = {

+ 5 - 5
VisualInspection/js/statistics/personal_data_statistics.js

@@ -166,7 +166,7 @@ $(function(){
 					if(months.indexOf(parseInt(data[i].mth.substr(5)))){
 						// 指定位置插入值
 						array_year_score.splice(parseInt(data[i].mth.substr(5))-1,0,
-						(1000-(filter_handler(data[i].all_check_score,data[i].checked_num,data[i].people_num,0)).toFixed(2)));
+						(1000-(filter(data[i].all_check_score,data[i].checked_num,0))));
 					}
 				}
 		    }else{
@@ -240,11 +240,11 @@ $(function(){
 	 * @param {*} num2 
 	 * @param {*} num4 
 	 */
-	function filter_handler(num,num1,num2,num4){
-		if(num1 == 0 || num2 == 0){
-			return num4;
+	function filter(num,num1,num2){
+		if(num1 == 0){
+			return num2;
 		}else{
-			return (num/num1)/num2;
+			return (num/num1).toFixed(2);
 		}
 	}