tj

VisualInspection/js/statistics/appeal.js

@@ -77,7 +77,7 @@ function getFsWorkInfo(){
 function getTableContent(obj,seq){
  
     var content = "<tr><td>"+seq+"</td> <td >"+obj.fee_station_name+"</td> <td >"+GDV(obj.appeal_num,0)+
-            "</td> <td >"+GDV(obj.appeal_success_num,0)+"</td><td>"+ GDV(obj.appeal_fail_num,0) +"</td><td>"+ GDV(obj.appeal_other_num,0) +"</td> </tr>";
+            "</td> <td >"+GDV(obj.appeal_success_num,0)+"</td><td>"+ GDV(obj.appeal_fail_num,0) +"</td> </tr>";
 
     return content;
 }

VisualInspection/js/statistics/common_statistic.js

@@ -179,4 +179,25 @@ function select_option(){
         temp += "<option value=20"+months[i]+">20"+months[i]+"</option>"
     }
     str.append(temp);
+}
+
+
+/**
+ * 根据当前月份 获取前13个月份
+ */
+function month_method_2(){
+    var montharray = new Array();
+    var now_month = new Date().getMonth() ;
+    for(var i= now_month ; i<13;i++){
+        montharray.push( (new Date().getFullYear()-1+'') + "/"+PrefixInteger(i,2) ) ;
+    }
+    for(var i=1;i<=now_month;i++){
+        montharray.push( (new Date().getFullYear()+'')  + "/"+ PrefixInteger(i,2) );
+    }
+    return montharray ;
+}
+
+// 数字前面补0
+function PrefixInteger(num, length) {
+    return (Array(length).join('0') + num).slice(-length);
 }

VisualInspection/js/statistics/personal_data_statistics.js

@@ -105,8 +105,8 @@ $(function(){
 	 */
 	function init_personal_score_statistics(url,user_id){
 		var param = {
-			"start_date":(year-1)+"-12-25 23:00:00",
-			"end_date":year+"-12-25 23:00:00",
+			"start_date":(year-1)+"-"+new Date().getMonth()+"-25"+" 23:00:00",
+			"end_date":year+"-"+new Date().getMonth()+"-25"+" 23:00:00",
 			"user_id":user_id
 		}
 		initRqueset(url,param,1);
@@ -159,21 +159,21 @@ $(function(){
 			array_year_score.length = 0;
 			months.length = 0;
 			if(data.length!=0){
-				if(data.length<12){
-					for(var i=0;i<12-data.length;i++){
+				if(data.length<13){
+					for(var i=0;i<13-data.length;i++){
 						array_year_score.push(0)
 					}
 				}
+				var month_arr = month_method_2();
 				for(var i=0;i<data.length;i++){
-					if(months.indexOf(parseInt(data[i].mth.substr(5)))){
+					if(month_arr.indexOf(parseInt(data[i].mth))){
 						// 指定位置插入值
-						array_year_score.splice(parseInt(data[i].mth.substr(5))-1,0,
+						array_year_score.splice(month_arr.indexOf(data[i].mth),0,
 						(1000-(filter(data[i].all_check_score,data[i].checked_num,0))));
 					}
 				}
 		    }else{
 				array_year_score.length = 0;
-				months.length = 0;
 			}	
 		}else if(type == 2){
 			array_check_type.length=0;
@@ -311,7 +311,7 @@ $(function(){
 						{
 							type : 'category',
 							boundaryGap : false,
-							data : monthsCH
+							data : month_method_2()
 						}
 					],
 					yAxis : [

VisualInspection/js/statistics/road_manage_statistics.js

@@ -75,8 +75,8 @@ $(function(){
 	 */
 	function init_company_year_assess(url,select_road){
 		var param = {
-			"start_date":(year-1)+"-"+new Date().getMonth()+"-"+date+" 23:00:00",
-			"end_date":year+"-"+new Date().getMonth()+"-"+date+" 23:00:00",
+			"start_date":(year-1)+"-"+new Date().getMonth()+"-25"+" 23:00:00",
+			"end_date":year+"-"+new Date().getMonth()+"-25"+" 23:00:00",
 			"dept_id":select_road,
 			"queryType":1
 		}

VisualInspection/js/statistics/toll_station_statistics.js

@@ -70,8 +70,8 @@ $(function(){
 	 */
 	function init_tollStation_year_assess(url,select_station){
 		var param = {
-			"start_date":(year-1)+"-"+new Date().getMonth()+"-"+date+" 23:00:00",
-			"end_date":year+"-"+new Date().getMonth()+"-"+date+" 23:00:00",
+			"start_date":(year-1)+"-"+new Date().getMonth()+"-25"+" 23:00:00",
+			"end_date":year+"-"+new Date().getMonth()+"-25"+" 23:00:00",
 			"dept_id":select_station,
 			"queryType":2
 		}

VisualInspection/js/statistics/total_company_statistics.js

@@ -53,8 +53,8 @@ $(function(){
 	 */
 	function init_company_year_assess(){
 		var param = {
-			"start_date":(year-1)+"-"+new Date().getMonth()+"-"+date+" 23:00:00",
-			"end_date":year+"-"+new Date().getMonth()+"-"+date+" 23:00:00"
+			"start_date":(year-1)+"-"+new Date().getMonth()+"-25"+" 23:00:00",
+			"end_date":year+"-"+new Date().getMonth()+"-25"+" 23:00:00"
 		}
 		initRqueset("statistics/score/year/info",param,1);
 

VisualInspection/view/statistics/appeal.html

@@ -52,11 +52,11 @@
                   <thead>
                     <tr>
                         <th  width="80px">序号</th>
-                        <th  width="120px">站名</th>
-                        <th  width="120px">申诉次数</th>
-                        <th>申诉成功（次数）<br> (已修改考核结果) </th>
-                        <th>申诉失败（次数）<br> (维持原稽查结果)</th>
-                        <th>其他情况（次数）<br>(更换被考核人等)</th>
+                        <th  width="160px">站名</th>
+                        <th  width="160px">申诉次数</th>
+                        <th>申诉成功（次数） </th>
+                        <th>申诉失败（次数）</th>
+                        <!--<th>其他情况（次数）</th>-->
                     </tr>
                   </thead>
                   <tbody class="table-tbody" style="background:white" align="center" height="500px">