update

潘钊
1 parent 1b849a09
Showing 6 changed files with 99 additions and 61 deletions
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/tzrc.html
src/main/resources/static/real_control_v2/js/common.js
src/main/resources/static/real_control_v2/js/data/data_basic.js
src/main/resources/static/real_control_v2/main.html
@@ -302,4 +302,9 @@ canvas.crosshair-layer {
 li.map-panel{
   height: 100%;
   position: relative;
+}
+
+.main-container .load-panel{
+    display: block;
+    color: #999797;
 }
 \ No newline at end of file
@@ -131,12 +131,12 @@
                     //车辆
                     gb_common.carAutocomplete($('.car-autocom', modal), rs);
                 });
-                $.get('/basic/all_personnel', function(rs) {
+                //$.get('/basic/all_personnel', function(rs) {
                     //驾驶员
-                    gb_common.personAutocomplete($('.jsy-autocom', modal), rs);
+                    gb_common.personAutocomplete($('.jsy-autocom', modal));
                     //售票员
-                    gb_common.personAutocomplete($('.spy-autocom', modal), rs);
-                });
+                    gb_common.personAutocomplete($('.spy-autocom', modal));
+                //});
                 //站点路由
                 stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function(a, b){
@@ -158,18 +158,6 @@
                         dl.removeClass('active');
                 });
-                //----------- Autocomplete --------------
-                $.get('/basic/cars', function(rs) {
-                    //车辆
-                    gb_common.carAutocomplete($('.car-autocom', modal), rs);
-                });
-                $.get('/basic/all_personnel', function(rs) {
-                    //驾驶员
-                    gb_common.personAutocomplete($('.jsy-autocom', modal), rs);
-                    //售票员
-                    gb_common.personAutocomplete($('.spy-autocom', modal), rs);
-                });
-
                 //默认选中项
                 $('[name=lineSelect]', modal).val(sch.xlBm).trigger('change');
                 $('[name=lpName]', modal).val(sch.lpName).trigger('change');
@@ -184,6 +172,18 @@
                 gb_ct_table.fixedHead($('.ct_table_wrap', modal));
+                //----------- Autocomplete --------------
+                $.get('/basic/cars', function(rs) {
+                    //车辆
+                    gb_common.carAutocomplete($('.car-autocom', modal), rs);
+                });
+                //$.get('/basic/all_personnel', function(rs) {
+                    //驾驶员
+                    gb_common.personAutocomplete($('.jsy-autocom', modal));
+                    //售票员
+                    gb_common.personAutocomplete($('.spy-autocom', modal));
+                //});
+
                 //submit
                 var f = $('form.tzrc_form', modal).formValidation(gb_form_validation_opts);
                 f.on('success.form.fv', function(e) {
@@ -177,7 +177,7 @@ var gb_common = (function() {
     };
     var personAutocomplete = function(element, personMaps) {
-        var data = [],name;
+        /*var data = [],name;
         for(var jobCode in personMaps){
           name=personMaps[jobCode];
           data.push({
@@ -185,8 +185,9 @@ var gb_common = (function() {
               fullChars: pinyin.getFullChars(name).toUpperCase(),
               camelChars: pinyin.getCamelChars(name)
           });
-        }
-        init_autocom_pinyin(element, data);
+        }*/
+        //init_autocom_pinyin(element, data);
+        init_autocom_pinyin(element, gb_data_basic.allPersonnel());
     };
     var carAutocomplete=function(element, list){
 /* 基础数据管理模块 */
-var gb_data_basic = (function() {
+var gb_data_basic = (function () {
-    var stationRoutes,lineCode2NameAll,lineInformations, nbbm2deviceMap;
-    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", function(routes, code2Name, informations, nbbm2device) {
-        stationRoutes = routes;
-        lineCode2NameAll = code2Name;
-        lineInformations = informations;
-        nbbm2deviceMap = nbbm2device;
-        gb_main_ep.emitLater('data-basic');
-    });
+    var stationRoutes, lineCode2NameAll, lineInformations, nbbm2deviceMap, allPersonnel;
+    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", "all_personnel"
+        , function (routes, code2Name, informations, nbbm2device, all_personnel) {
+            stationRoutes = routes;
+            lineCode2NameAll = code2Name;
+            lineInformations = informations;
+            nbbm2deviceMap = nbbm2device;
+            allPersonnel = all_personnel;
+            gb_main_ep.emitLater('data-basic');
+        });
     var storage = window.localStorage;
     //激活的线路
     var activeLines = JSON.parse(storage.getItem('lineControlItems'));
     //lineCode to line object
-    var codeToLine={};
+    var codeToLine = {};
     //lineCode idx string
-    var line_idx = (function() {
+    var line_idx = (function () {
         var str = '';
-        for (var i = 0, item; item = activeLines[i++];){
-          str += (',' + item.lineCode);
-          codeToLine[item.lineCode] = item;
+        for (var i = 0, item; item = activeLines[i++];) {
+            str += (',' + item.lineCode);
+            codeToLine[item.lineCode] = item;
         }
         return str.substr(1);
     })();
     //站点路由
-    gb_common.$get('/stationroute/multiLine', {lineIds: line_idx}, function(rs) {
+    gb_common.$get('/stationroute/multiLine', {lineIds: line_idx}, function (rs) {
         var list = JSON.parse(rs.list);
         ep.emit('stationRoutes', gb_common.groupBy(list, 'lineCode'));
     });
     //线路标准信息
-    gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function(rs){
-        var informations={};
-          $.each(rs, function(){
+    gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
+        var informations = {};
+        $.each(rs, function () {
             informations[this.line.lineCode] = this;
             delete this['line'];
-          });
-          ep.emit('lineInformations', informations);
+        });
+        ep.emit('lineInformations', informations);
+    });
+
+
+    //人员信息
+    $.get('/basic/all_personnel', function (rs) {
+        //转换成自动补全组件需要的数据
+        var data=[],name;
+        for(var jobCode in rs){
+            name=rs[jobCode];
+            data.push({
+                value: jobCode+'/'+name,
+                fullChars: pinyin.getFullChars(name).toUpperCase(),
+                camelChars: pinyin.getCamelChars(name)
+            });
+        }
+        ep.emit('all_personnel', data);
     });
     //line code to name
-    $.get('/basic/lineCode2Name', function(rs){
-      ep.emit('lineCode2Name', rs);
+    $.get('/basic/lineCode2Name', function (rs) {
+        ep.emit('lineCode2Name', rs);
     });
     //nbbm to device id
-    $.get('/basic/nbbm2deviceId', function(rs){
-      ep.emit('nbbm2deviceId', rs);
+    $.get('/basic/nbbm2deviceId', function (rs) {
+        ep.emit('nbbm2deviceId', rs);
     });
-    function findLineByCodes(codeArr){
-      var rs=[];
-      $.each(codeArr, function(){
-        rs.push(codeToLine[this]);
-      });
-      return rs;
+    function findLineByCodes(codeArr) {
+        var rs = [];
+        $.each(codeArr, function () {
+            rs.push(codeToLine[this]);
+        });
+        return rs;
     }
-    var findCodeByLinename = function(name){
-      for(var code in lineCode2NameAll){
-        if(name == lineCode2NameAll[code])
-          return code;
-      }
+    var findCodeByLinename = function (name) {
+        for (var code in lineCode2NameAll) {
+            if (name == lineCode2NameAll[code])
+                return code;
+        }
-      return null;
+        return null;
     }
-    var getLineInformation=function(lineCode){
-      return lineInformations[lineCode];
+    var getLineInformation = function (lineCode) {
+        return lineInformations[lineCode];
     }
     //文件载入完毕
     res_load_ep.emitLater('load_data_basic');
@@ -79,11 +97,20 @@ var gb_data_basic = (function() {
         activeLines: activeLines,
         line_idx: line_idx,
         codeToLine: codeToLine,
-        nbbm2deviceMap: function(){return nbbm2deviceMap;},
+        nbbm2deviceMap: function () {
+            return nbbm2deviceMap;
+        },
         getLineInformation: getLineInformation,
-        stationRoutes: function(lineCode){return stationRoutes[lineCode]},
+        stationRoutes: function (lineCode) {
+            return stationRoutes[lineCode]
+        },
         findLineByCodes: findLineByCodes,
-        lineCode2NameAll: function(){return lineCode2NameAll},
+        lineCode2NameAll: function () {
+            return lineCode2NameAll
+        },
+        allPersonnel: function () {
+            return allPersonnel;
+        },
         findCodeByLinename: findCodeByLinename
     };
 })();
@@ -50,7 +50,12 @@
         <div class="north-tabs"></div>
     </div>
-    <div class="main-container"></div>
+    <div class="main-container">
+        <div class="load-panel">
+            <i class="uk-icon-spinner uk-icon-spin"></i>
+            正在加载数据
+        </div>
+    </div>
     <!-- 地图相关 -->
     <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" ></script>