Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

VisualInspection/js/statistics/appeal.js

@@ -11,10 +11,15 @@ $(function(){
     }
 	setRoadManagerSelect("#center_manage",road_manager,true);
     // 当前月份初始化
-    $("#sel_month").val(getM()-1);
+    // $("#sel_month").val(getM()-1);
+    $.jeDate("#sel_month",{
+		isinitVal:true,
+		format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+	});
 
     $("#month_name").html( $("#sel_month").find("option:selected").text());
 
+
     if(road_manager){
         getFsStationList(road_manager,function(obj){
             $("#fs_station").html(obj);
@@ -73,10 +78,10 @@ $(function(){
  * @param {*} param 
  */
 function getFsWorkInfo(){
-
+ 
     var param = {
-        "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
-        "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+           "start_time": timeTranslate( GV("#sel_month") ) ,
+            "end_time": (GV("#sel_month")+"/25 23:00:00").replace("/","-").replace("/","-")
     }
     
     if(GV("#fs_station")!=''){

VisualInspection/js/statistics/assess_ranking.js

@@ -89,8 +89,8 @@ function initQueryEmp(parent_dept_id,dept_id) {
     var endD = new Date();
     var now = new Date();
     var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth() + 1) + "-" + startD.getDate();
-    var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1) + "-" + endD.getDate();
+    var start_time = startD.getFullYear() + "-" + (startD.getMonth()) + "-26";
+    var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1) + "-25" ;
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();
     var start_num = $("#start-num").val()!=''? $("#start-num").val(): 0  ;

VisualInspection/js/statistics/assess_situation.js

@@ -52,8 +52,8 @@ function initQuerySituation(){
     var endD = new Date();
     var now = new Date();
     var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear()+"-"+(startD.getMonth()+1)+"-"+startD.getDate(); 
-    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-"+endD.getDate(); 
+    var start_time = startD.getFullYear()+"-"+(startD.getMonth()+1)+"-26"; 
+    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-25"; 
     //默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);

VisualInspection/js/statistics/assess_type.js

@@ -55,8 +55,8 @@ function initQueryType(){
     var endD = new Date();
     var now = new Date();
     var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear()+"-"+(startD.getMonth()+1)+"-"+startD.getDate(); 
-    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-"+endD.getDate(); 
+    var start_time = startD.getFullYear()+"-"+(startD.getMonth())+"-26";
+    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-25";
     // 默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);

VisualInspection/js/statistics/change_work.js

@@ -29,7 +29,7 @@ $(function(){
     // $("#sel_month").val(getM()-1);
     // $("#month_name").html( $("#sel_month").find("option:selected").text());
     // 时间初始化
-    $("#start-time").val( new Date().getFullYear()+'-'+ (getM()-1) +"-25");
+    $("#start-time").val( new Date().getFullYear()+'-'+ (getM()-1) +"-26");
     $("#end-time").val( new Date().getFullYear()+'-'+ (getM()) +"-25");
 
     // 收费站中心选择

VisualInspection/js/statistics/check_workload_statistics.js

@@ -1,6 +1,6 @@
 // 默认初始化日期一个月
-$(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-"+new Date().getDate());
-$(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-"+new Date().getDate());
+$(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-26");
+$(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-25");
 var start_date = $(".div-start input").val()+" 23:00:00";
 var end_date = $(".div-end input").val()+" 23:00:00";
 var user_id = $("#select-personal").val();      
@@ -198,7 +198,4 @@ $(function(){
 			return (num/num1).toFixed(2);
 		}
 	}
-	
-
-
 });

VisualInspection/js/statistics/common_statistic.js

@@ -218,7 +218,7 @@ function month_method_2(){
     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++){
+    for(var i=1;i<=now_month+1;i++){
         montharray.push( (new Date().getFullYear()+'')  + "/"+ PrefixInteger(i,2) );
     }
     return montharray ;

VisualInspection/js/statistics/personal_data_statistics.js

@@ -9,8 +9,8 @@ var check_type;
 var cur_status;
 var hide = false;
 // 默认初始化日期一个月
-$(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-"+new Date().getDate());
-$(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-"+new Date().getDate());
+$(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-26");
+$(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-25");
 var start_date = $(".div-start input").val()+" 23:00:00";
 var end_date = $(".div-end input").val()+" 23:00:00";
 
@@ -108,7 +108,7 @@ $(function(){
 	function init_personal_score_statistics(url,user_id){
 		var param = {
 			"start_date":(year-1)+"-"+new Date().getMonth()+"-25"+" 23:00:00",
-			"end_date":year+"-"+new Date().getMonth()+"-25"+" 23:00:00",
+			"end_date":year+"-"+(new Date().getMonth()+1)+"-25"+" 23:00:00",
 			"user_id":user_id
 		}
 		initRqueset(url,param,1);
@@ -161,8 +161,8 @@ $(function(){
 			array_year_score.length = 0;
 			months.length = 0;
 			if(data.length!=0){
-				if(data.length<13){
-					for(var i=0;i<13-data.length;i++){
+				if(data.length<14){
+					for(var i=0;i<14-data.length;i++){
 						array_year_score.push(0)
 					}
 				}

VisualInspection/js/statistics/road_manage_statistics.js

@@ -1,35 +1,35 @@
-		var year = new Date().getFullYear();
-		var month = new Date().getMonth();
-		var date = new Date().getDate();
-		var year_assess ;
-		var score_rank;
-		var points_assess;
-		var check_type;
-		var select_road = $(".div-roadManage select").val();
-        var array_year_score = new Array();
-		var array_points = new Array();
-		var array_allStation = new Array();
-		var array_allStation_score = new Array();
-		var array_check_type = new Array();
-		var array_points_name = new Array();
-		var array_points_pre = new Array();
-		var arrar_points_month = new Array();
-		var array_score_order = new Array();
-		var array_score_data = new Array();
-		var array_score_last = new Array();
-		var array_get_score = new Array();
-		var year_assess ;
-		var score_rank;
-		var points_assess;
-		var check_type;
-		var people_points;
-		var rank_pre;
-		var rank_suf;
-		var min_year;
-		var min_station;
-		var min_pre
-		var min_suff;
-		var flag = true;
+var year = new Date().getFullYear();
+var month = new Date().getMonth();
+var date = new Date().getDate();
+var year_assess ;
+var score_rank;
+var points_assess;
+var check_type;
+var select_road = $(".div-roadManage select").val();
+var array_year_score = new Array();
+var array_points = new Array();
+var array_allStation = new Array();
+var array_allStation_score = new Array();
+var array_check_type = new Array();
+var array_points_name = new Array();
+var array_points_pre = new Array();
+var arrar_points_month = new Array();
+var array_score_order = new Array();
+var array_score_data = new Array();
+var array_score_last = new Array();
+var array_get_score = new Array();
+var year_assess ;
+var score_rank;
+var points_assess;
+var check_type;
+var people_points;
+var rank_pre;
+var rank_suf;
+var min_year;
+var min_station;
+var min_pre
+var min_suff;
+var flag = false;
 $(function(){
 	setVisit();
     // 公用方法，根据当前年月动态将13个月push数组
@@ -56,11 +56,11 @@ $(function(){
 		// var select_road = $(".div-roadManage select").val();
 		// 加载图配置
 		// echart();
-		refresh(false);
+		refresh(flag);
 		// if(flag ==true){
 		// 	init_company_year_assess("statistics/score/year/info",select_road);
 		// }
-		// flag = false;
+		flag = false;
 	});
     
 	// 如果道管中心下拉框改变，点击时加载图一
@@ -98,7 +98,7 @@ $(function(){
 	function init_company_year_assess(url,select_road){
 		var param = {
 			"start_date":(year-1)+"-"+new Date().getMonth()+"-25"+" 23:00:00",
-			"end_date":year+"-"+new Date().getMonth()+"-25"+" 23:00:00",
+			"end_date":year+"-"+(new Date().getMonth()+1)+"-25"+" 23:00:00",
 			"dept_id":select_road,
 			"queryType":1
 		}
@@ -240,8 +240,8 @@ $(function(){
 		if(type == 1){
 			array_year_score.length = 0;
 		    if(data!='' && data.length!=0){
-				if(data.length<13){
-					for(var i=0;i<13-data.length;i++){
+				if(data.length<14){
+					for(var i=0;i<14-data.length;i++){
 						// 不足月份补0
 						array_year_score.push(0);
 					}

VisualInspection/js/statistics/toll_station_statistics.js

@@ -26,7 +26,7 @@
 		var min_five;
 		var min_five_back;
 		var min_score;
-		var flag = true;
+		var flag = false;
 		var change_echart = 2;
 $(function(){     
 	setVisit();
@@ -48,7 +48,8 @@ $(function(){
 	setSecond();
 	refresh(true);
 	$(".div-button button").click(function(){	
-		refresh(false);
+		refresh(flag);
+		flag = false ;
 	});
 
 	// 加载图配置
@@ -87,8 +88,8 @@ $(function(){
 	 */
 	function init_tollStation_year_assess(url,select_station){
 		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()+1)+"-25"+" 23:00:00",
 			"dept_id":select_station,
 			"queryType":2
 		}		
@@ -254,8 +255,8 @@ $(function(){
 		if(type == 1){
 			array_year_score.length = 0;
 			if(data!='' &&　data.length!=0){
-				if(data.length<13){
-					for(var i=0;i<13-data.length;i++){
+				if(data.length<14){
+					for(var i=0;i<14-data.length;i++){
 						// 不足月份补0
 						array_year_score.push(0);
 					}
@@ -387,7 +388,7 @@ $(function(){
 				min_five_back = eval("Math.min(" + array_five_score_back.toString() + ")").toFixed(0)-1;
 			}
 
-			// 给考核进步top5排名次
+			// 退步top5排名次
 			var rank = new Array();
 			rank[0] = 1 ;
 			for(var i=1; i<array_five_score_back.length; i++){
@@ -466,6 +467,7 @@ $(function(){
 	 */
 	$(".div-roadManage select").change(function(){
 		setSecond();
+		flag = true ;
 	});
 	function setSecond(){ 
         var select_road = $(".div-roadManage select").val();

VisualInspection/js/statistics/total_company_statistics.js

@@ -1,26 +1,26 @@
-		var year = new Date().getFullYear();
-		var date = new Date().getDate();
-		var array_year_score = new Array();
-		var array_points = new Array();
-		var array_road = new Array();
-		var array_road_score = new Array();
-		var array_allStation = new Array();
-		var array_allStation_score = new Array();
-		var array_check_type = new Array();
-		var array_points_name = new Array();
-		var array_points_pre = new Array();
-		var arrar_points_month = new Array();
-		var year_assess;
-		var points_assess ;
-		var score_rank;
-		var stationAll_rank;
-		var check_type;
-		var people_points;
-		var flag = true;
-		var min_year;
-		var min_road;
-		var min_allStation;
-		var score_ranking = new Array();
+var year = new Date().getFullYear();
+var date = new Date().getDate();
+var array_year_score = new Array();
+var array_points = new Array();
+var array_road = new Array();
+var array_road_score = new Array();
+var array_allStation = new Array();
+var array_allStation_score = new Array();
+var array_check_type = new Array();
+var array_points_name = new Array();
+var array_points_pre = new Array();
+var arrar_points_month = new Array();
+var year_assess;
+var points_assess ;
+var score_rank;
+var stationAll_rank;
+var check_type;
+var people_points;
+var flag = true;
+var min_year;
+var min_road;
+var min_allStation;
+var score_ranking = new Array();
 $(function(){
     // 公用方法，根据当前年月动态将13个月push数组
 	month_method();
@@ -67,7 +67,7 @@ $(function(){
 	function init_company_year_assess(){
 		var param = {
 			"start_date":(year-1)+"-"+new Date().getMonth()+"-25"+" 23:00:00",
-			"end_date":year+"-"+new Date().getMonth()+"-25"+" 23:00:00"
+			"end_date":year+"-"+(new Date().getMonth()+1)+"-25"+" 23:00:00"
 		}
 		initRqueset("statistics/score/year/info",param,1);
 
@@ -187,8 +187,8 @@ $(function(){
 		if(type == 1){
 			array_year_score.length = 0;
 			if(data!='' && data.length!=0){
-			if(data.length<13){
-				for(var i=0;i<13-data.length;i++){
+			if(data.length<14){
+				for(var i=0;i<14-data.length;i++){
 					// 不足月份补0
 					array_year_score.push(0);
 				}

VisualInspection/view/statistics/appeal.html

@@ -7,7 +7,7 @@
             <div class="form-group">
                 <label for="exampleInputAccount1" class="col-sm-1">月份</label>
                 <div class="col-sm-2">
-                    <select class="form-control" id="sel_month">
+                    <!--<select class="form-control" id="sel_month">
                         <option value="1">一月</option>
                         <option value="2">二月</option>
                         <option value="3">三月</option>
@@ -20,7 +20,8 @@
                         <option value="10">十月</option>
                         <option value="11">十一月</option>
                         <option value="12">十二月</option>
-                    </select>
+                    </select>-->
+                    <input id="sel_month" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;"> 
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">部门</label>
                 <div class="col-sm-2">

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

@@ -528,7 +528,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		if (obj.getQueryType() != null && obj.getQueryType() == 1) {
 			// 检索当前导管中心下的deptid
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
+			
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中
 			obj.setDept_list(list);
@@ -628,6 +632,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			}
 		}
 		Organ organ = new Organ();
+		if(obj.getDept_id()==null){
+			return null ;
+		}
 		organ.setParentid(obj.getDept_id().intValue());
 		List<Organ> list = departmentDao.getOrgan(organ);
 
@@ -739,6 +746,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		} else if (obj.getQueryType() == 1) {
 			// 道管中心
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中
@@ -778,6 +788,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		if (obj.getQueryType() == 1) {
 			// 道管中心
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中
@@ -807,6 +820,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		} else if (obj.getQueryType() == 1) {
 			// 道管中心
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中
@@ -855,6 +871,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		if (obj.getQueryType() == 1) {
 			// 道管中心
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中
@@ -957,7 +976,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			return t_mthList.subList(0, 5);
 		} else if (obj.getOrder_type() == 1) {
 			// 反序
-			return t_mthList.subList(t_mthList.size() - 5, t_mthList.size());
+			List<StatisticsBean> reList = new ArrayList<>();
+			for(int j = t_mthList.size()-1; j>t_mthList.size()-6; j-- ){
+				reList.add( t_mthList.get(j) );
+			}
+			return reList;
 		}
 		return t_mthList;
 	}