潘钊 / bsth_control · Commits

Commit a5dc1fb37c788ed3c028607888b212cf0721d77e

Authored by lizhuojun
1 parent 7df1f744
build: skipped

线调 通知栏伸缩 地图 超速报警显示隐藏

Inline Side-by-side
Showing 7 changed files with 104 additions and 47 deletions
src/main/resources/static/real_control_v2/fragments/line_schedule/layout.html
  View file @a5dc1fb
... ... @@ -2,7 +2,7 @@
2 2 <!-- line schedule tab body layout template -->
3 3 <script id="cont-line-layout-temp" type="text/html">
4 4 <div class="uk-grid top-container">
5   - <div class="uk-width-5-6 uk-grid schedule-wrap">
  5 + <div class="uk-width-5-6 uk-grid schedule-wrap" style="position: relative">
6 6 <div class="uk-width-1-2">
7 7 <div class="card-panel"></div>
8 8 </div>
... ... @@ -11,7 +11,11 @@
11 11 <div class="card-panel"></div>
12 12 </div>
13 13 </div>
14   - <div class="uk-width-1-6" style="height: calc(100% - 1px);position: relative;">
  14 + <div style="width: 1%;position: relative">
  15 + <div class="menu-toggler sidebar-toggler"
  16 + 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>
  17 + </div>
  18 + <div class="uk-width-1-6" style="height: calc(100% - 1px);position: relative;width: 15.6%;">
15 19 <div class="card-panel sys-mailbox" style="overflow: auto;">
16 20 </div>
17 21 <div class="mileage_elec_panel">
... ... @@ -57,4 +61,15 @@
57 61 </ul>
58 62 </div>
59 63 </script>
  64 +<script>
  65 + $('body').on('click','.sidebar-toggler',function(){
  66 + if ($(".uk-width-1-6").css("display") == "none") {
  67 + $('.uk-width-5-6').css("width", "82.33%");
  68 + $('.uk-width-1-6').show();
  69 + } else {
  70 + $('.uk-width-5-6').css("width", "98.99%");
  71 + $('.uk-width-1-6').hide();
  72 + }
  73 + })
  74 +</script>
60 75 </div>
... ...
src/main/resources/static/real_control_v2/main.html
  View file @a5dc1fb
... ... @@ -5,17 +5,19 @@
5 5 <meta charset="UTF-8">
6 6 <title>线路调度 v2.0</title>
7 7 <!-- uikit core style-->
8   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" />
9   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="plugins"/>
10   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="plugins"/>
11   - <link rel="stylesheet"
12   - href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="plugins"/>
13   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" merge="plugins"/>
14   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" merge="plugins"/>
15   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css" merge="plugins"/>
  8 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css"/>
  9 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="plugins"/>
  10 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="plugins"/>
  11 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="plugins"/>
  12 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css"
  13 + merge="plugins"/>
  14 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css"
  15 + merge="plugins"/>
  16 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css"
  17 + merge="plugins"/>
16 18  
17 19 <!-- main style -->
18   - <link rel="stylesheet" href="/real_control_v2/css/main.css" />
  20 + <link rel="stylesheet" href="/real_control_v2/css/main.css"/>
19 21 <!-- north style -->
20 22 <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
21 23 <!-- home style -->
... ... @@ -28,21 +30,23 @@
28 30 <!-- custom table -->
29 31 <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
30 32 <!-- jquery contextMenu style -->
31   - <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" merge="plugins"/>
  33 + <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" merge="plugins"/>
32 34 <!-- formvalidation style -->
33   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css" merge="plugins"/>
  35 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"
  36 + merge="plugins"/>
34 37 <!-- js tree -->
35   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.css" merge="plugins"/>
  38 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.css" merge="plugins"/>
36 39 <!-- tooltip css-->
37   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css" merge="plugins"/>
38   - <link rel="stylesheet" href="/real_control_v2/css/pace.css" merge="plugins"/>
  40 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css" merge="plugins"/>
  41 + <link rel="stylesheet" href="/real_control_v2/css/pace.css" merge="plugins"/>
39 42  
40 43 <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
41 44 <!-- perfect-scrollbar style -->
42   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
  45 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css"
  46 + merge="plugins"/>
43 47 <!-- layer 3.0.3 -->
44   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css" merge="plugins"/>
45   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css" merge="plugins"/>
  48 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css" merge="plugins"/>
  49 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css" merge="plugins"/>
46 50  
47 51 <!-- flatpickr -->
48 52 <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css" merge="plugins">
... ... @@ -74,12 +78,12 @@
74 78 </div>
75 79  
76 80 <script>
77   -/* var gb_beforeunload_fun = function (e) {
78   - var confirmationMessage = "\o/";
79   - (e || window.event).returnValue = confirmationMessage;
80   - return confirmationMessage;
81   - }
82   - window.addEventListener("beforeunload", gb_beforeunload_fun);*/
  81 + /* var gb_beforeunload_fun = function (e) {
  82 + var confirmationMessage = "\o/";
  83 + (e || window.event).returnValue = confirmationMessage;
  84 + return confirmationMessage;
  85 + }
  86 + window.addEventListener("beforeunload", gb_beforeunload_fun);*/
83 87  
84 88 delete window.exports;
85 89 delete window.module;
... ... @@ -121,7 +125,7 @@
121 125 <!-- jquery actual -->
122 126 <script src="/real_control_v2/assets/js/jquery.actual.min.js" merge="plugins"></script>
123 127 <!-- jquery.serializejson JSON序列化插件 -->
124   -<script src="/assets/plugins/jquery.serializejson.js" merge="plugins"></script>
  128 +<script src="/assets/plugins/jquery.serializejson.js" merge="plugins"></script>
125 129 <!-- moment.js 日期处理类库 -->
126 130 <script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
127 131 <script src="/real_control_v2/assets/plugins/moment/zh-cn.js"></script>
... ... @@ -131,7 +135,7 @@
131 135 <script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" merge="plugins"></script>
132 136  
133 137 <!-- perfect-scrollbar -->
134   -<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" merge="plugins"></script>
  138 +<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" merge="plugins"></script>
135 139 <!-- common js -->
136 140 <script src="/real_control_v2/js/common.js"></script>
137 141 <!-- art-template 模版引擎 -->
... ... @@ -155,14 +159,14 @@
155 159  
156 160  
157 161 <!-- jquery contextMenu -->
158   -<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js" merge="plugins"></script>
159   -<script src="/real_control_v2/assets/js/jquery.ui.position.min.js" merge="plugins"></script>
  162 +<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js" merge="plugins"></script>
  163 +<script src="/real_control_v2/assets/js/jquery.ui.position.min.js" merge="plugins"></script>
160 164 <!-- formvalidation- -->
161   -<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js" merge="plugins"></script>
162   -<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js" merge="plugins"></script>
163   -<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js" merge="plugins"></script>
  165 +<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js" merge="plugins"></script>
  166 +<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js" merge="plugins"></script>
  167 +<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js" merge="plugins"></script>
164 168 <!-- js tree -->
165   -<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js" merge="plugins"></script>
  169 +<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js" merge="plugins"></script>
166 170 <!-- simple pinyin -->
167 171 <script src="/assets/plugins/pinyin.js" merge="plugins"></script>
168 172 <!-- qtip -->
... ... @@ -223,9 +227,10 @@
223 227 <script src="/real_control_v2/js/modal_extend.js" merge="custom_js"></script>
224 228  
225 229 <!-- #### 安全驾驶 start ### -->
226   -<div class="safe_driv_pop_wrap" ></div>
  230 +<div class="safe_driv_pop_wrap"></div>
227 231 <script id="safe_driv_item-temp" type="text/html">
228   - <div class="safe_driv_pop uk-animation-slide-bottom" data-nbbm="{{clzbh}}" data-type="{{yczltype}}" data-title="{{clzbh}} {{timeStr}} {{ycztText}}" data-url="{{url}}">
  232 + <div class="safe_driv_pop uk-animation-slide-bottom" data-nbbm="{{clzbh}}" data-type="{{yczltype}}"
  233 + data-title="{{clzbh}} {{timeStr}} {{ycztText}}" data-url="{{url}}">
229 234 <div>
230 235 <span class="title">异常&nbsp;{{clzbh}}</span>
231 236 <span class="text"> {{timeStr}} 出现违规驾驶（{{ycztText}}）</span>
... ... @@ -234,13 +239,13 @@
234 239 </div>
235 240 </script>
236 241  
237   -<script src="/real_control_v2/js/safe_driv/safeDriv.js" merge="custom_js"></script>
  242 +<script src="/real_control_v2/js/safe_driv/safeDriv.js" merge="custom_js"></script>
238 243 <!-- #### 安全驾驶 end ### -->
239 244  
240 245 <!-- 打电话 -->
241 246 <script src="http://114.80.178.12:9003/forward/voip/callCenterJs"></script>
242 247 <script src="http://114.80.178.12:9003/forward/voip/phonePluginJs"></script>
243   -<script src="/real_control_v2/js/safe_driv/call_phone.js" ></script>
  248 +<script src="/real_control_v2/js/safe_driv/call_phone.js"></script>
244 249  
245 250 <script id="voip_call_info_panel-temp" type="text/html">
246 251 <div class="voip_call_info_panel" style="{{style}}">
... ... @@ -248,7 +253,7 @@
248 253 <form class="uk-form uk-form-horizontal">
249 254  
250 255 <div class="uk-form-row">
251   - <label class="uk-form-label" >工号:</label>
  256 + <label class="uk-form-label">工号:</label>
252 257 <div class="uk-form-controls">
253 258 <input type="text" name="agentID" value="1002" disabled>
254 259 </div>
... ... @@ -256,17 +261,17 @@
256 261 <div class="uk-form-row">
257 262 <label class="uk-form-label" ">分机号:</label>
258 263 <div class="uk-form-controls">
259   - <input type="text" name="dn" value="" >
  264 + <input type="text" name="dn" value="">
260 265 </div>
261 266 </div>
262 267 <div class="uk-form-row">
263   - <label class="uk-form-label" >自编号:</label>
  268 + <label class="uk-form-label">自编号:</label>
264 269 <div class="uk-form-controls">
265 270 <input type="text" value="{{nbbm}}" disabled>
266 271 </div>
267 272 </div>
268 273 <div class="uk-form-row">
269   - <label class="uk-form-label" >SIM号:</label>
  274 + <label class="uk-form-label">SIM号:</label>
270 275 <div class="uk-form-controls">
271 276 <input type="text" name="simNo" disabled>
272 277 </div>
... ... @@ -281,3 +286,14 @@
281 286 </body>
282 287  
283 288 </html>
  289 +<script>
  290 + $('body').on('click','.sidebar-toggler',function(){
  291 + if ($(".uk-width-1-6").css("display") == "none") {
  292 + $('.uk-width-5-6').css("width", "83.33%");
  293 + $('.uk-width-1-6').show();
  294 + } else {
  295 + $('.uk-width-5-6').css("width", "98.99%");
  296 + $('.uk-width-1-6').hide();
  297 + }
  298 + })
  299 +</script>
284 300 \ No newline at end of file
... ...
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_config.html
  View file @a5dc1fb
... ... @@ -29,7 +29,7 @@
29 29 <div class="uk-form-row">
30 30 <span class="uk-form-label">异常警报</span>
31 31 <div class="uk-form-controls">
32   - <label><input type="checkbox" {{if abnormalPrint.speeding}}checked{{/if}}> 超速</label>
  32 + <label><input type="checkbox" name="over_speed" {{if abnormalPrint.speeding}}checked{{/if}} id="overSpeed"> 超速</label>
33 33 <label><input type="checkbox" {{if abnormalPrint.outBounds}}checked{{/if}}> 越界</label>
34 34 <label><input type="checkbox" {{if abnormalPrint.largeMargin}}checked{{/if}}> 大间隔</label>
35 35 </div>
... ...
src/main/resources/static/real_control_v2/mapmonitor/js/config.js
  View file @a5dc1fb
... ... @@ -32,6 +32,9 @@ var gb_map_config = (function () {
32 32 up: 'blue',
33 33 down: 'red'
34 34 }
  35 + },
  36 + exceptionWarn:{
  37 + overSpeed:false
35 38 }
36 39 };
37 40  
... ... @@ -87,7 +90,8 @@ var gb_map_config = (function () {
87 90 spatial_data_station: spatial_data_station,
88 91 spatial_data_carPark: spatial_data_carPark,
89 92 spatial_electronicFence: spatial_electronicFence,
90   - carIcon_angle: carIcon_angle
  93 + carIcon_angle: carIcon_angle,
  94 + over_speed:over_speed
91 95 };
92 96  
93 97 //切换地图类型
... ... @@ -147,6 +151,14 @@ var gb_map_config = (function () {
147 151 gb_map_overlay_mge.reDrawGps();
148 152 }
149 153  
  154 + function over_speed(val){
  155 + defaultConfig.exceptionWarn.overSpeed=this.checked;
  156 + if (this.checked)
  157 + $('.c_b_abnorm_notice').show();
  158 + else
  159 + $('.c_b_abnorm_notice').hide();
  160 + }
  161 +
150 162 function recursion_get_attr(data, attr) {
151 163 var ats = attr.split('.'),
152 164 val = data;
... ...
src/main/resources/static/real_control_v2/mapmonitor/real.html
  View file @a5dc1fb
... ... @@ -54,7 +54,7 @@
54 54 </div>
55 55  
56 56  
57   -<div class="c_b_abnorm_notice"></div>
  57 +<div class="c_b_abnorm_notice" style="display: none;"></div>
58 58  
59 59 <script id="map_abnorm_overspeed_list-temp" type="text/html">
60 60 {{each list as obj i}}
... ...
src/main/resources/static/real_control_v2_mobile/fragments/line_schedule/layout.html
  View file @a5dc1fb
... ... @@ -2,7 +2,7 @@
2 2 <!-- line schedule tab body layout template -->
3 3 <script id="cont-line-layout-temp" type="text/html">
4 4 <div class="uk-grid top-container">
5   - <div class="uk-width-5-6 uk-grid schedule-wrap">
  5 + <div class="uk-width-5-6 uk-grid schedule-wrap";style="width: 80.3%;">
6 6 <div class="uk-width-1-2">
7 7 <div class="card-panel"></div>
8 8 </div>
... ... @@ -11,7 +11,11 @@
11 11 <div class="card-panel"></div>
12 12 </div>
13 13 </div>
14   - <div class="uk-width-1-6" style="height: calc(100% - 1px);position: relative;">
  14 + <div style="width: 2%;position: relative;margin-right: 0;">
  15 + <div class="menu-toggler sidebar-toggler"
  16 + 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>
  17 + </div>
  18 + <div class="uk-width-1-6" style="height: calc(100% - 1px);position: relative;width: 14.6%;">
15 19 <div class="card-panel sys-mailbox" style="overflow: auto;">
16 20 </div>
17 21 <div class="mileage_elec_panel">
... ...
src/main/resources/static/real_control_v2_mobile/main.html
  View file @a5dc1fb
... ... @@ -65,7 +65,7 @@
65 65 </div>
66 66 </div>
67 67 <div class="north-tabs"></div>
68   -</div>
  68 + </div>
69 69  
70 70 <div class="main-container">
71 71 <div class="load-panel">
... ... @@ -293,4 +293,14 @@
293 293 lastTouchEnd=now;
294 294 },false)
295 295 }
  296 +
  297 + $('body').on('click','.sidebar-toggler',function(){
  298 + if ($(".uk-width-1-6").css("display") == "none") {
  299 + $('.uk-width-5-6').css("width", "82.33%");
  300 + $('.uk-width-1-6').show();
  301 + } else {
  302 + $('.uk-width-5-6').css("width", "97.99%");
  303 + $('.uk-width-1-6').hide();
  304 + }
  305 + })
296 306 </script>
297 307 \ No newline at end of file
... ...