chenrj-PC\chenrj 8 лет назад
Родитель
Сommit
eed315a0d6

+ 4 - 2
VisualInspection/js/statistics/road_manage_statistics.js

@@ -352,7 +352,8 @@ $(function(){
 				if(Tmth.length > 0){
 					for(var j= 0; j< Tmth.length;j++){
 						if(name[i] == Tmth[j].name && Tmth[j].all_check_score != null){
-							Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
+							// Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
+							Ttemp[i] =Tmth[j].all_check_score;
 							break;
 						}else{
 							Ttemp[i] = 0;
@@ -364,7 +365,8 @@ $(function(){
 				if(Pmth.length > 0){
 					for(var m= 0; m< Pmth.length;m++){
 						if(name[i] == Pmth[m].name && Pmth[m].all_check_score != null){
-							Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
+							// Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
+							Ptemp[i] =Pmth[m].all_check_score;
 							break;
 						}else{
 							Ptemp[i] = 0;

+ 4 - 2
VisualInspection/js/statistics/toll_station_statistics.js

@@ -389,7 +389,8 @@ $(function(){
 				if(Tmth.length > 0){
 					for(var j= 0; j< Tmth.length;j++){
 						if(name[i] == Tmth[j].name && Tmth[j].all_check_score != null){
-							Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
+							// Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
+							 Ttemp[i] =Tmth[j].all_check_score;
 							break;
 						}else{
 							Ttemp[i] = 0;
@@ -401,7 +402,8 @@ $(function(){
 				if(Pmth.length > 0){
 					for(var m= 0; m< Pmth.length;m++){
 						if(name[i] == Pmth[m].name && Pmth[m].all_check_score != null){
-							Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
+							// Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
+							Ptemp[i] =Pmth[m].all_check_score;
 							break;
 						}else{
 							Ptemp[i] = 0;

+ 5 - 3
VisualInspection/js/statistics/total_company_statistics.js

@@ -303,7 +303,8 @@ $(function(){
 				if(Tmth.length > 0){
 					for(var j= 0; j< Tmth.length;j++){
 						if(name[i] == Tmth[j].name && Tmth[j].all_check_score != null){
-							Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
+					//		Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
+							Ttemp[i] = Tmth[j].all_check_score;
 							break;
 						}else{
 							Ttemp[i] = 0;
@@ -315,7 +316,8 @@ $(function(){
 				if(Pmth.length > 0){
 					for(var m= 0; m< Pmth.length;m++){
 						if(name[i] == Pmth[m].name && Pmth[m].all_check_score != null){
-							Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
+						//	Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
+							Ptemp[i] =Pmth[m].all_check_score;
 							break;
 						}else{
 							Ptemp[i] = 0;
@@ -359,7 +361,7 @@ $(function(){
 			return ((num/num1)/num2).toFixed(2);
 		}
 	}
-	
+
 	/**
 	 * 图配置
 	 */

+ 1 - 1
VisualInspection/view/statistics/road_manage_statistics.html

@@ -61,7 +61,7 @@
   <div class="border-line">
     <div class="row-7">
         <div class="col-1"><span>温馨服务检查问题类别占比</span></div><div class="line-2"></div>
-        <div class="col-1"><span>各个问题类别的人均扣分情况</span></div>
+        <div class="col-1"><span>各个问题类别的扣分情况</span></div>
     </div>
     <div class="row-8">
         <div id="server-check-type" style="width:49%;height:400px;float:left;"></div>

+ 1 - 1
VisualInspection/view/statistics/toll_station_statistics.html

@@ -57,7 +57,7 @@
   <div class="border-line">
     <div class="row-7">
         <div class="col-1"><span>温馨服务检查问题类别占比</span></div><div class="line-2"></div>
-        <div class="col-1"><span>各个问题类别的人均扣分情况</span></div>
+        <div class="col-1"><span>各个问题类别的扣分情况</span></div>
     </div>
     <div class="row-8">
         <div id="server-check-type" style="width:49%;height:400px;float:left;"></div>

+ 1 - 1
VisualInspection/view/statistics/total_company_statistics.html

@@ -51,7 +51,7 @@
   <div class="border-line">
     <div class="row-7">
         <div class="col-1"><span>温馨服务检查问题类别占比</span></div><div class="line-2"></div>
-        <div class="col-1"><span>各个问题类别的人均扣分情况</span></div>
+        <div class="col-1"><span>各个问题类别的扣分情况</span></div>
     </div>
     <div class="row-8">
         <div id="server-check-type" style="width:49%;height:400px;float:left;"></div>

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -886,7 +886,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			// 道管 正序 前10
 			return lists.subList(0, 10);
 		}else if(obj.getQueryType()==1 && obj.getOrder_type() ==1){
-			return lists.subList(lists.size()-10, lists.size());
+			return lists.subList(lists.size()-20, lists.size());
 		}
 		
 		return lists;