潘钊 / bsth_control · Commits

Commit fac4040ae34c64a82848331bfa4a301422701759

Authored by ljq
1 parent f988a206
build: skipped

一键报警 加入车辆设备好 

线调区间线路显示
Inline Side-by-side
Showing 6 changed files with 9 additions and 9 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
  View file @fac4040
... ... @@ -156,7 +156,7 @@ public class PilotReport {
156 156  
157 157 String url = systemParamService.getValue("url.yjbj")+"dataDockingApi/accident/saveAccident?";
158 158 url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + nbbm +"&requestCode=" +d80.getData().getRequestCode()
159   - +"&lon=" +d80.getData().getLon()+"&lat="+d80.getData().getLat();
  159 + +"&lon=" +d80.getData().getLon()+"&lat="+d80.getData().getLat()+"&deviceId="+d80.getDeviceId();;
160 160 if (sch != null){
161 161 url = url + "&lineName=" +sch.getXlName()+"&jsy=" +sch.getjGh()+"&jsName=" +sch.getjName()+"&fgs="+sch.getFgsBm();
162 162 }
... ...
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
  View file @fac4040
... ... @@ -63,9 +63,9 @@
63 63 {{if type == 0}}
64 64 <span class="field">快慢：</span>{{t}}秒
65 65 {{else if type ==1}}
66   - <span class="field">快慢：</span>快{{t}}秒
67   - {{else if type ==2}}
68 66 <span class="field">快慢：</span>慢{{t}}秒
  67 + {{else if type ==2}}
  68 + <span class="field">快慢：</span>快{{t}}秒
69 69 {{/if}}
70 70 </div>
71 71  
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/add_normal.html
  View file @fac4040
... ... @@ -104,7 +104,7 @@
104 104 </div>
105 105 </div>
106 106 </div>
107   - <div class="uk-grid" style="display:none;">
  107 + <div class="uk-grid">
108 108 <div class="uk-width-1-2">
109 109 <div class="uk-form-row">
110 110 <label class="uk-form-label">是否预设</label>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/add_two_way.html
  View file @fac4040
... ... @@ -104,7 +104,7 @@
104 104 </div>
105 105 </div>
106 106 </div>
107   - <div class="uk-grid" style="display:none;">
  107 + <div class="uk-grid">
108 108 <div class="uk-width-1-2">
109 109 <div class="uk-form-row">
110 110 <label class="uk-form-label">是否预设</label>
... ... @@ -268,7 +268,7 @@
268 268 </div>
269 269 </div>
270 270 </div>
271   - <div class="uk-grid" style="display:none;">
  271 + <div class="uk-grid">
272 272 <div class="uk-width-1-2">
273 273 <div class="uk-form-row">
274 274 <label class="uk-form-label">是否预设</label>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch_v2/add_normal.html
  View file @fac4040
... ... @@ -104,7 +104,7 @@
104 104 </div>
105 105 </div>
106 106 </div>
107   - <div class="uk-grid" style="display:none;">
  107 + <div class="uk-grid">
108 108 <div class="uk-width-1-2">
109 109 <div class="uk-form-row">
110 110 <label class="uk-form-label">是否预设</label>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch_v2/add_two_way.html
  View file @fac4040
... ... @@ -104,7 +104,7 @@
104 104 </div>
105 105 </div>
106 106 </div>
107   - <div class="uk-grid" style="display:none;">
  107 + <div class="uk-grid">
108 108 <div class="uk-width-1-2">
109 109 <div class="uk-form-row">
110 110 <label class="uk-form-label">是否预设</label>
... ... @@ -278,7 +278,7 @@
278 278 </div>
279 279 </div>
280 280 </div>
281   - <div class="uk-grid" style="display:none;">
  281 + <div class="uk-grid" >
282 282 <div class="uk-width-1-2">
283 283 <div class="uk-form-row">
284 284 <label class="uk-form-label">是否预设</label>
... ...