改造查询时间，全部改成月

VisualInspection/fwq/js/other_check/other_check.js

@@ -261,8 +261,8 @@ function queryTable() {
     // }
 
     var cols = [
-        { width: 30, text: '序号', flex: false, colClass: 'text-center', field: 'num' },
-        { width: 50, text: '时间', flex: false, colClass: '', field: 'check_time' },
+        { width: 20, text: '序号', flex: false, colClass: 'text-center', field: 'num' },
+        { width: 70, text: '时间', flex: false, colClass: '', field: 'check_time' },
         { width: 50, text: '部门', flex: false, colClass: '', field: 'organ_name' },
         // {
         //     width: 30,

VisualInspection/fwq/js/statistics/assess_type.js

@@ -12,27 +12,9 @@ var itemArray = new Array();
 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) {
-        tip("请选择起止日期");
-        return;
-    } else {
-        start_date += " 00:00:00";
-        end_date += " 23:59:59";
-    }
-    var startStr = start_date.replace(/-/g, '/');
-    var endStr = end_date.replace(/-/g, '/');
-    var start = new Date(startStr);
-    //开始日期取前一天的23:00
-    // start.setDate(start.getDate() - 1);
-    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
-    var end = new Date(endStr);
-    if (start > end) {
-        tip("开始时间不能比结束时间大");
-        return;
-    }
+    var t = getTimeByMonth($("#start-time").val());
+    var start_date = getMomentTimeFormat(t.starttime);
+    var end_date = getMomentTimeFormat(t.endtime);
     var param = {
         "dept_id": $("#fsList").val(),
         "start_date": start_date,
@@ -52,30 +34,10 @@ function queryTypeClick() {
  * 表格初始化
  */
 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', 26).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', 26).format("YYYY-MM-DD");
+    var t = getTimeByMonth($("#start-time").val());
+    var start_date = getMomentTimeFormat(t.starttime);
+    var end_date = getMomentTimeFormat(t.endtime);
 
-    }
-
-    // 默认初始化时间页面回显
-    $("#start-time").val(start_time);
-    $("#end-time").val(end_time);
-    var start_date = start_time + " 00:00:00";
-    var end_date = end_time + " 00:00:00";
-    var start = new Date(start_date);
-    //开始日期取前一天的23:00
-    // 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,
@@ -365,18 +327,8 @@ function filterJudge(num1, num2) {
 }
 
 function exportExcel() {
-    var start_date = $("#start-time").val();
-    var end_date = $("#end-time").val();
-    if (start_date == '' || end_date == '') {
-        tip("请选择起止日期");
-        return;
-    } else {
-        start_date += " 00:00:00";
-        end_date += " 23:59:59";
-        var start = new Date(start_date);
-        //开始日期取前一天的23:00
-        // start.setDate(start.getDate() - 1);
-        start_date = start.Format("yyyy-MM-dd HH:mm:ss");
-    }
+    var t = getTimeByMonth($("#start-time").val());
+    var start_date = getMomentTimeFormat(t.starttime);
+    var end_date = getMomentTimeFormat(t.endtime);
     window.open(getExcelServeraddr() + "f/file/score/item/info?start_date=" + start_date + "&end_date=" + end_date);
 }

VisualInspection/fwq/js/statistics/dept_check_statistics.js

@@ -33,8 +33,8 @@ $(function() {
 
 
 function exportExcel() {
-    var start_date = moment($("#month_date_from").val() + "-26 00:00:00").valueOf();
-    var end_date = moment($("#month_date_to").val() + "-26 00:00:00").valueOf();
+    var start_date = moment($("#month_date_from").val() + "-25 23:00:00").valueOf();
+    var end_date = moment($("#month_date_to").val() + "-25 23:00:00").valueOf();
     if (start_date == '' || end_date == '') {
         tip("请选择起止日期");
         return;
@@ -52,8 +52,8 @@ function getdeptscore(starttime, endtime) {
     var time_m = moment(endtime).diff(moment(starttime), 'month')
 
     var data_p = {
-        "start_date": moment(starttime + "-26 00:00:00").valueOf(),
-        "end_date": moment(endtime + "-26 00:00:00").valueOf(),
+        "start_date": moment(starttime + "-25 23:00:00").valueOf(),
+        "end_date": moment(endtime + "-25 23:00:00").valueOf(),
 
     };
 

VisualInspection/fwq/js/statistics/operation_management_integration.js

@@ -11,27 +11,10 @@ var rank = new Array();
 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) {
-        tip("请选择起止日期");
-        return;
-    } else {
-        start_date += " 00:00:00";
-        end_date += " 23:59:59";
-    }
-    var startStr = start_date.replace(/-/g, '/');
-    var endStr = end_date.replace(/-/g, '/');
-    var start = new Date(startStr);
-    //开始日期取前一天的23:00
-    // start.setDate(start.getDate() - 1);
-    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
-    var end = new Date(endStr);
-    if (start > end) {
-        tip("开始时间不能比结束时间大");
-        return;
-    }
+    var t = getTimeByMonth($("#start-time").val());
+    var start_date = getMomentTimeFormat(t.starttime);
+    var end_date = getMomentTimeFormat(t.endtime);
+   
     var param = {
         "dept_id": $("#fsList").val(),
         "start_date": start_date,
@@ -51,29 +34,9 @@ function queryTypeClick() {
  * 表格初始化
  */
 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', 26).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', 26).format("YYYY-MM-DD");
-
-    }
-    // 默认初始化时间页面回显
-    $("#start-time").val(start_time);
-    $("#end-time").val(end_time);
-    var start_date = start_time + " 00:00:00";
-    var end_date = end_time + " 00:00:00";
-    var start = new Date(start_date);
-    //开始日期取前一天的23:00
-    // start.setDate(start.getDate() - 1);
-    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
+    var t = getTimeByMonth($("#start-time").val());
+    var start_date = getMomentTimeFormat(t.starttime);
+    var end_date = getMomentTimeFormat(t.endtime);
     var param = {
         "start_date": start_date,
         "end_date": end_date,
@@ -192,18 +155,8 @@ function filterJudge(num1, num2) {
 }
 
 function exportExcel() {
-    var start_date = $("#start-time").val();
-    var end_date = $("#end-time").val();
-    if (start_date == '' || end_date == '') {
-        tip("请选择起止日期");
-        return;
-    } else {
-        start_date += " 00:00:00";
-        end_date += " 23:59:59";
-        var start = new Date(start_date);
-        //开始日期取前一天的23:00
-        // start.setDate(start.getDate() - 1);
-        start_date = start.Format("yyyy-MM-dd HH:mm:ss");
-    }
+    var t = getTimeByMonth($("#start-time").val());
+    var start_date = getMomentTimeFormat(t.starttime);
+    var end_date = getMomentTimeFormat(t.endtime);
     window.open(getExcelServeraddr() + "f/file/operation/manage/integration?start_date=" + start_date + "&end_date=" + end_date);
 }

VisualInspection/fwq/js/statistics/service_area_check_statistics.js

@@ -43,8 +43,8 @@ $(function() {
 function getscore(starttime, endtime, limitnumber, limitscore, limitscore2) {
 
     var data_p = {
-        "start_date": moment(starttime + "-26 00:00:00").valueOf(),
-        "end_date": moment(endtime + "-26 00:00:00").valueOf(),
+        "start_date": moment(starttime + "-25 23:00:00").valueOf(),
+        "end_date": moment(endtime + "-25 23:00:00").valueOf(),
         "limitnumber": limitnumber,
         "limitscore": limitscore,
         "limitscore2": limitscore2

VisualInspection/fwq/js/statistics/service_area_data_statistics.js

@@ -13,27 +13,15 @@ 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', 26).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', 26).format("YYYY-MM-DD");
-}
-
-
-// 默认初始化日期一个月
-$(".div-start input").val(start_time);
-$(".div-end input").val(end_time);
-
-var start_date = moment($(".div-start input").val() + " 00:00:00");
+// 仅选择日期
+$.jeDate("#start-time", {
+    isinitVal: true,
+    format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+});
 
-var end_date = $(".div-end input").val() + " 23:59:59";
+var t = getTimeByMonth($("#start-time").val());
+var start_date = getMomentTimeFormat(t.starttime);
+var end_date = getMomentTimeFormat(t.endtime);
 
 /**
  * 预加载方法
@@ -41,27 +29,24 @@ var end_date = $(".div-end input").val() + " 23:59:59";
 $(function() {
     setVisit();
 
+    // var temp_time = $.zui.store.get('page_data_param_temp_time');
+    // if (temp_time) {
 
-    var temp_time = $.zui.store.get('page_data_param_temp_time');
-    if (temp_time) {
+    //     var year = temp_time.split('/')[0];
+    //     var month = temp_time.split('/')[1];
 
-        var year = temp_time.split('/')[0];
-        var month = temp_time.split('/')[1];
-
-        var starty = year;
-        var startm = parseInt(month) - 1;
-
-        if (startm <= 0) {
-            startm = 12;
-            starty = parseInt(year) - 1;
-        }
-
-        $(".div-start input").val(starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-26');
-        $(".div-end input").val(year + '-' + month + '-25');
-        $.zui.store.set('page_data_param_temp_time', null)
-    }
+    //     var starty = year;
+    //     var startm = parseInt(month) - 1;
 
+    //     if (startm <= 0) {
+    //         startm = 12;
+    //         starty = parseInt(year) - 1;
+    //     }
 
+    //     $(".div-start input").val(starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-25');
+    //     $(".div-end input").val(year + '-' + month + '-25');
+    //     $.zui.store.set('page_data_param_temp_time', null)
+    // }
 
     //*************************************数据表格******************************************
     function initAppealPage(start_date, end_date, dept_id) {
@@ -149,10 +134,10 @@ $(function() {
                 var now_date_time = moment(new Date(x.getResponseHeader("Date")))
                 var current_start_date = null;
 
-                if (now_date_time.date() >= 26) {
-                    current_start_date = moment(now_date_time.format("YYYY-MM") + "-26 00:00:00Z").subtract(0, "month");
+                if (now_date_time.date() >= 25) {
+                    current_start_date = moment(now_date_time.format("YYYY-MM") + "-25 23:00:00Z").subtract(0, "month");
                 } else {
-                    current_start_date = moment(now_date_time.format("YYYY-MM") + "-26 00:00:00Z").subtract(1, "month");
+                    current_start_date = moment(now_date_time.format("YYYY-MM") + "-25 23:00:00Z").subtract(1, "month");
                 }
                 var end_date_time = moment(end_date + "Z");
 
@@ -231,17 +216,9 @@ $(function() {
     $(".query button").click(function() {
         // var user_id = $("#select-personal").val();
         var dept_id = $("#select-dept").val();
-        var start_date = new Date($(".div-start input").val() + " 00:00:00") + "";
-        var end_date = $(".div-end input").val() + " 23:59:59";
-        var startStr = start_date.replace(/-/g, '/');
-        var endStr = end_date.replace(/-/g, '/');
-        var start = new Date(startStr);
-        var end = new Date(endStr);
-        if (start > end) {
-            tip("开始时间不能比结束时间大");
-            return;
-        }
-        start_date = start.Format("yyyy-MM-dd HH:mm:ss")
+        var t = getTimeByMonth($("#start-time").val());
+        var start_date = getMomentTimeFormat(t.starttime);
+        var end_date = getMomentTimeFormat(t.endtime);
         
         // 查询图一
         init_personal_score_statistics("f/statistics/one/serviceArea/year/info", dept_id);
@@ -260,14 +237,14 @@ $(function() {
      */
     function init_personal_score_statistics(url, dept_id) {
 
-        var end_date = $(".div-end input").val() + " 23:59:59";
+        var t = getTimeByMonth($("#start-time").val());
+        var start_date = getMomentTimeFormat(t.starttime);
+        var end_date = getMomentTimeFormat(t.endtime);        
+
         var date = moment(end_date);
         var y = date.get('y');
         var m = date.get('M') + 1;
 
-
-
-
         x_m_array = new Array();
         for (var i = 1; i <= 12; i++) {
             var month = parseInt(m) + i;
@@ -280,8 +257,8 @@ $(function() {
         }
 
         var param = {
-            "start_date": (y - 1) + "-" + new Date().getMonth() + "-26" + " 00:00:00",
-            "end_date": y + "-" + (new Date().getMonth() + 1) + "-26" + " 00:00:00",
+            "start_date": (y - 1) + "-" + new Date().getMonth() + "-25" + " 00:00:00",
+            "end_date": end_date,
             "dept_id": dept_id
         }
 
@@ -481,12 +458,14 @@ $(function() {
     // }
 
     function getInit() {
-        var start_date = $(".div-start input").val() + " 00:00:00";
-        var end_date = $(".div-end input").val() + " 00:00:00";
+        var t = getTimeByMonth($("#start-time").val());
+        var start_date = getMomentTimeFormat(t.starttime);
+        var end_date = getMomentTimeFormat(t.endtime);
         // var user_id = $("#select-personal").val();
         var dept_id = $("#select-dept").val();
         // 页面初始化
         echart();
+
         initAppealPage(start_date, end_date, dept_id);
         init_personal_score_statistics("f/statistics/one/serviceArea/year/info", dept_id);
         init_personal_check_type("f/statistics/one/serviceArea/checkedItem/info", dept_id, start_date, end_date);

VisualInspection/fwq/js/statistics/total_company_statistics.js

@@ -53,7 +53,6 @@ $(function() {
         $("#month_date").val(p.time)
     }
 
-
     refresh(true);
     $(".query-company").click(function() {
         // var select_month = $("#month_date").val();
@@ -102,8 +101,8 @@ $(function() {
 
 
         var param = {
-            "start_date": (parseInt(y) - 1) + "-" + m + "-26" + " 00:00:00",
-            "end_date": y + "-" + (m) + "-26" + " 00:00:00"
+            "start_date": (parseInt(y) - 1) + "-" + m + "-25" + " 23:00:00",
+            "end_date": y + "-" + (m) + "-25" + " 23:00:00"
         }
 
 
@@ -123,8 +122,8 @@ $(function() {
             starty = parseInt(y) - 1;
         }
         var param = {
-            "start_date": starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-26 00:00:00',
-            "end_date": y + '-' + mon + '-26 00:00:00'
+            "start_date": starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-25 23:00:00',
+            "end_date": y + '-' + mon + '-25 23:00:00'
         }
         initRqueset(url, param, 2);
     }

VisualInspection/fwq/view/statistics/assess_type.html

@@ -8,11 +8,11 @@
                 <div  class="form-group col-sm-5">
                     <label class="col-sm-2">查询日期</label>
                     <div class="col-sm-5">
-                        <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                        <input type="text" id="start-time" class="form-control form-date" placeholder="选择月份">
                     </div>
-                    <div class="col-sm-5">
+                    <!-- <div class="col-sm-5">
                         <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
-                    </div>
+                    </div> -->
                 </div>
                 <div  class="form-group col-sm-3">
                     <div class="col-sm-6">
@@ -70,30 +70,9 @@
         // 设置滚动表格的高度
         $("#scrollTable").height($(window).height() - 300);
         // 仅选择日期
-        $("#start-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $("#end-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
+        $.jeDate("#start-time", {
+            isinitVal: true,
+            format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
         });
         initQueryType();
     });

VisualInspection/fwq/view/statistics/operation_management_integration.html

@@ -7,11 +7,11 @@
             <div class="form-group">
                 <div class="from-label"><label>查询日期</label></div>
                 <div class="col-sm-2">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="选择月份">
                 </div>
-                <div class="col-sm-2">
+                <!-- <div class="col-sm-2">
                     <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
-                </div>
+                </div> -->
                 <div class="col-sm-1">
                     <button class="btn btn-primary " type="button" onclick="queryTypeClick()">查询</button>
                 </div>
@@ -65,31 +65,11 @@
     $(document).ready(function() {
         // 设置滚动表格的高度
         $("#scrollTable").height($(window).height() - 360);
+
         // 仅选择日期
-        $("#start-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $("#end-time").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
+        $.jeDate("#start-time", {
+            isinitVal: true,
+            format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
         });
         initQueryType();
     });

VisualInspection/fwq/view/statistics/service_area_data_statistics.html

@@ -14,12 +14,13 @@
         </div>
         <!-- <div class="div-select col-sm-2"><select class="form-control" id="select-personal"></select></button>
         </div> 2期无人员-->
-        <div class="col-sm-4">
-            <div class="div-start col-sm-5"><input class="form-control" placeholder="请选择考核开始时间"></input>
+        <div class="col-sm-3">
+            <div class="div-start col-sm-5">
+                <input class="form-control" id="start-time" placeholder="选择年月"></input>
             </div>
-            <div class="div-to col-sm-1"><label for="exampleInputAccount1">-</label></div>
+            <!-- <div class="div-to col-sm-1"><label for="exampleInputAccount1">-</label></div>
             <div class="div-end col-sm-5"><input class="form-control" placeholder="请选择考核结束时间"></input>
-            </div>
+            </div> -->
         </div>
         <div class="div-select col-sm-1">
             <select class="form-control score-select" id="score_select">
@@ -108,18 +109,6 @@
 </div>
 <script>
     $(document).ready(function() {
-
-        // 仅选择日期
-        $(".div-start input,.div-end input").datetimepicker({
-            language: "zh-CN",
-            weekStart: 1,
-            todayBtn: 1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
+        
     });
 </script>