update...

潘钊
1 parent 7a5a1e9a
Showing 6 changed files with 220 additions and 13 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/resources/static/pages/history_sch/edit/history_sch_maintain.html
src/main/resources/static/pages/history_sch/edit/js/data_basic.js
src/main/resources/static/pages/history_sch/edit/main_page.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/editor.html
src/main/resources/static/real_control_v2/js/north/toolbar.js
@@ -549,9 +549,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
 		List<String> rs = new ArrayList<>();
  
-		long t = new Date().getTime();
+		long t = System.currentTimeMillis();
 		if(c != 1)
-		 	t -= ONE_DAY - (1000 * 60 * 60 * 2);
+		 	t -= (ONE_DAY + (1000 * 60 * 60 * 2));
 		for(int i = 0; i < 3; i ++){
 			rs.add(fmtyyyyMMdd.print(t));
 			t -= ONE_DAY;
 <div class="uk-modal " id="history-sch-maintain-modal" style="">
-    <div class="uk-modal-dialog" style="width: 95%;">
+    <div class="uk-modal-dialog" style="width: 95%;margin: 20px auto;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
         <h2>历史路单维护</h2>
@@ -37,7 +37,7 @@
                         <input type="text" name="jGh_like" placeholder="驾驶员" style="width: 80px;">
                     </div>
                     <button class="uk-button">检索</button>
-                    <a class="add_lp_link" ><i class="uk-icon-plus"></i> 临加路牌</a>
+                    <a class="add_lp_link" title="先点击检索后再临加路牌"><i class="uk-icon-plus"></i> 临加路牌</a>
                 </fieldset>
             </form>
         </div>
@@ -131,7 +131,7 @@
                     $('.h-s-time', modal).html(tsStr);
                     clearLpSelect();
                     //reLoadLp=true;
-                    jsQuery();
+                    //jsQuery();
                 });
             });
  
@@ -176,6 +176,8 @@
                 data.subCompanyId=null;
                 var rq = $('.h-s-time li.uk-active', modal).text();
                 data.scheduleDateStr_eq = rq;
+                if(!data.xlBm_eq)
+                    return notify_err('请选择线路...');
                 if(data.jGh_like.indexOf('/')!=-1){
                     var jsy=data.jGh_like.split('/');
                     data.jGh_like=jsy[0];
@@ -226,6 +228,9 @@
                     $('.history-sch-wrap', modal).perfectScrollbar('update');
  
                     cb && cb();
+
+                    //初始化依赖数据
+                    gb_data_basic.initData(data.xlBm_eq);
                 });
             }
  
@@ -376,9 +381,10 @@
                 });
  
                 var lpName = '临' + (index + 1);
+                var lineSelect = $('[name=xlBm_eq]', modal);
                 var rq = $('.h-s-time li.uk-active', modal).text(),
-                        lineName = $('.h-s-line li.uk-active', modal).text(),
-                        lineCode = $('.h-s-line li.uk-active', modal).data('id');
+                        lineName = lineSelect[0].options[lineSelect[0].selectedIndex].text,//$('.h-s-line li.uk-active', modal).text(),
+                        lineCode = lineSelect.val();
  
                 var sch = {
                     scheduleDateStr: rq,
@@ -467,6 +473,9 @@
                 }
                 $('[name=xlBm_eq]', f).html(opts);
             });
+
+            $('[name=xlBm_eq]', f).on('change', clearLpSelect);
+            //clearLpSelect
         })();
     </script>
 </div>
 \ No newline at end of file
+/* 基础数据管理模块 */
+
+var gb_data_basic = (function () {
+
+    var allPersonnel;
+    var stationRoutes, lineInformations, codeToLine={};
+    var ep = EventProxy.create("all_personnel"
+        , function (all_personnel) {
+            allPersonnel = all_personnel;
+            //gb_main_ep.emitLater('data-basic');
+        });
+
+/*    //线路标准信息
+    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);
+    });*/
+
+    //人员信息
+    loadAllPersonnel(function (data) {
+        ep.emit('all_personnel', data);
+    });
+    function loadAllPersonnel(cb) {
+        $.get('/personnel/all_py', function (rs) {
+            //转换成自动补全组件需要的数据
+            var data = [], code;
+            for(var i =0, p; p = rs[i++];){
+                code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
+                data.push({
+                    value: code + '/' + p.name,
+                    fullChars: p.fullChars.toUpperCase(),
+                    camelChars: p.camelChars.toUpperCase()
+                });
+            }
+            cb && cb(data);
+        });
+    }
+
+    var carparks = {};
+    //停车场数据
+    gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+        rs.list.sort(function (a, b) {
+           return a.parkName.localeCompare(b.parkName);
+        });
+        $.each(rs.list, function () {
+            carparks[this.parkCode] = this;
+        });
+    });
+
+    //车辆数据
+    var carsArray;
+    $.get('/basic/cars?t=' + Math.random(), function (rs) {
+        carsArray = rs;
+    });
+
+    var getCarparkByCode = function (code) {
+        return carparks[code];
+    };
+
+    //line code to name
+    $.get('/basic/lineCode2Name', function (rs) {
+        ep.emit('lineCode2Name', rs);
+    });
+
+    var getLineInformation = function (lineCode) {
+        return lineInformations[lineCode];
+    };
+
+    var stationRouteSort = function (a, b) {
+        return a.stationRouteCode - b.stationRouteCode;
+    };
+
+    function findLineByCodes(codeArr) {
+        var rs = [];
+        $.each(codeArr, function () {
+            rs.push(codeToLine[this]);
+        });
+        return rs;
+    }
+
+    return {
+        getLineInformation: getLineInformation,
+        allInformations: function () {
+            return {};
+        },
+        allPersonnel: function () {
+            return allPersonnel;
+        },
+        getSvgAttr: function (lineCode) {
+            return svgAttrs[lineCode];
+        },
+        //刷新员工信息
+        refreshAllPersonnel: function (cb) {
+            loadAllPersonnel(function (data) {
+                allPersonnel = data;
+                cb && cb();
+            });
+        },
+        carsArray: function () {
+            return carsArray;
+        },
+        simpleParksArray: function () {
+            var map = {};
+            for(var code in carparks)
+                map[code] = carparks[code].parkName;
+            return map;
+        },
+        getLineInformation: getLineInformation,
+        allInformations: function () {
+            return lineInformations;
+        },
+        stationRoutes: function (lineCode) {
+            return stationRoutes[lineCode]
+        },
+        remarksMapps: function () {
+            return "";
+        },
+        findLineByCodes: findLineByCodes,
+        //初始化依赖数据
+        initData: function (lineCode) {
+            var ep = EventProxy.create("stationRoutes",  "lineInformations", "codeToLineMap", function (routes, informations, _codeToLine) {
+                stationRoutes = routes;
+                lineInformations = informations;
+                codeToLine[_codeToLine.lineCode] = _codeToLine;
+            });
+
+            //站点路由
+            gb_common.$get('/stationroute/multiLine', {lineIds: lineCode}, function (rs) {
+                var list = rs.list;
+                var routeData = gb_common.groupBy(list, 'lineCode');
+                //排序
+                for (var lineCode in routeData) {
+                    routeData[lineCode].sort(stationRouteSort);
+                }
+                ep.emitLater('stationRoutes', routeData);
+            });
+
+            //线路标准信息
+            gb_common.$get('/lineInformation/line/multi', {lineCodes: lineCode}, function (rs) {
+                var _informations = {};
+                $.each(rs, function () {
+                    _informations[this.line.lineCode] = this;
+                    delete this['line'];
+                });
+                ep.emitLater('lineInformations', _informations);
+            });
+
+            //线路基础信息
+            gb_common.$get('/line/' + lineCode, {}, function (rs) {
+                ep.emitLater('codeToLineMap', rs);
+            });
+        }
+    };
+})();
@@ -17,6 +17,8 @@
     <link rel="stylesheet" href="/pages/history_sch/edit/css/main.css" />
     <!-- north style -->
     <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
+    <!-- line style -->
+    <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css" merge="custom_style"/>
  
     <!-- custom table -->
     <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
@@ -33,6 +35,10 @@
             cursor: default;
             user-select: none;
         }
+        .uk-modal.ct_move_modal .uk-modal-dialog {
+            position: relative !important;
+            margin: 50px auto !important;
+        }
     </style>
 </head>
  
@@ -63,8 +69,6 @@
 <script src="/assets/js/d3.min.js"></script>
 <!-- EventProxy  -->
 <script src="/assets/js/eventproxy.js"></script>
-<!-- main js -->
-<script src="/real_control_v2/js/main.js"></script>
 <!-- uikit core -->
 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js" merge="uikit_js"></script>
 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js" merge="uikit_js"></script>
@@ -95,7 +99,10 @@
 <!-- custom table js -->
 <script src="/real_control_v2/js/utils/ct_table.js" merge="custom_js"></script>
 <script src="/pages/history_sch/edit/js/modal_extend.js" merge="custom_js"></script>
-
+<!-- 字典相关 -->
+<script src="/assets/js/dictionary.js" merge="custom_js"></script>
+<!-- 数据 -->
+<script src="/pages/history_sch/edit/js/data_basic.js" merge="custom_js"></script>
 <script>
  
     (function () {
@@ -104,6 +111,39 @@
             bgclose: false
         });
     })();
+
+    var notify_err = function (t) {
+        UIkit.notify("<i class='uk-icon-times'></i> " + t, {
+            status: 'danger'
+        });
+    };
+
+    var gb_form_validation_opts = {
+        framework: 'uikit',
+        locale: 'zh_CN',
+        icon: {
+            valid: 'uk-icon-check',
+            invalid: 'uk-icon-times',
+            validating: 'uk-icon-refresh'
+        }
+    };
+
+    var disabled_submit_btn = function (form) {
+        var subBtn = $('button[type=submit]', form);
+        if (subBtn) {
+            subBtn.addClass('disabled').attr('disabled', 'disabled');
+        }
+    };
+
+    var notify_succ = function (t) {
+        UIkit.notify("<i class='uk-icon-check'></i> " + t, {
+            status: 'success'
+        });
+    };
+
+    var hide_wait_modal = function () {
+        UIkit.modal('#gb_wait_modal').hide();
+    };
 </script>
 </body>
 </html>
 \ No newline at end of file
@@ -186,9 +186,9 @@
                 <a class="uk-button uk-button-success"><i class="uk-icon-pencil-square-o"></i> 添加子任务 <i class="uk-icon-caret-down"></i></a>
                 <div class="uk-dropdown" style="text-align: left;">
                     <ul class="uk-nav uk-nav-dropdown child_task_list">
-                        <li data-method="add_oil"><a>空驶进出场</a></li>
+                        <!--<li data-method="add_oil"><a>空驶进出场</a></li>
                         <li data-method="in_park"><a>进场</a></li>
-                        <li data-method="out_park"><a>出场</a></li>
+                        <li data-method="out_park"><a>出场</a></li>-->
                         <li data-method="other"><a>自定义</a></li>
                     </ul>
                 </div>
@@ -126,7 +126,7 @@ var gb_northToolbar = (function () {
             open_modal('/real_control_v2/fragments/north/nav/cache_data/list.html', {}, modal_opts);
         },
         form_waybill: function () {
-            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/waybill.html', '行车路单');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/<dd>上行</dd>', '行车路单');
         },
         form_waybillQp: function () {
             gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/waybillQp.html', '行车路单');