修改统计分析权限

VisualInspection/css/statistics/toll_station_statistics.css

@@ -41,7 +41,7 @@
     line-height: 50px;
 }
 .div-roadManage{
-    width:80px;
+    width:120px;
     height:50px;
     float:left;
     margin-left: 20px;
@@ -55,7 +55,7 @@
     line-height: 50px;
 }
 .div-roadManage select{
-    width:80px;
+    width:120px;
     height:30px;
     border: 1px solid #ccc;
     border-radius: 4px;
@@ -75,6 +75,14 @@
     border-radius: 4px;
     font-size: 14px;
 }
+.div-month input{
+    width:80px;
+    height:30px;
+    margin-top: 9px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    font-size: 14px;
+}
 .div-button{
     width:80px;
     height:50px;

VisualInspection/js/config.js

@@ -15,9 +15,11 @@ function getCurrentaddr() {
 function getserveraddr() {
     if (base_ui_url.indexOf("jsjtyxt.com") != -1) {
         return "http://server_yanhai.jsxt.jsjtyxt.com/";
+    } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
+        return "http://server_release_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://10.112.0.199:7001/"
-             return "http://localhost:8089/"
+        return "http://localhost:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {
@@ -28,9 +30,13 @@ function getserveraddr() {
 function getImageaddr() {
     if (base_ui_url.indexOf("jsjtyxt.com") != -1) {
         return "http://file_yanhai.jsxt.jsjtyxt.com/";
+    } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
+        return "http://file_release_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
         return "http://10.112.0.199:7000/"
             // return "http://localhost:9080/"
+    } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
+        return "http://192.168.8.236/"
     } else {
         return "http://10.112.0.199/"
     }

VisualInspection/js/main.js

@@ -20,7 +20,7 @@ $(document).ready(function () {
         layer.msg('登陆已经过期，将重新登陆！', {
             time: 2000, //20s后自动关闭
         }, function () {
-            self.location = base_ui_url + UI_USER_LOGIN
+            self.location = base_ui_url + UI_USER_LOGIN +"?time="+(Date.parse(new Date()));
         })
 
         return;
@@ -99,6 +99,8 @@ $(document).ready(function () {
                 });
             });
         });
+        //加载道管中心列表
+        getRoadManagerList();
     }, function (error) { });
 
 });

VisualInspection/js/mytask/apply_task.js

@@ -27,6 +27,10 @@
             format: "yyyy-mm-dd"
         });
         setFeSelect("#fsList");
+        setFeePersonSelect("#feePersonList",null,null);
+        $('#fsList').change(function(){ 
+            setFeePersonSelect("#feePersonList",null,$("#fsList").val());
+        }) 
         //获取页面参数
         var page_params = $.zui.store.get("page_params");
         if(page_params && page_params.status) {
@@ -35,6 +39,7 @@
         if(cur_status==21){
             $("#agreePatchBtn").show();
         }
+        
         queryUnexaminedTask();
     }
 //初始化表行按钮
@@ -57,6 +62,7 @@ function queryUnexaminedTask(){
         "start_time": start_time,
         "end_time": end_time,
         "checked_dept": $("#fsList").val(),
+        "checked_person": $("#feePersonList").val(),
         "check_status":cur_status
     }
     var hide = false;

VisualInspection/js/mytask/checkDetail.js1

@@ -1,124 +0,0 @@
-function initCheck(){
-    
-    // 仅选择日期
-    $("#start-time").datetimepicker({
-        language: "zh-CN",
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        minView: 2,
-        forceParse: 0,
-        format: "yyyy-mm-dd"
-    });
-    // 仅选择日期
-    $("#end-time").datetimepicker({
-        language: "zh-CN",
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        minView: 2,
-        forceParse: 0,
-        format: "yyyy-mm-dd"
-    });
-    if($.checkTask) {
-        setFeSelect("#fsList",$.checkTask.deptid);
-        setLaneSelect("#lane",$.checkTask.checked_location);
-        get_common_service('user/getUserById/'+$.checkTask.checked_person, null, function(data){
-            $("#checked_person").html(data.truename);
-        }) 
-        //查询评分情况
-        queryScores();
-    }
-}
-    // 使用data参数更新数据：
-    function queryScores(){
-        var data = {
-            "task_id": $.checkTask.id
-        }
-        var cols = [
-                    {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
-                    {width: 160, text: '评分记录', type: 'string', flex: true, sort: 'down',field: 'content'},
-                    {width: 80, text: '分数', type: 'string', flex: true, colClass: '',field: 'check_item_score'},
-                    {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
-                        oper:[
-                            {func:'showEditScore',text:'修改',icon_class:'icon-edit'},
-                            {func:'deleteScore',text:'删除',icon_class:'icon-remove-circle'}
-                        ]
-                    }
-                ];
-        
-        // var pager = {
-        //     page_size:10
-        // }
-        $('.datatable').mytable({'cols':cols,
-                                'url':"/score/getScoreList/",
-                                'param':data}
-                                );
-    }
-    function showEditScore(id){
-        // deleteItem4Common(id,"/score/delete/",queryScores);
-        var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
-        showPics(rowData.pics);
-    }
-
-    function deleteScore(id){
-        deleteItem4Common(id,"/score/delete/",queryScores);
-    }
-
-    function showPics(pics){
-        var picStr='';
-        $('#img_container').html(picStr);
-        if(pics){
-            var picArr = pics.split(',');
-            for(var i in picArr){
-                var pic = '<div id="img_item_'+i+'" class="col-md-4 col-sm-6 col-lg-3">'
-                    +  '<a href="javascript:void(0)" onclick="removeImg(\'#img_item_'+i+'\')" style="float:right;position:absolute;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
-                    +  '<a class="card lightbox-toggle" href="'+picArr[i]+'" style="position:absolute">'
-                    +      '<img src="'+picArr[i]+'" alt="">'
-                    +  '</a>'
-                    +'</div>';
-                picStr+=pic;
-            }
-            $('#img_container').html(picStr);
-            $('a.lightbox-toggle').lightbox();
-        }
-    }
-
-    function removeImg(img_id){
-        $(img_id).remove();
-    }
-
-    function clearAllImg(){
-        $('#img_container').empty();
-    }
-    function showPre(id){
-        // $('#myModal').modal({name:"dd"});
-        changePage("/view/mytask/taskDetail.html");
-    }
-
-    function saveValidReason(){
-        alert("提交成功！");
-        $('#validSubmitWin').modal('toggle');
-    }
-    function changePerson(id){
-        $('#checkedPerson').html(id);
-        $('#changePersonWin').modal('toggle');
-    }
-
-    function score(score){
-        alert("扣分："+score);
-        $('#scoreWin').modal('toggle');
-    }
-
-    function refuseApply(){
-        alert("拒绝申请");
-        $('#refuseApplyWin').modal('toggle');
-    }
-
-    function agreeApply(){
-        alert("同意申请");
-    }

VisualInspection/js/mytask/task_list.js

@@ -65,8 +65,8 @@ function initQueryParams() {
     }
     if(cur_status==4){
         $("#dispatchPatchBtn").show(); 
-        $("#checkPersonDiv").show();
     }
+    $("#checkPersonDiv").show();
 
     if(cur_status==4 || cur_status==5 || cur_status==6){
         $("#hasScoreDiv").show();       
@@ -97,7 +97,7 @@ function queryTask(){
         "check_status":cur_status,
         "hasScore":$("#hasScoreList").val(),
         "position_id":$("#jobSelect").val(),
-        "checked_person": $("#feePersonList").val(),
+        "checked_person": $("#feePersonList").val()
     }
     // console.log(data);
     var hide = false;

VisualInspection/js/statistics/assess_ranking.js

@@ -68,8 +68,8 @@ function initQueryEmp() {
     var end_num = $("#end-num").val();
     setJobSelect("#jobSelect");
     //默认初始化时间页面回显
-    $("#start-time").val("2017-6-09");//start_time);
-    $("#end-time").val("2017-6-25");//end_time);
+    $("#start-time").val(start_time);
+    $("#end-time").val(end_time);
     var start_date = start_time + " 23:00:00";
     var end_date = end_time + " 23:00:00";
 
@@ -99,8 +99,10 @@ function getEmployeeInfosClick(url, param, start_score, end_score,start_num,end_
             var check_number = filter(data[i].checked_num, '0');
             var flag = judgeParamFilter(data, i, score, start_score, end_score,check_number,start_num,end_num)
             if (flag) {
-
-                html = "<button id=\"user_" + data[i].user.id + "\" onClick='addTask(" + data[i].user.id + ",\"" + data[i].user.truename + "\",\"" + param.start_date + "\",\"" + param.end_date + "\")'  class=\"btn\" style='margin-left: 10px;padding: 0px;border: 0;background: none;' type=\"button\"><i class=\"icon icon-plus-sign\"></i></button>"
+                html = "";
+                if(hasRole(ROLE_JICHA_ADMIN) || hasRole(ROLE_ADMIN)){
+                    html += "<button id=\"user_" + data[i].user.id + "\" onClick='addTask(" + data[i].user.id + ",\"" + data[i].user.truename + "\",\"" + param.start_date + "\",\"" + param.end_date + "\")'  class=\"btn\" style='margin-left: 10px;padding: 0px;border: 0;background: none;' type=\"button\"><i class=\"icon icon-plus-sign\"></i></button>"
+                }
 
                 strTbody += "<tr><td width='4%;'>" + (count + 1) + "</td><td width='6%;'>" + data[i].user.fee_station_name + "</td>"
                     + "<td width='6%;'>" + data[i].user.truename + "</td><td width='6%;'>" + data[i].user.position_name + "</td>"

VisualInspection/js/statistics/toll_station_statistics.js

@@ -29,16 +29,26 @@
 		var flag = true;
 		var change_echart = 2;
 $(function(){     
+	setVisit();
     // 公用方法，根据当前年月动态将13个月push数组
 	month_method();
 	// 公用方法，月份下拉框
-    select_option();
+    select_option();	
+	$.jeDate("#month_date",{
+		isinitVal:true,
+		format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+	});
+	var road_manager;
+	if(roleContains("STATION")){
+        road_manager = getCurrentUser().road_manager_id;     
+    }
+	setRoadManagerSelect("#first",road_manager);
 	// 回显当前年月份
-	$(".div-month select").val(initDate);
+	// $(".div-month select").val(initDate);
 	setSecond();
 
 	$(".div-button button").click(function(){	
-		var select_month = $(".div-month select").val();
+		var select_month = $("month_date").val();
 		var select_station = $(".div-station select").val();
 		// 加载图配置
 		echart();
@@ -46,6 +56,7 @@ $(function(){
 			init_tollStation_year_assess("statistics/score/year/info",select_station);
 		}
 		flag = false;
+
 		top5_change(select_month,select_station);
 		// 查询图二
 		init_company_points_assess("statistics/lost/score/rate",select_month+'',select_station);
@@ -425,48 +436,62 @@ $(function(){
 	});
 	function setSecond(){ 
         var select_road = $(".div-roadManage select").val();
-		var sec = document.getElementById('second');
-		var tempStr = ''
-		var param = {
-			 "parentid":select_road
+		var feeList = $.zui.store.get("cache_fee_station_list");
+		if(select_road) feeList = cache_road_manager_fee_list_map.get(select_road);
+
+		var dept;
+		if(roleContains("STATION")){
+			dept = getCurrentUser().organid;     
 		}
-		post_common_service("dept/getDeptInfosByDeptId",param,function(data){
-			if(data.length!=0){
-				for(var i=0;i<data.length;i++){
-					if(select_road==30){
-				 	    tempStr += "<option value="+data[i].id+">"+data[i].organname+"</option>";  
-			        }else if(select_road==31){
-						tempStr += "<option value="+data[i].id+">"+data[i].organname+"</option>";  
-					}else{
-						tempStr += "<option value="+data[i].id+">"+data[i].organname+"</option>";  
-					}
-				sec.innerHTML=tempStr;
-				}
-			}else{
-				sec.innerHTML='';	
-			}
-			// 页面初始化
-			var select_month = $(".div-month select").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;
-		},function(error){
-        	return "" ;
-    	});
+		refresh(feeList,dept);
+		// var param = {
+		// 	 "parentid":select_road
+		// }
+		// post_common_service("dept/getDeptInfosByDeptId",param,function(data){
+			
+		// },function(error){
+        // 	return "" ;
+    	// });
     }
 
+	function refresh(data,selectId){
+		var sec = document.getElementById('second');
+		var tempStr = ''
+		if(data.length!=0){
+			for(var i=0;i<data.length;i++){
+				// if(select_road==30){
+				// 	tempStr += "<option value="+data[i].id+">"+data[i].organname+"</option>";  
+				// }else if(select_road==31){
+				// 	tempStr += "<option value="+data[i].id+">"+data[i].organname+"</option>";  
+				// }else{
+					if(data[i].deptid==selectId)
+						tempStr += "<option value="+data[i].deptid+" selected>"+data[i].name+"</option>";
+					else
+						tempStr += "<option value="+data[i].deptid+">"+data[i].name+"</option>"; 
+				// }
+			sec.innerHTML=tempStr;
+			}
+		}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;
+	}
 	/**
 	 * 进步前5名后退步前五名切换
 	 */
 	$(".view_change").click(function(){
-			var select_month = $(".div-month select").val();
+			var select_month = $("#month_date").val();
 		    var select_station = $("#second").val();
 			// 进退步top5
 		    top5_change(select_month,select_station);
@@ -1039,8 +1064,12 @@ $(function(){
 		]
 	};					
 				return option;
-		}
-			
+		}   
+});
 
-   
-});
+function setVisit(){
+	if(roleContains("STATION")){
+		$("#first").attr("disabled","disabled");
+		$("#second").attr("disabled","disabled");
+	}
+}

VisualInspection/js/util/const.js

@@ -60,4 +60,5 @@ var ROLE_STATION_ADMIN="ROLE_STATION_ADMIN";
 var ROLE_STATION="ROLE_STATION";
 var ROLE_JICHA="ROLE_JICHA";
 var ROLE_MANAGER="ROLE_MANAGER";
-var ROLE_STATION_AGENT="ROLE_STATION_AGENT";
+var ROLE_STATION_AGENT="ROLE_STATION_AGENT";
+var ROLE_ADMIN ="ROLE_ADMIN";

VisualInspection/js/util/util.js

@@ -77,7 +77,7 @@ function HandleError(error) {
                 layer.msg('登陆已经过期，将重新登陆！', {
                     time: 2000, //20s后自动关闭
                 }, function() {
-                    self.location = base_ui_url + UI_USER_LOGIN
+                    self.location = base_ui_url + UI_USER_LOGIN +"?time="+(Date.parse(new Date()));
                 })
 
 
@@ -167,10 +167,42 @@ function addOrUpdateItem4Common(param,url,okCb){
         alert(error);
     });
 }
+//获取道管中心列表
+function getRoadManagerList(){
+    get_common_service("/dept/getAllRM",null,function(data){
+        $.zui.store.set("cache_road_manager_list",data);
+    });
+}
+function setRoadManagerSelect(div,selectId){
+     var rmList = $.zui.store.get("cache_road_manager_list");
+     setRoadManagerValue(rmList,div,selectId);
+}
+function setRoadManagerValue(data,div,selectId){
+    var 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>';
+        else
+            optStr += '<option value="'+data[i].deptid+'">'+data[i].name+'</option>';
+    }
+    $(div).html('');
+    $(div).html(optStr);
+}
+
+var cache_road_manager_fee_list_map;
 function getFeeList(callback){
     get_common_service("/dept/getAllFs",null,function(data){
         $.zui.store.set("cache_fee_station_list",data);
-        callback(data);
+        var map= new Map();
+        for(var i=0;i<data.length;i++) {
+            if(!map.get(data[i].parentid)){
+                map.put(data[i].parentid,[]);
+            }
+            var arr = map.get(data[i].parentid);
+            arr.push(data[i]);
+        }
+        cache_road_manager_fee_list_map = map;
+        if(callback) callback(data);
     });
 }
 function setFeSelect(div,selectId){

VisualInspection/view/common/commoncsslink.html

@@ -11,3 +11,4 @@
 <link rel="stylesheet" type="text/css" href="/js/lib/tags/jquery.tagsinput.min.css"> 
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/uploader/zui.uploader.min.css">
 <link href="/node_modules/zui/dist/lib/chosen/chosen.min.css" rel="stylesheet">
+<link rel="stylesheet" type="text/css" href="/js/lib/jedate/skin/jedate.css">

VisualInspection/view/common/commonscriptlink.html

@@ -22,6 +22,7 @@
 <script type="text/javascript" src="/js/lib/combotree/icontains.js"></script>
 <script type="text/javascript" src="/js/lib/combotree/comboTreePlugin.js"></script>
 <script src="/js/lib/tags/jquery.tagsinput.js"></script>
+<script src="/js/lib/jedate/jedate.js"></script>
 <script src="/js/util/util.js"></script>
 <script src="/js/util/service.js"></script>
 <script src="/js/constant/constant.js"></script>

VisualInspection/view/main.html

@@ -9,8 +9,8 @@
     <link rel="import" href="/view/common/commoncsslink.html?__inline">
     <link rel="stylesheet" type="text/css" href="/css/main.css">
     <link rel="import" href="/view/common/commonscriptlink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/js/lib/jedate/skin/jedate.css">
-    <script src="/js/lib/jedate/jedate.js"></script>
+    <!--<link rel="stylesheet" type="text/css" href="/js/lib/jedate/skin/jedate.css">
+    <script src="/js/lib/jedate/jedate.js"></script>-->
     <style>
         html{overflow:auto;}
         img.lightbox-img{width:600px;}

VisualInspection/view/mytask/apply_task.html

@@ -15,6 +15,13 @@
                     <select class="form-control" id="fsList">
                     </select>
                 </div>
+                <div class="form-group col-sm-2">
+                    <label for="exampleInputAccount1" class="col-sm-5">考核人</label>
+                    <div class="col-sm-7">
+                        <select class="form-control" id="feePersonList">
+                        </select>
+                    </div>
+                </div>
                 <div class="col-sm-2">
                     <button class="btn btn-primary " type="button" onclick="queryUnexaminedTask()">查询</button>
                     <div id="agreePatchBtn" style="float:right;display:none;">

VisualInspection/view/mytask/task_list.html

@@ -34,15 +34,17 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">职位</label>
-                <div class="col-sm-2" style="width:200px;">
-                    <select class="form-control" id="jobSelect">
-                    </select>
+            <div class="form-group" style="margin:0px;">
+                <div  class="form-group col-sm-5" style="margin:0px;">
+                    <label for="exampleInputAccount1" class="col-sm-2">考核职位</label>
+                    <div class="col-sm-10">
+                        <select class="form-control" id="jobSelect">
+                        </select>
+                    </div>
                 </div>
-                <div id="hasScoreDiv" style="display:none;" class="form-group col-sm-2">
-                    <label for="exampleInputAccount1" class="col-sm-5">扣分</label>
-                    <div class="col-sm-7">
+                <div id="hasScoreDiv" style="display:none;" class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4">有无扣分</label>
+                    <div class="col-sm-8">
                         <select class="form-control" id="hasScoreList">
                             <option value="" selected>全部</option>
                             <option value="1">有</option>

VisualInspection/view/statistics/toll_station_statistics.html

@@ -2,11 +2,14 @@
 <script src="/js/statistics/common_statistic.js?__inline"></script>
 <script src="/js/statistics/toll_station_statistics.js"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/toll_station_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="div-month"><select>
+    <div class="row">
+     <form  class="form-horizontal">
+         <div class="form-group">
+        <div class="div-month">
+            <!--<select>-->
                 <!--<option value="1">一月</option>
                 <option value="2">二月</option>
                 <option value="3">三月</option>
@@ -19,14 +22,20 @@
                 <option value="10">十月</option>
                 <option value="11">十一月</option>
                 <option value="12">十二月</option>-->
-                </select></div>
-        <div class="div-roadManage"><select id="first">
-            <option value="30">连云港</option>
+                <!--</select>-->
+            <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+        </div>
+        <div class="div-roadManage">
+            <select id="first">
+            <!--<option value="30">连云港</option>
             <option value="31">盐城</option>
-            <option value="32">南通</option>
-            </select></div>
+            <option value="32">南通</option>-->
+            </select>
+        </div>
         <div class="div-station"><select id="second"></select></div>
         <div class="div-button"><button>查询</button></div></div>
+        </div>
+     </form>
     </div>
     <div class="line-1"></div>
 

VisualInspection/view/user/login.html

@@ -32,7 +32,7 @@
                     <div class="row">
                         <label for="exampleInputAccount4" class="col-md-3  ll">用户名：</label>
                         <div class="col-md-9 lll">
-                            <input type="text" id="username" class="form-control" placeholder="用户账号">
+                            <input type="text" id="username" class="form-control" autofocus placeholder="用户账号">
                         </div>
                     </div>