统计

VisualInspection/js/statistics/assess_ranking.js

@@ -14,8 +14,8 @@ function queryEmpClick(){
         tip("请选择起止日期");
         return;
     }else{
-        start_date += " 00:00:00";
-        end_date += " 00:00:00";
+        start_date += " 23:00:00";
+        end_date += " 23:00:00";
     }
     var param = {
         "dept_id": $("#fsList").val(),
@@ -39,8 +39,8 @@ function initQueryEmp(){
     //默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
-    var start_date = start_time+" 00:00:00"; 
-    var end_date = end_time+" 00:00:00"; 
+    var start_date = start_time+" 23:00:00"; 
+    var end_date = end_time+" 23:00:00"; 
 
     var param = {
         "start_date": start_date,
@@ -72,8 +72,8 @@ function getEmployeeInfosClick(url,param,start_score,end_score){
                 +"<td width='4%;'>"+getItemScore(data[i], '动作')+"</td><td width='4%;'>"+getItemScore(data[i], '文明用语')+"</td>"
                 +"<td width='4%;'>"+ getItemScore(data[i], '工作纪律') +"</td><td width='4%'>"+getItemScore(data[i], '便民服务')+"</td><td width='4%;'>"
                 +getItemScore(data[i], '安全管理')+"</td><td width='4%;'>"+data[i].check_all_score+"</td>"
-                +"<td width='4%;'>"+filter(data[i].checked_num,'0')+"</td><td width='4%;'>"+filterByZeroHandle(average(data[i]).toFixed(2),'0')+"</td>"
-                +"<td width='4%;'>"+score+"</td><td width='4%;'>"+"</td><td width='4%;'>"+"</td></tr>";
+                +"<td width='4%;'>"+filter(data[i].checked_num,'0')+"</td><td width='4%;'>"+filterSlash(filterByZeroHandle(average(data[i]).toFixed(2),'0'),filter(data[i].checked_num,'0'))+"</td>"
+                +"<td width='4%;'>"+filterSlash(score,filter(data[i].checked_num,'0'))+"</td><td width='4%;'>"+"</td><td width='4%;'>"+"</td></tr>";
                 count++;
             }
         }
@@ -83,6 +83,19 @@ function getEmployeeInfosClick(url,param,start_score,end_score){
     });
 }
 
+/**
+ * 对于受检次数为0，扣分和得分都为 /
+ * @param {*} value , check_num 受此次数
+ * @return value or /
+ */
+function filterSlash(value,check_num){
+    if(check_num == 0 ){
+        return '/' ;
+    }else{
+        return value ;
+    }
+}
+
 function judgeParamFilter(data,i,score, start_score,end_score){
     var flag1=false;
     if(score>=parseFloat(start_score) && score<=parseFloat(end_score)){
@@ -112,31 +125,7 @@ function judgeParamFilter(data,i,score, start_score,end_score){
         flag3=true;
     }
     return flag1&flag2&flag3;
-} 
-/**
- * init
- * @param {*} url 
- * @param {*} param 
- */
-// function getEmployeeInfos(url,param){
-//     post_common_service( url,param,function(data){
-//         var strTbody='';
-//         for(var i=0;i<data.length;i++){
-//             strTbody+="<tr><td width='67px;'>"+(i+1)+"</td><td width='87px;'>"+data[i].user.fee_station_name+"</td>"
-//                 +"<td width='67px;'>"+data[i].user.truename+"</td><td width='67px;'>"+"</td>"
-//                 +"<td width='87px;'>"+data[i].user.workno+"</td><td width='58px;'>"+ getItemScore(data[i], '环境') +"</td>"
-//                 +"<td width='58px;'>"+getItemScore(data[i], '仪容仪表')+"</td><td width='58px;'>"+getItemScore(data[i], '表情')+"</td>"
-//                 +"<td width='58px;'>"+getItemScore(data[i], '动作')+"</td><td width='58px;'>"+getItemScore(data[i], '文明用语')+"</td>"
-//                 +"<td width='58px;'>"+ getItemScore(data[i], '工作纪律') +"</td><td width='58px'>"+getItemScore(data[i], '便民服务')+"</td><td width='58px'>"
-//                 +getItemScore(data[i], '安全管理')+"</td><td width='58px'>"+data[i].check_all_score+"</td>"
-//                 +"<td width='67px;'>"+filter(data[i].checked_num,'0')+"</td><td width='67px;'>"+filterByZeroHandle(average(data[i]).toFixed(2),'0')+"</td>"
-//                 +"<td width='55px;'>"+(1000-filterByZeroHandle(average(data[i]).toFixed(2),'0'))+"</td><td width='58px;'>"+"</td><td>"+"</td></tr>";
-//         }
-//        $(".table-tbody").append(strTbody);   
-//     },function(error){
-//         return "" ;
-//     });
-// }
+}
 
 function average(obj){
     if(filter(obj.checked_num,'0') == 0){
@@ -208,8 +197,8 @@ function exportExcel(){
         tip("请选择起止日期");
         return ;
     }else{
-        start_date += " 00:00:00";
-        end_date += " 00:00:00";
+        start_date += " 23:00:00";
+        end_date += " 23:00:00";
     }
     window.open( getserveraddr() + "/file/employee/order?dept_id="+dept_id+
     "&start_date="+start_date+"&end_date="+end_date+"&start_score="+start_score+"&end_score="+end_score);

VisualInspection/js/statistics/assess_situation.js

@@ -8,8 +8,8 @@ function querySituationClick(){
         tip("请选择起止日期");
                 return ;
     }else{
-        start_date += " 00:00:00";
-        end_date += " 00:00:00";
+        start_date += " 23:00:00";
+        end_date += " 23:00:00";
     }
   
     var param = {
@@ -40,8 +40,8 @@ function initQuerySituation(){
     //默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
-    var start_date = start_time+" 00:00:00"; 
-    var end_date = end_time+" 00:00:00"; 
+    var start_date = start_time+" 23:00:00"; 
+    var end_date = end_time+" 23:00:00"; 
     
     var param = {
         "start_date": start_date,
@@ -146,8 +146,8 @@ function exportExcel(){
         tip("请选择起止日期");
         return ;
     }else{
-        start_date += " 00:00:00";
-        end_date += " 00:00:00";
+        start_date += " 23:00:00";
+        end_date += " 23:00:00";
     }
     window.open( getserveraddr() + "/file/score/info?start_date="+start_date+"&end_date="+end_date);
 }

VisualInspection/js/statistics/assess_type.js

@@ -12,8 +12,8 @@ function queryTypeClick(){
         tip("请选择起止日期");
                 return ;
     }else{
-        start_date += " 00:00:00";
-        end_date += " 00:00:00";
+        start_date += " 23:00:00";
+        end_date += " 23:00:00";
     }
   
     var param = {
@@ -44,8 +44,8 @@ function initQueryType(){
     // 默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
-    var start_date = start_time+" 00:00:00"; 
-    var end_date = end_time+" 00:00:00"; 
+    var start_date = start_time+" 23:00:00"; 
+    var end_date = end_time+" 23:00:00"; 
     
     var param = {
         "start_date": start_date,
@@ -239,8 +239,8 @@ function exportExcel(){
         tip("请选择起止日期");
         return ;
     }else{
-        start_date += " 00:00:00";
-        end_date += " 00:00:00";
+        start_date += " 23:00:00";
+        end_date += " 23:00:00";
     }
     window.open( getserveraddr() + "/file/score/item/info?start_date="+start_date+"&end_date="+end_date);
 }

VisualInspection/js/statistics/change_attendance.js

@@ -74,10 +74,10 @@ function getFsWorkInfo(){
     post_common_service("statistics/fs/unregular/work/info",param,function(data){
         // 月份变化
         monthChange();
-        $(".table-tbody").empty();
+        $("#ca-a-table").empty();
         if(data.length >0){
             for(var i=0;i< data.length;i++){
-                $(".table-tbody").append( getTableContent(data[i],i+1));
+                $("#ca-a-table").append( getTableContent(data[i],i+1));
             }
         }
     },function(error){

VisualInspection/js/statistics/common_attendance.js

@@ -50,40 +50,39 @@ $(function(){
         getFsWorkInfo();
     })
     // end
-})
-
-/**
- * 检索出勤明细数据
- * @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"
-    }
-    
-    if(GV("#fs_employee")!=''){
-            param[ 'user_id'] = GV("#fs_employee");
-    }else if(GV("#fs_station")!=''){
-        param[ 'dept_id' ] = GV("#fs_station");
-    }else if(GV("#center_manage") != ''){
-            param[ 'parent_dept_id' ] = GV("#center_manage");
-    }
+    /**
+     * 检索出勤明细数据
+     * @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"
+        }
+        
+        if(GV("#fs_employee")!=''){
+                param[ 'user_id'] = GV("#fs_employee");
+        }else if(GV("#fs_station")!=''){
+            param[ 'dept_id' ] = GV("#fs_station");
+        }else if(GV("#center_manage") != ''){
+                param[ 'parent_dept_id' ] = GV("#center_manage");
+        }
 
-    post_common_service("statistics/fs/work/info",param,function(data){
-        // 月份变化
-        monthChange();
-        $(".table-tbody").empty();
-        if(data.length >0){
-            for(var i=0;i< data.length;i++){
-                $(".table-tbody").append( getTableContent(data[i],i+1));
+        post_common_service("statistics/fs/work/info",param,function(data){
+            // 月份变化
+            monthChange();
+            $("#c-a-tbody").empty();
+            if(data.length >0){
+                for(var i=0;i< data.length;i++){
+                    $("#c-a-tbody").append( getTableContent(data[i],i+1));
+                }
             }
-        }
-    },function(error){
-    });
-}
+        },function(error){
+        });
+    }
 
+})
 /**
  * 拼接表格内容
  * @param {*} obj 

VisualInspection/js/statistics/personal_data_statistics.js

@@ -11,8 +11,8 @@ 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());
-var start_date = $(".div-start input").val()+" 00:00:00";
-var end_date = $(".div-end input").val()+" 23:59:59";
+var start_date = $(".div-start input").val()+" 23:00:00";
+var end_date = $(".div-end input").val()+" 23:00:00";
 
 
 /**
@@ -72,8 +72,8 @@ $(function(){
 
 	$(".query button").click(function(){
         var user_id = $("#select-personal").val();
-		var start_date = $(".div-start input").val()+" 00:00:00";
-		var end_date = $(".div-end input").val()+" 23:59:59";
+		var start_date = $(".div-start input").val()+" 23:00:00";
+		var end_date = $(".div-end input").val()+" 23:00:00";
 		var startStr = start_date.replace(/-/g, '/');
 		var endStr = end_date.replace(/-/g, '/');
 		var start = new Date(startStr);

VisualInspection/view/statistics/change_attendance.html

@@ -102,7 +102,7 @@
                         <th>班次</th>
                     </tr>
                   </thead>
-                  <tbody class="table-tbody" style="background:white" align="center" height="500px">
+                  <tbody class="table-tbody" id="ca-a-table" style="background:white" align="center" height="500px">
 
                   </tbody>
                   </table>

VisualInspection/view/statistics/common_attendance.html

@@ -102,7 +102,7 @@
                         <th>班次</th>
                     </tr>
                   </thead>
-                  <tbody class="table-tbody" style="background:white" align="center" height="500px">
+                  <tbody class="table-tbody" id="c-a-tbody" style="background:white" align="center" height="500px">
 
                   </tbody>
                   </table>

VisualInspection/view/statistics/emp_ranking.html

@@ -105,21 +105,8 @@
         // 设置滚动表格的高度
         $("#scrollTable").height(  $(window).height()  - 360 );
 
-        // 仅选择日期
-        $("#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(
+        // 仅选择日期 开始 ，结束时间
+        $("#start-time,#end-time").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,
@@ -131,6 +118,7 @@
             forceParse: 0,
             format: "yyyy-mm-dd"
         });
+      
         setFeSelect("#fsList");
         initQueryEmp();
     });

VisualInspection/view/statistics/personal_data_statistics.html

@@ -72,20 +72,7 @@
     $(document).ready(function() {
         
         // 仅选择日期
-        $(".div-start input").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $(".div-end input").datetimepicker(
+        $(".div-start input,.div-end input").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,