修改统计分析权限

VisualInspection/css/statistics/personal_data_statistics.css

@@ -97,7 +97,7 @@
     width:20px;
     height:50px;
     float:left;
-    line-height: 50px;
+    /*line-height: 50px;*/
 }
 .div-start input,.div-end input{
     width:100px;
@@ -129,14 +129,14 @@
     border-radius: 4px;
 }
 .div-select{
-    width:100px;
+    width:120px;
     height:50px;
     float:left;
     margin-left: 5px;
     line-height: 50px;
 }
 .div-select select{
-    width:100px; 
+    width:120px; 
     height:30px;
     border: 1px solid #ccc;
     border-radius: 4px;
@@ -170,7 +170,7 @@
     border-color: #1970fc;
     border:1px solid transparent;
     border-radius: 4px;
-    margin-top: 10px;
+    /*margin-top: 10px;*/
 }
 .row-7{
     width:100%;

VisualInspection/css/statistics/road_manage_statistics.css

@@ -40,15 +40,23 @@
     margin-left: 20px;
     line-height: 50px;
 }
+#month_date
+{
+    /*margin-top: 9px;*/
+    width:80px;
+    height:50px;
+    float:left;
+    line-height: 50px;
+}
 .div-roadManage{
-    width:120px;
+    width:140px;
     height:50px;
     float:left;
     margin-left: 20px;
     line-height: 50px;
 }
 .div-roadManage select{
-    width:120px;
+    width:140px;
     height:30px;
     border: 1px solid #ccc;
     border-radius: 4px;
@@ -71,7 +79,7 @@
     border-color: #1970fc;
     border:1px solid transparent;
     border-radius: 4px;
-    margin-top: 10px;
+    /*margin-top: 10px;*/
 }
 .row-3,.row-4,.row-6,.row-7{
     width:100%;

VisualInspection/css/statistics/toll_station_statistics.css

@@ -41,7 +41,7 @@
     line-height: 50px;
 }
 .div-roadManage{
-    width:120px;
+    width:140px;
     height:50px;
     float:left;
     margin-left: 20px;
@@ -55,7 +55,7 @@
     line-height: 50px;
 }
 .div-roadManage select{
-    width:120px;
+    width:140px;
     height:30px;
     border: 1px solid #ccc;
     border-radius: 4px;
@@ -78,7 +78,7 @@
 .div-month input{
     width:80px;
     height:30px;
-    margin-top: 9px;
+    /*margin-top: 9px;*/
     border: 1px solid #ccc;
     border-radius: 4px;
     font-size: 14px;
@@ -98,7 +98,7 @@
     border-color: #1970fc;
     border:1px solid transparent;
     border-radius: 4px;
-    margin-top: 10px;
+    /*margin-top: 10px;*/
 }
 .btn-change{
     width:60px;

VisualInspection/css/statistics/total_company_statistics.css

@@ -7,6 +7,14 @@
     border-radius: 4px;
     font-size: 15px;
 }
+.div-month input{
+    width:80px;
+    height:30px;
+    /*margin-top: 9px;*/
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+}
 .row-1{
     width:100%;
     height:35px;
@@ -62,7 +70,7 @@
     border-color: #1970fc;
     border:1px solid transparent;
     border-radius: 4px;
-    margin-top: 10px;
+    /*margin-top: 10px;*/
 }
 .row-3,.row-4,.row-6,.row-7{
     width:100%;

VisualInspection/js/main.js

@@ -84,6 +84,8 @@ $(document).ready(function () {
 
         MENU = data;
         //首先要获取任务列表页面的下拉参数，然后才能显示页面
+        //加载道管中心列表
+        getRoadManagerList();
         getFeeList(function(data1){            
             getFeePersonList(function(data3){
                 getJobList(function(data2){
@@ -99,8 +101,6 @@ $(document).ready(function () {
                 });
             });
         });
-        //加载道管中心列表
-        getRoadManagerList();
     }, function (error) { });
 
 });

VisualInspection/js/statistics/appeal.js

@@ -1,11 +1,35 @@
 
 $(function(){
 
+    setVisit();
+    var road_manager;
+	if(roleContains("STATION")){
+        road_manager = getCurrentUser().road_manager_id;     
+    }
+    if(roleContains("ROAD_MANAGER")){
+        road_manager = getCurrentUser().organid;     
+    }
+	setRoadManagerSelect("#center_manage",road_manager,true);
     // 当前月份初始化
     $("#sel_month").val(getM()-1);
 
     $("#month_name").html( $("#sel_month").find("option:selected").text());
 
+    if(road_manager){
+        getFsStationList(road_manager,function(obj){
+            $("#fs_station").html(obj);
+            var dept;
+            if(roleContains("STATION")){
+                dept = getCurrentUser().organid;     
+            }
+            $("#fs_station").val(dept);
+            // 初始化查询
+            getFsWorkInfo();
+        });
+    }else{
+        // 初始化查询
+        getFsWorkInfo();
+    }
     // 导管中心选择
     $("#center_manage").change(function(){
         var center_manage_id = GV(this);
@@ -13,7 +37,12 @@ $(function(){
             $("#fs_station,#fs_employee").html('');
         }else{
             getFsStationList(center_manage_id,function(obj){
-                 $("#fs_station").html(obj);
+                $("#fs_station").html(obj);
+                var dept;
+                if(roleContains("STATION")){
+                    dept = getCurrentUser().organid;     
+                }
+                $("#fs_station").val(dept);
             });
         }
     })
@@ -34,8 +63,7 @@ $(function(){
         window.location.href = getserveraddr() +"/file/appeal/info?month="+GV("#sel_month")+param;
     })
 
-    // 初始化查询
-     getFsWorkInfo();
+
 
     // end
 })
@@ -54,7 +82,7 @@ function getFsWorkInfo(){
     if(GV("#fs_station")!=''){
         param[ 'dept_id' ] = GV("#fs_station");
     }else if(GV("#center_manage") != ''){
-            param[ 'parent_dept_id' ] = GV("#center_manage");
+        param[ 'parent_dept_id' ] = GV("#center_manage");
     }
 
     post_common_service("statistics/check/appeal",param,function(data){
@@ -81,3 +109,12 @@ function getTableContent(obj,seq){
 
     return content;
 }
+function setVisit(){
+	if(roleContains("STATION")){
+		$("#center_manage").attr("disabled","disabled");
+		$("#fs_station").attr("disabled","disabled");
+	}
+	if(roleContains("ROAD_MANAGER")){
+		$("#center_manage").attr("disabled","disabled");
+	}
+}

VisualInspection/js/statistics/assess_ranking.js

@@ -1,13 +1,41 @@
 
 
 $(function () {
-
+    setVisit();
+    var road_manager;
+	if(roleContains("STATION")){
+        road_manager = getCurrentUser().road_manager_id;     
+    }
+    if(roleContains("ROAD_MANAGER")){
+        road_manager = getCurrentUser().organid;     
+    }
+	setRoadManagerSelect("#center-manager",road_manager,true);
+    if(road_manager){
+        var dept;
+        if(roleContains("STATION")){
+            dept = getCurrentUser().organid;     
+        }
+        var feeList = cache_road_manager_fee_list_map.get(road_manager);
+        // $("#fsList").html(obj);
+        setRoadManagerValue(feeList,"#fsList",dept,true);
+        // $("#fsList").val(dept);
+        // 初始化查询
+        initQueryEmp(road_manager,dept);
+    }else{
+        // 初始化查询
+        initQueryEmp(null,null);
+    }
     // 道管中心选择变化
     $("#center-manager").change(function () {
         $("#fsList").empty();
         if (GV(this) != '') {
             getFsStationList(GV(this), function (options) {
                 $("#fsList").append(options);
+                var dept;
+                if(roleContains("STATION")){
+                    dept = getCurrentUser().organid;     
+                }
+                $("#fsList").val(dept);
             });
         }
     })
@@ -15,6 +43,7 @@ $(function () {
 })
 
 function queryEmpClick() {
+
     //每次点击前清空表格数据
     $(".table-tbody").empty('');
     var start_date = $("#start-time").val();
@@ -55,7 +84,7 @@ function queryEmpClick() {
     getEmployeeInfosClick(url, param, start_score, end_score,start_num,end_num)
 }
 
-function initQueryEmp() {
+function initQueryEmp(parent_dept_id,dept_id) {
     //默认初始化前一周查所有
     var endD = new Date();
     var now = new Date();
@@ -77,7 +106,10 @@ function initQueryEmp() {
     //开始日期取前一天的23:00
     start.setDate(start.getDate() - 1);
     start_date = start.Format("yyyy-MM-dd HH:mm:ss");
+        // alert("dd");
     var param = {
+        "parent_dept_id": parent_dept_id,
+        "dept_id": dept_id,
         "start_date": start_date,
         "end_date": end_date,
     }
@@ -649,4 +681,12 @@ function param_method(start_score, end_score) {
         return true;
     }
 }
-
+function setVisit(){
+	if(roleContains("STATION")){
+		$("#center-manager").attr("disabled","disabled");
+		$("#fsList").attr("disabled","disabled");
+	}
+	if(roleContains("ROAD_MANAGER")){
+		$("#center-manager").attr("disabled","disabled");
+	}
+}

VisualInspection/js/statistics/change_attendance.js

@@ -1,9 +1,22 @@
 
 $(function(){
-
+    setVisit();
+    var road_manager;
+	if(roleContains("STATION")){
+        road_manager = getCurrentUser().road_manager_id;     
+    }
+    if(roleContains("ROAD_MANAGER")){
+        road_manager = getCurrentUser().organid;     
+    }
+	setRoadManagerSelect("#center_manage",road_manager,true);
     // 初始化部门下的收费站
      getFsStationList(GV("#center_manage"),function(obj){
         $("#fs_station").html(obj);
+        var dept;
+        if(roleContains("STATION")){
+            dept = getCurrentUser().organid;     
+        }
+        $("#fs_station").val(dept);
         // 初始化收费站下的人数
         getFsEmployee(GV("#fs_station"),function(obj){
             $("#fs_employee").html(obj);
@@ -46,7 +59,12 @@ $(function(){
             $("#fs_station,#fs_employee").html('');
         }else{
             getFsStationList(center_manage_id,function(obj){
-                 $("#fs_station").html(obj);
+                $("#fs_station").html(obj);
+                var dept;
+                if(roleContains("STATION")){
+                    dept = getCurrentUser().organid;     
+                }
+                $("#fs_station").val(dept);
             });
         }
     })
@@ -154,4 +172,14 @@ function getTableContent(obj,seq){
 function monthChange(){
     $(".m28").show();
     $(".m"+getDaysByDate(GV("#sel_month")+"/01")).hide();
+}
+
+function setVisit(){
+	if(roleContains("STATION")){
+		$("#center_manage").attr("disabled","disabled");
+		$("#fs_station").attr("disabled","disabled");
+	}
+	if(roleContains("ROAD_MANAGER")){
+		$("#center_manage").attr("disabled","disabled");
+	}
 }

VisualInspection/js/statistics/change_work.js

@@ -1,9 +1,22 @@
 
 $(function(){
-
+    setVisit();
+    var road_manager;
+	if(roleContains("STATION")){
+        road_manager = getCurrentUser().road_manager_id;     
+    }
+    if(roleContains("ROAD_MANAGER")){
+        road_manager = getCurrentUser().organid;     
+    }
+	setRoadManagerSelect("#center_manage",road_manager,true);
     // 初始化部门下的收费站
      getFsStationList(GV("#center_manage"),function(obj){
         $("#fs_station").html(obj);
+        var dept;
+        if(roleContains("STATION")){
+            dept = getCurrentUser().organid;     
+        }
+        $("#fs_station").val(dept);
         // 初始化收费站下的人数
         getFsEmployee(GV("#fs_station"),function(obj){
             $("#fs_employee").html(obj);
@@ -38,7 +51,12 @@ $(function(){
             $("#fs_station,#fs_employee").html('');
         }else{
             getFsStationList(center_manage_id,function(obj){
-                 $("#fs_station").html(obj);
+                $("#fs_station").html(obj);
+                var dept;
+                if(roleContains("STATION")){
+                    dept = getCurrentUser().organid;     
+                }
+                $("#fs_station").val(dept);
             });
         }
     })
@@ -107,3 +125,12 @@ function getTableContent(obj,seq){
 
     return content;
 }
+function setVisit(){
+	if(roleContains("STATION")){
+		$("#center_manage").attr("disabled","disabled");
+		$("#fs_station").attr("disabled","disabled");
+	}
+	if(roleContains("ROAD_MANAGER")){
+		$("#center_manage").attr("disabled","disabled");
+	}
+}

VisualInspection/js/statistics/common_attendance.js

@@ -1,9 +1,24 @@
 
 $(function(){
+    setVisit();
+    var road_manager;
+	if(roleContains("STATION")){
+        road_manager = getCurrentUser().road_manager_id;     
+    }
+    if(roleContains("ROAD_MANAGER")){
+        road_manager = getCurrentUser().organid;     
+    }
+	setRoadManagerSelect("#center_manage",road_manager,true);
+
 
     // 初始化部门下的收费站
      getFsStationList(GV("#center_manage"),function(obj){
         $("#fs_station").html(obj);
+        var dept;
+        if(roleContains("STATION")){
+        dept = getCurrentUser().organid;     
+        }
+        $("#fs_station").val(dept);
         // 初始化收费站下的人数
         getFsEmployee(GV("#fs_station"),function(obj){
             $("#fs_employee").html(obj);
@@ -47,6 +62,11 @@ $(function(){
         }else{
             getFsStationList(center_manage_id,function(obj){
                  $("#fs_station").html(obj);
+                 var dept;
+                 if(roleContains("STATION")){
+                    dept = getCurrentUser().organid;     
+                 }
+                 $("#fs_station").val(dept);
             });
         }
     })
@@ -155,4 +175,14 @@ function getTableContent(obj,seq){
 function monthChange(){
     $(".m28").show();
     $(".m"+getDaysByDate(GV("#sel_month")+'/01')).hide();
+}
+
+function setVisit(){
+	if(roleContains("STATION")){
+		$("#center_manage").attr("disabled","disabled");
+		$("#fs_station").attr("disabled","disabled");
+	}
+	if(roleContains("ROAD_MANAGER")){
+		$("#center_manage").attr("disabled","disabled");
+	}
 }

VisualInspection/js/statistics/common_statistic.js

@@ -77,7 +77,7 @@ function getFsStationList(center_manage_id,func){
             "parentid":center_manage_id
     }
     post_common_service("dept/getDeptInfosByDeptId",param,function(data){
-         var str = '';
+        var str = '';
         if(data.length > 0){
             str = "<option value=''>全部</option>";  
             for(var i=0;i<data.length;i++){
@@ -172,12 +172,12 @@ var initDate;
  * 根据当前年月动态将13个月push数组
  */
 function month_method(){		
-    // 将上一年的当前月的上个月到12月加入到数组里
+    // 将上一年的当前月的上个月到12月加入到数组里//改为当前月到上年同月
     for(var i=1;i<=mth_pre+1;i++){
         mth_handle(m,(year-1),(m++));
     }
-    // 将当前年的一月份到当前月的上个月加入到数组里
-    for(var i=1;i<=new Date().getMonth();i++){
+    // 将当前年的一月份到当前月的上个月加入到数组里（改为当前月）
+    for(var i=1;i<=new Date().getMonth()+1;i++){
         mth_handle(i,year,i);
     }
     // 当前年月的上个月（初始化图用）

VisualInspection/js/statistics/common_work.js

@@ -1,9 +1,22 @@
 
 $(function(){
-
+    setVisit();
+    var road_manager;
+	if(roleContains("STATION")){
+        road_manager = getCurrentUser().road_manager_id;     
+    }
+    if(roleContains("ROAD_MANAGER")){
+        road_manager = getCurrentUser().organid;     
+    }
+	setRoadManagerSelect("#center_manage",road_manager,true);
     // 初始化部门下的收费站
      getFsStationList(GV("#center_manage"),function(obj){
         $("#fs_station").html(obj);
+        var dept;
+        if(roleContains("STATION")){
+            dept = getCurrentUser().organid;     
+        }
+        $("#fs_station").val(dept);
         // 初始化收费站下的人数
         getFsEmployee(GV("#fs_station"),function(obj){
             $("#fs_employee").html(obj);
@@ -39,6 +52,11 @@ $(function(){
         }else{
             getFsStationList(center_manage_id,function(obj){
                  $("#fs_station").html(obj);
+                 var dept;
+                 if(roleContains("STATION")){
+                    dept = getCurrentUser().organid;     
+                 }
+                 $("#fs_station").val(dept);
             });
         }
     })
@@ -108,3 +126,12 @@ function getTableContent(obj,seq){
 
     return content;
 }
+function setVisit(){
+	if(roleContains("STATION")){
+		$("#center_manage").attr("disabled","disabled");
+		$("#fs_station").attr("disabled","disabled");
+	}
+	if(roleContains("ROAD_MANAGER")){
+		$("#center_manage").attr("disabled","disabled");
+	}
+}

VisualInspection/js/statistics/personal_data_statistics.js

@@ -19,6 +19,7 @@ var end_date = $(".div-end input").val()+" 23:00:00";
  * 预加载方法
  */		
 $(function(){
+	setVisit();
 
 //*************************************数据表格******************************************
 	function initAppealPage(start_date,end_date,user_id) {
@@ -194,7 +195,18 @@ $(function(){
 		}
 	});
 	// 收费站下拉框
-	setFeSelect("#select-dept");
+	var dept;
+	if(roleContains("STATION")){
+		dept=getCurrentUser().organid; 
+	}
+	var roadManager;
+	if(roleContains("ROAD_MANAGER")){
+		roadManager=getCurrentUser().organid; 
+	}
+	var feeList = $.zui.store.get("cache_fee_station_list");
+	if(roadManager) feeList = cache_road_manager_fee_list_map.get(roadManager);
+	setFeeSelectValueNoAll(feeList,"#select-dept",dept);
+	setSecond();
 	/**
 	 * 部门人员下拉框
 	 */
@@ -422,4 +434,9 @@ $(function(){
 			return option;
 		}
 
-});
+});
+function setVisit(){
+	if(roleContains("STATION")){
+		$("#select-dept").attr("disabled","disabled");
+	}
+}

VisualInspection/js/statistics/road_manage_statistics.js

@@ -35,23 +35,49 @@ $(function(){
     // 公用方法，根据当前年月动态将13个月push数组
 	month_method();
 	// 公用方法，月份下拉框
-    select_option();
+    // select_option();
 	// 回显当前年月份
-	$(".div-month select").val(initDate);
-
+	// $(".div-month select").val(initDate);
+	$.jeDate("#month_date",{
+		isinitVal:true,
+		format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+	});
 	var road_manager;
 	if(roleContains("STATION")){
         road_manager = getCurrentUser().road_manager_id;     
     }
 	setRoadManagerSelect(".div-roadManage select",road_manager);
+	//加载数据
+	refresh(true);
+
 	$(".div-button button").click(function(){	
-		var select_month = $(".div-month select").val();
-		console.log("fffffff"+select_month);
+		// var select_month = $("#month_date").val();
+		// console.log("fffffff"+select_month);
+		// var select_road = $(".div-roadManage select").val();
+		// 加载图配置
+		// echart();
+		refresh(false);
+		// if(flag ==true){
+		// 	init_company_year_assess("statistics/score/year/info",select_road);
+		// }
+		// flag = false;
+	});
+    
+	// 如果道管中心下拉框改变，点击时加载图一
+	$(".div-roadManage").change(function(){
+		flag = true;
+	});
+
+	// 加载图配置
+	// echart();
+	function refresh(flag){
+		echart(flag);
+		var select_month = $("#month_date").val();
 		var select_road = $(".div-roadManage select").val();
-		if(flag ==true ){
+		console.log(select_road);
+		if(flag ==true){
 			init_company_year_assess("statistics/score/year/info",select_road);
 		}
-		flag = false;
 		// 查询图二
 		init_company_points_assess("statistics/lost/score/rate",select_month+'',select_road);
 		// 查询图三
@@ -64,19 +90,8 @@ $(function(){
 		init_server_check_type("statistics/lost/itemscore/rate",select_month+"",select_road);
         // 查询图七
 		init_each_people_points("statistics/lost/twice/itemscore/rate",select_month+"",select_road);
-		
-		
-		// 加载图配置
-		echart();
-	});
-    
-	// 如果道管中心下拉框改变，点击时加载图一
-	$(".div-roadManage").change(function(){
-		flag = true;
-	});
-
-	// 加载图配置
-		echart();
+	}
+	
 	/**
 	 * 初始化图一
 	 */
@@ -88,7 +103,6 @@ $(function(){
 			"queryType":1
 		}
 		initRqueset(url,param,1);
-
 	}
 	init_company_year_assess("statistics/score/year/info",select_road);
 
@@ -437,7 +451,7 @@ $(function(){
 		}
 	}
     
-    function echart(){
+    function echart(flag){
         // 路径配置
         require.config({
             paths: {

VisualInspection/js/statistics/toll_station_statistics.js

@@ -31,7 +31,7 @@
 $(function(){     
 	setVisit();
     // 公用方法，根据当前年月动态将13个月push数组
-	// month_method();
+	month_method();
 	// 公用方法，月份下拉框
     // select_option();	
 	$.jeDate("#month_date",{
@@ -46,16 +46,30 @@ $(function(){
 	// 回显当前年月份
 	// $(".div-month select").val(initDate);
 	setSecond();
-
+	refresh(true);
 	$(".div-button button").click(function(){	
-		var select_month = $("month_date").val();
+		refresh(false);
+	});
+
+	// 加载图配置
+	// echart();
+
+	// 如果道管中心下拉框改变，点击时加载图一
+	$(".div-station select").change(function(){
+		flag = true;
+	});	
+    
+	function refresh(flag){
+		var select_month = $("#month_date").val();
 		var select_station = $(".div-station select").val();
 		// 加载图配置
-		echart();
+		echart(flag);
+		echart_change();
+		echart_change2();
 		if(flag ==true ){
 			init_tollStation_year_assess("statistics/score/year/info",select_station);
 		}
-		flag = false;
+		// flag = false;
 
 		top5_change(select_month,select_station);
 		// 查询图二
@@ -63,29 +77,22 @@ $(function(){
         // 查询图四
 		init_people_score_rank("statistics/stuff/score/info",select_month+'',select_station);
         // 查询图五
+		console.log(select_month+","+select_station);
 		init_server_check_type("statistics/lost/itemscore/rate",select_month+"",select_station);
         // 查询图六
 		init_each_people_points("statistics/lost/twice/itemscore/rate",select_month+"",select_station);
-	});
-
-	// 加载图配置
-	echart();
-
-	// 如果道管中心下拉框改变，点击时加载图一
-	$(".div-station select").change(function(){
-		flag = true;
-	});	
-    
+	}
 	/**
 	 * 初始化图一
 	 */
 	function init_tollStation_year_assess(url,select_station){
 		var param = {
-			"start_date":(year-1)+"-"+new Date().getMonth()+"-25"+" 23:00:00",
-			"end_date":year+"-"+new Date().getMonth()+"-25"+" 23:00:00",
+			"start_date":(year-1)+"-"+"12-25"+" 23:00:00",
+			"end_date":year+"-"+"12-25"+" 23:00:00",
 			"dept_id":select_station,
 			"queryType":2
-		}
+		}		
+		console.log(param);
 		initRqueset(url,param,1);
 	}
 	
@@ -208,7 +215,7 @@ $(function(){
 	 * @param {*} type 
 	 */
 	function initRqueset(url,param,type){
-		post_common_service( url,param,function(data){
+		post_common_service(url,param,function(data){
 			data_array(data,type);
 			if(type == 1){
 				// 画图
@@ -243,6 +250,7 @@ $(function(){
 	 * @param {*} type 
 	 */
 	function data_array(data,type){
+
 		if(type == 1){
 			array_year_score.length = 0;
 			if(data!='' &&　data.length!=0){
@@ -468,7 +476,7 @@ $(function(){
 		if(roleContains("STATION")){
 			dept = getCurrentUser().organid;     
 		}
-		refresh(feeList,dept);
+		refreshFee(feeList,dept);
 		// var param = {
 		// 	 "parentid":select_road
 		// }
@@ -479,7 +487,7 @@ $(function(){
     	// });
     }
 
-	function refresh(data,selectId){
+	function refreshFee(data,selectId){
 		var sec = document.getElementById('second');
 		var tempStr = ''
 		if(data.length!=0){
@@ -499,18 +507,18 @@ $(function(){
 		}else{
 			sec.innerHTML='';	
 		}
-		// 页面初始化
-		var select_month = $("#month_date").val();
-		var select_station = $("#second").val();
-		echart();	
-		// 进退步top5
-		top5_change(select_month,select_station);
-		init_tollStation_year_assess("statistics/score/year/info",select_station);
-		init_company_points_assess("statistics/lost/score/rate",select_month+'',select_station);
-		init_people_score_rank("statistics/stuff/score/info",select_month+'',select_station);
-		init_server_check_type("statistics/lost/itemscore/rate",select_month+"",select_station);
-		init_each_people_points("statistics/lost/twice/itemscore/rate",select_month+"",select_station);
-		flag = false;
+		// // 页面初始化
+		// var select_month = $("#month_date").val();
+		// var select_station = $("#second").val();
+		// echart();	
+		// // 进退步top5
+		// top5_change(select_month,select_station);
+		// init_tollStation_year_assess("statistics/score/year/info",select_station);
+		// init_company_points_assess("statistics/lost/score/rate",select_month+'',select_station);
+		// init_people_score_rank("statistics/stuff/score/info",select_month+'',select_station);
+		// init_server_check_type("statistics/lost/itemscore/rate",select_month+"",select_station);
+		// init_each_people_points("statistics/lost/twice/itemscore/rate",select_month+"",select_station);
+		// flag = false;
 	}
 	/**
 	 * 进步前5名后退步前五名切换
@@ -569,25 +577,25 @@ $(function(){
     /**
 	 * 其它图配置
 	 */
-	function echart(){
-        echart_config(1);
+	function echart(flag){
+        echart_config(1,flag);
 	}
     /**
 	 * 进步top5图配置
 	 */
 	function echart_change2(){
-        echart_config(2);
+        echart_config(2,false);
 	}
     /**
 	 * 退步top5图配置
 	 */
 	function echart_change(){
-        echart_config(3);
+        echart_config(3,false);
 	}
     /**
 	 * 图配置
 	 */
-	function echart_config(type){
+	function echart_config(type,flag){
 		require.config({
             paths: {
                 echarts: '/js/lib/echarts/build/dist'

VisualInspection/js/statistics/total_company_statistics.js

@@ -25,13 +25,31 @@ $(function(){
     // 公用方法，根据当前年月动态将13个月push数组
 	month_method();
 	// 公用方法，月份下拉框
-    select_option();
+    // select_option();
 	// 回显当前年月份
-	$(".div-month select").val(initDate);
-
+	// $(".div-month select").val(initDate);
+	$.jeDate("#month_date",{
+		isinitVal:true,
+		format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+	});
+	refresh(true);
 	$(".query-company").click(function(){	
-		var select_month = $(".div-month select").val();
-		flag = false;
+		// var select_month = $("#month_date").val();
+		// flag = false;
+		// console.log(select_month);
+		
+		// // 加载图配置
+		// echart();
+		refresh(false);
+	});
+	
+
+	function refresh(flag){
+		// 加载图配置
+    	echart(flag);
+		var select_month = $("#month_date").val();
+		// console.log(select_month);
+		if(flag) init_company_year_assess();
 		// 查询图二
 		init_company_points_assess("statistics/lost/score/rate",select_month+'');
 		// 查询图三
@@ -42,12 +60,7 @@ $(function(){
 		init_server_check_type_five("statistics/lost/itemscore/rate",select_month+"");
 		// 查询图六
 		init_each_people_points_six("statistics/lost/twice/itemscore/rate",select_month+"");
-		// 加载图配置
-		echart();
-	});
-	// 加载图配置
-    echart();
-
+	}
 	/**
 	 * 初始化图一
 	 */
@@ -59,7 +72,7 @@ $(function(){
 		initRqueset("statistics/score/year/info",param,1);
 
 	}
-    init_company_year_assess();
+    // init_company_year_assess();
     /**
 	 * 初始化图二
 	 */
@@ -70,7 +83,7 @@ $(function(){
 		}
 		initRqueset(url,param,2);
 	}
-    init_company_points_assess("statistics/lost/score/rate",initDate+"");
+    // init_company_points_assess("statistics/lost/score/rate",initDate+"");
 
 
 	/**
@@ -82,7 +95,7 @@ $(function(){
 		};
 		initRqueset(url,param,3);
 	}
-	init_road_manager_score_rank_three("statistics/score/center/manage/info",initDate+"");
+	// init_road_manager_score_rank_three("statistics/score/center/manage/info",initDate+"");
 
 	/**
 	 * 初始化图四
@@ -93,7 +106,7 @@ $(function(){
 		};
 		initRqueset(url,param,4);
 	}
-	init_stationAll_rank_four("statistics/score/tollgate/info",initDate+"");
+	// init_stationAll_rank_four("statistics/score/tollgate/info",initDate+"");
 
 	/**
 	 * 初始化图五
@@ -105,7 +118,7 @@ $(function(){
 		};
 		initRqueset(url,param,5);
 	}
-	init_server_check_type_five("statistics/lost/itemscore/rate",initDate+"");
+	// init_server_check_type_five("statistics/lost/itemscore/rate",initDate+"");
 
 	/**
 	 * 初始化图六
@@ -129,7 +142,7 @@ $(function(){
 		};
 		initRqueset(url,param,6);
 	}
-	init_each_people_points_six("statistics/lost/twice/itemscore/rate",initDate+"");
+	// init_each_people_points_six("statistics/lost/twice/itemscore/rate",initDate+"");
     
 	/**
 	 * 请求
@@ -362,7 +375,7 @@ $(function(){
 	/**
 	 * 图配置
 	 */
-	function echart(){
+	function echart(flag){
 			// 路径配置
 			require.config({
 				paths: {

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -229,10 +229,10 @@
 
             var now_date = moment(nowStr).toDate();//new Date();
             now_date.setDate(now_date.getDate()-1);
-            if(now_date.Format('yyyy-MM-dd') >= $("#save_user_class").data("work_date").trim() ){
-                tip("不能生成过期的排班");
-                return ;
-            }
+            // if(now_date.Format('yyyy-MM-dd') >= $("#save_user_class").data("work_date").trim() ){
+            //     tip("不能生成过期的排班");
+            //     return ;
+            // }
             // if($("#save_user_class").data("work_date").trim() >'2017-06-25'){
             //     tip("只能生成6月份排班");// tip("不能生成过期的排班");
             //     return ;
@@ -664,10 +664,10 @@
             // 判断当前时间和待添加班组时间判断
             var now_date = moment(nowStr).toDate();//new Date();
             now_date.setDate(now_date.getDate()-1);
-            if(now_date.Format('yyyy-MM-dd') >= $("#save_term_class").data("date").trim() ){
-                tip("不能生成过期的排班");
-                return ;
-            }
+            // if(now_date.Format('yyyy-MM-dd') >= $("#save_term_class").data("date").trim() ){
+            //     tip("不能生成过期的排班");
+            //     return ;
+            // }
 
             // if($("#save_term_class").data("date").trim() >'2017-06-25'){
             //     tip("只能生成6月份排班");// tip("不能生成过期的排班");

VisualInspection/js/util/util.js

@@ -171,14 +171,16 @@ function addOrUpdateItem4Common(param,url,okCb){
 function getRoadManagerList(){
     get_common_service("/dept/getAllRM",null,function(data){
         $.zui.store.set("cache_road_manager_list",data);
+        // cb(data);
     });
 }
-function setRoadManagerSelect(div,selectId){
+function setRoadManagerSelect(div,selectId,hasAll){
      var rmList = $.zui.store.get("cache_road_manager_list");
-     setRoadManagerValue(rmList,div,selectId);
+     setRoadManagerValue(rmList,div,selectId,hasAll);
 }
-function setRoadManagerValue(data,div,selectId){
+function setRoadManagerValue(data,div,selectId,hasAll){
     var optStr = '';//<option value="">全部</option>';
+    if(hasAll) optStr = '<option value="">全部</option>';
     for(var i in data) {
         if(data[i].deptid==selectId)
             optStr += '<option value="'+data[i].deptid+'" selected="selected">'+data[i].name+'</option>';
@@ -226,6 +228,17 @@ function setFeeSelectValue(data,div,selectId){
     $(div).html('');
     $(div).html(optStr);
 }
+function setFeeSelectValueNoAll(data,div,selectId){
+    var optStr = '';
+    for(var i in data) {
+        if(data[i].deptid==selectId)
+            optStr += '<option value="'+data[i].deptid+'" selected="selected">'+data[i].name+'</option>';
+        else
+            optStr += '<option value="'+data[i].deptid+'">'+data[i].name+'</option>';
+    }
+    $(div).html('');
+    $(div).html(optStr);
+}
 function setLaneSelect(div,selectId){
     var optStr = '';
     var data =[];

VisualInspection/view/statistics/appeal.html

@@ -25,10 +25,10 @@
                 <label for="exampleInputAccount1" class="col-sm-1">部门</label>
                 <div class="col-sm-2">
                     <select class="form-control" id="center_manage">
-                        <option selected value="">全部</option>
+                        <!--<option selected value="">全部</option>
                         <option value="30">连云港</option>
                         <option value="31">盐城</option>
-                        <option value="32">南通</option>
+                        <option value="32">南通</option>-->
                     </select>
                 </div>
                 <div class="col-sm-2">

VisualInspection/view/statistics/common_attendance.html

@@ -25,10 +25,10 @@
                 <label for="exampleInputAccount1" class="col-sm-1">部门</label>
                 <div class="col-sm-2">
                     <select class="form-control" id="center_manage">
-                        <option value="">全部</option>
+                        <!--<option value="">全部</option>
                         <option selected value="30">连云港</option>
                         <option value="31">盐城</option>
-                        <option value="32">南通</option>
+                        <option value="32">南通</option>-->
                     </select>
                 </div>
                 <div class="col-sm-2">

VisualInspection/view/statistics/emp_ranking.html

@@ -8,10 +8,10 @@
                 <label for="exampleInputAccount1" class="col-sm-1">道管中心</label>
                 <div class="col-sm-2" style="width:150px;">
                     <select class="form-control"  id="center-manager">
-                        <option selected value="">全部</option>
+                        <!--<option selected value="">全部</option>
                         <option  value="30">连云港</option>
                         <option value="31">盐城</option>
-                        <option value="32">南通</option>
+                        <option value="32">南通</option>-->
                     </select>
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">部门</label>
@@ -142,6 +142,6 @@
         });
       
    //     setFeSelect("#fsList");
-        initQueryEmp();
+        // initQueryEmp();
     });
 </script>

VisualInspection/view/statistics/personal_data_statistics.html

@@ -2,20 +2,20 @@
 <script src="/js/statistics/common_statistic.js?__inline"></script>
 <script src="/js/statistics/personal_data_statistics.js"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/personal_data_statistics.css">
-<div class="container-right">
+<div class="container-fluid">
     <!--<div class="row-1"><span>个人数据统计</span></div>
     <div class="line-1"></div>-->
-    <div class="row-2">
+    <div class="row">
         <div>
             <!--<div class="name"><span>刘娟</span></div>
             <div class="div-select div-button"><button>选择人员</button></div>-->
-            <div class="name1"><span>请选择收费站：</span></div>
-            <div class="div-select"><select id="select-dept"></select></button></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>
-            <div class="div-end"><input placeholder="请选择考核结束时间"></input></div>
-            <div class="div-select"><select class="score-select">
+            <!--<div class="name1"><span  for="exampleInputAccount1">请选择收费站：</span></div>-->
+            <div class="div-select"><select  class="form-control" id="select-dept"></select></button></div>
+            <div class="div-select"><select  class="form-control" id="select-personal"></select></button></div>
+            <div class="div-start"><input class="form-control" placeholder="请选择考核开始时间"></input></div>
+            <div class="div-to"><label  for="exampleInputAccount1">-</label></div>
+            <div class="div-end"><input class="form-control" placeholder="请选择考核结束时间"></input></div>
+            <div class="div-select"><select class="form-control" class="score-select">
                     <option value="">全部</option><option value="1" selected>扣分</option><option value="0">不扣分</option>
                 </select>
             </div>

VisualInspection/view/statistics/road_manage_statistics.html

@@ -2,13 +2,13 @@
 <script src="/js/statistics/common_statistic.js?__inline"></script>
 <script src="/js/statistics/road_manage_statistics.js"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/road_manage_statistics.css">
-<div class="container-right">
+<div class="container-fluid">
     <!--<div class="row-1"><span>道管中心统计</span></div>-->
     <!--<div class="line-1"></div>-->
-    <div class="row-2">
+    <div class="row">
         <div>
             <div class="div-month">
-                <select>
+                <!--<select>-->
                 <!--<option value="1">一月</option>
                 <option value="2">二月</option>
                 <option value="3">三月</option>
@@ -21,15 +21,15 @@
                 <option value="10">十月</option>
                 <option value="11">十一月</option>
                 <option value="12">十二月</option>-->
-                </select>
-                
+                <!--</select>-->
+             <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">   
             </div>
-        <div class="div-roadManage"><select>
+        <div class="div-roadManage"><select class="form-control">
             <!--<option value="30">连云港</option>
             <option value="31">盐城</option>
             <option value="32">南通</option>-->
             </select></div>
-        <div class="div-button"><button>查询</button></div></div>
+        <div class="div-button"><button class="btn btn-primary">查询</button></div></div>
     </div>
     <div class="line-1"></div>
 

VisualInspection/view/statistics/toll_station_statistics.html

@@ -6,8 +6,8 @@
     <!--<div class="row-1"><span>收费站统计</span></div>
     <div class="line-1"></div>-->
     <div class="row">
-     <form  class="form-horizontal">
-         <div class="form-group">
+        <form  class="form-horizontal" style="margin:0px;">
+            <div class="form-group" style="margin:0px;">
         <div class="div-month">
             <!--<select>-->
                 <!--<option value="1">一月</option>
@@ -26,16 +26,16 @@
             <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
         </div>
         <div class="div-roadManage">
-            <select id="first">
+            <select class="form-control" id="first">
             <!--<option value="30">连云港</option>
             <option value="31">盐城</option>
             <option value="32">南通</option>-->
             </select>
         </div>
-        <div class="div-station"><select id="second"></select></div>
-        <div class="div-button"><button>查询</button></div></div>
+        <div class="div-station"><select class="form-control" id="second"></select></div>
+        <div class="div-button"><button class="btn btn-primary" type="button">查询</button></div></div>
         </div>
-     </form>
+        </form>
     </div>
     <div class="line-1"></div>
 

VisualInspection/view/statistics/total_company_statistics.html

@@ -2,12 +2,13 @@
 <script src="/js/statistics/common_statistic.js?__inline"></script>
 <script src="/js/statistics/total_company_statistics.js"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/total_company_statistics.css">
-<div class="container-right">
+<div class="container-fluid">
     <!--<div class="row-1"><span>公司统计</span></div>
     <div class="line-1"></div>-->
-    <div class="row-2">
+    <div class="row">
         <div>
-            <div class="div-month"><select>
+            <div class="div-month">
+                <!--<select>-->
                 <!--<option value="1">一月</option>
                 <option value="2">二月</option>
                 <option value="3">三月</option>
@@ -20,7 +21,9 @@
                 <option value="10">十月</option>
                 <option value="11">十一月</option>
                 <option value="12">十二月</option>-->
-                </select></div>
+                <!--</select>-->
+                <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+            </div>
             <div class="div-button"><button class="query-company">查询</button></div>
         </div>
     </div>