潘钊 / bsth_control · Commits

Commit a06b8964012830f5db97a3e09757925eff785804

Authored by 潘钊
1 parent 5ee29854

update...

Inline Side-by-side
Showing 8 changed files with 30 additions and 13 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @a06b896
... ... @@ -499,7 +499,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
499 499  
500 500 //公司 和 分公司名称
501 501 t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
502   - t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getGsBm() + "_" + t.getFgsBm()));
  502 + t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm() + "_" + t.getGsBm()));
503 503  
504 504 t.setScheduleDateStr(schDate);
505 505 t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
... ...
src/main/resources/static/real_control_v2/css/line_schedule.css
  View file @a06b896
... ... @@ -243,7 +243,7 @@
243 243 }
244 244  
245 245 span.fcsj-diff {
246   - color: gray;
  246 + /*color: gray;*/
247 247 margin-left: 3px;
248 248 }
249 249  
... ... @@ -252,7 +252,7 @@ span.fcsj-diff {
252 252  
253 253 .tl-yzx {
254 254 background: rgb( 192,192,255);
255   - border-top: 1px solid #ebebeb !important;
  255 + border-top: 1px solid #d9d9d9 !important;
256 256 color: #444;
257 257 }
258 258  
... ... @@ -268,13 +268,13 @@ span.fcsj-diff {
268 268  
269 269 .tl-xxsd{
270 270 background: rgb(205,133,63);
271   - color: #f5f4f4;
  271 + /*color: #f5f4f4;*/
272 272 }
273 273  
274 274 .tl-xxrd{
275 275 background: rgb(255,99,71);
276 276 border-top: 1px solid #ebebeb !important;
277   - color: #fff;
  277 + /*color: #fff;*/
278 278 }
279 279  
280 280 .tl-qrlb {
... ... @@ -290,6 +290,7 @@ span.fcsj-diff {
290 290 .tl-zzzx {
291 291 background: rgb(173,255,47);
292 292 color: #444;
  293 + border-top: 1px solid #d9d9d9 !important;
293 294 }
294 295  
295 296 .ct_table>.ct_table_body dl:hover dd.tl-yzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-yzx, .ct_table>.ct_table_body dl:hover dd.tl-zzzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-zzzx {
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
  View file @a06b896
... ... @@ -30,7 +30,7 @@
30 30 <div class="uk-form-row">
31 31 <label class="uk-form-label">班次类型</label>
32 32 <div class="uk-form-controls">
33   - <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
  33 + <select class="form-control nt-dictionary" required name="bcType" data-code="{{bcType}}"
34 34 data-group=ScheduleType></select>
35 35 </div>
36 36 </div>
... ... @@ -156,7 +156,7 @@
156 156 <div class="uk-form-row">
157 157 <label class="uk-form-label">班次类型</label>
158 158 <div class="uk-form-controls">
159   - <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
  159 + <select class="form-control nt-dictionary" name="bcType" required data-code="{{bcType}}"
160 160 data-group=ScheduleType></select>
161 161 </div>
162 162 </div>
... ... @@ -274,7 +274,7 @@
274 274 <div class="uk-form-row">
275 275 <label class="uk-form-label">班次类型</label>
276 276 <div class="uk-form-controls">
277   - <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
  277 + <select class="form-control nt-dictionary" name="bcType" required data-code="{{bcType}}"
278 278 data-group=ScheduleType></select>
279 279 </div>
280 280 </div>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
  View file @a06b896
... ... @@ -289,8 +289,12 @@
289 289 //新增临加
290 290 var add_temp_sch = function () {
291 291 var sch = getActiveSch();
292   - if (!sch)
293   - sch = {xlBm: $('[name=lineSelect]', f).val(), lpName: $('[name=lpName]', f).val()};
  292 + if (!sch){
  293 + var xlBm = $('[name=lineSelect]', f).val();
  294 + var xlName = $('[name=lineSelect]', f).find("option:selected").text();
  295 + var lpName = $('[name=lpName]', f).val();
  296 + sch = {xlBm: xlBm,xlName: xlName, lpName: lpName};
  297 + }
294 298  
295 299 open_modal(folder + '/add_temp_sch.html', {
296 300 sch: sch
... ...
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
  View file @a06b896
... ... @@ -2,7 +2,7 @@
2 2 <script id="north-toolbar-temp" type="text/html">
3 3 <div class="uk-margin" id="north_toolbar_panel">
4 4 <nav class="uk-navbar">
5   - <a class="uk-navbar-brand" >
  5 + <a class="uk-navbar-brand" id="navbar_user_detail_link">
6 6 <span><i class="uk-icon-user"></i> <span id="north_toolbar_user">{{user.userName}}</span></span><i class="uk-icon-ellipsis-v"></i>
7 7 </a>
8 8 <ul class="uk-navbar-nav">
... ...
src/main/resources/static/real_control_v2/js/main.js
  View file @a06b896
... ... @@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
169 169 function showUpdateDescription() {
170 170 //更新说明
171 171 var updateDescription = {
172   - date: '2017-04-28 下午',
173   - text: '<h5>修复在特定情况下出现线调界面班次显示不全，比路单少的情况。</h5><h5>尝试修复在特定情况下车辆走向不跟随班次执行结束而跳动的问题。</h5>'
  172 + date: '2017-05-03',
  173 + text: '<h5>修复了在临加/子任务里临加路牌后再临加班次出现的异常情况。</h5>'
174 174 };
175 175  
176 176 var storage = window.localStorage
... ...
src/main/resources/static/real_control_v2/js/north/toolbar.js
  View file @a06b896
... ... @@ -45,6 +45,11 @@ var gb_northToolbar = (function () {
45 45 gb_sch_websocket.sock().close();
46 46 window.location.href = '/pages/control/lineallot/allot.html';
47 47 });
  48 +
  49 + //点击用户名
  50 + $('#navbar_user_detail_link').on('click', function () {
  51 + //alert('1111');
  52 + });
48 53 });
49 54  
50 55 $(document).on('click', '#north_toolbar_panel li.event a', function () {
... ...
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
  View file @a06b896
... ... @@ -269,6 +269,13 @@
269 269 (function () {
270 270 var modal = '#map-playback2-modal', gpsArray;
271 271  
  272 + //modal hide remove dom
  273 + $(modal).on('hide.uk.modal', function () {
  274 + $('.map-wrap-tools .play_btn', modal).removeClass('play');
  275 + playObj.pause();
  276 + searchForm.hideShade();
  277 + });
  278 +
272 279 $(modal).on('init', function (e, data) {
273 280 //初始化地图
274 281 mapObj.initMap();
... ...