update...

潘钊
1 parent ee48439a
Showing 9 changed files with 45 additions and 202 deletions
src/main/java/com/bsth/XDApplication.java
src/main/resources/static/real_control_v2/fragments/line_schedule/badge_tooltip.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/edit.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
src/main/resources/static/real_control_v2/js/line_schedule/badge_tooltip.js
src/main/resources/static/real_control_v2/js/north/second_timer.js
@@ -88,14 +88,14 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         //抓取GPS数据
         gpsDataLoader.setFlag(-1);
-        sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
         //实际排班更新线程
-        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //实际排班延迟入库线程
-        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
-        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
     }
     public void prodInit(){
@@ -65,7 +65,7 @@
     <script id="sch-table-ldks-tootip-temp" type="text/html">
         <div class="tl-tip-panel">
             <div style="font-size: 13px;">
-                {{qdzName}} 至 {{zdzName}}
+                {{qdzName}} 空驶至 {{zdzName}}
             </div>
         </div>
     </script>
@@ -100,7 +100,7 @@
                 {{else if sch.bcType == "region"}}
                 <span class="uk-badge">区间</span>
                 {{else if sch.bcType == "ldks"}}
-                <span class="uk-badge sch_ldks">空2</span>
+                <span class="uk-badge sch_ldks">空驶</span>
                 {{/if}}
                 {{if sch.sflj}}
                 <span class="uk-badge uk-badge-danger">临加</span>
@@ -75,7 +75,7 @@
                                     {{else if sch.bcType == "region"}}
                                     <span class="uk-badge sch_region">区间</span>
                                     {{else if sch.bcType == "ldks"}}
-                                    <span class="uk-badge sch_ldks">空2</span>
+                                    <span class="uk-badge sch_ldks">空驶</span>
                                     {{/if}}
                                     {{if sch.sflj}}
                                     <span class="uk-badge uk-badge-danger">临加</span>
@@ -128,8 +128,8 @@
             <span class="uk-badge uk-badge-danger">放站</span>
             {{else if bcType == "region"}}
             <span class="uk-badge sch_region">区间</span>
-            {{else if sch.bcType == "ldks"}}
-            <span class="uk-badge uk-badge-notification sch_ldks">空2</span>
+            {{else if bcType == "ldks"}}
+            <span class="uk-badge uk-badge-notification sch_ldks">空驶</span>
             {{/if}}
             {{if sflj}}
             <span class="uk-badge uk-badge-danger">临加</span>
-<div class="uk-modal ct-form-modal ct_move_modal" id="history-sch-edit-modal">
-    <div class="uk-modal-dialog" style="width: 900px;">
-        <a href="" class="uk-modal-close uk-close"></a>
-        <div class="uk-modal-header">
-            <h2>历史班次编辑</h2></div>
-        <form class="uk-form uk-form-horizontal">
-        </form>
-    </div>
-
-    <script id="history-sch-edit-form-temp" type="text/html">
-        <input type="hidden" name="id" value="{{id}}"/>
-
-        <div class="uk-grid">
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >班次类型</label>
-                    <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" disabled data-code="{{bcType}}" name="bcType" data-group=ScheduleType></select>
-                    </div>
-                </div>
-            </div>
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >起点</label>
-                    <div class="uk-form-controls">
-                        <input type="text"  value="{{qdzName}}" disabled>
-                    </div>
-                </div>
-            </div>
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >终点</label>
-                    <div class="uk-form-controls">
-                        <input type="text"  value="{{zdzName}}" disabled>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="uk-grid">
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >车辆</label>
-                    <div class="uk-form-controls">
-                        <div class="uk-autocomplete uk-form car-autocom">
-                            <input type="text" value="{{clZbh}}" name="clZbh" required>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >驾驶员</label>
-                    <div class="uk-form-controls">
-                        <div class="uk-autocomplete uk-form jsy-autocom">
-                            <input type="text" value="{{jGh}}/{{jName}}" name="jsy" required>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="uk-grid">
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >计发</label>
-                    <div class="uk-form-controls">
-                        <input type="text"  value="{{fcsj}}" disabled>
-                    </div>
-                </div>
-            </div>
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >待发</label>
-                    <div class="uk-form-controls">
-                        <input type="text" name="dfsj"  value="{{dfsj}}" required>
-                    </div>
-                </div>
-            </div>
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >实发</label>
-                    <div class="uk-form-controls">
-                        <input type="text" name="fcsjActual"  value="{{fcsjActual}}" >
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="uk-grid">
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >计划里程</label>
-                    <div class="uk-form-controls">
-                        <input type="text"  value="{{jhlc}}" disabled>
-                    </div>
-                </div>
-            </div>
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >计划终点</label>
-                    <div class="uk-form-controls">
-                        <input type="text"  value="{{zdsj}}" disabled>
-                    </div>
-                </div>
-            </div>
-            <div class="uk-width-1-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label" >实际终点</label>
-                    <div class="uk-form-controls">
-                        <input type="text" name="zdsjActual" value="{{zdsjActual}}" >
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="uk-grid">
-            <div class="uk-width-1-1">
-                <div class="uk-form-row ct-stacked">
-                    <label class="uk-form-label" >备注</label>
-                    <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="100" placeholder="备注">{{remarks}}</textarea>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
-            <button type="button" class="uk-button uk-modal-close">取消</button>
-            <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
-        </div>
-    </script>
-
-    <script>
-        (function() {
-            var modal = '#history-sch-edit-modal'
-                    ,sch,parentModal;
-            $(modal).on('init', function(e, data) {
-                var id = data.id;
-                parentModal=data.parentModal;
-
-                $.get('/realSchedule/'+id, function (sch) {
-                    var htmlStr = template('history-sch-edit-form-temp', sch);
-                    $('form', modal).html(htmlStr);
-
-                    //字典转换
-                    dictionaryUtils.transformDom($('.nt-dictionary', 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), rs);
-                        //售票员
-                        gb_common.personAutocomplete($('.spy-autocom', modal), rs);
-                    });
-
-
-                    //submit
-                    var f = $('form', modal).formValidation(gb_form_validation_opts);
-                    f.on('success.form.fv', function(e) {
-                        e.preventDefault();
-                        var data = $(this).serializeJSON();
-
-                        //拆分驾驶员工号和姓名
-                        data.jGh = data.jsy.split('/')[0];
-                        data.jName = data.jsy.split('/')[1];
-                        delete data.jsy;
-                        //拆分售票员工号和姓名
-                        if(data.sGh != null){
-                            data.sGh = data.spy.split('/')[0];
-                            data.sName = data.spy.split('/')[1];
-                            delete data.spy;
-                        }
-
-                        gb_common.$post('/realSchedule/history', data, function (rs) {
-                            //console.log(rs);
-                            UIkit.modal(modal).hide();
-                            $(parentModal).trigger('refresh');
-                        });
-                    });
-                });
-            });
-        })();
-    </script>
-</div>
@@ -86,6 +86,8 @@
                 <span class="uk-badge uk-badge-danger">放站</span>
                 {{else if sch.bcType == "region"}}
                 <span class="uk-badge sch_region">区间</span>
+                {{else if sch.bcType == "ldks"}}
+                <span class="uk-badge sch_ldks">空驶</span>
                 {{/if}}
                 {{if sch.sflj}}
                 <span class="uk-badge uk-badge-danger">临加</span>
@@ -55,7 +55,7 @@
               </li>
               {{/each}}
             </ul>
-            <a class="uk-navbar-brand op-beijingtime-time" title="每次秒数到0与服务器同步一次，睡眠状态唤醒会短暂异常，可鼠标右击横幅任意区域立刻同步！">
+            <a class="uk-navbar-brand op-beijingtime-time" >
                 <span></span>
             </a>
             <div class="uk-navbar-content uk-navbar-flip  uk-hidden-small" style="padding-left: 0;">
@@ -124,7 +124,6 @@ var gb_schedule_badge_tootip = (function () {
         $(this).qtip({
             show: _opts.show,
             content: {
-                title:'两点间空驶',
                 text: function() {
                     return temps['sch-table-ldks-tootip-temp'](getSch(this));
                 }
@@ -19,7 +19,7 @@ var gb_second_timer = (function () {
             setTime();
             secondTimer = window.setInterval(function () {
-                if(0 == now.getSeconds() || true == contextFlag){
+                if (0 == now.getSeconds() || true == contextFlag) {
                     minuteTimer();
                     contextFlag = false;
                 }
@@ -48,7 +48,7 @@ var gb_second_timer = (function () {
             })
     };
-    var timeFormat = function(str) {
+    var timeFormat = function (str) {
         return ("0" + str).slice(-2)
     };
@@ -57,11 +57,41 @@ var gb_second_timer = (function () {
     };
     var minuteTimer = function () {
-        getServerTime(function(time) {
+        getServerTime(function (time) {
             now = time;
             setTime()
         })
     };
     window.setTimeout(init, 6000);
+
+/*    $(document).on('mouseenter', '.op-beijingtime-time', function () {
+        $(this).qtip({
+            show: {ready: true, delay: 300},
+            content: {
+                text: function () {
+                    return '<div class="tl-tip-panel">' +
+                            '<div style="font-size: 13px;">' +
+                            '每次秒数到0与服务器同步一次<br>服务器每10分钟与国家授时中心标准时间同步一次<br>睡眠状态唤醒会短暂异常，可鼠标右击横幅任意区域立刻同步' +
+                            '</div>' +
+                        '</div>';
+                }
+            },
+            position: {
+                viewport: $(window),
+                my: 'top center',
+                at: 'bottom center'
+            },
+            style: {
+                classes: 'qtip-shadow qtip-tipped sch-badge-tip'
+            },
+            hide: {fixed: true, delay: 300},
+            events: {
+                hidden: function(event, api) {
+                    //destroy dom
+                    $(this).qtip('destroy', true);
+                }
+            }
+        });
+    });*/
 })();
 \ No newline at end of file