BUG修复（切换页面，线路输入框失效）

zlz
1 parent e9ab2032
Showing 1 changed file with 50 additions and 69 deletions
src/main/resources/static/pages/trafficManage/js/lineStationUploadRecord.js
@@ -13,7 +13,7 @@
  */
  
 (function(){
-    var page = 0, initPag;
+    var page = 0, initPag, storage = window.localStorage;
 	// 关闭左侧栏
 	if (!$('body').hasClass('page-sidebar-closed'))
 		$('.menu-toggler.sidebar-toggler').click();
@@ -23,46 +23,48 @@
         locale : 'zh-cn'
     });
  
-    var lines = new Array();
+    function getComp(cb) {
+        $.get('/user/companyData',null,function(rs) {
+            return cb && cb(rs);
+        });
+    }
+
+    initLineSelect2();
  
-    $('#line').select2({
-        ajax: {
-            url: '/realSchedule/findLine',
-            type: 'post',
-            dataType: 'json',
-            delay: 150,
-            data: function(params){
-                return{line: params.term};
-            },
-            processResults: function (data) {
-                return {
-                    results: data
-                };
-            },
-            cache: true
-        },
-        templateResult: function(repo){
-            if (repo.loading) return repo.text;
-            var h = '<span>'+repo.text+'</span>';
-            return h;
-        },
-        escapeMarkup: function (markup) { return markup; },
-        minimumInputLength: 1,
-        templateSelection: function(repo){
-            return repo.text;
-        },
-        language: {
-            noResults: function(){
-                return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-            },
-            inputTooShort : function(e) {
-                return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-            },
-            searching : function() {
-                return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
+    function initLineSelect2(compD) {debugger;
+        getComp(function(rs) {
+            var params = {};
+            if(rs.length>0) {
+                var compA = new Array();
+                for(var c = 0 ; c<rs.length;c++) {
+                    var comC = rs[c].companyCode;
+                    var child = rs[c].children;
+                    if(child.length>0) {
+                        for(var d = 0 ;d< child.length;d++) {
+                            compA.push(comC + '_' + child[d].code);
+                        }
+                    }else {
+                        compA.push(comC);
+                    }
+                }
+                params.cgsbm_in  = compA.toString();
             }
-        }
-    });
+            // 填充线路拉框选择值
+            $get('/line/all', params, function(array){
+                var len_ = array.length,paramsD = new Array();
+                if(len_>0) {
+                    $.each(array, function(i, g){
+                        if(g.name!='' || g.name != null) {
+                            paramsD.push({'id':g.name + '_' + g.id + '_' + g.lineCode ,'text':g.name});
+                        }
+                    });
+                    initPinYinSelect2($('#line'),paramsD,function(selector) {
+                        selector.select2("val", storage.xlName_AgursData);
+                    });
+                }
+            });
+        });
+    }
  
 	 // 日期范围输入框限制，绑定按键和粘贴事件
 	 $(".dateRange").keyup(function(){     
@@ -99,6 +101,9 @@
             alert("请选择时间");
             return ;
         }
+        if(pagination){
+            page = 0;
+        }
         var params = {};
         // 排序（按方向与序号）
         params['order'] = 'reportDate';
@@ -114,30 +119,12 @@
         $.each(inputs, function(i, element) {
             params[$(element).attr("name")] = $(element).val();
         });
-
-        var startDate = params['startDate'];
-        var endDate = params['endDate'];
+        var startDate = params['startDate'] == "" ? "0" : params['startDate'];
+        var endDate = params['endDate'] == "" ? "23" : params['endDate'];
         var reportDate = params['reportDate'];
-        if($("#carPlate").val() != ''){
-            params['cars.carPlate_eq'] = changeCarPlate($("#carPlate").val());
-        }
-        if($("#insideCode").val() != ''){
-            params['cars.insideCode_eq'] = $("#insideCode").val().toUpperCase();
-        }
-        // 默认开始时间
-        params['reportDate_ge'] = str2datetime(reportDate+" 00:00:00");
-        // 默认结束时间
-        params['reportDate_le'] = str2datetime(reportDate+" 23:59:59");
-
-        // 指定的开始时间
-        if(startDate != ''){
-            params['reportDate_gt'] = str2datetime(reportDate+" "+ (startDate > 9 ? startDate : "0"+startDate + ":00:00"));
-        }
-        // 指定的结束时间
-        if(endDate != ''){
-            params['reportDate_lt'] = str2datetime(reportDate+" "+ (endDate > 9 ? endDate : "0"+endDate + ":59:59"));
-        }
-        $get('/vehicle_stop', params, function(data) {
+        params['reportDate_start'] = reportDate.replace(/-/g,'') + (startDate > 9 ? startDate : "0"+startDate);
+        params['reportDate_end'] = reportDate.replace(/-/g,'') + (endDate > 9 ? endDate : "0"+endDate);
+        $get('/vehicle_stop/getVehicleInoutStopByParam', params, function(data) {
             var content = data.content;
             _dateFormat(content);
             var bodyHtm = template('lineStationUploadRecord_list_temp', {
@@ -183,7 +170,7 @@
     function _dateFormat(list) {
         var fs = 'YYYY-MM-DD HH:mm:ss';
         $.each(list, function(i, obj) {
-            obj.reportDate = moment(obj.reportDate).format(fs);
+            obj['report_date'] = moment(obj['report_date']).format(fs);
         });
     }
  
@@ -191,10 +178,4 @@
     function str2datetime(stringTime){
         return Date.parse(new Date(stringTime));
     }
-
-    // 时间字符串转成时间戳
-    function changeCarPlate(carPlate){
-        var tmp = "沪" + carPlate.substr(0, 1) + "-" + carPlate.substr(1, carPlate.length);
-        return tmp.toUpperCase();;
-    }
 })();
 \ No newline at end of file