bug fix

VisualInspection/js/appeal_management/appeal_list.js

@@ -1,17 +1,18 @@
 var cur_status;
 var cur_page;
+
 function initAppealPage() {
     initQueryParams();
     initTableRowBtn();
     queryAppeal();
 }
+
 function initQueryParams() {
     // 仅选择日期
-    $("#start_time").datetimepicker(
-    {
-        language:  "zh-CN",
+    $("#start_time").datetimepicker({
+        language: "zh-CN",
         weekStart: 1,
-        todayBtn:  1,
+        todayBtn: 1,
         autoclose: 1,
         todayHighlight: 1,
         startView: 2,
@@ -20,11 +21,10 @@ function initQueryParams() {
         format: "yyyy-mm-dd"
     });
     // 仅选择日期
-    $("#end_time").datetimepicker(
-    {
-        language:  "zh-CN",
+    $("#end_time").datetimepicker({
+        language: "zh-CN",
         weekStart: 1,
-        todayBtn:  1,
+        todayBtn: 1,
         autoclose: 1,
         todayHighlight: 1,
         startView: 2,
@@ -33,238 +33,249 @@ function initQueryParams() {
         format: "yyyy-mm-dd"
     });
     //去上次查询保留的参数
-    var store_params = $.zui.store.get('store_param_'+current_url);
+    var store_params = $.zui.store.get('store_param_' + current_url);
     var checked_dept = null;
     var position_id = null;
     var checked_person = null;
-    if(store_params) {
+    if (store_params) {
         checked_dept = store_params.checked_dept;
         position_id = store_params.position_id;
         checked_person = store_params.checked_person;
-        $("#start_time").val(store_params.start_time.substr(0,11));
-        $("#end_time").val(store_params.end_time.substr(0,11));
+        $("#start_time").val(store_params.start_time.substr(0, 11));
+        $("#end_time").val(store_params.end_time.substr(0, 11));
         // $("#hasScoreList").val(store_params.hasScore);
         cur_page = store_params.currentpage;
     }
-    if(roleContains("STATION")){
-        checked_dept = getCurrentUser().organid;     
+    if (roleContains("STATION")) {
+        checked_dept = getCurrentUser().organid;
     }
-    setFeSelect("#fsList",checked_dept);
-    if(roleContains("STATION")){
-        $("#fsList").attr('disabled','disabled');
+    setFeSelect("#fsList", checked_dept);
+    if (roleContains("STATION")) {
+        $("#fsList").attr('disabled', 'disabled');
     }
-    setJobSelect("#jobSelect",position_id);
+    setJobSelect("#jobSelect", position_id);
 
-    setFeePersonSelect("#feePersonList",checked_person,checked_dept);
+    setFeePersonSelect("#feePersonList", checked_person, checked_dept);
 
-    $('#fsList').change(function(){ 
-        setFeePersonSelect("#feePersonList",null,$("#fsList").val());
-    }) 
-    //获取页面参数
+    $('#fsList').change(function() {
+            setFeePersonSelect("#feePersonList", null, $("#fsList").val());
+        })
+        //获取页面参数
     var page_params = $.zui.store.get("page_params");
-    if(page_params && page_params.status) {
+    if (page_params && page_params.status) {
         cur_status = page_params.status;
     }
 
-    if(cur_status==14 || cur_status==15 || cur_status==16){
-        $("#appealResultDiv").show();     
+    if (cur_status == 14 || cur_status == 15 || cur_status == 16) {
+        $("#appealResultDiv").show();
     }
 }
 //初始化表行按钮
 function initTableRowBtn() {
-    $.zui.store.set("task_table_btn_11",[{func:'seeCheckAudit',text:'处理',icon_class:'icon-tasks'}]);
-    $.zui.store.set("task_table_btn_12",[{func:'showAppealCheck',text:'开始稽查',icon_class:'icon-eye-open'}]);
-    $.zui.store.set("task_table_btn_13",[{func:'showAppealCheck',text:'开始稽查',icon_class:'icon-eye-open'}]);
-    $.zui.store.set("task_table_btn_17",[{func:'showAppealContinueCheck',text:'继续稽查',icon_class:'icon-eye-open'}]);
-    $.zui.store.set("task_table_btn_14",[{func:'seeCheckAudit',text:'详情',icon_class:'icon-tasks'},
-                                        {func:'dispatchAppealTaskById',text:'下发',icon_class:'icon-signin'}]);
+    $.zui.store.set("task_table_btn_11", [{ func: 'seeCheckAudit', text: '处理', icon_class: 'icon-tasks' }]);
+    $.zui.store.set("task_table_btn_12", [{ func: 'showAppealCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    $.zui.store.set("task_table_btn_13", [{ func: 'showAppealCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    $.zui.store.set("task_table_btn_17", [{ func: 'showAppealContinueCheck', text: '继续稽查', icon_class: 'icon-eye-open' }]);
+    $.zui.store.set("task_table_btn_14", [{ func: 'seeCheckAudit', text: '详情', icon_class: 'icon-tasks' },
+        { func: 'dispatchAppealTaskById', text: '下发', icon_class: 'icon-signin' }
+    ]);
     // $.zui.store.set("task_table_btn_14",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
-    $.zui.store.set("task_table_btn_15",[{func:'seeCheckAudit',text:'详情',icon_class:'icon-tasks'}]);
-    $.zui.store.set("task_table_btn_16",[{func:'seeCheckAudit',text:'详情',icon_class:'icon-tasks'}]);
+    $.zui.store.set("task_table_btn_15", [{ func: 'seeCheckAudit', text: '详情', icon_class: 'icon-tasks' }]);
+    $.zui.store.set("task_table_btn_16", [{ func: 'seeCheckAudit', text: '详情', icon_class: 'icon-tasks' }]);
 }
 
 function initAppealList() {
-    queryTable();   
+    queryTable();
 }
 
-function queryAppeal(){
+function queryAppeal() {
     var start_time = "";
-    if($("#start_time").val()) start_time = $("#start_time").val()+" 00:00:00";
+    if ($("#start_time").val()) start_time = $("#start_time").val() + " 00:00:00";
     var end_time = "";
-    if($("#end_time").val()) end_time = $("#end_time").val()+" 23:59:59"; 
+    if ($("#end_time").val()) end_time = $("#end_time").val() + " 23:59:59";
     var data = {
         "start_time": start_time,
         "end_time": end_time,
-        "checked_dept":  $("#fsList").val(),
+        "checked_dept": $("#fsList").val(),
         "check_status": cur_status,
-        "position_id":$("#jobSelect").val(),
+        "position_id": $("#jobSelect").val(),
         "checked_person": $("#feePersonList").val(),
         "appeal_result": $("#appealResultSelect").val()
     }
     var hide = false;
-    if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA) || roleContains('STATION')) {
+    if (hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) || hasRole(ROLE_JICHA) || roleContains('STATION')) {
         hide = true;
     }
-    
-    var appeal_result_hide=true;
-    if(cur_status==14 || cur_status==15 || cur_status==16){
-        appeal_result_hide = false;   
+
+    var appeal_result_hide = true;
+    if (cur_status == 14 || cur_status == 15 || cur_status == 16) {
+        appeal_result_hide = false;
     }
 
     var cols = [
-            {width: 30, text: '序号', flex: true, colClass: 'text-center',field:'num'},
-            {width: 100, text: '任务名称', flex: true,colClass: '',field:'name'},
-            {width: 80, text: '申诉人员',  flex: true, colClass: '',field:'checked_person_name'},
-            {width: 100, text: '申诉部门',  flex: true, colClass: '',sort: 'down',field:'checked_dept_name'},
-            {width: 80, text: '稽查人员', type: 'string', flex: true, hide:hide,field:'checkman_name'},
-            {width: 80, text: '复核人员', type: 'string', flex: true, hide:hide,field:'recheckman_name'},
-            {width: 120, text: '稽查时间段', type: 'string', flex: true, colClass: '',field:'check_period'},
-            {width: 80, text: '申诉结果', type: 'string', flex: true, hide:appeal_result_hide,field:'appeal_result_name'},
-            // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field:'check_status_name'},
-        ];
-    var colFunc = {width: 120, text: '操作', type: 'string', flex: true, field: 'id'};   
-    colFunc.oper = $.zui.store.get("task_table_btn_"+cur_status);
+        { width: 30, text: '序号', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 100, text: '任务名称', flex: true, colClass: '', field: 'name' },
+        { width: 80, text: '申诉人员', flex: true, colClass: '', field: 'checked_person_name' },
+        { width: 100, text: '申诉部门', flex: true, colClass: '', sort: 'down', field: 'checked_dept_name' },
+        { width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide, field: 'checkman_name' },
+        { width: 80, text: '复核人员', type: 'string', flex: true, hide: hide, field: 'recheckman_name' },
+        { width: 120, text: '稽查时间段', type: 'string', flex: true, colClass: '', field: 'check_period' },
+        { width: 80, text: '申诉结果', type: 'string', flex: true, hide: appeal_result_hide, field: 'appeal_result_name' },
+        // {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field:'check_status_name'},
+    ];
+    var colFunc = { width: 120, text: '操作', type: 'string', flex: true, field: 'id' };
+    colFunc.oper = $.zui.store.get("task_table_btn_" + cur_status);
     cols.push(colFunc);
-    if(cur_status==12 || cur_status==13){
-        data.check_status_arr = [12,13];
+    if (cur_status == 12 || cur_status == 13) {
+        data.check_status_arr = [12, 13];
     }
-    appealTableObj = $('#appeal_list_table').mytable({'cols':cols,
-                            'url':"/checkAppeal/getTaskList",
-                            'param':data,
-                            'pager': {
-                                    'p_cur': cur_page
-                                }
-                            });
+    appealTableObj = $('#appeal_list_table').mytable({
+        'cols': cols,
+        'url': "/checkAppeal/getTaskList",
+        'param': data,
+        'pager': {
+            'p_cur': cur_page
+        }
+    });
     //保存本次查询参数
-    $.zui.store.set('store_param_'+current_url,data);
+    $.zui.store.set('store_param_' + current_url, data);
 }
 //查看稽查结果
-function seeCheckAudit(id,task_id){
+function seeCheckAudit(id, task_id) {
     // alert("task_id:"+task_id+"---id:"+id)
     // function showTaskDetail1(id){
-    var rowData=getItemByIdFromArr(id,$('#appeal_list_table').mytable('getTableData'));
-    post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
-        if(!data) {
-            layer.msg('未获取到申诉内容！',{
-                time: 2000//20s后自动关闭
+    var rowData = getItemByIdFromArr(id, $('#appeal_list_table').mytable('getTableData'));
+    post_common_service("/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
+        if (!data) {
+            layer.msg('未获取到申诉内容！', {
+                time: 2000 //20s后自动关闭
             });
             return;
         }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        changePage("/view/mytask/taskDetail.html",appealTableObj);
+        changePage("/view/mytask/taskDetail.html", appealTableObj);
     });
-// }
+    // }
 }
 //再分配
-function distributionAgain(id,task_id){
-    alert("task_id:"+task_id+"---id:"+id)
+function distributionAgain(id, task_id) {
+    alert("task_id:" + task_id + "---id:" + id)
 }
 
 //详情
-function seeDetail(id,task_id){
-    alert("task_id:"+task_id+"---id:"+id)
+function seeDetail(id, task_id) {
+    alert("task_id:" + task_id + "---id:" + id)
 }
 
-function queryUnAssignedTable(){
-        var data = {
-            "start_time": $("#start_time").val(),
-            "end_time": $("#end_time").val(),
-            "checked_dept": $("#dept_select").val(),
-        }
-        var hide = false;
-        if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
-            hide = true;
-        }
-        var cols = [
-                        // {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
-                        // {width: 100, text: '任务名称', flex: false,colClass: '',field:'name'},
-                        // {width: 80, text: '考核人员',  flex: false, colClass: '',field:'appeal_man_name'},
-                        // {width: 100, text: '考核部门',  flex: false, colClass: '',sort: 'down',field:'appeal_dept_name'},
-                        // {width: 80, text: '稽查人员', type: 'string', flex: false, hide:true,colClass: '',field:'verify_person_name'},
-                        // {width: 120, text: '稽查时间段', type: 'string', flex: false, colClass: '',field:'start_time'},
-                        // {width: 80, text: '状态', type: 'string', flex: false, colClass: '',field:'code_name'},
-                        // {width: 120, text: '上次稽查时间', type: 'string', flex: false, colClass: '',field:'start_time'},
-                        {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
-                        {width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down',field: 'name'},
-                        {width: 80, text: '申诉人员', type: 'string', flex: true, field: 'checked_person_name'},
-                        {width: 160, text: '申诉部门', type: 'string', flex: true, sort: 'down',field: 'checked_dept_name'},
-                        {width: 80, text: '稽查人员', type: 'string', flex: true, hide:hide,field: 'checkman_name'},
-                        {width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down',field: 'check_period'},
-                        {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
-                        {width: 100, text: '操作',  flex: false, colClass: '',field:'id',field_other:'task_id',oper:[
-                            {func:'seeCheckAudit1',text:'查看稽查结果',col_class:''},{func:'seeDetail',text:'详情',col_class:''}
-                        ]},
-                    ] ;
-        
-        $('#appeal_list_table').mytable({'cols':cols,
-                                'url':"checkAppeal/getList",
-                                'param':data}
-                                );
+function queryUnAssignedTable() {
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "checked_dept": $("#dept_select").val(),
     }
+    var hide = false;
+    if (hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION)) {
+        hide = true;
+    }
+    var cols = [
+        // {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
+        // {width: 100, text: '任务名称', flex: false,colClass: '',field:'name'},
+        // {width: 80, text: '考核人员',  flex: false, colClass: '',field:'appeal_man_name'},
+        // {width: 100, text: '考核部门',  flex: false, colClass: '',sort: 'down',field:'appeal_dept_name'},
+        // {width: 80, text: '稽查人员', type: 'string', flex: false, hide:true,colClass: '',field:'verify_person_name'},
+        // {width: 120, text: '稽查时间段', type: 'string', flex: false, colClass: '',field:'start_time'},
+        // {width: 80, text: '状态', type: 'string', flex: false, colClass: '',field:'code_name'},
+        // {width: 120, text: '上次稽查时间', type: 'string', flex: false, colClass: '',field:'start_time'},
+        { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down', field: 'name' },
+        { width: 80, text: '申诉人员', type: 'string', flex: true, field: 'checked_person_name' },
+        { width: 160, text: '申诉部门', type: 'string', flex: true, sort: 'down', field: 'checked_dept_name' },
+        { width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide, field: 'checkman_name' },
+        { width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' },
+        { width: 80, text: '状态', type: 'string', flex: true, colClass: '', field: 'check_status_name' },
+        {
+            width: 100,
+            text: '操作',
+            flex: false,
+            colClass: '',
+            field: 'id',
+            field_other: 'task_id',
+            oper: [
+                { func: 'seeCheckAudit1', text: '查看稽查结果', col_class: '' }, { func: 'seeDetail', text: '详情', col_class: '' }
+            ]
+        },
+    ];
+
+    $('#appeal_list_table').mytable({
+        'cols': cols,
+        'url': "checkAppeal/getList",
+        'param': data
+    });
+}
 //进入稽查页面
-function showAppealCheck(id){
-    var rowData=getItemByIdFromArr(id,$('#appeal_list_table').mytable('getTableData'));
-    post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
-        if(!data) {
-            layer.msg('未获取到申诉内容！',{
-                time: 2000//20s后自动关闭
+function showAppealCheck(id) {
+    var rowData = getItemByIdFromArr(id, $('#appeal_list_table').mytable('getTableData'));
+    post_common_service("/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
+        if (!data) {
+            layer.msg('未获取到申诉内容！', {
+                time: 2000 //20s后自动关闭
             });
             return;
         }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        console.log(data);
+        // console.log(data);
         // console.log("申诉："+$.checkTask.appeal.id);
-        no_return_common_service('/task/update', {"id":id,"check_status":13})
-        changePage("/view/mytask/check.html",appealTableObj);
+        no_return_common_service('/task/update', { "id": id, "check_status": 13 })
+        changePage("/view/mytask/check.html", appealTableObj);
     });
 }
 //进入继续稽查页面
-function showAppealContinueCheck(id){
+function showAppealContinueCheck(id) {
     // $('#myModal').modal({name:"dd"});
-    var rowData=getItemByIdFromArr(id,$('#appeal_list_table').mytable('getTableData'));
-    post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
-        if(!data) {
-            layer.msg('未获取到申诉内容！',{
-                time: 2000//20s后自动关闭
+    var rowData = getItemByIdFromArr(id, $('#appeal_list_table').mytable('getTableData'));
+    post_common_service("/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
+        if (!data) {
+            layer.msg('未获取到申诉内容！', {
+                time: 2000 //20s后自动关闭
             });
             return;
         }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        changePage("/view/mytask/check.html",appealTableObj);
+        changePage("/view/mytask/check.html", appealTableObj);
     });
 }
 
 //再分配
-function distributionAgain(id,task_id){
-    alert("task_id:"+task_id+"---id:"+id)
+function distributionAgain(id, task_id) {
+    alert("task_id:" + task_id + "---id:" + id)
 }
 
 //详情
-function seeDetail(id,task_id){
-    alert("task_id:"+task_id+"---id:"+id)
+function seeDetail(id, task_id) {
+    alert("task_id:" + task_id + "---id:" + id)
 }
 
 //下发单条任务
-function dispatchAppealTaskById(id){
+function dispatchAppealTaskById(id) {
     layer.confirm('确定下发任务？', {
-        btn: ['确定','取消'] //按钮
-    }, function(){
-       var rowData=getItemByIdFromArr(id,$('#appeal_list_table').mytable('getTableData'));
-       var param = {
+        btn: ['确定', '取消'] //按钮
+    }, function() {
+        var rowData = getItemByIdFromArr(id, $('#appeal_list_table').mytable('getTableData'));
+        var param = {
             "id": rowData.id,
-            "check_status":15
+            "check_status": 15
         }
-       no_return_common_service('/task/dispatchById', param, function(data){
+        no_return_common_service('/task/dispatchById', param, function(data) {
             queryAppeal();
             layer.msg(data, {
-                time: 2000//20s后自动关闭
+                time: 2000 //20s后自动关闭
             });
         });
-    }, function(index){
+    }, function(index) {
         layer.close(index);
     });
-    
-}
+
+}

VisualInspection/js/statistics/assess_ranking.js

@@ -195,7 +195,7 @@ function initQueryEmp(parent_dept_id, dept_id) {
 function getEmployeeInfosClick(url, param, start_score, end_score, start_num, end_num) {
     post_common_service(url, param, function(data) {
 
-        console.log(data)
+        // console.log(data)
 
         var strTbody = '';
         var count = 0;

VisualInspection/js/statistics/assess_type.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,318 +38,312 @@ function queryTypeClick(){
         "end_date": end_date,
     }
     var url = "statistics/score/item/info";
-    var strTbody='';
-      post_common_service( url,param,function(data){
-          // 管道中心受检人平均每人次扣分
-          check_people_avg(data);
-            },function(error){
-                return "" ;
-     });
+    var strTbody = '';
+    post_common_service(url, param, function(data) {
+        // 管道中心受检人平均每人次扣分
+        check_people_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 start_time = startD.getFullYear() + "-" + (startD.getMonth()) + "-26";
+    var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1) + "-25";
     // 默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
-    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/score/item/info";
-    var strTbody='';
-   
-    post_common_service( url,param,function(data){
-            // 管道中心受检人平均每人次扣分
-            check_people_avg(data); 
-        },function(error){
-            return "" ;
-     });
-    
+    var strTbody = '';
+
+    post_common_service(url, param, function(data) {
+        // 管道中心受检人平均每人次扣分
+        check_people_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){
-        
+    if (i == 0 || i == 7 || i == 13) {
+
         var ranking;
         var name = "";
         var rowspan = 0;
-          order = 1;
-        if(i==0){
+        order = 1;
+        if (i == 0) {
             name = "连云港";
             rowspan = 7;
-            ranking=rank[i];
-            for(var i=0;i<lists.length;i++){
-                if(avg > lists[i]){
+            ranking = rank[i];
+            for (var i = 0; i < lists.length; i++) {
+                if (avg > lists[i]) {
                     order = order + 1;
                 }
             }
-        }else if(i==7){
+        } else if (i == 7) {
             name = "盐城";
             rowspan = 6;
-            ranking=rank[i];
-            for(var i=0;i<lists.length;i++){
-                if(avg > lists[i]){
+            ranking = rank[i];
+            for (var i = 0; i < lists.length; i++) {
+                if (avg > lists[i]) {
                     order = order + 1;
                 }
             }
-        }else if(i==13){
+        } else if (i == 13) {
             name = "南通";
             rowspan = 8;
-            ranking=rank[i];
-            for(var i=0;i<lists.length;i++){
-                if(avg > lists[i]){
+            ranking = rank[i];
+            for (var i = 0; i < lists.length; i++) {
+                if (avg > lists[i]) {
                     order = order + 1;
                 }
             }
         }
-        strTbody += "<tr><td rowspan="+rowspan+" width='6%'>"+order+"</td>"+"<td rowspan="+rowspan+" width='6%'>"+name+"</td>";
-        strTbody+="<td width='6%'>"+ranking+"</td><td width='8%'>"+data.name+"</td><td width='6%'>"+filter(data.people_num,'0')
-                   +"</td><td width='6%'>"+filter(data.checked_people_num,'0')
-                   +"</td><td width='6%'>"+filter(data.checked_num,'0')+"</td><td width='54px'>"+getItemScore(data, '环境卫生')
-                   +"</td><td width='54px'>"+getItemScore(data, '仪容仪表')+"</td><td width='54px'>"+getItemScore(data, '表情')
-                   +"</td><td width='54px'>"+getItemScore(data, '动作')+"</td><td width='54px'>"+getItemScore(data, '文明用语')
-                   +"</td><td width='54px'>"+getItemScore(data, '工作纪律')+"</td><td width='54px'>"+getItemScore(data, '便民服务')
-                   +"</td><td width='54px'>"+getItemScore(data, '安全管理')+"</td><td>"+data.all_check_score+"</td><td width='6%'>"
-                   +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')
-                   +"</td><td rowspan="+rowspan+" width='6%'>"+avg+"</td>";
+        strTbody += "<tr><td rowspan=" + rowspan + " width='6%'>" + order + "</td>" + "<td rowspan=" + rowspan + " width='6%'>" + name + "</td>";
+        strTbody += "<td width='6%'>" + ranking + "</td><td width='8%'>" + data.name + "</td><td width='6%'>" + filter(data.people_num, '0') +
+            "</td><td width='6%'>" + filter(data.checked_people_num, '0') +
+            "</td><td width='6%'>" + filter(data.checked_num, '0') + "</td><td width='54px'>" + getItemScore(data, '环境卫生') +
+            "</td><td width='54px'>" + getItemScore(data, '仪容仪表') + "</td><td width='54px'>" + getItemScore(data, '表情') +
+            "</td><td width='54px'>" + getItemScore(data, '动作') + "</td><td width='54px'>" + getItemScore(data, '文明用语') +
+            "</td><td width='54px'>" + getItemScore(data, '工作纪律') + "</td><td width='54px'>" + getItemScore(data, '便民服务') +
+            "</td><td width='54px'>" + getItemScore(data, '安全管理') + "</td><td>" + data.all_check_score + "</td><td width='6%'>" +
+            filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') +
+            "</td><td rowspan=" + rowspan + " width='6%'>" + avg + "</td>";
         strTbody += "</tr>";
-    }else{
-        strTbody += "<tr><td>"+rank[i]+"</td>";
-        strTbody+="<td>"+data.name+"</td><td>"+data.people_num+"</td><td>"
-                  +filter(data.checked_people_num,'0')+"</td><td>"+filter(data.checked_num,'0')
-                  +"</td><td>"+getItemScore(data, '环境卫生')+"</td><td>"+getItemScore(data, '仪容仪表')
-                  +"</td><td>"+getItemScore(data, '表情')+"</td><td>"+getItemScore(data, '动作')
-                  +"</td><td>"+getItemScore(data, '文明用语')+"</td><td>"+getItemScore(data, '工作纪律')
-                  +"</td><td>"+getItemScore(data, '便民服务')+"</td><td>"+getItemScore(data, '安全管理')
-                  +"</td><td>"+data.all_check_score+"</td><td>"
-                  +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')+"</td>";
+    } else {
+        strTbody += "<tr><td>" + rank[i] + "</td>";
+        strTbody += "<td>" + data.name + "</td><td>" + data.people_num + "</td><td>" +
+            filter(data.checked_people_num, '0') + "</td><td>" + filter(data.checked_num, '0') +
+            "</td><td>" + getItemScore(data, '环境卫生') + "</td><td>" + getItemScore(data, '仪容仪表') +
+            "</td><td>" + getItemScore(data, '表情') + "</td><td>" + getItemScore(data, '动作') +
+            "</td><td>" + getItemScore(data, '文明用语') + "</td><td>" + getItemScore(data, '工作纪律') +
+            "</td><td>" + getItemScore(data, '便民服务') + "</td><td>" + getItemScore(data, '安全管理') +
+            "</td><td>" + data.all_check_score + "</td><td>" +
+            filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') + "</td>";
         strTbody += "</tr>";
-          
+
     }
     return strTbody;
 }
 
-function getTotalHtml(data){
-    var html = "<tr><td>合计</td><td></td><td></td><td></td><td>"+data.totalMan+"</td><td>"+data.totalcheckedMan+"</td><td>"+data.totalcheckedCount+"</td><td>"
-    +getTotalScore(data,'环境卫生')+"</td><td>"+getTotalScore(data,'仪容仪表')+"</td><td>"+getTotalScore(data,'表情')+"</td><td>"+getTotalScore(data,'动作')
-    +"</td><td>"+getTotalScore(data,'文明用语')+"</td><td>"+getTotalScore(data,'工作纪律')+"</td><td>"+getTotalScore(data,'便民服务')
-    +"</td><td>"+getTotalScore(data,'安全管理')+"</td><td>"+data.totalAll+"</td><td>-</td><td>-</td></tr>";
+function getTotalHtml(data) {
+    var html = "<tr><td>合计</td><td></td><td></td><td></td><td>" + data.totalMan + "</td><td>" + data.totalcheckedMan + "</td><td>" + data.totalcheckedCount + "</td><td>" +
+        getTotalScore(data, '环境卫生') + "</td><td>" + getTotalScore(data, '仪容仪表') + "</td><td>" + getTotalScore(data, '表情') + "</td><td>" + getTotalScore(data, '动作') +
+        "</td><td>" + getTotalScore(data, '文明用语') + "</td><td>" + getTotalScore(data, '工作纪律') + "</td><td>" + getTotalScore(data, '便民服务') +
+        "</td><td>" + getTotalScore(data, '安全管理') + "</td><td>" + data.totalAll + "</td><td>-</td><td>-</td></tr>";
     return html;
 }
 /**
  * 获取扣分合计
- * @param {*} obj 
- * @param {*} check_item_name 
+ * @param {*} obj
+ * @param {*} check_item_name
  */
-function getTotalScore(data, check_item_name){
-    for (var i in data){
-        console.log(i);
-        if(i.indexOf(check_item_name) > -1){
-            return data[i] ;
+function getTotalScore(data, check_item_name) {
+    for (var i in data) {
+        // console.log(i);
+        if (i.indexOf(check_item_name) > -1) {
+            return data[i];
         }
     }
-    return 0 ;
+    return 0;
 }
 /**
  * 管道中心受检人平均每人次扣分
- * @param {*} data 
+ * @param {*} data
  */
-function check_people_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(filterByZeroHandle(list[k].all_check_score,'0'));
-                sum1 = parseFloat(sum1)+ parseFloat(filterByZeroHandle(list[k].checked_num,'0'));
-            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;
-            }
-        }   
-        // 道管下的收费站排名     
-        ranking_method(list);
+function check_people_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(filterByZeroHandle(list[k].all_check_score, '0'));
+        sum1 = parseFloat(sum1) + parseFloat(filterByZeroHandle(list[k].checked_num, '0'));
+        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;
+        }
+    }
+    // 道管下的收费站排名
+    ranking_method(list);
 
-        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));
 }
 /**
  * 道管下的收费站排名
- * @param {*} data 
+ * @param {*} data
  */
-function ranking_method(data){
-        //清空数组
-        lianyungang_Station.length=0;
-        yancheng_Station.length=0;
-        nantong_Station.length=0;
-        r1.length=0;
-        r2.length=0;
-        r3.length=0;
-        rank.length=0;
-        // 把收费站得分分别添加到3个数组
-        for(i=0;i<data.length;i++){
-            if(i>=0 && i<=6)
-            lianyungang_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score,data[i].checked_num),'0'));
-            else if(i>6 && i<=12)
-            yancheng_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score,data[i].checked_num),'0'));
-            else
-            nantong_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score,data[i].checked_num),'0'));
-        }
-        // 得分转化为3个排名数组
-        for(var i=1;i<=3;i++){
-            station_rank(i);
-        }
-        // 将3个排名数组合并成一个数组
-        rank=r1.concat(r2).concat(r3);
+function ranking_method(data) {
+    //清空数组
+    lianyungang_Station.length = 0;
+    yancheng_Station.length = 0;
+    nantong_Station.length = 0;
+    r1.length = 0;
+    r2.length = 0;
+    r3.length = 0;
+    rank.length = 0;
+    // 把收费站得分分别添加到3个数组
+    for (i = 0; i < data.length; i++) {
+        if (i >= 0 && i <= 6)
+            lianyungang_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score, data[i].checked_num), '0'));
+        else if (i > 6 && i <= 12)
+            yancheng_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score, data[i].checked_num), '0'));
+        else
+            nantong_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score, data[i].checked_num), '0'));
+    }
+    // 得分转化为3个排名数组
+    for (var i = 1; i <= 3; i++) {
+        station_rank(i);
+    }
+    // 将3个排名数组合并成一个数组
+    rank = r1.concat(r2).concat(r3);
 }
 
 /**
  * 排名
  */
-function station_rank_method(array,rank){
-    rank[0] = 1 ;
-    for(var i=1; i<array.length; i++){
-        if(array[i-1] == array[i]  ){
-            rank[i] = rank[i-1];
-        }else{
-            rank[i] = i +1;
-        }				
+function station_rank_method(array, rank) {
+    rank[0] = 1;
+    for (var i = 1; i < array.length; i++) {
+        if (array[i - 1] == array[i]) {
+            rank[i] = rank[i - 1];
+        } else {
+            rank[i] = i + 1;
+        }
     }
-} 
+}
 
 /**
  * 得分转化为排名
- * @param {*} type 
+ * @param {*} type
  */
-function station_rank(type){
-    if(type==1){
+function station_rank(type) {
+    if (type == 1) {
         station_rank_method(lianyungang_Station, r1);
-    }else if(type==2){
+    } else if (type == 2) {
         station_rank_method(yancheng_Station, r2);
-    }else if(type==3){
+    } else if (type == 3) {
         station_rank_method(nantong_Station, r3);
     }
 }
 
 /**
  * 过滤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 "";
     }
 }
 
 /**
  * 获取扣分详情
- * @param {*} obj 
- * @param {*} check_item_name 
+ * @param {*} obj
+ * @param {*} check_item_name
  */
-function getItemScore(obj, check_item_name){
-    var names = obj.checked_socre_name ;
-    var scores = obj.checked_score ;
+function getItemScore(obj, check_item_name) {
+    var names = obj.checked_socre_name;
+    var scores = obj.checked_score;
 
-    for(var i=0;i<names.length ;i++){
-        if( names[i]!=null && names[i].indexOf(check_item_name) > -1){
-            return scores[i] ;
+    for (var i = 0; i < names.length; i++) {
+        if (names[i] != null && names[i].indexOf(check_item_name) > -1) {
+            return scores[i];
         }
     }
-    return 0 ;
+    return 0;
 }
 
 /**
  * 过滤除数为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/score/item/info?start_date="+start_date+"&end_date="+end_date);
-}
-
-
-
-
-
-
+    window.open(getserveraddr() + "/file/score/item/info?start_date=" + start_date + "&end_date=" + end_date);
+}

VisualInspection/js/statistics/check_workload_statistics.js

@@ -183,7 +183,7 @@ $(function() {
 
 
         post_common_service("statistics/checkman/info", param, function(data) {
-            console.log(data)
+            // console.log(data)
             if (data != null) {
                 WH(".all_check_task", GDV(data.all_task_num, 0));
                 WH(".all_check_minute", convertT(GDV(data.all_check_minute, 0)));

VisualInspection/js/statistics/personal_data_statistics.js

@@ -232,6 +232,7 @@ $(function() {
 
 
 
+
         // 查询图一
         init_personal_score_statistics("statistics/one/person/year/info", user_id);
         // 查询图二
@@ -255,6 +256,8 @@ $(function() {
         var m = date.get('M') + 1;
 
 
+
+
         x_m_array = new Array();
         for (var i = 1; i <= 12; i++) {
             var month = parseInt(m) + i;
@@ -267,10 +270,11 @@ $(function() {
         }
 
         var param = {
-            "start_date": (year - 1) + "-" + new Date().getMonth() + "-25" + " 23:00:00",
-            "end_date": year + "-" + (new Date().getMonth() + 1) + "-25" + " 23:00:00",
+            "start_date": (y - 1) + "-" + new Date().getMonth() + "-25" + " 23:00:00",
+            "end_date": y + "-" + (new Date().getMonth() + 1) + "-25" + " 23:00:00",
             "user_id": user_id
         }
+
         initRqueset(url, param, 1);
     }
 
@@ -368,7 +372,7 @@ $(function() {
                         var score = (1000 - (filter(data[index].all_check_score, data[index].checked_num, 1.0, 0)));
                         var data_s = getsymbol(score)
 
-                        console.log(data_s)
+                        // console.log(data_s)
                         array_year_score.push(data_s);
                     }
                 }

VisualInspection/view/mytask/taskDetail.html

@@ -327,7 +327,7 @@
         };
         post_common_service("/task/getStatusById/", data, function(data) {
             if (data) {
-                console.log(data)
+                // console.log(data)
                 var flowStr = "";
 
                 var color_t = new $.zui.Color("#63B8FF");