瀏覽代碼

查询时间修改

温红权 8 年之前
父節點
當前提交
8c54eb9d39

+ 17 - 6
VisualInspection/js/statistics/assess_ranking.js

@@ -153,12 +153,23 @@ function initQueryEmp(parent_dept_id, dept_id) {
         });
     }
 
+
+
     //默认初始化前一周查所有
-    var endD = new Date();
-    var startD = new Date();
-    // var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth() >= 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
-    var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1 >= 10 ? endD.getMonth() + 1 : "0" + (endD.getMonth() + 1)) + "-25";
+    var tdaytime = moment();
+    var start_time = "";
+    var end_time = "";
+    if (tdaytime.get('D') >= 26) {
+        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+    } else {
+        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+    }
+
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();
     var start_num = $("#start-num").val() != '' ? $("#start-num").val() : 0;
@@ -248,7 +259,7 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
 
 
                 var showNumberHtml = (isshownumber ? (filter(data[i].checked_num, '0') + (data[i].checked_num < 6 ? html : "")) : "-");
-                if (hasRole(ROLE_ADMIN)) {
+                if (hasRole(ROLE_ADMIN) || hasRole(ROLE_JICHA_ADMIN)) {
                     showNumberHtml = (ischage ? ("<span style='color:red;' data-toggle='tooltip' data-placement='right' title=" + tiptext + ">" + userChangeStation.old_dept_check_num + "+" + userChangeStation.new_dept_check_num + "</span>") : filter(data[i].checked_num, '0')) + html;
                 }
 

+ 13 - 5
VisualInspection/js/statistics/assess_situation.js

@@ -52,11 +52,19 @@
 
         function initQuerySituation() {
             //默认初始化前一周查所有
-            var endD = new Date();
-            var startD = new Date();
-            // var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-            var start_time = startD.getFullYear() + "-" + (startD.getMonth()) + "-26";
-            var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1) + "-25";
+            var tdaytime = moment();
+            var start_time = "";
+            var end_time = "";
+            if (tdaytime.get('D') >= 26) {
+                start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+                tdaytime = moment();
+                end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+            } else {
+                start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+                tdaytime = moment();
+                end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+            }
 
             var temp_time = $.zui.store.get('page_data_param_temp_time');
             if (temp_time) {

+ 14 - 5
VisualInspection/js/statistics/assess_type.js

@@ -52,11 +52,20 @@ function queryTypeClick() {
  */
 function initQueryType() {
     // 默认初始化前一周查所有
-    var endD = new Date();
-    var startD = new Date();
-    // var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth()) + "-26";
-    var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1) + "-25";
+    var tdaytime = moment();
+    var start_time = "";
+    var end_time = "";
+    if (tdaytime.get('D') >= 26) {
+        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+    } else {
+        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+    }
+
     // 默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);

+ 17 - 9
VisualInspection/js/statistics/business_promotion_feedback.js

@@ -116,11 +116,19 @@ function initQueryEmp(parent_dept_id, dept_id) {
     }
 
     //默认初始化前一周查所有
-    var endD = new Date();
-    var startD = new Date();
-    // var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth() >= 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
-    var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1 >= 10 ? endD.getMonth() + 1 : "0" + (endD.getMonth() + 1)) + "-25";
+    var tdaytime = moment();
+    var start_time = "";
+    var end_time = "";
+    if (tdaytime.get('D') >= 26) {
+        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+    } else {
+        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+    }
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();
     var start_num = $("#start-num").val() != '' ? $("#start-num").val() : 0;
@@ -191,15 +199,15 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
 
                 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>" +
-                     "<td width='7%;'>" + data[i].user.workno + "</td>"+
-                     //<td width='4%;'>" + filter(data[i].company_ranking, '/') + "</td>" 
+                    "<td width='7%;'>" + data[i].user.workno + "</td>" +
+                    //<td width='4%;'>" + filter(data[i].company_ranking, '/') + "</td>"
                     // "<td width='4%;'>" + filter(data[i].center_ranking, '/') + "</td><td width='4%;'>" + filter(data[i].fee_station_ranking, '/') +
-                    "</td><td width='4%;'>" +filter(data[i].checked_num, '0') + "</td>" +
+                    "</td><td width='4%;'>" + filter(data[i].checked_num, '0') + "</td>" +
                     "<td width='4%;'>" + filter(data[i].score, '0') + "</td><td width='4%;'>" + filter(data[i].check_t_num, '0') + "</td>" +
                     "<td width='4%;'>" + filter(data[i].check_t_score, '0') + "</td><td width='4%;'>" + filter(data[i].check_x_num, '0') + "</td>" +
                     "<td width='4%;'>" + filter(data[i].check_x_score, '0') + "</td><td width='4%'>" + filter(data[i].check_s_num, '0') + "</td><td width='4%;'>" +
                     filter(data[i].check_s_score, '0') + "</td><td width='4%;'>" + filter(data[i].check_all_num, '0') + "</td>" +
-                    "<td width='4%;'>" +  filter(data[i].check_all_score, '0') + "</td><td width='4%;'>" + filterSlash(filterByZeroHandle(data[i].check_score_avg, '0'), filter(data[i].checked_num  + data[i].check_t_num  + data[i].check_x_num + data[i].check_s_num, '0')) + "</td>" +
+                    "<td width='4%;'>" + filter(data[i].check_all_score, '0') + "</td><td width='4%;'>" + filterSlash(filterByZeroHandle(data[i].check_score_avg, '0'), filter(data[i].checked_num + data[i].check_t_num + data[i].check_x_num + data[i].check_s_num, '0')) + "</td>" +
                     "<td width='4%;'>" + filterSlash(score.toFixed(2), filter(data[i].check_all_num, '0')) + "</td>" + "<td width='4%;'>" + "</td></tr>";
                 count++;
             }

+ 78 - 65
VisualInspection/js/statistics/change_work.js

@@ -1,24 +1,23 @@
-
-$(function(){
+$(function() {
     setVisit();
     var road_manager;
-	if(roleContains("STATION")){
-        road_manager = getCurrentUser().road_manager_id;     
+    if (roleContains("STATION")) {
+        road_manager = getCurrentUser().road_manager_id;
     }
-    if(roleContains("ROAD_MANAGER")){
-        road_manager = getCurrentUser().organid;     
+    if (roleContains("ROAD_MANAGER")) {
+        road_manager = getCurrentUser().organid;
     }
-	setRoadManagerSelect("#center_manage",road_manager,true);
+    setRoadManagerSelect("#center_manage", road_manager, true);
     // 初始化部门下的收费站
-     getFsStationList(GV("#center_manage"),function(obj){
+    getFsStationList(GV("#center_manage"), function(obj) {
         $("#fs_station").html(obj);
         var dept;
-        if(roleContains("STATION")){
-            dept = getCurrentUser().organid;     
+        if (roleContains("STATION")) {
+            dept = getCurrentUser().organid;
         }
         $("#fs_station").val(dept);
         // 初始化收费站下的人数
-        getFsEmployee(GV("#fs_station"),function(obj){
+        getFsEmployee(GV("#fs_station"), function(obj) {
             $("#fs_employee").html(obj);
             // 检索
             getFsWorkInfo();
@@ -29,91 +28,104 @@ $(function(){
     // $("#sel_month").val(getM()-1);
     // $("#month_name").html( $("#sel_month").find("option:selected").text());
     // 时间初始化
-    $("#start-time").val( new Date().getFullYear()+'-'+ (getM()-1) +"-26");
-    $("#end-time").val( new Date().getFullYear()+'-'+ (getM()) +"-25");
+
+    var tdaytime = moment();
+    var start_time = "";
+    var end_time = "";
+    if (tdaytime.get('D') >= 26) {
+        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+    } else {
+        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+    }
+    $("#start-time").val(start_time);
+    $("#end-time").val(end_time);
 
     // 收费站中心选择
-    $("#fs_station").change(function(){
+    $("#fs_station").change(function() {
         var fee_station_id = GV(this);
         // if(fee_station_id == ''){
         //     $("#fs_employee").html('');
         // }else{
-            getFsEmployee(fee_station_id,function(obj){
-                $("#fs_employee").html(obj);
-            });
+        getFsEmployee(fee_station_id, function(obj) {
+            $("#fs_employee").html(obj);
+        });
         // }
     })
 
     // 导管中心选择
-    $("#center_manage").change(function(){
+    $("#center_manage").change(function() {
         var center_manage_id = GV(this);
         // if(center_manage_id == ''){
         //     $("#fs_station,#fs_employee").html('');
         // }else{
-            getFsStationList(center_manage_id,function(obj){
-                $("#fs_station").html(obj);
-                var dept;
-                if(roleContains("STATION")){
-                    dept = getCurrentUser().organid;     
-                }
-                $("#fs_station").val(dept);
-            });
+        getFsStationList(center_manage_id, function(obj) {
+            $("#fs_station").html(obj);
+            var dept;
+            if (roleContains("STATION")) {
+                dept = getCurrentUser().organid;
+            }
+            $("#fs_station").val(dept);
+        });
         // }
     })
 
     // 查询
-    $("#searchBtn").click(function(){        
-        // $("#month_name").html( $("#sel_month").find("option:selected").text()  )
-        getFsWorkInfo();
-    })
-    // end
+    $("#searchBtn").click(function() {
+            // $("#month_name").html( $("#sel_month").find("option:selected").text()  )
+            getFsWorkInfo();
+        })
+        // end
 })
 
 /**
  * 检索出勤明细数据
- * @param {*} param 
+ * @param {*} param
  */
-function getFsWorkInfo(){
+function getFsWorkInfo() {
 
     var param = {
-        "start_time":dateChange(new Date(GV("#start-time")+" 00:00:00"),60*60*1000 )  ,
-        "end_time": GV("#end-time")+" 23:00:00"
+        "start_time": dateChange(new Date(GV("#start-time") + " 00:00:00"), 60 * 60 * 1000),
+        "end_time": GV("#end-time") + " 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");
+
+    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/unregular/work/person",param,function(data){
-        var seq = 1 ;
+    post_common_service("statistics/fs/unregular/work/person", param, function(data) {
+        var seq = 1;
         $(".table-tbody").empty();
-        if(data.length >0){
-            for(var i=0;i< data.length;i++){
-                if(data[i].userName != undefined){
-                    $(".table-tbody").append( getTableContent(data[i],seq++));
+        if (data.length > 0) {
+            for (var i = 0; i < data.length; i++) {
+                if (data[i].userName != undefined) {
+                    $(".table-tbody").append(getTableContent(data[i], seq++));
                 }
             }
         }
-    },function(error){
-    });
+    }, function(error) {});
 }
 
 /**
  * 拼接表格内容
- * @param {*} obj 
- * @param {*} seq 
+ * @param {*} obj
+ * @param {*} seq
  */
-function getTableContent(obj,seq){
-    
+function getTableContent(obj, seq) {
+
     var map_class = {};
     var workdays = 0;
-    for(var z=0; z < obj.subStatisticsFsWork.length ;z++){
-        map_class[obj.subStatisticsFsWork[z].class_type] = obj.subStatisticsFsWork[z].work_days ;
-        workdays += GDV(obj.subStatisticsFsWork[z].work_days,0);
+    for (var z = 0; z < obj.subStatisticsFsWork.length; z++) {
+        map_class[obj.subStatisticsFsWork[z].class_type] = obj.subStatisticsFsWork[z].work_days;
+        workdays += GDV(obj.subStatisticsFsWork[z].work_days, 0);
     }
 
     var content = "<tr><td width='8%'>" + seq + "</td> <td  width='16%'>" + obj.feeStationName + "</td> <td  width='16%'>" + obj.userName +
@@ -121,12 +133,13 @@ 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");
-	}
+
+function setVisit() {
+    if (roleContains("STATION")) {
+        $("#center_manage").attr("disabled", "disabled");
+        $("#fs_station").attr("disabled", "disabled");
+    }
+    if (roleContains("ROAD_MANAGER")) {
+        $("#center_manage").attr("disabled", "disabled");
+    }
 }

+ 15 - 2
VisualInspection/js/statistics/check_workload_statistics.js

@@ -1,6 +1,19 @@
 // 默认初始化日期一个月
-$(".div-start input").val(new Date().getFullYear() + "-" + new Date().getMonth() + "-26");
-$(".div-end input").val(new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-25");
+var tdaytime = moment();
+var start_time = "";
+var end_time = "";
+if (tdaytime.get('D') >= 26) {
+    start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+    tdaytime = moment();
+    end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+} else {
+    start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+    tdaytime = moment();
+    end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+}
+$(".div-start input").val(start_time);
+$(".div-end input").val(end_time);
 var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);
 var end_date = $(".div-end input").val() + " 23:00:00";
 var user_id = $("#select-personal").val();

+ 32 - 18
VisualInspection/js/statistics/common_work.js

@@ -23,14 +23,28 @@ $(function() {
             // 检索
             getFsWorkInfo();
         });
-    },false);
+    }, false);
 
     // 当前月份初始化
     // $("#sel_month").val(getM()-1);
 
     // $("#month_name").html( $("#sel_month").find("option:selected").text());
-    $("#start-time").val(new Date().getFullYear() + '-' + (getM() - 1) + "-26");
-    $("#end-time").val(new Date().getFullYear() + '-' + (getM()) + "-25");
+
+    var tdaytime = moment();
+    var start_time = "";
+    var end_time = "";
+    if (tdaytime.get('D') >= 26) {
+        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+    } else {
+        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+    }
+    $("#start-time").val(start_time);
+    $("#end-time").val(end_time);
 
     // $("#month_name").html(getM() + "月");
 
@@ -41,9 +55,9 @@ $(function() {
         // if (fee_station_id == '') {
         //     $("#fs_employee").html('');
         // } else {
-            getFsEmployee(fee_station_id, function(obj) {
-                $("#fs_employee").html(obj);
-            });
+        getFsEmployee(fee_station_id, function(obj) {
+            $("#fs_employee").html(obj);
+        });
         // }
     })
 
@@ -53,14 +67,14 @@ $(function() {
         // if (center_manage_id == '') {
         //     $("#fs_station,#fs_employee").html('');
         // } else {
-            getFsStationList(center_manage_id, function(obj) {
-                $("#fs_station").html(obj);
-                var dept;
-                if (roleContains("STATION")) {
-                    dept = getCurrentUser().organid;
-                }
-                $("#fs_station").val(dept);
-            });
+        getFsStationList(center_manage_id, function(obj) {
+            $("#fs_station").html(obj);
+            var dept;
+            if (roleContains("STATION")) {
+                dept = getCurrentUser().organid;
+            }
+            $("#fs_station").val(dept);
+        });
         // }
     })
 
@@ -73,7 +87,7 @@ $(function() {
 
 /**
  * 检索出勤明细数据
- * @param {*} param 
+ * @param {*} param
  */
 function getFsWorkInfo() {
 
@@ -82,7 +96,7 @@ function getFsWorkInfo() {
     //     "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
     // }
     var param = {
-        "start_time":  dateChange(new Date(GV("#start-time")+" 00:00:00"),60*60*1000 ) ,
+        "start_time": dateChange(new Date(GV("#start-time") + " 00:00:00"), 60 * 60 * 1000),
         "end_time": GV("#end-time") + " 23:00:00"
     }
 
@@ -110,8 +124,8 @@ function getFsWorkInfo() {
 
 /**
  * 拼接表格内容
- * @param {*} obj 
- * @param {*} seq 
+ * @param {*} obj
+ * @param {*} seq
  */
 function getTableContent(obj, seq) {
 

+ 129 - 127
VisualInspection/js/statistics/operation_management_integration.js

@@ -8,16 +8,16 @@ var rank = new Array();
 /**
  * 点击查询
  */
-function queryTypeClick(){
+function queryTypeClick() {
     //每次点击前清空表格数据
     $(".table-tbody").empty('');
     var start_date = $("#start-time").val();
     var end_date = $("#end-time").val();
-    if(start_date==null||start_date==''||start_date==undefined||
-    end_date==null||end_date==''||end_date==undefined){
+    if (start_date == null || start_date == '' || start_date == undefined ||
+        end_date == null || end_date == '' || end_date == undefined) {
         tip("请选择起止日期");
-                return ;
-    }else{
+        return;
+    } else {
         start_date += " 23:00:00";
         end_date += " 23:00:00";
     }
@@ -25,10 +25,10 @@ function queryTypeClick(){
     var endStr = end_date.replace(/-/g, '/');
     var start = new Date(startStr);
     //开始日期取前一天的23:00
-    start.setDate(start.getDate()-1);
+    start.setDate(start.getDate() - 1);
     start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
-    if(start>end){
+    if (start > end) {
         tip("开始时间不能比结束时间大");
         return;
     }
@@ -38,57 +38,65 @@ function queryTypeClick(){
         "end_date": end_date,
     }
     var url = "statistics/operation/manage/integration";
-    var strTbody='';
-      post_common_service( url,param,function(data){
-          // 运营管理综合检查情况
-          check_operation_avg(data);
-            },function(error){
-                return "" ;
-     });
+    var strTbody = '';
+    post_common_service(url, param, function(data) {
+        // 运营管理综合检查情况
+        check_operation_avg(data);
+    }, function(error) {
+        return "";
+    });
 }
 
 /**
  * 表格初始化
  */
-function initQueryType(){
+function initQueryType() {
     // 默认初始化前一周查所有
-    var endD = new Date();
-    var startD = new Date();
-    // var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear()+"-"+(startD.getMonth())+"-26";
-    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-25";
+    var tdaytime = moment();
+    var start_time = "";
+    var end_time = "";
+    if (tdaytime.get('D') >= 26) {
+        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+    } else {
+        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+    }
     // 默认初始化时间页面回显
     $("#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"; 
+    var start_date = start_time + " 23:00:00";
+    var end_date = end_time + " 23:00:00";
     var start = new Date(start_date);
     //开始日期取前一天的23:00
-    start.setDate(start.getDate()-1);
+    start.setDate(start.getDate() - 1);
     start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var param = {
         "start_date": start_date,
         "end_date": end_date,
     }
     var url = "statistics/operation/manage/integration";
-    var strTbody='';
-   
-    post_common_service( url,param,function(data){
-             // 运营管理综合检查情况
-            check_operation_avg(data); 
-        },function(error){
-            return "" ;
-     });
-    
+    var strTbody = '';
+
+    post_common_service(url, param, function(data) {
+        // 运营管理综合检查情况
+        check_operation_avg(data);
+    }, function(error) {
+        return "";
+    });
+
 }
 
 /**
  * 表格拼接及数据传入
- * @param {*} data 
- * @param {*} i 
- * @param {*} avg 
+ * @param {*} data
+ * @param {*} i
+ * @param {*} avg
  */
-function gethtml(data,i,avg,lists){
+function gethtml(data, i, avg, lists) {
     var strTbody = "";
 
     // if(i==0 || i==7 || i==13){
@@ -146,130 +154,124 @@ function gethtml(data,i,avg,lists){
     //               +data.check_total_avg+"</td>"
     //               +"<td>"+data.score_avg+"</td>";
     //     strTbody += "</tr>";
-          
+
     // }
-    strTbody += "<tr><td width='8%'>"+data.company_ranking2+"</td>";
-        strTbody+="<td width='8%'>"+data.name+"</td><td width='8%'>"+data.people_num+"</td><td width='6%'>"+data.company_check_num
-                  +"</td><td width='6%'>"+data.company_total_score+"</td><td width='6%'>"+data.third_check_num
-                  +"</td><td width='6%'>"+data.third_total_score+"</td><td width='6%'>"+data.special_check_num
-                  +"</td><td width='6%'>"+data.special_total_score+"</td><td width='6%'>"+data.onsite_check_num
-                  +"</td><td width='6%'>"+data.onsite_total_score+"</td><td width='6%'>"+data.data_check_num
-                  +"</td><td width='6%'>"+data.data_total_score+"</td><td width='8%'>"
-                  +data.check_total_avg+"</td>"
-                  +"<td width='8%'>"+data.score_avg+"</td>";
-        strTbody += "</tr>";
+    strTbody += "<tr><td width='8%'>" + data.company_ranking2 + "</td>";
+    strTbody += "<td width='8%'>" + data.name + "</td><td width='8%'>" + data.people_num + "</td><td width='6%'>" + data.company_check_num +
+        "</td><td width='6%'>" + data.company_total_score + "</td><td width='6%'>" + data.third_check_num +
+        "</td><td width='6%'>" + data.third_total_score + "</td><td width='6%'>" + data.special_check_num +
+        "</td><td width='6%'>" + data.special_total_score + "</td><td width='6%'>" + data.onsite_check_num +
+        "</td><td width='6%'>" + data.onsite_total_score + "</td><td width='6%'>" + data.data_check_num +
+        "</td><td width='6%'>" + data.data_total_score + "</td><td width='8%'>" +
+        data.check_total_avg + "</td>" +
+        "<td width='8%'>" + data.score_avg + "</td>";
+    strTbody += "</tr>";
     return strTbody;
 }
 
-function getTotalHtml(data){
-    var html = "<tr><td>合计</td><td></td><td>"+data.totalMan+"</td><td>"+data.totalCompanyNum+"</td><td>"+data.totalCompanyScore+"</td><td>"
-    +data.totalThirdNum+"</td><td>"+data.totalThirdScore+"</td><td>"+data.totalSpecialNum+"</td><td>"+data.totalSpecialScore
-    +"</td><td>"+data.totalOnsiteNum+"</td><td>"+data.totalOnsiteScore+"</td><td>"+data.totalDataNum
-    +"</td><td>"+data.totalDataScore+"</td><td>-</td><td>-</td></tr>";
+function getTotalHtml(data) {
+    var html = "<tr><td>合计</td><td></td><td>" + data.totalMan + "</td><td>" + data.totalCompanyNum + "</td><td>" + data.totalCompanyScore + "</td><td>" +
+        data.totalThirdNum + "</td><td>" + data.totalThirdScore + "</td><td>" + data.totalSpecialNum + "</td><td>" + data.totalSpecialScore +
+        "</td><td>" + data.totalOnsiteNum + "</td><td>" + data.totalOnsiteScore + "</td><td>" + data.totalDataNum +
+        "</td><td>" + data.totalDataScore + "</td><td>-</td><td>-</td></tr>";
     return html;
 }
 
 /**
  * 管道中心受检人平均每人次扣分
- * @param {*} data 
+ * @param {*} data
  */
-function check_operation_avg(data){
-        var list = data.list;
-        var dataArray = new Array();
-        var sum = 0;
-        var sum1 = 0;
-        for(k=0;k<list.length;k++){
-                sum = parseFloat(sum)+ parseFloat(list[k].check_total_avg);
-                sum1++;
-            if(k==6){               
-                dataArray.push(filterJudge(sum,sum1));
-                sum = 0;
-                sum1 = 0;
-            }
-            if(k==12){  
-                dataArray.push(filterJudge(sum,sum1));
-                sum = 0;
-                sum1 = 0;
-            }
-            if(k==20){
-                dataArray.push(filterJudge(sum,sum1)); 
-                sum = 0;
-                sum1 = 0;
-            }
-        }   
+function check_operation_avg(data) {
+    var list = data.list;
+    var dataArray = new Array();
+    var sum = 0;
+    var sum1 = 0;
+    for (k = 0; k < list.length; k++) {
+        sum = parseFloat(sum) + parseFloat(list[k].check_total_avg);
+        sum1++;
+        if (k == 6) {
+            dataArray.push(filterJudge(sum, sum1));
+            sum = 0;
+            sum1 = 0;
+        }
+        if (k == 12) {
+            dataArray.push(filterJudge(sum, sum1));
+            sum = 0;
+            sum1 = 0;
+        }
+        if (k == 20) {
+            dataArray.push(filterJudge(sum, sum1));
+            sum = 0;
+            sum1 = 0;
+        }
+    }
 
-        for(i=0;i<list.length;i++){
-           if(i==0){
-                $(".table-tbody").append(gethtml(list[i],i,dataArray[0],dataArray));
-           }else if(i==7){
-                $(".table-tbody").append(gethtml(list[i],i,dataArray[1],dataArray));
-           }else if(i==13){
-                $(".table-tbody").append(gethtml(list[i],i,dataArray[2],dataArray));
-           }else{
-                $(".table-tbody").append(gethtml(list[i],i));              
-           }
-        } 
-        $(".table-tbody").append(getTotalHtml(data));
+    for (i = 0; i < list.length; i++) {
+        if (i == 0) {
+            $(".table-tbody").append(gethtml(list[i], i, dataArray[0], dataArray));
+        } else if (i == 7) {
+            $(".table-tbody").append(gethtml(list[i], i, dataArray[1], dataArray));
+        } else if (i == 13) {
+            $(".table-tbody").append(gethtml(list[i], i, dataArray[2], dataArray));
+        } else {
+            $(".table-tbody").append(gethtml(list[i], i));
+        }
+    }
+    $(".table-tbody").append(getTotalHtml(data));
 }
 
 /**
  * 过滤undefined
- * @param {*} value 
- * @param {*} default_display_value 
+ * @param {*} value
+ * @param {*} default_display_value
  */
-function filter(value , default_display_value){
-    if(value!='' && value!=undefined ){
-        return value ;
-    }else if(default_display_value != undefined){
-        return default_display_value ;
-    }else{
-        return "" ;
+function filter(value, default_display_value) {
+    if (value != '' && value != undefined) {
+        return value;
+    } else if (default_display_value != undefined) {
+        return default_display_value;
+    } else {
+        return "";
     }
 }
 
 /**
  * 过滤除数为0和保留二位小数时出现的0.00
- * @param {*} value 
- * @param {*} default_display_value 
+ * @param {*} value
+ * @param {*} default_display_value
  */
-function filterByZeroHandle(value , default_display_value){
-        if(isNaN(value)){
-            return default_display_value ;
-        }else{
-            if((value+'').endsWith('.00')){
-                return value.substring(0,value.length-3);
-            }
-            return value ;
+function filterByZeroHandle(value, default_display_value) {
+    if (isNaN(value)) {
+        return default_display_value;
+    } else {
+        if ((value + '').endsWith('.00')) {
+            return value.substring(0, value.length - 3);
         }
+        return value;
+    }
 }
 
-function filterJudge(num1,num2){
-        if(num2==0){
-            return 0;
-        }else{
-            return (num1/num2).toFixed(2);
-        }
+function filterJudge(num1, num2) {
+    if (num2 == 0) {
+        return 0;
+    } else {
+        return (num1 / num2).toFixed(2);
+    }
 }
 
-function exportExcel(){
+function exportExcel() {
     var start_date = $("#start-time").val();
     var end_date = $("#end-time").val();
-    if( start_date=='' || end_date==''){
+    if (start_date == '' || end_date == '') {
         tip("请选择起止日期");
-        return ;
-    }else{
+        return;
+    } else {
         start_date += " 23:00:00";
         end_date += " 23:00:00";
         var start = new Date(start_date);
         //开始日期取前一天的23:00
-        start.setDate(start.getDate()-1);
+        start.setDate(start.getDate() - 1);
         start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     }
-    window.open( getserveraddr() + "/file/operation/manage/integration?start_date="+start_date+"&end_date="+end_date);
-}
-
-
-
-
-
-
+    window.open(getserveraddr() + "/file/operation/manage/integration?start_date=" + start_date + "&end_date=" + end_date);
+}

+ 17 - 2
VisualInspection/js/statistics/personal_data_statistics.js

@@ -14,9 +14,24 @@ var hide = false;
 var array_points = new Array();
 var array_points2 = new Array();
 
+var tdaytime = moment();
+var start_time = "";
+var end_time = "";
+if (tdaytime.get('D') >= 26) {
+    start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+    tdaytime = moment();
+    end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+} else {
+    start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+    tdaytime = moment();
+    end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+}
+
+
 // 默认初始化日期一个月
-$(".div-start input").val(new Date().getFullYear() + "-" + (new Date().getMonth() >= 10 ? new Date().getMonth() : "0" + new Date().getMonth()) + "-26");
-$(".div-end input").val(new Date().getFullYear() + "-" + (new Date().getMonth() + 1 >= 10 ? new Date().getMonth() + 1 : "0" + (new Date().getMonth() + 1)) + "-25");
+$(".div-start input").val(start_time);
+$(".div-end input").val(end_time);
 
 var start_date = dateChange(moment($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);
 

+ 93 - 89
VisualInspection/js/statistics/wrecker.js

@@ -3,16 +3,16 @@ var url = "statistics/check/wrecker";
 /**
  * 点击查询
  */
-function queryTypeClick(){
+function queryTypeClick() {
     //每次点击前清空表格数据
     $(".table-tbody").empty('');
     var start_date = $("#start-time").val();
     var end_date = $("#end-time").val();
-    if(start_date==null||start_date==''||start_date==undefined||
-    end_date==null||end_date==''||end_date==undefined){
+    if (start_date == null || start_date == '' || start_date == undefined ||
+        end_date == null || end_date == '' || end_date == undefined) {
         tip("请选择起止日期");
-                return ;
-    }else{
+        return;
+    } else {
         start_date += " 23:00:00";
         end_date += " 23:00:00";
     }
@@ -20,10 +20,10 @@ function queryTypeClick(){
     var endStr = end_date.replace(/-/g, '/');
     var start = new Date(startStr);
     //开始日期取前一天的23:00
-    start.setDate(start.getDate()-1);
+    start.setDate(start.getDate() - 1);
     start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
-    if(start>end){
+    if (start > end) {
         tip("开始时间不能比结束时间大");
         return;
     }
@@ -33,67 +33,77 @@ function queryTypeClick(){
         "end_date": end_date,
     }
 
-    post_common_service( url,param,function(data){
+    post_common_service(url, param, function(data) {
         check_operation_avg(data);
-        },function(error){
-            return "" ;
+    }, function(error) {
+        return "";
     });
 }
 
 /**
  * 表格初始化
  */
-function initQueryType(){
-    var endD = new Date();
-    var startD = new Date();
-    var start_time = startD.getFullYear()+"-"+(startD.getMonth())+"-26";
-    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-25";
+function initQueryType() {
+    var tdaytime = moment();
+    var start_time = "";
+    var end_time = "";
+    if (tdaytime.get('D') >= 26) {
+        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+    } else {
+        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+    }
+
     // 默认初始化时间页面回显
     $("#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"; 
+    var start_date = start_time + " 23:00:00";
+    var end_date = end_time + " 23:00:00";
     var start = new Date(start_date);
     //开始日期取前一天的23:00
-    start.setDate(start.getDate()-1);
+    start.setDate(start.getDate() - 1);
     start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var param = {
         "start_date": start_date,
         "end_date": end_date,
     }
-   
-    post_common_service( url,param,function(data){
-            check_operation_avg(data); 
-        },function(error){
-            return "" ;
-     });
+
+    post_common_service(url, param, function(data) {
+        check_operation_avg(data);
+    }, function(error) {
+        return "";
+    });
 }
 
 /**
  * 表格拼接及数据传入
- * @param {*} data 
- * @param {*} i 
- * @param {*} avg 
+ * @param {*} data
+ * @param {*} i
+ * @param {*} avg
  */
-function gethtml(data,i){
-    var strTbody = "<tr><td  width='5%'>"+ i +"</td>";
-    strTbody+="<td width='10%'>"+data.name+"</td><td width='5%'>"+data.people_num+"</td><td width='5%'>"+data.checked_people_num
-                +"</td><td width='5%'>"+data.data_check_num+"</td><td width='5%'>"+data.data_total_score
-                +"</td><td width='5%'>"+data.special_check_num+"</td><td width='5%'>"+data.special_total_score
-                +"</td><td width='5%'>"+data.third_check_num+"</td><td width='5%'>"+data.third_total_score
-                +"</td><td width='5%'>"+data.onsite_check_num+"</td><td width='5%'>"+data.onsite_total_score
-                +"</td><td width='5%'>"+data.other_check_num+"</td><td width='5%'>"+data.other_total_score
-                 +"</td><td width='5%'>"+data.check_all_score+"</td><td width='8%'>"
-                + calculate_avg( data.check_all_score,data.checked_num) +"</td>"
-                +"<td width='7%'></td><tr>";
+function gethtml(data, i) {
+    var strTbody = "<tr><td  width='5%'>" + i + "</td>";
+    strTbody += "<td width='10%'>" + data.name + "</td><td width='5%'>" + data.people_num + "</td><td width='5%'>" + data.checked_people_num +
+        "</td><td width='5%'>" + data.data_check_num + "</td><td width='5%'>" + data.data_total_score +
+        "</td><td width='5%'>" + data.special_check_num + "</td><td width='5%'>" + data.special_total_score +
+        "</td><td width='5%'>" + data.third_check_num + "</td><td width='5%'>" + data.third_total_score +
+        "</td><td width='5%'>" + data.onsite_check_num + "</td><td width='5%'>" + data.onsite_total_score +
+        "</td><td width='5%'>" + data.other_check_num + "</td><td width='5%'>" + data.other_total_score +
+        "</td><td width='5%'>" + data.check_all_score + "</td><td width='8%'>" +
+        calculate_avg(data.check_all_score, data.checked_num) + "</td>" +
+        "<td width='7%'></td><tr>";
     return strTbody;
 }
 // data.check_all_score/data.checked_num
-function calculate_avg(score,num){
-    if(num == 0){
+function calculate_avg(score, num) {
+    if (num == 0) {
         return '/';
     }
-    return 1000 -  (score/num).toFixed(2) ;
+    return 1000 - (score / num).toFixed(2);
 }
 
 
@@ -113,84 +123,78 @@ function calculate_avg(score,num){
 //     return strTbody;
 // }
 
-function getTotalHtml(data){
-    var html = "<tr><td>合计</td><td></td><td>"+data.totalMan+"</td><td>"+data.totalCompanyNum+"</td><td>"+data.totalCompanyScore+"</td><td>"
-    +data.totalThirdNum+"</td><td>"+data.totalThirdScore+"</td><td>"+data.totalSpecialNum+"</td><td>"+data.totalSpecialScore
-    +"</td><td>"+data.totalOnsiteNum+"</td><td>"+data.totalOnsiteScore+"</td><td>"+data.totalDataNum
-    +"</td><td>"+data.totalDataScore+"</td><td>-</td><td>-</td></tr>";
+function getTotalHtml(data) {
+    var html = "<tr><td>合计</td><td></td><td>" + data.totalMan + "</td><td>" + data.totalCompanyNum + "</td><td>" + data.totalCompanyScore + "</td><td>" +
+        data.totalThirdNum + "</td><td>" + data.totalThirdScore + "</td><td>" + data.totalSpecialNum + "</td><td>" + data.totalSpecialScore +
+        "</td><td>" + data.totalOnsiteNum + "</td><td>" + data.totalOnsiteScore + "</td><td>" + data.totalDataNum +
+        "</td><td>" + data.totalDataScore + "</td><td>-</td><td>-</td></tr>";
     return html;
 }
 
 /**
- * @param {*} data 
+ * @param {*} data
  */
-function check_operation_avg(data){
-      // 获取的请求数据初始化到表格中 ... 
+function check_operation_avg(data) {
+    // 获取的请求数据初始化到表格中 ...
     //   console.log(data) ;
     $(".table-tbody").empty();
-    for(var i =0;i<data.length; i++ ){
-        $(".table-tbody").append( gethtml(data[i],i+1) );
+    for (var i = 0; i < data.length; i++) {
+        $(".table-tbody").append(gethtml(data[i], i + 1));
     }
 }
 
 /**
  * 过滤undefined
- * @param {*} value 
- * @param {*} default_display_value 
+ * @param {*} value
+ * @param {*} default_display_value
  */
-function filter(value , default_display_value){
-    if(value!='' && value!=undefined ){
-        return value ;
-    }else if(default_display_value != undefined){
-        return default_display_value ;
-    }else{
-        return "" ;
+function filter(value, default_display_value) {
+    if (value != '' && value != undefined) {
+        return value;
+    } else if (default_display_value != undefined) {
+        return default_display_value;
+    } else {
+        return "";
     }
 }
 
 /**
  * 过滤除数为0和保留二位小数时出现的0.00
- * @param {*} value 
- * @param {*} default_display_value 
+ * @param {*} value
+ * @param {*} default_display_value
  */
-function filterByZeroHandle(value , default_display_value){
-        if(isNaN(value)){
-            return default_display_value ;
-        }else{
-            if((value+'').endsWith('.00')){
-                return value.substring(0,value.length-3);
-            }
-            return value ;
+function filterByZeroHandle(value, default_display_value) {
+    if (isNaN(value)) {
+        return default_display_value;
+    } else {
+        if ((value + '').endsWith('.00')) {
+            return value.substring(0, value.length - 3);
         }
+        return value;
+    }
 }
 
-function filterJudge(num1,num2){
-        if(num2==0){
-            return 0;
-        }else{
-            return (num1/num2).toFixed(2);
-        }
+function filterJudge(num1, num2) {
+    if (num2 == 0) {
+        return 0;
+    } else {
+        return (num1 / num2).toFixed(2);
+    }
 }
 
-function exportExcel(){
+function exportExcel() {
     var start_date = $("#start-time").val();
     var end_date = $("#end-time").val();
-    if( start_date=='' || end_date==''){
+    if (start_date == '' || end_date == '') {
         tip("请选择起止日期");
-        return ;
-    }else{
+        return;
+    } else {
         start_date += " 23:00:00";
         end_date += " 23:00:00";
         var start = new Date(start_date);
         //开始日期取前一天的23:00
-        start.setDate(start.getDate()-1);
+        start.setDate(start.getDate() - 1);
         start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     }
-    window.open( getserveraddr() + "/file/operation/manage/integration?start_date="+start_date+"&end_date="+end_date);
-}
-
-
-
-
-
-
+    window.open(getserveraddr() + "/file/operation/manage/integration?start_date=" + start_date + "&end_date=" + end_date);
+}

+ 29 - 22
VisualInspection/js/statistics/wrecker_person.js

@@ -4,8 +4,8 @@ $(function() {
 
     var feeList = getOrganList();
     $("#select-dept").append("<option value='' >请选择清障单位</option>");
-    for(var i =0  ;i<feeList.length;  i++){
-        $("#select-dept").append("<option value='"+ feeList[i].deptid +"'>"+ feeList[i].name +"</option>");
+    for (var i = 0; i < feeList.length; i++) {
+        $("#select-dept").append("<option value='" + feeList[i].deptid + "'>" + feeList[i].name + "</option>");
     }
 
     // 初始化查询
@@ -55,15 +55,22 @@ function queryEmpClick() {
 }
 
 function initQueryEmp() {
-   
-     setJobSelect("#jobSelect");
 
-    //默认初始化前一周查所有
-    var endD = new Date();
-    var startD = new Date();
+    setJobSelect("#jobSelect");
 
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth() >= 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
-    var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1 >= 10 ? endD.getMonth() + 1 : "0" + (endD.getMonth() + 1)) + "-25";
+    var tdaytime = moment();
+    var start_time = "";
+    var end_time = "";
+    if (tdaytime.get('D') >= 26) {
+        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+    } else {
+        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+        tdaytime = moment();
+        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+
+    }
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();
     var start_num = $("#start-num").val() != '' ? $("#start-num").val() : 0;
@@ -99,33 +106,33 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
     post_common_service(url, param, function(data) {
         var strTbody = '';
         for (var i = 0; i < data.length; i++) {
-            var agv = filterSlash( data[i].all_check_score, data[i].check_num) ;
-            if( !(start_score ==0 && end_score ==1000)){
-                 if(agv ==  '/' || agv< start_score || agv > end_score ){
-                    continue ;
+            var agv = filterSlash(data[i].all_check_score, data[i].check_num);
+            if (!(start_score == 0 && end_score == 1000)) {
+                if (agv == '/' || agv < start_score || agv > end_score) {
+                    continue;
                 }
             }
             strTbody += "<tr><td width='4%;'>" + (i + 1) + "</td><td width='6%;'>" + data[i].dept_name + "</td>" +
                 "<td width='5%;'>" + data[i].name + "</td><td width='5%;'>" + data[i].work_no + "</td>" +
-                    "<td width='5%;'>" + data[i].position_name + "</td>"+
+                "<td width='5%;'>" + data[i].position_name + "</td>" +
 
                 "</td><td width='4%;'>" + data[i].chu_jing + "</td>" +
-                "<td width='4%;'>" +  data[i].xian_chang + "</td><td width='4%;'>" + data[i].chang_tong + "</td>" +
+                "<td width='4%;'>" + data[i].xian_chang + "</td><td width='4%;'>" + data[i].chang_tong + "</td>" +
                 "<td width='4%;'>" + data[i].zuo_ye + "</td><td width='4%;'>" + data[i].xin_xi + "</td>" +
-                "<td width='4%;'>" + data[i].zhuo_zhuang + "</td><td width='4%'>" +data[i].zuo_ye_xian_chang + "</td><td width='4%;'>" +
+                "<td width='4%;'>" + data[i].zhuo_zhuang + "</td><td width='4%'>" + data[i].zuo_ye_xian_chang + "</td><td width='4%;'>" +
                 data[i].wen_ming + "</td><td width='4%;'>" + data[i].cao_zuo + "</td>" +
-                "<td width='4%;'>" +   data[i].gong_zuo + "</td><td width='5%;'>" + data[i].private_check + "</td>" +
-                "<td width='5%;'>" + data[i].in_check + "</td>" + "<td width='5%;'>"+  data[i].other_check +"</td><td width='5%;'>"+data[i].all_check_score +"</td><td width='5%;'>"+ agv+"</td><td width='5%;'></td><td width='5%;'>" + "</td></tr>";
+                "<td width='4%;'>" + data[i].gong_zuo + "</td><td width='5%;'>" + data[i].private_check + "</td>" +
+                "<td width='5%;'>" + data[i].in_check + "</td>" + "<td width='5%;'>" + data[i].other_check + "</td><td width='5%;'>" + data[i].all_check_score + "</td><td width='5%;'>" + agv + "</td><td width='5%;'></td><td width='5%;'>" + "</td></tr>";
         }
-         $(".table-tbody").empty();
+        $(".table-tbody").empty();
         $(".table-tbody").append(strTbody);
     }, function(error) {
         return "";
     });
 }
 
-function getOrganList(){
-    var  organList = $.zui.store.get("cache_wrecker_group_list");
+function getOrganList() {
+    var organList = $.zui.store.get("cache_wrecker_group_list");
     return organList;
 }
 
@@ -138,7 +145,7 @@ function filterSlash(value, check_num) {
     if (check_num == 0) {
         return '/';
     } else {
-        return 1000- (value/check_num).toFixed(2);
+        return 1000 - (value / check_num).toFixed(2);
     }
 }
 

+ 163 - 163
VisualInspection/js/teamClass/check_team_schedule.js

@@ -2,25 +2,25 @@
 
         //  $("#main_content_title").html("稽查人员排班")
 
-        var user = $.zui.store.get("user") ;  // 缓存用户信息,取出dept_id
+        var user = $.zui.store.get("user"); // 缓存用户信息,取出dept_id
         // console.log(user );
         // 用户的dept_id
-        var user_dept_id = user.organid ;
-        
+        var user_dept_id = user.organid;
+
         // 稽查小组type
-        var team_type = 2 ;
+        var team_type = 2;
 
         // 日期游标
-        var date_cursor = 0 ;
+        var date_cursor = 0;
 
         // 选择下拉框
-        var role_selectinput ;
+        var role_selectinput;
 
-        var team_stuffs = [] ;
+        var team_stuffs = [];
 
         selectInitInput(team_stuffs);
 
-        function selectInitInput(objs){
+        function selectInitInput(objs) {
             $("#relash").empty();
             $("#relash").append('<input type="text" class="form-control class_team_41" id="team_detail" >');
             role_selectinput = $('#relash #team_detail').comboTree({
@@ -29,57 +29,57 @@
             });
         }
 
-        function getSelectInputValue(){
-            return  role_selectinput.getSelectedItemsId();
+        function getSelectInputValue() {
+            return role_selectinput.getSelectedItemsId();
         }
 
         $('#calendar').calendar();
         var calendar = $('#calendar').data('zui.calendar');
-       
+
         calendarInit();
 
         // 请求稽查人员排班数据
-        function calendarInit(data_param){
+        function calendarInit(data_param) {
             var data = {
-                "dept_id": user_dept_id ,
-                "start_time":getCurrentMonthFirst(),
-                "end_time":getCurrentMonthLast(),
-                 'type':team_type
+                "dept_id": user_dept_id,
+                "start_time": getCurrentMonthFirst(),
+                "end_time": getCurrentMonthLast(),
+                'type': team_type
             }
-            if(data_param != undefined){
-                data = data_param ;
+            if (data_param != undefined) {
+                data = data_param;
             }
-            getTeamClass(data,function(data){
+            getTeamClass(data, function(data) {
                 var newEvents = [];
                 //  console.log(data);
-                for(var i=0;i<data.length;i++){
-                    var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].start_time, end: data[i].start_time};
+                for (var i = 0; i < data.length; i++) {
+                    var obj = { id: data[i].id, desc: data[i].team_name, title: data[i].team_name + "-" + getTeamName(data[i].class_type), start: data[i].start_time, end: data[i].start_time };
                     newEvents.push(obj);
                 }
-                                // console.log(newEvents)
+                // console.log(newEvents)
                 calendar.addEvents(newEvents);
             })
         }
 
         // 获取排班信息
-        function getTeamClass(data,_function){
-            post_common_service( "teamClass/getClassList",data,function(data){
-               _function(data);
-            },function(error){
-                return "" ;
+        function getTeamClass(data, _function) {
+            post_common_service("teamClass/getClassList", data, function(data) {
+                _function(data);
+            }, function(error) {
+                return "";
             })
         }
 
         // 更新日历数据
-        function updateCalendar(data){
+        function updateCalendar(data) {
             calendar.events = [];
             calendar.display();
             calendarInit(data);
         }
 
         // 当月第一天
-        function getCurrentMonthFirst(){
-            var date=new Date();
+        function getCurrentMonthFirst() {
+            var date = new Date();
             date.setDate(1);
             date.setHours(0);
             date.setMinutes(0);
@@ -88,13 +88,13 @@
         }
 
         // 当月最后一天
-        function getCurrentMonthLast(){
-            var date=new Date();
-            var currentMonth=date.getMonth();
-            var nextMonth=++currentMonth;
-            var nextMonthFirstDay=new Date(date.getFullYear(),nextMonth,1);
-            var oneDay=1000*60*60*24;
-            var date1 = new Date(nextMonthFirstDay-oneDay);
+        function getCurrentMonthLast() {
+            var date = new Date();
+            var currentMonth = date.getMonth();
+            var nextMonth = ++currentMonth;
+            var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1);
+            var oneDay = 1000 * 60 * 60 * 24;
+            var date1 = new Date(nextMonthFirstDay - oneDay);
             date1.setHours(0);
             date1.setMinutes(0);
             date1.setSeconds(0);
@@ -102,21 +102,21 @@
         }
 
         // 上一个月或者下个月的第一天或者最后一天
-        function getMonthByCondition(pre_or_after,first_or_last){
-            if(first_or_last == 'first'){
-                var date=new Date();
+        function getMonthByCondition(pre_or_after, first_or_last) {
+            if (first_or_last == 'first') {
+                var date = new Date();
                 date.setDate(1);
-                date.setMonth(date.getMonth()+pre_or_after);
+                date.setMonth(date.getMonth() + pre_or_after);
                 return date;
-            }else if(first_or_last == 'last'){
+            } else if (first_or_last == 'last') {
                 var date = new Date();
-                var currentMonth=date.getMonth();
-                var nextMonth=++currentMonth;
-                var nextMonthFirstDay=new Date(date.getFullYear(),nextMonth,1);
-                var oneDay=1000*60*60*24;
-                date = new Date(nextMonthFirstDay-oneDay);
-                date.setMonth(date.getMonth()+pre_or_after);
-                return date ;
+                var currentMonth = date.getMonth();
+                var nextMonth = ++currentMonth;
+                var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1);
+                var oneDay = 1000 * 60 * 60 * 24;
+                date = new Date(nextMonthFirstDay - oneDay);
+                date.setMonth(date.getMonth() + pre_or_after);
+                return date;
             }
         }
 
@@ -128,52 +128,52 @@
         /**
          * 点击日历触发函数
          */
-        function click_function(date){
+        function click_function(date) {
             setAddTermTitle(date.format("yyyy-MM-dd"));
             // 保存当前日期
-            $("#save_term_class").data("date",date.format("yyyy-MM-dd"));
-             $("#team_detail").val("");
+            $("#save_term_class").data("date", date.format("yyyy-MM-dd"));
+            $("#team_detail").val("");
             var data = {
-                "dept_id": user_dept_id ,
-                "start_time":date.format("yyyy-MM-dd 00:00:00"),
+                "dept_id": user_dept_id,
+                "start_time": date.format("yyyy-MM-dd 00:00:00"),
                 "end_time": date.format("yyyy-MM-dd 00:00:00"),
-                 'type':team_type
+                'type': team_type
             }
 
-            getTeamClass(data,function(data){
-                for(var i=0;i<$("select[id*='_term']").length;i++){
+            getTeamClass(data, function(data) {
+                for (var i = 0; i < $("select[id*='_term']").length; i++) {
                     $("select[id*='_term']").eq(i).val("");
                 }
-               
-                if(data.length > 0){
-                  
-                    $("#save_term_class").data("modify_flag",1);
-                    for(var i=0;i<data.length;i++){
-                        $(".class_team_"+data[i].class_type).val(data[i].team_id);
+
+                if (data.length > 0) {
+
+                    $("#save_term_class").data("modify_flag", 1);
+                    for (var i = 0; i < data.length; i++) {
+                        $(".class_team_" + data[i].class_type).val(data[i].team_id);
                     }
 
-                    var user_ids_name = data[0].user_ids_name ;
+                    var user_ids_name = data[0].user_ids_name;
                     var user_ids = data[0].user_ids;
                     // 请求班组下人员信息
-                    var dataObj ={ "id": data[0].team_id };
-                    post_common_service( "team/getDetailById",dataObj,function(data){
-                        get_input_data(data) ;    
+                    var dataObj = { "id": data[0].team_id };
+                    post_common_service("team/getDetailById", dataObj, function(data) {
+                        get_input_data(data);
                         // $("#team_detail").val(user_ids_name.substring(0,user_ids_name.length-1));
                         var user_id = user_ids.split(",");
-                        var user_name = user_ids_name.substring(0,data.user_ids_name.length-1).split(',');
+                        var user_name = user_ids_name.substring(0, data.user_ids_name.length - 1).split(',');
                         var team_temp_stuffs = [];
-                        for(var i=0; i< user_id.length ;i++ ){
-                            $('span[data-id="'+ user_id[i] +'"] input').attr("checked",true);
+                        for (var i = 0; i < user_id.length; i++) {
+                            $('span[data-id="' + user_id[i] + '"] input').attr("checked", true);
                             var zdataItem = {};
-                            zdataItem["id"] =user_id[i] ;
+                            zdataItem["id"] = user_id[i];
                             zdataItem["title"] = user_name[i];
                             team_temp_stuffs.push(zdataItem);
                         }
-                        role_selectinput._selectedItems = team_temp_stuffs ;
+                        role_selectinput._selectedItems = team_temp_stuffs;
                         role_selectinput.refreshInputVal();
-                    },function(error){})
-                }else{
-                     $("#save_term_class").data("modify_flag",0);
+                    }, function(error) {})
+                } else {
+                    $("#save_term_class").data("modify_flag", 0);
                 }
                 $('#myModal').modal();
             })
@@ -187,25 +187,25 @@
         // 下一个日期
         $('#calendar').calendar().on("clickNextBtn.zui.calendar", function(event) {
             // console.log(event);
-            date_cursor++ ;
+            date_cursor++;
 
             var data = {
-                "dept_id": user_dept_id ,
-                "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
-                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00"),
-                 'type':team_type
+                "dept_id": user_dept_id,
+                "start_time": getMonthByCondition(date_cursor, 'first').format("yyyy-MM-dd 00:00:00"),
+                "end_time": getMonthByCondition(date_cursor, 'last').format("yyyy-MM-dd 00:00:00"),
+                'type': team_type
             }
             updateCalendar(data);
         });
 
         // 上一个日期
         $('#calendar').calendar().on("clickPrevBtn.zui.calendar", function(event) {
-            date_cursor-- ;
+            date_cursor--;
             var data = {
-                "dept_id": user_dept_id ,
-                "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
-                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00"),
-                 'type':team_type
+                "dept_id": user_dept_id,
+                "start_time": getMonthByCondition(date_cursor, 'first').format("yyyy-MM-dd 00:00:00"),
+                "end_time": getMonthByCondition(date_cursor, 'last').format("yyyy-MM-dd 00:00:00"),
+                'type': team_type
             }
             updateCalendar(data);
         });
@@ -213,63 +213,63 @@
         // 今天
         $('#calendar').calendar().on("clickTodayBtn.zui.calendar", function(event) {
             // console.log(event);
-            date_cursor = 0 ;
+            date_cursor = 0;
             calendarInit();
         });
 
-        $("#save_term_class").click(function(){
+        $("#save_term_class").click(function() {
             var data = [];
             var user_ids = getSelectInputValue();
             var str_user_ids = '';
-            if(user_ids!=false){
-                for(var i=0;i<user_ids.length;i++){
-                    str_user_ids = str_user_ids + ((i!=0)?(','+user_ids[i]):user_ids[i]);
+            if (user_ids != false) {
+                for (var i = 0; i < user_ids.length; i++) {
+                    str_user_ids = str_user_ids + ((i != 0) ? (',' + user_ids[i]) : user_ids[i]);
                 }
             }
-           if(str_user_ids == ''){
-               tip("请选择值班人员");
-               return ;
-           }
-            for(var i=0;i<$("select[id*='_term']").length;i++){
-                if($("select[id*='_term']").eq(i).val()!=""){
+            if (str_user_ids == '') {
+                tip("请选择值班人员");
+                return;
+            }
+            for (var i = 0; i < $("select[id*='_term']").length; i++) {
+                if ($("select[id*='_term']").eq(i).val() != "") {
                     var obj = {
-                        "class_type":4,
-                        "team_id":$("select[id*='_term']").eq(i).val(),
-                        "work_date": $("#save_term_class").data("date")+" 00:00:00",
-                        "start_time": $("#save_term_class").data("date")+" 00:00:00",
-                        "end_time": $("#save_term_class").data("date")+" 00:00:00",
+                        "class_type": 4,
+                        "team_id": $("select[id*='_term']").eq(i).val(),
+                        "work_date": $("#save_term_class").data("date") + " 00:00:00",
+                        "start_time": $("#save_term_class").data("date") + " 00:00:00",
+                        "end_time": $("#save_term_class").data("date") + " 00:00:00",
                         "dept_id": user_dept_id,
-                        "user_ids":  str_user_ids,
-                        "user_type":2//表示稽查办   
+                        "user_ids": str_user_ids,
+                        "user_type": 2 //表示稽查办
                     };
                     data.push(obj);
                 }
             }
 
-            if(data.length == 0 ){
+            if (data.length == 0) {
                 tip("请填写排班信息!");
-                return ;
+                return;
             }
-            if( $("#save_term_class").data("modify_flag") != 1){
-                post_common_service("teamClass/add/list",data,function(data){
+            if ($("#save_term_class").data("modify_flag") != 1) {
+                post_common_service("teamClass/add/list", data, function(data) {
                     updateCalendar();
                     tip("今日排班成功!");
                     $('#myModal').modal('hide');
-                },function(error){
+                }, function(error) {
                     $('#myModal').modal('hide');
                 })
-            }else{
-                post_common_service("teamClass/update/list",data,function(data){
+            } else {
+                post_common_service("teamClass/update/list", data, function(data) {
                     updateCalendar();
-                     tip("今日排班成功!");
+                    tip("今日排班成功!");
                     $('#myModal').modal('hide');
-                },function(error){
+                }, function(error) {
                     $('#myModal').modal('hide');
                 })
             }
         })
 
-        $("#close_btn").click(function(){
+        $("#close_btn").click(function() {
             $('#myModal').modal('hide');
         })
 
@@ -277,71 +277,71 @@
         getTermClass(user_dept_id);
 
         // 获取班组信息
-        function getTermClass(dept_id){
+        function getTermClass(dept_id) {
             var data = {
-                'dept_id':dept_id ,
-                'type':team_type
+                'dept_id': dept_id,
+                'type': team_type
             }
-            post_common_service( "team/getTeamByDeptId/1/50",data,function(data){
-                for(var i=0;i<data.list.length;i++){
-                    $("#mooring_term,#middle_term,#night_term,#all_term").append("<option value='"+data.list[i].id+"'>"+data.list[i].name +"</option>")
+            post_common_service("team/getTeamByDeptId/1/50", data, function(data) {
+                for (var i = 0; i < data.list.length; i++) {
+                    $("#mooring_term,#middle_term,#night_term,#all_term").append("<option value='" + data.list[i].id + "'>" + data.list[i].name + "</option>")
                 }
                 //cs客户端弹出框显示下拉框有问题
                 $('#all_term').chosen({
-                    width:'200px',
-                    height:'100px',
-                    no_results_text: '没有找到',    // 当检索时没有找到匹配项时显示的提示文本
+                    width: '200px',
+                    height: '100px',
+                    no_results_text: '没有找到', // 当检索时没有找到匹配项时显示的提示文本
                     disable_search_threshold: 10, // 10 个以下的选择项则不显示检索框
-                    search_contains: true         // 从任意位置开始检索
+                    search_contains: true // 从任意位置开始检索
                 });
-            },function(error){})
+            }, function(error) {})
         }
 
 
-    $("#all_term").change(function(){
-       if($(this).val() !="" ){
-           // 请求班组下人员信息
-           var data ={ "id": $(this).val() };
-           post_common_service( "team/getDetailById",data,function(data){
-               
-                get_input_data(data)         
-           },function(error){})
-       }else{
-            $("#team_detail").val();   
-       }
-   })
-
-    function get_input_data(data){
-        if(data.user_ids.length > 0){
-            var user_name = data.user_ids_name.substring(0,data.user_ids_name.length-1).split(',');
-            var user_id = data.user_ids.split(",");
-            team_stuffs = [] ;
-            for(var i =0;i< user_name.length;i++){
-                var zdataItem = {};
-                zdataItem["id"] =user_id[i] ;
-                zdataItem["title"] = user_name[i];
-                team_stuffs.push(zdataItem);
+        $("#all_term").change(function() {
+            if ($(this).val() != "") {
+                // 请求班组下人员信息
+                var data = { "id": $(this).val() };
+                post_common_service("team/getDetailById", data, function(data) {
+
+                    get_input_data(data)
+                }, function(error) {})
+            } else {
+                $("#team_detail").val();
+            }
+        })
+
+        function get_input_data(data) {
+            if (data.user_ids.length > 0) {
+                var user_name = data.user_ids_name.substring(0, data.user_ids_name.length - 1).split(',');
+                var user_id = data.user_ids.split(",");
+                team_stuffs = [];
+                for (var i = 0; i < user_name.length; i++) {
+                    var zdataItem = {};
+                    zdataItem["id"] = user_id[i];
+                    zdataItem["title"] = user_name[i];
+                    team_stuffs.push(zdataItem);
+                }
+                selectInitInput(team_stuffs);
             }
-            selectInitInput(team_stuffs);
         }
-    }
 
 
-    // 根据class_type 获取班次名称
-    function getTeamName(class_type){
-        if(class_type == 1){
-            return "早班";
-        }else if(class_type == 2){
+        // 根据class_type 获取班次名称
+        function getTeamName(class_type) {
+            if (class_type == 1) {
+                return "早班";
+            } else if (class_type == 2) {
                 return "中班";
-        }else if(class_type == 3){
-            return "夜班";
-        }else if(class_type == 4){
-            return "全班";
+            } else if (class_type == 3) {
+                return "夜班";
+            } else if (class_type == 4) {
+                return "全班";
+            }
         }
-    }
 
-    function setAddTermTitle(title){
-        $(".modal-title").html("添加班组-"+title);
-    }
+        function setAddTermTitle(title) {
+            $(".modal-title").html("添加班组-" + title);
+        }
 
-   })
+    })