update

潘钊
1 parent ea73153e
Showing 10 changed files with 159 additions and 107 deletions
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/real_control_v2/css/electron.css
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/electron/lineSelect.html
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
src/main/resources/static/real_control_v2/js/data/data_basic.js
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
src/main/resources/static/real_control_v2/js/forms/form_embed.js
src/main/resources/static/real_control_v2/js/north/toolbar.js
@@ -337,8 +337,8 @@
                 //alert('进入线调');
                 layer.closeAll();
                 //loadPage('/pages/control/line/index.html');
-                //window.location.href = "/real_control/v2";
-                window.open("/real_control/v2");
+                window.location.href = "/real_control/v2";
+                //window.open("/real_control/v2");
             });
         });
@@ -5,7 +5,7 @@
 }
 .north-toolbar{
-    width: 582px !important;
+    width: 662px !important;
 }
 .north>div.uk-grid.uk-grid-match{
@@ -13,6 +13,7 @@
 .line_schedule div.uk-width-1-6, .line_schedule div.uk-width-1-2 {
     padding: 0 2px 2px 2px;
+    height: 100%;
 }
 .line_schedule .footer-chart {
@@ -5,8 +5,8 @@
 }
 .north.main {
-    /*background: linear-gradient(to right, #082F4A, #125688, #0a3f64);*/
-    background-image: url('/assets/img/title-bg.jpg');
+    background: linear-gradient(to right, #082F4A, #125688, #0a3f64);
+    /*background-image: url('/assets/img/title-bg.jpg');*/
 }
 .north.monitor {
@@ -12,6 +12,21 @@
           href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sortable.gradient.min.css"/>
     <style type="text/css">
+        html,body{
+            background: transparent;
+        }
+
+        body {
+            overflow: hidden;
+            padding: 3px;
+        }
+        .wrapper.ng-scope{
+            box-shadow: 1px 0px 20px 0 rgba(18, 86, 136, 0.41), 1px 3px 20px 0 rgba(18, 86, 136, 0.45);
+            background-position: -15px -18px;
+            border: 1px solid #125688;
+            border-radius: 5px 5px 0 0;
+            background: #fff;
+        }
         ::-webkit-scrollbar {
             width: 16px;
@@ -115,11 +130,52 @@
         #submitBtn:disabled{
             border-color: #ebe9e9;
         }
+
+        .top-tools{
+            height:55px;
+            position: relative;
+            background-image: linear-gradient(to bottom,#125688,#14517b);
+        }
+
+        .icon-span{
+            padding: 6px 13px 10px 13px;
+            cursor: default;
+            -webkit-app-region: no-drag;
+        }
+
+        .icon-span:hover{
+            background: rgba(255, 255, 255, 0.29);
+            border-radius: 3px;
+        }
+
+        .icon-span.close-icon:hover{
+            background: rgb(255, 118, 118);
+        }
+
+        div.title{
+            font-size: 18px;
+            color: #e1e0e0;
+            text-indent: 15px;
+            padding-top: 15px;
+        }
     </style>
 </head>
 <body>
 <div class="wrapper ng-scope">
+    <div class="top-tools" style="-webkit-app-region: drag">
+        <div class="title">
+            选择线路
+        </div>
+        <div style="position: absolute;right: 5px;top: 10px;">
+                <span class="icon-span" id="mnavbarIconBtnMIN">
+                    <img src="/real_control_v2/electron/imgs/minus.png">
+                </span>
+            <span class="icon-span close-icon" id="mnavbarIconBtnCLOSE">
+                    <img src="/real_control_v2/electron/imgs/remove.png">
+                </span>
+        </div>
+    </div>
     <div class="dialog dialog-shadow">
         <form class="uk-form" style="width: 100%;">
             <div class="uk-grid">
@@ -236,11 +292,13 @@
             var rs = [];
             $.each(all, function () {
-                if (this.camelChars.indexOf(t) != -1
-                        || this.fullChars.indexOf(t) != -1
-                        || this.name.indexOf(t) != -1) {
-                    rs.push(this.lineCode);
-                }
+                try{
+                    if (this.camelChars.indexOf(t) != -1
+                            || this.fullChars.indexOf(t) != -1
+                            || this.name.indexOf(t) != -1) {
+                        rs.push(this.lineCode);
+                    }
+                }catch (e){}
             });
             $('.line-btn-list .line-item').hide().each(function () {
@@ -120,11 +120,11 @@
                     </li>
                     {{/each}}
                 </ul>
-                <div class="uk-navbar-content uk-navbar-flip uk-hidden-small">
+                <div class="uk-navbar-content uk-navbar-flip uk-hidden-small" style="padding-left: 0;">
                     <div class="icon-item" id="mnavbarIconBtnMIN" data-uk-tooltip="{pos:'bottom'}" title="最小化">
                         <img src="/real_control_v2/assets/imgs/icon/minus.png">
                     </div>
-                    &nbsp;&nbsp;
+                    &nbsp;
                     <div class="icon-item" id="mnavbarIconBtnCLOSE" data-uk-tooltip="{pos:'bottom'}" title="退出系统">
                         <img src="/real_control_v2/assets/imgs/icon/remove.png">
                     </div>
@@ -164,7 +164,7 @@ var gb_data_basic = (function () {
         //是否是环线
         isLoopLine: function (lineCode) {
             var data = gb_common.groupBy(stationRoutes[lineCode], 'directions');
-            //如果上行起终点距离50米内 并且下行只有2个站点
+            //下行只有2个站点
             var len = data[0].length;
             if (len > 0 && data[1].length == 2) {
                 var first = data[0][0],
@@ -176,7 +176,8 @@ var gb_data_basic = (function () {
                 var fPoint = {latitude: first.station.gLaty, longitude: first.station.gLonx}
                     , ePoint = {latitude: end.station.gLaty, longitude: end.station.gLonx};
-                if (geolib.getDistance(fPoint, ePoint) < 40) {
+                //并且上行起终点距离200米内
+                if (geolib.getDistance(fPoint, ePoint) < 200) {
                     return true;
                 }
             }
@@ -65,7 +65,7 @@
     ]
   },
   {
-    "id": 1,
+    "id": 2,
     "text": "报表管理",
     "clazz": "dropdown-column-2-lg",
     "columns": true,
@@ -78,79 +78,79 @@
           "header": 1
         },
         {
-          "id": 4.5,
+          "id": 2.2,
           "text": "月存油报表",
           "event": "form_oilListMonth",
           "icon": "uk-icon-table"
         },
         {
-          "id": 4.6,
+          "id": 2.3,
           "text": "时刻表分析",
           "event": "form_scheduleAnaly",
           "icon": "uk-icon-table"
         },
         {
-          "id": 4.7,
+          "id": 2.4,
           "text": "调度消息分析",
           "event": "form_message",
           "icon": "uk-icon-table"
         },
         {
-          "id": 4.8,
+          "id": 2.5,
           "text": "指令状态分析",
           "event": "form_commandState",
           "icon": "uk-icon-table"
         },
         {
-          "id": 4.9,
+          "id": 2.6,
           "text": "线路首末班查询",
           "event": "form_firstAndLastBus",
           "icon": "uk-icon-table"
         },
         {
-          "id": 5.0,
+          "id": 2.7,
           "text": "路单数据",
           "event": "form_singledata",
           "icon": "uk-icon-table"
         },
         {
-          "id": 5.1,
+          "id": 2.8,
           "text": "车辆加注",
           "event": "form_vehicleloading",
           "icon": "uk-icon-table"
         },
         {
-          "id": 5.2,
+          "id": 2.9,
           "text": "运营服务阶段报表",
           "event": "form_operationservice",
           "icon": "uk-icon-table"
         },
         {
-          "id": 5.3,
+          "id": 3.0,
           "text": "线路客流量报表",
           "event": "form_linepassengerflow",
           "icon": "uk-icon-table"
         },
         {
-          "id": 5.4,
+          "id": 3.1,
           "text": "换人换车情况统计表",
           "event": "form_changetochange",
           "icon": "uk-icon-table"
         },
         {
-          "id": 5.5,
+          "id": 3.2,
           "text": "营运线路出车率统计表",
           "event": "form_turnoutrate",
           "icon": "uk-icon-table"
         },
         {
-          "id": 5.6,
+          "id": 3.3,
           "text": "班次执行率统计表",
           "event": "form_executionrate",
           "icon": "uk-icon-table"
         },
         {
-          "id": 5.6,
+          "id": 3.4,
           "text": "营运线路名称统计表",
           "event": "form_allline",
           "icon": "uk-icon-table"
@@ -158,84 +158,84 @@
       ],
       [
         {
-          "id": 3.1,
+          "id": 4.1,
           "text": "报表管理",
           "header": 1
         },
         {
-          "id": 3.2,
+          "id": 4.2,
           "text": "行车路单",
           "event": "form_waybill",
           "icon": "uk-icon-table"
         },
         {
-          "id": 3.3,
+          "id": 4.3,
           "text": "调度历史消息",
           "event": "form_history_message",
           "icon": "uk-icon-table"
         },
         {
-          "id": 3.4,
+          "id": 4.4,
           "text": "驾驶员请求台账",
           "event": "form_account",
           "icon": "uk-icon-table"
         },
         {
-          "id": 3.5,
+          "id": 4.5,
           "text": "班次日报表",
           "event": "form_daily",
           "icon": "uk-icon-table"
         },
         {
-          "id": 3.6,
+          "id": 4.6,
           "text": "修正报表",
           "event": "form_correctForm",
           "icon": "uk-icon-table"
         },
         {
-          "id": 3.7,
+          "id": 4.7,
           "text": "统计日报",
           "event": "form_statisticsDaily",
           "icon": "uk-icon-table"
         },
         {
-          "id": 3.8,
+          "id": 4.8,
           "text": "调度日报",
           "event": "form_scheduleDaily",
           "icon": "uk-icon-table"
         },
         {
-          "id": 3.9,
+          "id": 4.9,
           "text": "行车路单日报表",
           "event": "form_waybillday",
           "icon": "uk-icon-table"
         },
         {
-          "id": 4.0,
+          "id": 5.0,
           "text": "班次到离站",
           "event": "form_inoutstation",
           "icon": "uk-icon-table"
         },
         {
-          "id": 4.1,
+          "id": 5.1,
           "text": "班次车辆人员日报表",
           "event": "form_shifday",
           "icon": "uk-icon-table"
         },
         {
-          "id": 4.2,
+          "id": 5.2,
           "text": "班次车辆人员月报表",
           "event": "form_shiftuehiclemanth",
           "icon": "uk-icon-table"
         },
         {
-          "id": 4.3,
+          "id": 5.3,
           "text": "营运服务日报表",
           "event": "form_workDaily",
           "icon": "uk-icon-table"
         },
         {
-          "id": 4.4,
+          "id": 5.4,
           "text": "计划车辆班次人员",
           "event": "form_peopleCarPlan",
           "icon": "uk-icon-table"
@@ -244,47 +244,47 @@
     ]
   },
   {
-    "id": 2,
+    "id": 3,
     "text": "车载设备",
     "children": [
       {
-        "id": 2.1,
+        "id": 3.1,
         "text": "设备管理",
         "event": "all_devices"
       },
       {
-        "id": 2.3,
+        "id": 3.2,
         "text": "指令下发记录",
         "event": "directive_history"
       },
       {
-        "id": 2.2,
+        "id": 3.3,
         "text": "设备上报记录",
         "event": "device_report"
       },
       {
-        "id": 2.3,
+        "id": 3.4,
         "text": "轨迹回放",
         "event": "gps_play_back"
       }
     ]
   },
   {
-    "id": 3,
+    "id": 4,
     "text": "系统设置",
     "children": [
       {
-        "id": 3.1,
+        "id": 4.1,
         "text": "线路配置",
         "event": "line_config"
       },
       {
-        "id": 3.2,
+        "id": 4.2,
         "text": "TTS",
         "event": "tts_config"
       },
       {
-        "id": 3.3,
+        "id": 4.3,
         "text": "信号标记",
         "event": "signal_state"
       }
@@ -11,40 +11,32 @@ var gb_embed_form_hanlde = (function () {
         temps = gb_common.compileTempByDom(dom, {escape: false});
     });
-    //setTimeout(loadPlugins, 5000);
+    /**
+     * 打开表单片段
+     * @param pageUrl
+     */
+    var open_modal_form_fragment = function (pageUrl, title) {
+        //modal ID
+        var id = '#formFragmentModal';
+
+        if($(id+'.uk-modal').length > 0){
+            $(id).remove();
+        }
+
+        //将片段路径写入 localStorage
+        window.localStorage.setItem('real_control_form_embed_pageUrl', pageUrl);
+        //包裹页面
+        var wrapUrl = '/real_control_v2/js/forms/wrap.html?origin=real_control_iframe';
+        var htmlStr = gb_embed_form_hanlde.temps()['forms-embed-modal-temp']({pageUrl: wrapUrl, title: title});
+        $(document.body).append(htmlStr);
+        UIkit.modal(id, {bgclose: false}).show();
+    };
     return {
         temps: function () {
             return temps;
-        }
+        },
+        open_modal_form_fragment: open_modal_form_fragment
     }
 })();
-/**
- * 打开表单片段
- * @param pageUrl
- */
-var open_modal_form_fragment = function (pageUrl, title) {
-    //将片段路径写入 localStorage
-    window.localStorage.setItem('real_control_form_embed_pageUrl', pageUrl);
-    //包裹页面
-    var wrapUrl = '/real_control_v2/js/forms/wrap.html?origin=real_control_iframe';
-    //modal ID
-    var id = '#formFragmentModal';
-
-    var htmlStr = gb_embed_form_hanlde.temps()['forms-embed-modal-temp']({pageUrl: wrapUrl, title: title});
-    $(document.body).append(htmlStr);
-    UIkit.modal(id, {bgclose: false}).show();
-};
-
-
-/*function setIframeHeight(iframe) {
-    setTimeout(function () {
-        if (iframe) {
-            var iframeWin = iframe.contentWindow || iframe.contentDocument.parentWindow;
-            if (iframeWin.document.body) {
-                iframe.height = iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight;
-            }
-        }
-    }, 800);
-};*/
@@ -100,82 +100,82 @@ var gb_northToolbar = (function () {
             open_modal('/real_control_v2/fragments/north/nav/cache_data/list.html', {}, modal_opts);
         },
         form_waybill: function () {
-            open_modal_form_fragment('/pages/forms/statement/waybill.html', '行车路单');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/waybill.html', '行车路单');
         },
         form_history_message: function () {
-            open_modal_form_fragment('/pages/forms/statement/historyMessage.html', '调度历史消息');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/historyMessage.html', '调度历史消息');
         },
         form_account: function () {
-            open_modal_form_fragment('/pages/forms/statement/account.html', '驾驶员请求台账');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/account.html', '驾驶员请求台账');
         },
         form_daily: function () {
-            open_modal_form_fragment('/pages/forms/statement/daily.html', '班次日报表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/daily.html', '班次日报表');
         },
         form_correctForm: function () {
-            open_modal_form_fragment('/pages/forms/statement/correctForm.html', '修正报表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/correctForm.html', '修正报表');
         },
         form_statisticsDaily: function () {
-            open_modal_form_fragment('/pages/forms/statement/statisticsDaily.html', '统计日报');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/statisticsDaily.html', '统计日报');
         },
         form_scheduleDaily: function () {
-            open_modal_form_fragment('/pages/forms/statement/scheduleDaily.html', '调度日报');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleDaily.html', '调度日报');
         },
         form_waybillday: function () {
-            open_modal_form_fragment('/pages/forms/statement/waybillday.html', '行车路单日报表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/waybillday.html', '行车路单日报表');
         },
         form_inoutstation: function () {
-            open_modal_form_fragment('/pages/report/inoutstation.html', '班次到离站');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/report/inoutstation.html', '班次到离站');
         },
         form_shifday: function () {
-            open_modal_form_fragment('/pages/mforms/shifdays/shifday.html', '班次车辆人员日报表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/shifdays/shifday.html', '班次车辆人员日报表');
         },
         form_shiftuehiclemanth: function () {
-            open_modal_form_fragment('/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html', '班次车辆人员月报表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html', '班次车辆人员月报表');
         },
         form_workDaily: function () {
-            open_modal_form_fragment('/pages/forms/statement/workDaily.html', '营运服务日报表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/workDaily.html', '营运服务日报表');
         },
         form_peopleCarPlan: function () {
-            open_modal_form_fragment('/pages/forms/statement/peopleCarPlan.html', '计划车辆班次人员');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/peopleCarPlan.html', '计划车辆班次人员');
         },
         form_oilListMonth: function () {
-            open_modal_form_fragment('/pages/report/oil/oilListMonth.html', '月存油报表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/report/oil/oilListMonth.html', '月存油报表');
         },
         form_scheduleAnaly: function () {
-            open_modal_form_fragment('/pages/forms/statement/scheduleAnaly.html', '时刻表分析');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleAnaly.html', '时刻表分析');
         },
         form_message: function () {
-            open_modal_form_fragment('/pages/report/message/message.html', '调度消息分析');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/report/message/message.html', '调度消息分析');
         },
         form_commandState: function () {
-            open_modal_form_fragment('/pages/forms/statement/commandState.html', '指令状态分析');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/commandState.html', '指令状态分析');
         },
         form_firstAndLastBus: function () {
-            open_modal_form_fragment('/pages/forms/statement/firstAndLastBus.html', '线路首末班查询');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/firstAndLastBus.html', '线路首末班查询');
         },
         form_singledata: function () {
-            open_modal_form_fragment('/pages/mforms/singledatas/singledata.html', '路单数据');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/singledatas/singledata.html', '路单数据');
         },
         form_vehicleloading: function () {
-            open_modal_form_fragment('/pages/mforms/vehicleloadings/vehicleloading.html', '车辆加注');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/vehicleloadings/vehicleloading.html', '车辆加注');
         },
         form_operationservice: function () {
-            open_modal_form_fragment('/pages/mforms/operationservices/operationservice.html', '运营服务阶段报表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/operationservices/operationservice.html', '运营服务阶段报表');
         },
         form_linepassengerflow: function () {
-            open_modal_form_fragment('/pages/mforms/linepassengerflows/linepassengerflow.html', '线路客流量报表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/linepassengerflows/linepassengerflow.html', '线路客流量报表');
         },
         form_changetochange: function () {
-            open_modal_form_fragment('/pages/mforms/changetochanges/changetochange.html', '换人换车情况统计表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/changetochanges/changetochange.html', '换人换车情况统计表');
         },
         form_turnoutrate: function () {
-            open_modal_form_fragment('/pages/mforms/changetochanges/turnoutrate.html', '营运线路出车率统计表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/changetochanges/turnoutrate.html', '营运线路出车率统计表');
         },
         form_executionrate: function () {
-            open_modal_form_fragment('/pages/mforms/executionrates/executionrate.html', '班次执行率统计表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/executionrates/executionrate.html', '班次执行率统计表');
         },
         form_allline: function () {
-            open_modal_form_fragment('/pages/mforms/alllines/allline.html', '营运线路名称统计表');
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/mforms/alllines/allline.html', '营运线路名称统计表');
         }
     };