潘钊 / bsth_control · Commits

Commit 6a8a81aa8f75bee17232418d32e27e335f439854

Authored by 潘钊
1 parent 1b849a09

update

Inline Side-by-side
Showing 6 changed files with 99 additions and 61 deletions
src/main/resources/static/real_control_v2/css/main.css
  View file @6a8a81a
... ... @@ -302,4 +302,9 @@ canvas.crosshair-layer {
302 302 li.map-panel{
303 303 height: 100%;
304 304 position: relative;
  305 +}
  306 +
  307 +.main-container .load-panel{
  308 + display: block;
  309 + color: #999797;
305 310 }
306 311 \ No newline at end of file
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
  View file @6a8a81a
... ... @@ -131,12 +131,12 @@
131 131 //车辆
132 132 gb_common.carAutocomplete($('.car-autocom', modal), rs);
133 133 });
134   - $.get('/basic/all_personnel', function(rs) {
  134 + //$.get('/basic/all_personnel', function(rs) {
135 135 //驾驶员
136   - gb_common.personAutocomplete($('.jsy-autocom', modal), rs);
  136 + gb_common.personAutocomplete($('.jsy-autocom', modal));
137 137 //售票员
138   - gb_common.personAutocomplete($('.spy-autocom', modal), rs);
139   - });
  138 + gb_common.personAutocomplete($('.spy-autocom', modal));
  139 + //});
140 140  
141 141 //站点路由
142 142 stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function(a, b){
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/tzrc.html
  View file @6a8a81a
... ... @@ -158,18 +158,6 @@
158 158 dl.removeClass('active');
159 159 });
160 160  
161   - //----------- Autocomplete --------------
162   - $.get('/basic/cars', function(rs) {
163   - //车辆
164   - gb_common.carAutocomplete($('.car-autocom', modal), rs);
165   - });
166   - $.get('/basic/all_personnel', function(rs) {
167   - //驾驶员
168   - gb_common.personAutocomplete($('.jsy-autocom', modal), rs);
169   - //售票员
170   - gb_common.personAutocomplete($('.spy-autocom', modal), rs);
171   - });
172   -
173 161 //默认选中项
174 162 $('[name=lineSelect]', modal).val(sch.xlBm).trigger('change');
175 163 $('[name=lpName]', modal).val(sch.lpName).trigger('change');
... ... @@ -184,6 +172,18 @@
184 172  
185 173 gb_ct_table.fixedHead($('.ct_table_wrap', modal));
186 174  
  175 + //----------- Autocomplete --------------
  176 + $.get('/basic/cars', function(rs) {
  177 + //车辆
  178 + gb_common.carAutocomplete($('.car-autocom', modal), rs);
  179 + });
  180 + //$.get('/basic/all_personnel', function(rs) {
  181 + //驾驶员
  182 + gb_common.personAutocomplete($('.jsy-autocom', modal));
  183 + //售票员
  184 + gb_common.personAutocomplete($('.spy-autocom', modal));
  185 + //});
  186 +
187 187 //submit
188 188 var f = $('form.tzrc_form', modal).formValidation(gb_form_validation_opts);
189 189 f.on('success.form.fv', function(e) {
... ...
src/main/resources/static/real_control_v2/js/common.js
  View file @6a8a81a
... ... @@ -177,7 +177,7 @@ var gb_common = (function() {
177 177 };
178 178  
179 179 var personAutocomplete = function(element, personMaps) {
180   - var data = [],name;
  180 + /*var data = [],name;
181 181 for(var jobCode in personMaps){
182 182 name=personMaps[jobCode];
183 183 data.push({
... ... @@ -185,8 +185,9 @@ var gb_common = (function() {
185 185 fullChars: pinyin.getFullChars(name).toUpperCase(),
186 186 camelChars: pinyin.getCamelChars(name)
187 187 });
188   - }
189   - init_autocom_pinyin(element, data);
  188 + }*/
  189 + //init_autocom_pinyin(element, data);
  190 + init_autocom_pinyin(element, gb_data_basic.allPersonnel());
190 191 };
191 192  
192 193 var carAutocomplete=function(element, list){
... ...
src/main/resources/static/real_control_v2/js/data/data_basic.js
  View file @6a8a81a
1 1 /* 基础数据管理模块 */
2 2  
3   -var gb_data_basic = (function() {
  3 +var gb_data_basic = (function () {
4 4  
5   - var stationRoutes,lineCode2NameAll,lineInformations, nbbm2deviceMap;
6   - var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", function(routes, code2Name, informations, nbbm2device) {
7   - stationRoutes = routes;
8   - lineCode2NameAll = code2Name;
9   - lineInformations = informations;
10   - nbbm2deviceMap = nbbm2device;
11   - gb_main_ep.emitLater('data-basic');
12   - });
  5 + var stationRoutes, lineCode2NameAll, lineInformations, nbbm2deviceMap, allPersonnel;
  6 + var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", "all_personnel"
  7 + , function (routes, code2Name, informations, nbbm2device, all_personnel) {
  8 + stationRoutes = routes;
  9 + lineCode2NameAll = code2Name;
  10 + lineInformations = informations;
  11 + nbbm2deviceMap = nbbm2device;
  12 + allPersonnel = all_personnel;
  13 + gb_main_ep.emitLater('data-basic');
  14 + });
13 15  
14 16 var storage = window.localStorage;
15 17 //激活的线路
16 18 var activeLines = JSON.parse(storage.getItem('lineControlItems'));
17 19 //lineCode to line object
18   - var codeToLine={};
  20 + var codeToLine = {};
19 21 //lineCode idx string
20   - var line_idx = (function() {
  22 + var line_idx = (function () {
21 23 var str = '';
22   - for (var i = 0, item; item = activeLines[i++];){
23   - str += (',' + item.lineCode);
24   - codeToLine[item.lineCode] = item;
  24 + for (var i = 0, item; item = activeLines[i++];) {
  25 + str += (',' + item.lineCode);
  26 + codeToLine[item.lineCode] = item;
25 27 }
26 28 return str.substr(1);
27 29 })();
28 30  
29 31 //站点路由
30   - gb_common.$get('/stationroute/multiLine', {lineIds: line_idx}, function(rs) {
  32 + gb_common.$get('/stationroute/multiLine', {lineIds: line_idx}, function (rs) {
31 33 var list = JSON.parse(rs.list);
32 34 ep.emit('stationRoutes', gb_common.groupBy(list, 'lineCode'));
33 35 });
34 36  
35 37 //线路标准信息
36   - gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function(rs){
37   - var informations={};
38   - $.each(rs, function(){
  38 + gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
  39 + var informations = {};
  40 + $.each(rs, function () {
39 41 informations[this.line.lineCode] = this;
40 42 delete this['line'];
41   - });
42   - ep.emit('lineInformations', informations);
  43 + });
  44 + ep.emit('lineInformations', informations);
  45 + });
  46 +
  47 +
  48 + //人员信息
  49 + $.get('/basic/all_personnel', function (rs) {
  50 + //转换成自动补全组件需要的数据
  51 + var data=[],name;
  52 + for(var jobCode in rs){
  53 + name=rs[jobCode];
  54 + data.push({
  55 + value: jobCode+'/'+name,
  56 + fullChars: pinyin.getFullChars(name).toUpperCase(),
  57 + camelChars: pinyin.getCamelChars(name)
  58 + });
  59 + }
  60 + ep.emit('all_personnel', data);
43 61 });
44 62  
45 63 //line code to name
46   - $.get('/basic/lineCode2Name', function(rs){
47   - ep.emit('lineCode2Name', rs);
  64 + $.get('/basic/lineCode2Name', function (rs) {
  65 + ep.emit('lineCode2Name', rs);
48 66 });
49 67  
50 68 //nbbm to device id
51   - $.get('/basic/nbbm2deviceId', function(rs){
52   - ep.emit('nbbm2deviceId', rs);
  69 + $.get('/basic/nbbm2deviceId', function (rs) {
  70 + ep.emit('nbbm2deviceId', rs);
53 71 });
54 72  
55   - function findLineByCodes(codeArr){
56   - var rs=[];
57   - $.each(codeArr, function(){
58   - rs.push(codeToLine[this]);
59   - });
60   - return rs;
  73 + function findLineByCodes(codeArr) {
  74 + var rs = [];
  75 + $.each(codeArr, function () {
  76 + rs.push(codeToLine[this]);
  77 + });
  78 + return rs;
61 79 }
62 80  
63   - var findCodeByLinename = function(name){
64   - for(var code in lineCode2NameAll){
65   - if(name == lineCode2NameAll[code])
66   - return code;
67   - }
  81 + var findCodeByLinename = function (name) {
  82 + for (var code in lineCode2NameAll) {
  83 + if (name == lineCode2NameAll[code])
  84 + return code;
  85 + }
68 86  
69   - return null;
  87 + return null;
70 88 }
71 89  
72   - var getLineInformation=function(lineCode){
73   - return lineInformations[lineCode];
  90 + var getLineInformation = function (lineCode) {
  91 + return lineInformations[lineCode];
74 92 }
75 93 //文件载入完毕
76 94 res_load_ep.emitLater('load_data_basic');
... ... @@ -79,11 +97,20 @@ var gb_data_basic = (function() {
79 97 activeLines: activeLines,
80 98 line_idx: line_idx,
81 99 codeToLine: codeToLine,
82   - nbbm2deviceMap: function(){return nbbm2deviceMap;},
  100 + nbbm2deviceMap: function () {
  101 + return nbbm2deviceMap;
  102 + },
83 103 getLineInformation: getLineInformation,
84   - stationRoutes: function(lineCode){return stationRoutes[lineCode]},
  104 + stationRoutes: function (lineCode) {
  105 + return stationRoutes[lineCode]
  106 + },
85 107 findLineByCodes: findLineByCodes,
86   - lineCode2NameAll: function(){return lineCode2NameAll},
  108 + lineCode2NameAll: function () {
  109 + return lineCode2NameAll
  110 + },
  111 + allPersonnel: function () {
  112 + return allPersonnel;
  113 + },
87 114 findCodeByLinename: findCodeByLinename
88 115 };
89 116 })();
... ...
src/main/resources/static/real_control_v2/main.html
  View file @6a8a81a
... ... @@ -50,7 +50,12 @@
50 50 <div class="north-tabs"></div>
51 51 </div>
52 52  
53   - <div class="main-container"></div>
  53 + <div class="main-container">
  54 + <div class="load-panel">
  55 + <i class="uk-icon-spinner uk-icon-spin"></i>
  56 + 正在加载数据
  57 + </div>
  58 + </div>
54 59  
55 60 <!-- 地图相关 -->
56 61 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" ></script>
... ...