未修改任何文件，单纯拉取代码

VisualInspection/js/statistics/road_manage_statistics.js

@@ -105,7 +105,6 @@ $(function(){
 		}
 		initRqueset(url,param,1);
 	}
-	init_company_year_assess("statistics/score/year/info",select_road);
 
 	/**
 	 * 初始化图二
@@ -118,7 +117,6 @@ $(function(){
 		}
 		initRqueset(url,param,2);
 	}
-    init_company_points_assess("statistics/lost/score/rate",initDate+'',select_road);
     
 	/**
 	 * 初始化图三
@@ -130,7 +128,6 @@ $(function(){
 		};
 		initRqueset(url,param,3);
 	}
-	init_stationAll_rank("statistics/score/manage/tollgate/info",initDate+"",select_road);
 
 	/**
 	 * 初始化图四
@@ -144,7 +141,6 @@ $(function(){
 		}
 		initRqueset(url,param,4);
 	}
-    //init_people_rank_pre("statistics/stuff/score/info",initDate+'',select_road);
     
     /**
 	 * 初始化图五
@@ -158,7 +154,6 @@ $(function(){
 		}
 		initRqueset(url,param,5);
 	}
-    init_people_rank_suf("statistics/stuff/score/info",initDate+'',select_road);
 
 	/**
 	 * 初始化图六
@@ -171,7 +166,6 @@ $(function(){
 		};
 		initRqueset(url,param,6);
 	}
-	init_server_check_type("statistics/lost/itemscore/rate",initDate+"",select_road);
 
 	/**
 	 * 初始化图七
@@ -196,7 +190,6 @@ $(function(){
 		};
 		initRqueset(url,param,7);
 	}
-	init_each_people_points("statistics/lost/twice/itemscore/rate",initDate+"",select_road);
 	/**
 	 * 请求
 	 * @param {*} url 
@@ -337,11 +330,12 @@ $(function(){
 							feeStationTemp.push(data[i].user.fee_station_name);
 						}
 				    }
+					array_score_pie = [] ;
 					for(var x=0; x<feeStationTemp.length; x++){
 						array_score_pie.push({'name':feeStationTemp[x] ,'value':feeStationTempObj[feeStationTemp[x]] });
 					}
-					console.log(feeStationTemp);
-					console.log(feeStationTempObj);
+					// console.log(feeStationTemp);
+					// console.log(feeStationTempObj);
 				 }else{
 					array_score_last.length=0;
 			        array_get_score.length=0;	
@@ -381,7 +375,7 @@ $(function(){
 			array_points_name.length=0;
 			array_points_pre.length=0;
 			arrar_points_month.length=0;
-			if(data!=null && data.Pmth.length!=0 || data.Tmth.length!=0){
+			if( (data!=null && data.Pmth.length!=0) || (data!=null &&  data.Tmth.length!=0)){
 			   data_each_people_points(data);
 			}else{
 				array_points_name.length=0;
@@ -790,75 +784,7 @@ $(function(){
 		 * 图五
 		 */
 		function people_rank_suf(){
-			// 		option = {
-			// 	color : [ '#00ced1' ],// 条形图颜色
-			// 	tooltip : {
-			// 		trigger: 'axis'
-			// 	},
-			// 	noDataLoadingOption :{
-            //         text: '暂无数据',
-            //         effect:'bubble',
-            //         effectOption : {
-            //             effect: {
-            //                 n: 0 //气泡个数为0 
-            //             }
-            //         },
-            //         textStyle: {
-            //             fontSize: 20,
-			// 			fontFamily:'cursive',
-            //             fontWeight: 'bold'
-            //         }
-            //     },
-			// 	grid:{
-            //         width:"88%",	
-            //     },
-			// 	legend: {
-			// 		data:['人员考核得分']
-			// 	},
-			// 	calculable : true,
-			// 	xAxis : [
-			// 		{
-			// 			type : 'category',
-			// 			axisLabel :{  
-            //                interval:0  // 显示x轴所有信息，不隐藏部分  
-            //             },
-			// 			data : array_score_last
-			// 		}
-			// 	],
-			// 	yAxis : [
-			// 		{
-			// 			type : 'value',
-			// 			min : min_suff ,
-			// 			max : 1000
-			// 		}
-			// 	],
-			// 	series : [
-			// 		{
-			// 			name:'人员考核得分',
-			// 			type:'bar',
-			// 			data: array_get_score,
-			// 		    itemStyle: {
-			// 			normal: {
-			// 				label: {
-			// 					show: true,
-			// 					position: 'insideTop'
-			// 				}
-			// 			}
-			// 		},
-            //             markPoint : {
-            //                     data : [
-            //                     {type : 'max', name: '最大值'},
-            //                     {type : 'min', name: '最小值'}
-            //                     ]
-            //                     },
-			// 			markLine : {
-			// 				data : [
-			// 					{type : 'average', name: '平均值'}
-			// 				]
-			// 			}
-			// 		}   
-			// 	]
-			// };
+			
 			option = {
 				tooltip : {
 					trigger: 'axis'
@@ -917,7 +843,7 @@ $(function(){
 						trigger: 'item',
 						formatter: '{a} <br/>{b} : {c} ({d}%)'
 					},
-					center: [910,90],
+					center: ['80%','20%'],
 					radius : [0, 40],
 					itemStyle :　{
 						normal : {

VisualInspection/view/statistics/change_attendance.html

@@ -70,15 +70,15 @@
                         <th class="m28"  rowspan="2">29</th>
                         <th class="m28 m29"  rowspan="2">30</th>
                         <th class="m28 m29 m30"  rowspan="2">31</th>
-                        <th  rowspan="2">1</th>
-                        <th  rowspan="2">2</th>
-                        <th  rowspan="2">3</th>
-                        <th rowspan="2">4</th>
-                        <th  rowspan="2">5</th>
-                        <th  rowspan="2">6</th>
-                        <th  rowspan="2">7</th>
-                        <th rowspan="2">8</th>
-                        <th  rowspan="2">9</th>
+                        <th  rowspan="2">01</th>
+                        <th  rowspan="2">02</th>
+                        <th  rowspan="2">03</th>
+                        <th rowspan="2">04</th>
+                        <th  rowspan="2">05</th>
+                        <th  rowspan="2">06</th>
+                        <th  rowspan="2">07</th>
+                        <th rowspan="2">08</th>
+                        <th  rowspan="2">09</th>
                         <th rowspan="2">10</th>
                         <th  rowspan="2">11</th>
                         <th rowspan="2">12</th>

VisualInspection/view/statistics/check_workload_statistics.html

@@ -6,7 +6,7 @@
     <div class="line-1"></div>-->
     <div class="row-2">
         <div>
-            <div class="name1"><span>请选择稽查人员：</span></div>
+            <div class="name1" style="width:70px;"><span>稽查人员：</span></div>
             <div class="div-select"><select id="select-personal"></select></button></div>
             <div class="div-start"><input placeholder="请选择考核开始时间"></input></div>
             <div class="div-to"><label>-</label></div>

VisualInspection/view/statistics/common_attendance.html

@@ -70,15 +70,15 @@
                         <th class="m28"  rowspan="2">29</th>
                         <th class="m28 m29"  rowspan="2">30</th>
                         <th class="m28 m29 m30"  rowspan="2">31</th>
-                        <th  rowspan="2">1</th>
-                        <th  rowspan="2">2</th>
-                        <th  rowspan="2">3</th>
-                        <th rowspan="2">4</th>
-                        <th  rowspan="2">5</th>
-                        <th  rowspan="2">6</th>
-                        <th  rowspan="2">7</th>
-                        <th rowspan="2">8</th>
-                        <th  rowspan="2">9</th>
+                        <th  rowspan="2">01</th>
+                        <th  rowspan="2">02</th>
+                        <th  rowspan="2">03</th>
+                        <th rowspan="2">04</th>
+                        <th  rowspan="2">05</th>
+                        <th  rowspan="2">06</th>
+                        <th  rowspan="2">07</th>
+                        <th rowspan="2">08</th>
+                        <th  rowspan="2">09</th>
                         <th rowspan="2">10</th>
                         <th  rowspan="2">11</th>
                         <th rowspan="2">12</th>

VisualInspection/view/statistics/road_manage_statistics.html

@@ -81,9 +81,6 @@
   
 </div>
 <script>
-    $(document).ready(function() {
-
-    });
 </script>
 
        

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

@@ -51,16 +51,15 @@ public class StatisticsBo {
 		if((o2.getChecked_num()+o2.getChecked_m_num())!=0){
 			b = (o2.getCheck_all_score()+o2.getCheck_all_m_score()) /(o2.getChecked_num()+o2.getChecked_m_num()+0.00);
 		}
-		int numA = this.getChecked_num();
-		int numB = o2.getChecked_num();
+	
 		if (a > b ) {
 			return 1;
 		} else if (a < b) {
 			return -1;
 		} else {
-			if(numA>numB){
-				return -1;
-			}else if(numA<numB){
+			if(this.getChecked_num() == 0 && o2.getChecked_num()!=0 ){
+				return -1 ;
+			}else if(o2.getChecked_num() ==0 && this.getChecked_num() != 0){
 				return 1;
 			}else{
 				return 0;