潘钊 / bsth_control · Commits

Commit 0eeefc51c35632c49ec618d934029ea73a30cd96

Authored by 廖磊
2 parents 53a6bca0 8d35e7f7
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control 

into pudong
Inline Side-by-side
Showing 5 changed files with 90 additions and 98 deletions
src/main/resources/static/pages/trafficManage/js/lineStationUpload.js
  View file @0eeefc5
@@ -13,45 +13,49 @@ @@ -13,45 +13,49 @@
13 */ 13 */
14 14
15 (function(){ 15 (function(){
  16 + function getComp(cb) {
  17 + $.get('/user/companyData',null,function(rs) {
  18 + return cb && cb(rs);
  19 + });
  20 + }
  21 +
  22 + initLineSelect2();
16 23
17 - $('#line').select2({  
18 - ajax: {  
19 - url: '/realSchedule/findLine',  
20 - type: 'post',  
21 - dataType: 'json',  
22 - delay: 150,  
23 - data: function(params){  
24 - return{line: params.term};  
25 - },  
26 - processResults: function (data) {  
27 - return {  
28 - results: data  
29 - };  
30 - },  
31 - cache: true  
32 - },  
33 - templateResult: function(repo){  
34 - if (repo.loading) return repo.text;  
35 - var h = '<span>'+repo.text+'</span>';  
36 - return h;  
37 - },  
38 - escapeMarkup: function (markup) { return markup; },  
39 - minimumInputLength: 1,  
40 - templateSelection: function(repo){  
41 - return repo.text;  
42 - },  
43 - language: {  
44 - noResults: function(){  
45 - return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';  
46 - },  
47 - inputTooShort : function(e) {  
48 - return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';  
49 - },  
50 - searching : function() {  
51 - return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>'; 24 + function initLineSelect2(compD) {
  25 + getComp(function(rs) {
  26 + var params = {};
  27 + if(rs.length>0) {
  28 + var compA = new Array();
  29 + for(var c = 0 ; c<rs.length;c++) {
  30 + var comC = rs[c].companyCode;
  31 + var child = rs[c].children;
  32 + if(child.length>0) {
  33 + for(var d = 0 ;d< child.length;d++) {
  34 + compA.push(comC + '_' + child[d].code);
  35 + }
  36 + }else {
  37 + compA.push(comC);
  38 + }
  39 + }
  40 + params.cgsbm_in = compA.toString();
52 } 41 }
53 - }  
54 - }); 42 + params["remove_ne"] = 1;
  43 + // 填充线路拉框选择值
  44 + $get('/line/all', params, function(array){
  45 + var len_ = array.length,paramsD = new Array();
  46 + if(len_>0) {
  47 + $.each(array, function(i, g){
  48 + if(g.name!='' || g.name != null) {
  49 + paramsD.push({'id':g.id ,'text':g.name});
  50 + }
  51 + });
  52 + initPinYinSelect2($('#line'),paramsD,function(selector) {
  53 + selector.select2("val", storage.xlName_AgursData);
  54 + });
  55 + }
  56 + });
  57 + });
  58 + }
55 59
56 // 绑定查询事件 60 // 绑定查询事件
57 $("#search").click(searchM); 61 $("#search").click(searchM);
src/main/resources/static/pages/trafficManage/js/lineStationUploadRecord.js
  View file @0eeefc5
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
49 } 49 }
50 params.cgsbm_in = compA.toString(); 50 params.cgsbm_in = compA.toString();
51 } 51 }
  52 + params["remove_ne"] = 1;
52 // 填充线路拉框选择值 53 // 填充线路拉框选择值
53 $get('/line/all', params, function(array){ 54 $get('/line/all', params, function(array){
54 var len_ = array.length,paramsD = new Array(); 55 var len_ = array.length,paramsD = new Array();
src/main/resources/static/pages/trafficManage/js/shLineCodeList.js
  View file @0eeefc5
@@ -34,8 +34,9 @@ @@ -34,8 +34,9 @@
34 } 34 }
35 var lines = new Array(); 35 var lines = new Array();
36 var gsmap = getBusMap(); 36 var gsmap = getBusMap();
  37 + var pars = {"remove_ne":1};
37 // 取得所有线路 38 // 取得所有线路
38 - $get('/line/all', null, function(allLine) { 39 + $get('/line/all', pars, function(allLine) {
39 // 遍历数组 40 // 遍历数组
40 $.each(allLine, function(i, e) { 41 $.each(allLine, function(i, e) {
41 var companyCode = e.company; 42 var companyCode = e.company;
src/main/resources/static/pages/trafficManage/js/timeTempletUpload.js
  View file @0eeefc5
@@ -13,66 +13,51 @@ @@ -13,66 +13,51 @@
13 */ 13 */
14 14
15 (function(){ 15 (function(){
16 - /**  
17 - * 取得编码-公司map  
18 - * gsmap["5"] = 南汇公司  
19 - * gsmap["5_3"] = 芦潮港分公司  
20 - */  
21 - function getBusMap(){  
22 - // 取得公司信息，替换公司编码  
23 - var gsmap = {};  
24 - $get('/business/all', null, function(array){  
25 - $.each(array, function(i, gs){  
26 - var k = gs.upCode + '_' + gs.businessCode;  
27 - if(gs.upCode === '88'){  
28 - k = gs.businessCode;  
29 - }  
30 - gsmap[k] = gs.businessName;  
31 - });  
32 - });  
33 - return gsmap;  
34 - }  
35 - var lines = new Array();  
36 - var gsmap = getBusMap();  
37 -  
38 - $('#line').select2({  
39 - ajax: {  
40 - url: '/realSchedule/findLine',  
41 - type: 'post',  
42 - dataType: 'json',  
43 - delay: 150,  
44 - data: function(params){  
45 - return{line: params.term};  
46 - },  
47 - processResults: function (data) {  
48 - return {  
49 - results: data  
50 - };  
51 - },  
52 - cache: true  
53 - },  
54 - templateResult: function(repo){  
55 - if (repo.loading) return repo.text;  
56 - var h = '<span>'+repo.text+'</span>';  
57 - return h;  
58 - },  
59 - escapeMarkup: function (markup) { return markup; },  
60 - minimumInputLength: 1,  
61 - templateSelection: function(repo){  
62 - return repo.text;  
63 - },  
64 - language: {  
65 - noResults: function(){  
66 - return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';  
67 - },  
68 - inputTooShort : function(e) {  
69 - return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';  
70 - },  
71 - searching : function() {  
72 - return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';  
73 - }  
74 - }  
75 - }); 16 +
  17 + function getComp(cb) {
  18 + $.get('/user/companyData',null,function(rs) {
  19 + return cb && cb(rs);
  20 + });
  21 + }
  22 +
  23 + initLineSelect2();
  24 +
  25 + function initLineSelect2(compD) {
  26 + getComp(function(rs) {
  27 + var params = {};
  28 + if(rs.length>0) {
  29 + var compA = new Array();
  30 + for(var c = 0 ; c<rs.length;c++) {
  31 + var comC = rs[c].companyCode;
  32 + var child = rs[c].children;
  33 + if(child.length>0) {
  34 + for(var d = 0 ;d< child.length;d++) {
  35 + compA.push(comC + '_' + child[d].code);
  36 + }
  37 + }else {
  38 + compA.push(comC);
  39 + }
  40 + }
  41 + params.cgsbm_in = compA.toString();
  42 + }
  43 + params["remove_ne"] = 1;
  44 + // 填充线路拉框选择值
  45 + $get('/line/all', params, function(array){
  46 + var len_ = array.length,paramsD = new Array();
  47 + if(len_>0) {
  48 + $.each(array, function(i, g){
  49 + if(g.name!='' || g.name != null) {
  50 + paramsD.push({'id':g.id ,'text':g.name});
  51 + }
  52 + });
  53 + initPinYinSelect2($('#line'),paramsD,function(selector) {
  54 + selector.select2("val", storage.xlName_AgursData);
  55 + });
  56 + }
  57 + });
  58 + });
  59 + }
  60 +
76 61
77 // 绑定查询事件 62 // 绑定查询事件
78 $("#search").click(searchM); 63 $("#search").click(searchM);
src/main/resources/static/pages/trafficManage/js/timeTempletUploadRecord.js
  View file @0eeefc5
@@ -88,6 +88,7 @@ @@ -88,6 +88,7 @@
88 } 88 }
89 var lines = new Array(); 89 var lines = new Array();
90 var gsmap = getBusMap(); 90 var gsmap = getBusMap();
  91 + params["remove_ne"] = 1;
91 // 取得所有线路 92 // 取得所有线路
92 $get('/line/all', params, function(allLine) { 93 $get('/line/all', params, function(allLine) {
93 // 遍历数组 94 // 遍历数组