Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into minhang

王通
2 parents cc96fe44 a5dc1fb3
Showing 7 changed files with 104 additions and 47 deletions
src/main/resources/static/real_control_v2/fragments/line_schedule/layout.html
src/main/resources/static/real_control_v2/main.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_config.html
src/main/resources/static/real_control_v2/mapmonitor/js/config.js
src/main/resources/static/real_control_v2/mapmonitor/real.html
src/main/resources/static/real_control_v2_mobile/fragments/line_schedule/layout.html
src/main/resources/static/real_control_v2_mobile/main.html
@@ -2,7 +2,7 @@
     <!-- line schedule tab body layout template -->
     <script id="cont-line-layout-temp" type="text/html">
         <div class="uk-grid top-container">
-            <div class="uk-width-5-6 uk-grid schedule-wrap">
+            <div class="uk-width-5-6 uk-grid schedule-wrap" style="position: relative">
                 <div class="uk-width-1-2">
                     <div class="card-panel"></div>
                 </div>
@@ -11,7 +11,11 @@
                     <div class="card-panel"></div>
                 </div>
             </div>
-            <div class="uk-width-1-6" style="height: calc(100% - 1px);position: relative;">
+            <div style="width: 1%;position: relative">
+                <div class="menu-toggler sidebar-toggler"
+                     style="border-radius:350px 0 20px 350px;writing-mode:tb-lr;line-height:300%;float: right;margin:auto;background-color:#99CD52;color: white;opacity:0.8;text-align: center;display: block;cursor: pointer;z-index: 9999;width: 100%;height: 120px;background-repeat: no-repeat;background-position: center center;position: absolute;right: 0;top: 0px;bottom: 0px;">通知栏</div>
+            </div>
+            <div class="uk-width-1-6" style="height: calc(100% - 1px);position: relative;width: 15.6%;">
                 <div class="card-panel sys-mailbox" style="overflow: auto;">
                 </div>
                 <div class="mileage_elec_panel">
@@ -57,4 +61,15 @@
             </ul>
         </div>
     </script>
+<script>
+    $('body').on('click','.sidebar-toggler',function(){
+            if ($(".uk-width-1-6").css("display") == "none") {
+                $('.uk-width-5-6').css("width", "82.33%");
+                $('.uk-width-1-6').show();
+            } else {
+                $('.uk-width-5-6').css("width", "98.99%");
+                $('.uk-width-1-6').hide();
+            }
+    })
+</script>
 </div>
@@ -5,17 +5,19 @@
     <meta charset="UTF-8">
     <title>线路调度 v2.0</title>
     <!-- uikit  core style-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" />
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="plugins"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="plugins"/>
-    <link rel="stylesheet"
-          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="plugins"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" merge="plugins"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" merge="plugins"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css"   merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css"
+          merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css"
+          merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css"
+          merge="plugins"/>
     <!-- main style -->
-    <link rel="stylesheet" href="/real_control_v2/css/main.css" />
+    <link rel="stylesheet" href="/real_control_v2/css/main.css"/>
     <!-- north style -->
     <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
     <!-- home style -->
@@ -28,21 +30,23 @@
     <!-- custom table -->
     <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
     <!-- jquery contextMenu style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" merge="plugins"/>
     <!-- formvalidation style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"
+          merge="plugins"/>
     <!-- js tree -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.css" merge="plugins"/>
     <!-- tooltip css-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"  merge="plugins"/>
-    <link rel="stylesheet" href="/real_control_v2/css/pace.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/css/pace.css" merge="plugins"/>
     <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
     <!-- perfect-scrollbar style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css"
+          merge="plugins"/>
     <!-- layer 3.0.3 -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css"  merge="plugins"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css" merge="plugins"/>
     <!-- flatpickr -->
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css" merge="plugins">
@@ -74,12 +78,12 @@
 </div>
 <script>
-/*    var gb_beforeunload_fun = function (e) {
-        var confirmationMessage = "\o/";
-        (e || window.event).returnValue = confirmationMessage;
-        return confirmationMessage;
-    }
-    window.addEventListener("beforeunload", gb_beforeunload_fun);*/
+    /*    var gb_beforeunload_fun = function (e) {
+            var confirmationMessage = "\o/";
+            (e || window.event).returnValue = confirmationMessage;
+            return confirmationMessage;
+        }
+        window.addEventListener("beforeunload", gb_beforeunload_fun);*/
     delete window.exports;
     delete window.module;
@@ -121,7 +125,7 @@
 <!-- jquery actual -->
 <script src="/real_control_v2/assets/js/jquery.actual.min.js" merge="plugins"></script>
 <!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<script src="/assets/plugins/jquery.serializejson.js" merge="plugins"></script>
 <!-- moment.js 日期处理类库 -->
 <script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
 <script src="/real_control_v2/assets/plugins/moment/zh-cn.js"></script>
@@ -131,7 +135,7 @@
 <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" merge="plugins"></script>
 <!-- perfect-scrollbar -->
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" merge="plugins"></script>
 <!-- common js -->
 <script src="/real_control_v2/js/common.js"></script>
 <!-- art-template 模版引擎 -->
@@ -155,14 +159,14 @@
 <!-- jquery contextMenu -->
-<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"  merge="plugins"></script>
-<script src="/real_control_v2/assets/js/jquery.ui.position.min.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js" merge="plugins"></script>
+<script src="/real_control_v2/assets/js/jquery.ui.position.min.js" merge="plugins"></script>
 <!-- formvalidation- -->
-<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js"  merge="plugins"></script>
-<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js"  merge="plugins"></script>
-<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js" merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js" merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js" merge="plugins"></script>
 <!-- js tree -->
-<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js" merge="plugins"></script>
 <!-- simple pinyin -->
 <script src="/assets/plugins/pinyin.js" merge="plugins"></script>
 <!-- qtip -->
@@ -223,9 +227,10 @@
 <script src="/real_control_v2/js/modal_extend.js" merge="custom_js"></script>
 <!-- #### 安全驾驶 start ###  -->
-<div class="safe_driv_pop_wrap" ></div>
+<div class="safe_driv_pop_wrap"></div>
 <script id="safe_driv_item-temp" type="text/html">
-    <div class="safe_driv_pop uk-animation-slide-bottom" data-nbbm="{{clzbh}}" data-type="{{yczltype}}" data-title="{{clzbh}} {{timeStr}} {{ycztText}}" data-url="{{url}}">
+    <div class="safe_driv_pop uk-animation-slide-bottom" data-nbbm="{{clzbh}}" data-type="{{yczltype}}"
+         data-title="{{clzbh}} {{timeStr}} {{ycztText}}" data-url="{{url}}">
         <div>
             <span class="title">异常&nbsp;{{clzbh}}</span>
             <span class="text"> {{timeStr}} 出现违规驾驶（{{ycztText}}）</span>
@@ -234,13 +239,13 @@
     </div>
 </script>
-<script src="/real_control_v2/js/safe_driv/safeDriv.js"  merge="custom_js"></script>
+<script src="/real_control_v2/js/safe_driv/safeDriv.js" merge="custom_js"></script>
 <!-- #### 安全驾驶 end ###  -->
 <!-- 打电话 -->
 <script src="http://114.80.178.12:9003/forward/voip/callCenterJs"></script>
 <script src="http://114.80.178.12:9003/forward/voip/phonePluginJs"></script>
-<script src="/real_control_v2/js/safe_driv/call_phone.js" ></script>
+<script src="/real_control_v2/js/safe_driv/call_phone.js"></script>
 <script id="voip_call_info_panel-temp" type="text/html">
     <div class="voip_call_info_panel" style="{{style}}">
@@ -248,7 +253,7 @@
         <form class="uk-form uk-form-horizontal">
             <div class="uk-form-row">
-                <label class="uk-form-label" >工号:</label>
+                <label class="uk-form-label">工号:</label>
                 <div class="uk-form-controls">
                     <input type="text" name="agentID" value="1002" disabled>
                 </div>
@@ -256,17 +261,17 @@
             <div class="uk-form-row">
                 <label class="uk-form-label" ">分机号:</label>
                 <div class="uk-form-controls">
-                    <input type="text" name="dn" value="" >
+                    <input type="text" name="dn" value="">
                 </div>
             </div>
             <div class="uk-form-row">
-                <label class="uk-form-label" >自编号:</label>
+                <label class="uk-form-label">自编号:</label>
                 <div class="uk-form-controls">
                     <input type="text" value="{{nbbm}}" disabled>
                 </div>
             </div>
             <div class="uk-form-row">
-                <label class="uk-form-label" >SIM号:</label>
+                <label class="uk-form-label">SIM号:</label>
                 <div class="uk-form-controls">
                     <input type="text" name="simNo" disabled>
                 </div>
@@ -281,3 +286,14 @@
 </body>
 </html>
+<script>
+    $('body').on('click','.sidebar-toggler',function(){
+        if ($(".uk-width-1-6").css("display") == "none") {
+            $('.uk-width-5-6').css("width", "83.33%");
+            $('.uk-width-1-6').show();
+        } else {
+            $('.uk-width-5-6').css("width", "98.99%");
+            $('.uk-width-1-6').hide();
+        }
+    })
+</script>
 \ No newline at end of file
@@ -29,7 +29,7 @@
             <div class="uk-form-row">
                 <span class="uk-form-label">异常警报</span>
                 <div class="uk-form-controls">
-                    <label><input type="checkbox" {{if abnormalPrint.speeding}}checked{{/if}}> 超速</label>
+                    <label><input type="checkbox" name="over_speed" {{if abnormalPrint.speeding}}checked{{/if}} id="overSpeed"> 超速</label>
                     <label><input type="checkbox" {{if abnormalPrint.outBounds}}checked{{/if}}> 越界</label>
                     <label><input type="checkbox" {{if abnormalPrint.largeMargin}}checked{{/if}}> 大间隔</label>
                 </div>
@@ -32,6 +32,9 @@ var gb_map_config = (function () {
                 up: 'blue',
                 down: 'red'
             }
+        },
+        exceptionWarn:{
+            overSpeed:false
         }
     };
@@ -87,7 +90,8 @@ var gb_map_config = (function () {
         spatial_data_station: spatial_data_station,
         spatial_data_carPark: spatial_data_carPark,
         spatial_electronicFence: spatial_electronicFence,
-        carIcon_angle: carIcon_angle
+        carIcon_angle: carIcon_angle,
+        over_speed:over_speed
     };
     //切换地图类型
@@ -147,6 +151,14 @@ var gb_map_config = (function () {
         gb_map_overlay_mge.reDrawGps();
     }
+    function over_speed(val){
+        defaultConfig.exceptionWarn.overSpeed=this.checked;
+        if (this.checked)
+            $('.c_b_abnorm_notice').show();
+        else
+            $('.c_b_abnorm_notice').hide();
+    }
+
     function recursion_get_attr(data, attr) {
         var ats = attr.split('.'),
             val = data;
@@ -54,7 +54,7 @@
 </div>
-<div class="c_b_abnorm_notice"></div>
+<div class="c_b_abnorm_notice" style="display: none;"></div>
 <script id="map_abnorm_overspeed_list-temp" type="text/html">
     {{each list as obj i}}
@@ -2,7 +2,7 @@
     <!-- line schedule tab body layout template -->
     <script id="cont-line-layout-temp" type="text/html">
         <div class="uk-grid top-container">
-            <div class="uk-width-5-6 uk-grid schedule-wrap">
+            <div class="uk-width-5-6 uk-grid schedule-wrap";style="width: 80.3%;">
                 <div class="uk-width-1-2">
                     <div class="card-panel"></div>
                 </div>
@@ -11,7 +11,11 @@
                     <div class="card-panel"></div>
                 </div>
             </div>
-            <div class="uk-width-1-6" style="height: calc(100% - 1px);position: relative;">
+            <div style="width: 2%;position: relative;margin-right: 0;">
+                <div class="menu-toggler sidebar-toggler"
+                     style="border-radius:350px 0 20px 350px;writing-mode:tb;line-height:300%;float: right;margin:auto;background-color: #99CD52;color: white;text-align: center;display: block;cursor: pointer;z-index: 9999;width: 100%;height: 130px;background-repeat: no-repeat;background-position: center center;position: absolute;right: 0;top: 0px;bottom: 0px;">通知栏</div>
+            </div>
+            <div class="uk-width-1-6" style="height: calc(100% - 1px);position: relative;width: 14.6%;">
                 <div class="card-panel sys-mailbox" style="overflow: auto;">
                 </div>
                 <div class="mileage_elec_panel">
@@ -65,7 +65,7 @@
         </div>
     </div>
     <div class="north-tabs"></div>
-</div>
+ </div>
 <div class="main-container">
     <div class="load-panel">
@@ -293,4 +293,14 @@
             lastTouchEnd=now;
         },false)
     }
+
+    $('body').on('click','.sidebar-toggler',function(){
+        if ($(".uk-width-1-6").css("display") == "none") {
+            $('.uk-width-5-6').css("width", "82.33%");
+            $('.uk-width-1-6').show();
+        } else {
+            $('.uk-width-5-6').css("width", "97.99%");
+            $('.uk-width-1-6').hide();
+        }
+    })
 </script>
 \ No newline at end of file