潘钊 / bsth_control · Commits

Commit f1862e46d1c3589f94f7de96f935bf6834961af2

Authored by 娄高锋
1 parent 53a9c45b
build: skipped

线调的服务报备登记中，隐藏咨询和事故两类报备，添加一类绕改道。

Inline Side-by-side
Showing 7 changed files with 240 additions and 172 deletions
src/main/java/com/bsth/data/report_register/ReportRegisterServiceImpl.java
  View file @f1862e4
@@ -83,13 +83,15 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl<ReportRegister, L @@ -83,13 +83,15 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl<ReportRegister, L
83 List<Iterator<?>> list4 = new ArrayList<>(); 83 List<Iterator<?>> list4 = new ArrayList<>();
84 List<Iterator<?>> list5 = new ArrayList<>(); 84 List<Iterator<?>> list5 = new ArrayList<>();
85 List<Iterator<?>> list6 = new ArrayList<>(); 85 List<Iterator<?>> list6 = new ArrayList<>();
  86 + List<Iterator<?>> list7 = new ArrayList<>();
86 List<Map<String, Object>> resList1 = new ArrayList<Map<String, Object>>(); 87 List<Map<String, Object>> resList1 = new ArrayList<Map<String, Object>>();
87 List<Map<String, Object>> resList2 = new ArrayList<Map<String, Object>>(); 88 List<Map<String, Object>> resList2 = new ArrayList<Map<String, Object>>();
88 List<Map<String, Object>> resList3 = new ArrayList<Map<String, Object>>(); 89 List<Map<String, Object>> resList3 = new ArrayList<Map<String, Object>>();
89 List<Map<String, Object>> resList4 = new ArrayList<Map<String, Object>>(); 90 List<Map<String, Object>> resList4 = new ArrayList<Map<String, Object>>();
90 List<Map<String, Object>> resList5 = new ArrayList<Map<String, Object>>(); 91 List<Map<String, Object>> resList5 = new ArrayList<Map<String, Object>>();
91 List<Map<String, Object>> resList6 = new ArrayList<Map<String, Object>>(); 92 List<Map<String, Object>> resList6 = new ArrayList<Map<String, Object>>();
92 - int i1 =0,i2 =0,i3 =0,i4 =0,i5 =0,i6 =0; 93 + List<Map<String, Object>> resList7 = new ArrayList<Map<String, Object>>();
  94 + int i1 =0,i2 =0,i3 =0,i4 =0,i5 =0,i6 =0,i7 =0;
93 ReportUtils ee = new ReportUtils(); 95 ReportUtils ee = new ReportUtils();
94 for (ReportRegister l : list) { 96 for (ReportRegister l : list) {
95 Map<String, Object> m = new HashMap<String, Object>(); 97 Map<String, Object> m = new HashMap<String, Object>();
@@ -152,6 +154,10 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl&lt;ReportRegister, L @@ -152,6 +154,10 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl&lt;ReportRegister, L
152 i6++; 154 i6++;
153 m.put("i", i6); 155 m.put("i", i6);
154 resList6.add(m); 156 resList6.add(m);
  157 + }else if(report_type.equals("7")){
  158 + i7++;
  159 + m.put("i", i7);
  160 + resList7.add(m);
155 } 161 }
156 } 162 }
157 try { 163 try {
@@ -163,6 +169,8 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl&lt;ReportRegister, L @@ -163,6 +169,8 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl&lt;ReportRegister, L
163 lists.add(list3); 169 lists.add(list3);
164 list4.add(resList4.iterator()); 170 list4.add(resList4.iterator());
165 lists.add(list4); 171 lists.add(list4);
  172 + list7.add(resList7.iterator());
  173 + lists.add(list7);
166 list5.add(resList5.iterator()); 174 list5.add(resList5.iterator());
167 lists.add(list5); 175 lists.add(list5);
168 list6.add(resList6.iterator()); 176 list6.add(resList6.iterator());
src/main/resources/static/pages/forms/mould/report_register.xls
View file @f1862e4
No preview for this file type
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/add.html
  View file @f1862e4
@@ -40,9 +40,10 @@ @@ -40,9 +40,10 @@
40 <option value="1">首末班误点</option> 40 <option value="1">首末班误点</option>
41 <option value="2">大间隔</option> 41 <option value="2">大间隔</option>
42 <option value="3">突发事件</option> 42 <option value="3">突发事件</option>
43 - <option value="4">事故</option> 43 + <option value="7">绕改道</option>
  44 +<!-- <option value="4">事故</option> -->
44 <option value="5">其他</option> 45 <option value="5">其他</option>
45 - <option value="6">咨询</option> 46 +<!-- <option value="6">咨询</option> -->
46 </select> 47 </select>
47 </div> 48 </div>
48 </div> 49 </div>
@@ -88,25 +89,7 @@ @@ -88,25 +89,7 @@
88 首末班延误原因: 89 首末班延误原因:
89 </label> 90 </label>
90 <div class="uk-form-controls"> 91 <div class="uk-form-controls">
91 - <input type="text" class="form-control" name="REPORT_SMBWD" placeholder="首末班延误原因" required>  
92 - </div>  
93 - </div>  
94 - </div>  
95 - <div class="uk-grid uk-width-2-3 uk-container-center">  
96 - <div class="uk-form-row">  
97 - <label class="uk-form-label">  
98 - 对外上报部门:  
99 - </label>  
100 - <div class="uk-form-controls">  
101 - <input type="text" class="form-control" name="REPORT_DWSBBM" placeholder="对外上报部门" required>  
102 - </div>  
103 - </div>  
104 - </div>  
105 - <div class="uk-grid uk-width-2-3 uk-container-center">  
106 - <div class="uk-form-row">  
107 - <label class="uk-form-label">对外上报时间:</label>  
108 - <div class="uk-form-controls">  
109 - <input type="text" class="form-control" name="REPORT_DWSBSJ" placeholder="对外上报时间" required> 92 + <input type="text" class="form-control" name="REPORT_SMBWD" placeholder="首末班延误原因" required>
110 </div> 93 </div>
111 </div> 94 </div>
112 </div> 95 </div>
@@ -124,7 +107,7 @@ @@ -124,7 +107,7 @@
124 路段: 107 路段:
125 </label> 108 </label>
126 <div class="uk-form-controls"> 109 <div class="uk-form-controls">
127 - <input type="text" class="form-control" name="REPORT_ROAD" placeholder="路段" required> 110 + <input type="text" class="form-control" name="REPORT_ROAD" placeholder="路段" >
128 </div> 111 </div>
129 </div> 112 </div>
130 </div> 113 </div>
@@ -134,7 +117,7 @@ @@ -134,7 +117,7 @@
134 行驶方向: 117 行驶方向:
135 </label> 118 </label>
136 <div class="uk-form-controls"> 119 <div class="uk-form-controls">
137 - <input type="text" class="form-control" name="REPORT_XSFX" placeholder="行驶方向" required> 120 + <input type="text" class="form-control" name="REPORT_XSFX" placeholder="行驶方向" >
138 </div> 121 </div>
139 </div> 122 </div>
140 </div> 123 </div>
@@ -144,7 +127,7 @@ @@ -144,7 +127,7 @@
144 站点: 127 站点:
145 </label> 128 </label>
146 <div class="uk-form-controls"> 129 <div class="uk-form-controls">
147 - <input type="text" class="form-control" name="REPORT_STATION" placeholder="站点" required > 130 + <input type="text" class="form-control" name="REPORT_STATION" placeholder="站点" >
148 </div> 131 </div>
149 </div> 132 </div>
150 </div> 133 </div>
@@ -168,24 +151,6 @@ @@ -168,24 +151,6 @@
168 </div> 151 </div>
169 </div> 152 </div>
170 </div> 153 </div>
171 - <div class="uk-grid uk-width-2-3 uk-container-center">  
172 - <div class="uk-form-row">  
173 - <label class="uk-form-label">  
174 - 对外上报部门:  
175 - </label>  
176 - <div class="uk-form-controls">  
177 - <input type="text" class="form-control" name="REPORT_DWSBBM" placeholder="对外上报部门" required>  
178 - </div>  
179 - </div>  
180 - </div>  
181 - <div class="uk-grid uk-width-2-3 uk-container-center">  
182 - <div class="uk-form-row">  
183 - <label class="uk-form-label">对外上报时间:</label>  
184 - <div class="uk-form-controls">  
185 - <input type="text" class="form-control" name="REPORT_DWSBSJ" placeholder="对外上报时间" required>  
186 - </div>  
187 - </div>  
188 - </div>  
189 <div class="uk-modal-footer uk-text-right"> 154 <div class="uk-modal-footer uk-text-right">
190 <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span> 155 <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
191 <button type="button" class="uk-button uk-modal-close">取消</button> 156 <button type="button" class="uk-button uk-modal-close">取消</button>
@@ -211,7 +176,7 @@ @@ -211,7 +176,7 @@
211 影响时间: 176 影响时间:
212 </label> 177 </label>
213 <div class="uk-form-controls"> 178 <div class="uk-form-controls">
214 - <input type="text" class="form-control" name="REPORT_YXSJ" placeholder="影响时间" required> 179 + <input type="text" class="form-control" name="REPORT_YXSJ" placeholder="影响时间" >
215 </div> 180 </div>
216 </div> 181 </div>
217 </div> 182 </div>
@@ -221,7 +186,7 @@ @@ -221,7 +186,7 @@
221 影响班次数: 186 影响班次数:
222 </label> 187 </label>
223 <div class="uk-form-controls"> 188 <div class="uk-form-controls">
224 - <input type="text" class="form-control" name="REPORT_YXBC" placeholder="影响班次数" required> 189 + <input type="text" class="form-control" name="REPORT_YXBC" placeholder="影响班次数" >
225 </div> 190 </div>
226 </div> 191 </div>
227 </div> 192 </div>
@@ -231,25 +196,7 @@ @@ -231,25 +196,7 @@
231 调整措施: 196 调整措施:
232 </label> 197 </label>
233 <div class="uk-form-controls"> 198 <div class="uk-form-controls">
234 - <input type="text" class="form-control" name="REPORT_TZCS" placeholder="调整措施" required>  
235 - </div>  
236 - </div>  
237 - </div>  
238 - <div class="uk-grid uk-width-2-3 uk-container-center">  
239 - <div class="uk-form-row">  
240 - <label class="uk-form-label">  
241 - 对外上报部门:  
242 - </label>  
243 - <div class="uk-form-controls">  
244 - <input type="text" class="form-control" name="REPORT_DWSBBM" placeholder="对外上报部门" required>  
245 - </div>  
246 - </div>  
247 - </div>  
248 - <div class="uk-grid uk-width-2-3 uk-container-center">  
249 - <div class="uk-form-row">  
250 - <label class="uk-form-label">对外上报时间:</label>  
251 - <div class="uk-form-controls">  
252 - <input type="text" class="form-control" name="REPORT_DWSBSJ" placeholder="对外上报时间" required> 199 + <input type="text" class="form-control" name="REPORT_TZCS" placeholder="调整措施" >
253 </div> 200 </div>
254 </div> 201 </div>
255 </div> 202 </div>
@@ -395,6 +342,55 @@ @@ -395,6 +342,55 @@
395 <button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button> 342 <button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
396 </div> 343 </div>
397 </form> 344 </form>
  345 + <!-- 绕改道-->
  346 + <form id="add_detour_table" class="c_register_form" style="display:none; margin-top: 35px;">
  347 + <div class="uk-grid uk-width-2-3 uk-container-center">
  348 + <div class="uk-form-row">
  349 + <label class="uk-form-label">
  350 + 路段:
  351 + </label>
  352 + <div class="uk-form-controls">
  353 + <input type="text" class="form-control" name="REPORT_ROAD" placeholder="路段" >
  354 + </div>
  355 + </div>
  356 + </div>
  357 + <div class="uk-grid uk-width-2-3 uk-container-center">
  358 + <div class="uk-form-row">
  359 + <label class="uk-form-label">
  360 + 行驶方向:
  361 + </label>
  362 + <div class="uk-form-controls">
  363 + <input type="text" class="form-control" name="REPORT_XSFX" placeholder="行驶方向" >
  364 + </div>
  365 + </div>
  366 + </div>
  367 + <div class="uk-grid uk-width-2-3 uk-container-center">
  368 + <div class="uk-form-row">
  369 + <label class="uk-form-label">
  370 + 跳站:
  371 + </label>
  372 + <div class="uk-form-controls">
  373 + <input type="text" class="form-control" name="REPORT_SGGK" placeholder="跳站" >
  374 + </div>
  375 + </div>
  376 + </div>
  377 + <div class="uk-grid uk-width-2-3 uk-container-center">
  378 + <div class="uk-form-row">
  379 + <label class="uk-form-label">
  380 + 原因:
  381 + </label>
  382 + <div class="uk-form-controls">
  383 + <textarea type="text" class="form-control" name="REPORT_BZ" placeholder="原因" required>
  384 + </textarea>
  385 + </div>
  386 + </div>
  387 + </div>
  388 + <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
  389 + <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
  390 + <button type="button" class="uk-button uk-modal-close">取消</button>
  391 + <button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
  392 + </div>
  393 + </form>
398 <!-- 其他--> 394 <!-- 其他-->
399 <form id="add_rests_table" class="c_register_form" style="display:none; margin-top: 35px;"> 395 <form id="add_rests_table" class="c_register_form" style="display:none; margin-top: 35px;">
400 396
@@ -404,7 +400,8 @@ @@ -404,7 +400,8 @@
404 报备内容: 400 报备内容:
405 </label> 401 </label>
406 <div class="uk-form-controls"> 402 <div class="uk-form-controls">
407 - <input type="text" class="form-control" name="REPORT_BZ" placeholder="报备内容" required> 403 + <textarea type="text" class="form-control" name="REPORT_BZ" placeholder="报备内容" required>
  404 + </textarea>
408 </div> 405 </div>
409 </div> 406 </div>
410 </div> 407 </div>
@@ -494,6 +491,8 @@ @@ -494,6 +491,8 @@
494 typeInt = 5; 491 typeInt = 5;
495 } else if (tableActive == 'add_consult_table') { 492 } else if (tableActive == 'add_consult_table') {
496 typeInt = 6; 493 typeInt = 6;
  494 + } else if (tableActive == 'add_detour_table') {
  495 + typeInt = 7;
497 } else { 496 } else {
498 UIkit.modal(modal).hide(); 497 UIkit.modal(modal).hide();
499 notify_err('您所选的数据有问题，请重新选择！'); 498 notify_err('您所选的数据有问题，请重新选择！');
@@ -553,6 +552,8 @@ @@ -553,6 +552,8 @@
553 tableActive = 'add_rests_table'; 552 tableActive = 'add_rests_table';
554 } else if (REPORT_TYPE == 6) { 553 } else if (REPORT_TYPE == 6) {
555 tableActive = 'add_consult_table'; 554 tableActive = 'add_consult_table';
  555 + } else if (REPORT_TYPE == 7) {
  556 + tableActive = 'add_detour_table';
556 } 557 }
557 document.getElementById(tableActive).style.display = ""; 558 document.getElementById(tableActive).style.display = "";
558 changeType(tableActive); 559 changeType(tableActive);
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/list.html
  View file @f1862e4
@@ -33,9 +33,10 @@ @@ -33,9 +33,10 @@
33 <li id="first_last_late" class="uk-active"><a>首末班误点</a></li> 33 <li id="first_last_late" class="uk-active"><a>首末班误点</a></li>
34 <li id="large_interval"><a>大间隔</a></li> 34 <li id="large_interval"><a>大间隔</a></li>
35 <li id="emergency"><a>突发事件</a></li> 35 <li id="emergency"><a>突发事件</a></li>
36 - <li id="accident"><a>事故</a></li> 36 + <li id="detour"><a>绕改道</a></li>
  37 +<!-- <li id="accident"><a>事故</a></li> -->
37 <li id="rests"><a>其他</a></li> 38 <li id="rests"><a>其他</a></li>
38 - <li id="consult"><a>咨询</a></li> 39 +<!-- <li id="consult"><a>咨询</a></li> -->
39 </ul> 40 </ul>
40 </div> 41 </div>
41 42
@@ -68,8 +69,6 @@ @@ -68,8 +69,6 @@
68 <th width="7%">延误站点</th> 69 <th width="7%">延误站点</th>
69 <th width="5%">延误时间</th> 70 <th width="5%">延误时间</th>
70 <th width="10%">首末班延误原因</th> 71 <th width="10%">首末班延误原因</th>
71 - <th width="7%">对外上报部门</th>  
72 - <th width="7%">对外上报时间</th>  
73 </tr> 72 </tr>
74 </thead> 73 </thead>
75 <tbody class="table_body"> 74 <tbody class="table_body">
@@ -90,8 +89,6 @@ @@ -90,8 +89,6 @@
90 <th width="7%">站点</th> 89 <th width="7%">站点</th>
91 <th width="7%">大间隔时间</th> 90 <th width="7%">大间隔时间</th>
92 <th width="7%">大间隔原因</th> 91 <th width="7%">大间隔原因</th>
93 - <th width="7%">对外上报部门</th>  
94 - <th width="7%">对外上报时间</th>  
95 </tr> 92 </tr>
96 </thead> 93 </thead>
97 <tbody class="table_body"> 94 <tbody class="table_body">
@@ -111,8 +108,6 @@ @@ -111,8 +108,6 @@
111 <th width="7%">影响时间</th> 108 <th width="7%">影响时间</th>
112 <th width="7%">影响班次数</th> 109 <th width="7%">影响班次数</th>
113 <th width="7%">调整措施</th> 110 <th width="7%">调整措施</th>
114 - <th width="7%">对外上报部门</th>  
115 - <th width="7%">对外上报时间</th>  
116 </tr> 111 </tr>
117 </thead> 112 </thead>
118 <tbody class="table_body"> 113 <tbody class="table_body">
@@ -146,6 +141,25 @@ @@ -146,6 +141,25 @@
146 <tbody class="table_body"> 141 <tbody class="table_body">
147 </tbody> 142 </tbody>
148 </table> 143 </table>
  144 + <!-- 绕改道-->
  145 + <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="detour_table">
  146 + <thead class="">
  147 + <tr role="row">
  148 + <th width="2%">序号</th>
  149 + <th width="5%">报备时间</th>
  150 + <th width="5%">报备人</th>
  151 + <th width="5%">公司</th>
  152 + <th width="5%">分公司</th>
  153 + <th width="5%">线路</th>
  154 + <th width="5%">路段</th>
  155 + <th width="5%">行驶方向</th>
  156 + <th width="5%">跳站</th>
  157 + <th width="7%">原因</th>
  158 + </tr>
  159 + </thead>
  160 + <tbody class="table_body">
  161 + </tbody>
  162 + </table>
149 <!-- 其他--> 163 <!-- 其他-->
150 <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="rests_table"> 164 <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="rests_table">
151 <tr role="row"> 165 <tr role="row">
@@ -202,8 +216,6 @@ @@ -202,8 +216,6 @@
202 <td style="vertical-align: middle;">{{obj.report_STATION}}</td> 216 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
203 <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td> 217 <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td>
204 <td style="vertical-align: middle;">{{obj.report_SMBWD}}</td> 218 <td style="vertical-align: middle;">{{obj.report_SMBWD}}</td>
205 - <td style="vertical-align: middle;">{{obj.report_DWSBBM}}</td>  
206 - <td style="vertical-align: middle;">{{obj.report_DWSBSJ}}</td>  
207 </tr> 219 </tr>
208 {{/each}} 220 {{/each}}
209 </script> 221 </script>
@@ -225,8 +237,6 @@ @@ -225,8 +237,6 @@
225 <td style="vertical-align: middle;">{{obj.report_STATION}}</td> 237 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
226 <td style="vertical-align: middle;">{{obj.report_DJGSNAMEJ}}</td> 238 <td style="vertical-align: middle;">{{obj.report_DJGSNAMEJ}}</td>
227 <td style="vertical-align: middle;">{{obj.report_DJGYY}}</td> 239 <td style="vertical-align: middle;">{{obj.report_DJGYY}}</td>
228 - <td style="vertical-align: middle;">{{obj.report_DWSBBM}}</td>  
229 - <td style="vertical-align: middle;">{{obj.report_DWSBSJ}}</td>  
230 </tr> 240 </tr>
231 {{/each}} 241 {{/each}}
232 </script> 242 </script>
@@ -247,8 +257,6 @@ @@ -247,8 +257,6 @@
247 <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td> 257 <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td>
248 <td style="vertical-align: middle;">{{obj.report_YXBC}}</td> 258 <td style="vertical-align: middle;">{{obj.report_YXBC}}</td>
249 <td style="vertical-align: middle;">{{obj.report_TZCS}}</td> 259 <td style="vertical-align: middle;">{{obj.report_TZCS}}</td>
250 - <td style="vertical-align: middle;">{{obj.report_DWSBBM}}</td>  
251 - <td style="vertical-align: middle;">{{obj.report_DWSBSJ}}</td>  
252 </tr> 260 </tr>
253 {{/each}} 261 {{/each}}
254 </script> 262 </script>
@@ -281,6 +289,26 @@ @@ -281,6 +289,26 @@
281 </tr> 289 </tr>
282 {{/each}} 290 {{/each}}
283 </script> 291 </script>
  292 + <script id="detour_table_body_list" type="text/html">
  293 + {{each data.list as obj i}}
  294 + {{if obj.status == 2}}
  295 + <tr style="background-color: #ff5f78">
  296 + {{else}}
  297 + <tr>
  298 + {{/if}}
  299 + <td style="vertical-align: middle;">{{i + 1}}</td>
  300 + <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
  301 + <td style="vertical-align: middle;">{{obj.report_BBR}}</td>
  302 + <td style="vertical-align: middle;">{{obj.report_GSNAME}}</td>
  303 + <td style="vertical-align: middle;">{{obj.report_FGSNAME}}</td>
  304 + <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
  305 + <td style="vertical-align: middle;">{{obj.report_ROAD}}</td>
  306 + <td style="vertical-align: middle;">{{obj.report_XSFX}}</td>
  307 + <td style="vertical-align: middle;">{{obj.report_SGGK}}</td>
  308 + <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
  309 + </tr>
  310 + {{/each}}
  311 + </script>
284 <script id="rests_table_body_list" type="text/html"> 312 <script id="rests_table_body_list" type="text/html">
285 {{each data.list as obj i}} 313 {{each data.list as obj i}}
286 {{if obj.status == 2}} 314 {{if obj.status == 2}}
@@ -410,7 +438,7 @@ @@ -410,7 +438,7 @@
410 if (data.status == "SUCCESS") { 438 if (data.status == "SUCCESS") {
411 var list = data.list; 439 var list = data.list;
412 var tableList1 = [], tableList2 = [], tableList3 = [], tableList4 = [], tableList5 = [], 440 var tableList1 = [], tableList2 = [], tableList3 = [], tableList4 = [], tableList5 = [],
413 - tableList6 = []; 441 + tableList6 = [], tableList7 = [];
414 $.each(list, function (i, rr) { 442 $.each(list, function (i, rr) {
415 rr.report_DATE = formatDate(new Date(rr.report_DATE)); 443 rr.report_DATE = formatDate(new Date(rr.report_DATE));
416 if (rr.report_TYPE == 1) { 444 if (rr.report_TYPE == 1) {
@@ -425,6 +453,8 @@ @@ -425,6 +453,8 @@
425 tableList5.push(rr); 453 tableList5.push(rr);
426 } else if (rr.report_TYPE == 6) { 454 } else if (rr.report_TYPE == 6) {
427 tableList6.push(rr); 455 tableList6.push(rr);
  456 + } else if (rr.report_TYPE == 7) {
  457 + tableList7.push(rr);
428 } 458 }
429 }); 459 });
430 var htmlStr = template('first_last_late_table_body_list', {'data':{'list': tableList1,'line':lineList}}); 460 var htmlStr = template('first_last_late_table_body_list', {'data':{'list': tableList1,'line':lineList}});
@@ -435,6 +465,8 @@ @@ -435,6 +465,8 @@
435 $('#emergency_table .table_body', modal).html(htmlStr); 465 $('#emergency_table .table_body', modal).html(htmlStr);
436 htmlStr = template('accident_table_body_list', {'data':{'list': tableList4,'line':lineList}}); 466 htmlStr = template('accident_table_body_list', {'data':{'list': tableList4,'line':lineList}});
437 $('#accident_table .table_body', modal).html(htmlStr); 467 $('#accident_table .table_body', modal).html(htmlStr);
  468 + htmlStr = template('detour_table_body_list', {'data':{'list': tableList7,'line':lineList}});
  469 + $('#detour_table .table_body', modal).html(htmlStr);
438 htmlStr = template('rests_table_body_list', {'data':{'list': tableList5,'line':lineList}}); 470 htmlStr = template('rests_table_body_list', {'data':{'list': tableList5,'line':lineList}});
439 $('#rests_table .table_body', modal).html(htmlStr); 471 $('#rests_table .table_body', modal).html(htmlStr);
440 htmlStr = template('consult_table_body_list', {'data':{'list': tableList6,'line':lineList}}); 472 htmlStr = template('consult_table_body_list', {'data':{'list': tableList6,'line':lineList}});
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/list2.html
  View file @f1862e4
@@ -43,9 +43,9 @@ @@ -43,9 +43,9 @@
43 <option value="1">首末班误点</option> 43 <option value="1">首末班误点</option>
44 <option value="2">大间隔</option> 44 <option value="2">大间隔</option>
45 <option value="3">突发事件</option> 45 <option value="3">突发事件</option>
46 - <option value="4">事故</option> 46 +<!-- <option value="4">事故</option> -->
47 <option value="5">其他</option> 47 <option value="5">其他</option>
48 - <option value="6">咨询</option> 48 +<!-- <option value="6">咨询</option> -->
49 </select> 49 </select>
50 </div> 50 </div>
51 <div class="form-group"> 51 <div class="form-group">
@@ -190,8 +190,6 @@ @@ -190,8 +190,6 @@
190 <th width="7%">延误站点</th> 190 <th width="7%">延误站点</th>
191 <th width="5%">延误时间</th> 191 <th width="5%">延误时间</th>
192 <th width="10%">首末班延误原因</th> 192 <th width="10%">首末班延误原因</th>
193 - <th width="7%">对外上报部门</th>  
194 - <th width="7%">对外上报时间</th>  
195 </tr> 193 </tr>
196 </thead> 194 </thead>
197 <tbody> 195 <tbody>
@@ -206,8 +204,6 @@ @@ -206,8 +204,6 @@
206 <td style="vertical-align: middle;">{{obj.report_STATION}}</td> 204 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
207 <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td> 205 <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td>
208 <td style="vertical-align: middle;">{{obj.report_SMBWD}}</td> 206 <td style="vertical-align: middle;">{{obj.report_SMBWD}}</td>
209 - <td style="vertical-align: middle;">{{obj.report_DWSBBM}}</td>  
210 - <td style="vertical-align: middle;">{{obj.report_DWSBSJ}}</td>  
211 </tr> 207 </tr>
212 {{/each}} 208 {{/each}}
213 {{if list.length == 0}} 209 {{if list.length == 0}}
@@ -228,8 +224,6 @@ @@ -228,8 +224,6 @@
228 <th width="7%">站点</th> 224 <th width="7%">站点</th>
229 <th width="7%">大间隔时间</th> 225 <th width="7%">大间隔时间</th>
230 <th width="7%">大间隔原因</th> 226 <th width="7%">大间隔原因</th>
231 - <th width="7%">对外上报部门</th>  
232 - <th width="7%">对外上报时间</th>  
233 </tr> 227 </tr>
234 </thead> 228 </thead>
235 <tbody> 229 <tbody>
@@ -246,8 +240,6 @@ @@ -246,8 +240,6 @@
246 <td style="vertical-align: middle;">{{obj.report_STATION}}</td> 240 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
247 <td style="vertical-align: middle;">{{obj.report_DJGSJ}}</td> 241 <td style="vertical-align: middle;">{{obj.report_DJGSJ}}</td>
248 <td style="vertical-align: middle;">{{obj.report_DJGYY}}</td> 242 <td style="vertical-align: middle;">{{obj.report_DJGYY}}</td>
249 - <td style="vertical-align: middle;">{{obj.report_DWSBBM}}</td>  
250 - <td style="vertical-align: middle;">{{obj.report_DWSBSJ}}</td>  
251 </tr> 243 </tr>
252 {{/each}} 244 {{/each}}
253 {{if list.length == 0}} 245 {{if list.length == 0}}
@@ -267,8 +259,6 @@ @@ -267,8 +259,6 @@
267 <th width="7%">影响时间</th> 259 <th width="7%">影响时间</th>
268 <th width="7%">影响班次数</th> 260 <th width="7%">影响班次数</th>
269 <th width="7%">调整措施</th> 261 <th width="7%">调整措施</th>
270 - <th width="7%">对外上报部门</th>  
271 - <th width="7%">对外上报时间</th>  
272 </tr> 262 </tr>
273 </thead> 263 </thead>
274 <tbody> 264 <tbody>
@@ -284,8 +274,6 @@ @@ -284,8 +274,6 @@
284 <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td> 274 <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td>
285 <td style="vertical-align: middle;">{{obj.report_YXBC}}</td> 275 <td style="vertical-align: middle;">{{obj.report_YXBC}}</td>
286 <td style="vertical-align: middle;">{{obj.report_TZCS}}</td> 276 <td style="vertical-align: middle;">{{obj.report_TZCS}}</td>
287 - <td style="vertical-align: middle;">{{obj.report_DWSBBM}}</td>  
288 - <td style="vertical-align: middle;">{{obj.report_DWSBSJ}}</td>  
289 </tr> 277 </tr>
290 {{/each}} 278 {{/each}}
291 {{if list.length == 0}} 279 {{if list.length == 0}}
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/manage.html
  View file @f1862e4
@@ -36,9 +36,10 @@ @@ -36,9 +36,10 @@
36 <li id="first_last_late" class="uk-active"><a>首末班误点</a></li> 36 <li id="first_last_late" class="uk-active"><a>首末班误点</a></li>
37 <li id="large_interval"><a>大间隔</a></li> 37 <li id="large_interval"><a>大间隔</a></li>
38 <li id="emergency"><a>突发事件</a></li> 38 <li id="emergency"><a>突发事件</a></li>
39 - <li id="accident"><a>事故</a></li> 39 + <li id="detour"><a>绕改道</a></li>
  40 +<!-- <li id="accident"><a>事故</a></li> -->
40 <li id="rests"><a>其他</a></li> 41 <li id="rests"><a>其他</a></li>
41 - <li id="consult"><a>咨询</a></li> 42 +<!-- <li id="consult"><a>咨询</a></li> -->
42 </ul> 43 </ul>
43 </div> 44 </div>
44 45
@@ -68,8 +69,6 @@ @@ -68,8 +69,6 @@
68 <th width="7%">延误站点</th> 69 <th width="7%">延误站点</th>
69 <th width="5%">延误时间</th> 70 <th width="5%">延误时间</th>
70 <th width="10%">首末班延误原因</th> 71 <th width="10%">首末班延误原因</th>
71 - <th width="7%">对外上报部门</th>  
72 - <th width="7%">对外上报时间</th>  
73 </tr> 72 </tr>
74 </thead> 73 </thead>
75 <tbody class="table_body"> 74 <tbody class="table_body">
@@ -89,8 +88,6 @@ @@ -89,8 +88,6 @@
89 <th width="7%">站点</th> 88 <th width="7%">站点</th>
90 <th width="7%">大间隔时间</th> 89 <th width="7%">大间隔时间</th>
91 <th width="7%">大间隔原因</th> 90 <th width="7%">大间隔原因</th>
92 - <th width="7%">对外上报部门</th>  
93 - <th width="7%">对外上报时间</th>  
94 </tr> 91 </tr>
95 </thead> 92 </thead>
96 <tbody class="table_body"> 93 <tbody class="table_body">
@@ -109,8 +106,6 @@ @@ -109,8 +106,6 @@
109 <th width="7%">影响时间</th> 106 <th width="7%">影响时间</th>
110 <th width="7%">影响班次数</th> 107 <th width="7%">影响班次数</th>
111 <th width="7%">调整措施</th> 108 <th width="7%">调整措施</th>
112 - <th width="7%">对外上报部门</th>  
113 - <th width="7%">对外上报时间</th>  
114 </tr> 109 </tr>
115 </thead> 110 </thead>
116 <tbody class="table_body"> 111 <tbody class="table_body">
@@ -143,6 +138,24 @@ @@ -143,6 +138,24 @@
143 <tbody class="table_body"> 138 <tbody class="table_body">
144 </tbody> 139 </tbody>
145 </table> 140 </table>
  141 + <!-- 绕改道-->
  142 + <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="detour_table">
  143 + <thead class="">
  144 + <tr role="row">
  145 + <!--<th width="2%"><input type="radio" name="checkItems"></th>-->
  146 + <th width="2%">#</th>
  147 + <th width="2%">序号</th>
  148 + <th width="5%">报备时间</th>
  149 + <th width="5%">线路</th>
  150 + <th width="5%">路段</th>
  151 + <th width="5%">行驶方向</th>
  152 + <th width="5%">跳站</th>
  153 + <th width="7%">原因</th>
  154 + </tr>
  155 + </thead>
  156 + <tbody class="table_body">
  157 + </tbody>
  158 + </table>
146 <!-- 其他--> 159 <!-- 其他-->
147 <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="rests_table"> 160 <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="rests_table">
148 <thead class=""> 161 <thead class="">
@@ -204,8 +217,6 @@ @@ -204,8 +217,6 @@
204 <td style="vertical-align: middle;">{{obj.report_STATION}}</td> 217 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
205 <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td> 218 <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td>
206 <td style="vertical-align: middle;">{{obj.report_SMBWD}}</td> 219 <td style="vertical-align: middle;">{{obj.report_SMBWD}}</td>
207 - <td style="vertical-align: middle;">{{obj.report_DWSBBM}}</td>  
208 - <td style="vertical-align: middle;">{{obj.report_DWSBSJ}}</td>  
209 </tr> 220 </tr>
210 {{/each}} 221 {{/each}}
211 </script> 222 </script>
@@ -233,8 +244,6 @@ @@ -233,8 +244,6 @@
233 <td style="vertical-align: middle;">{{obj.report_STATION}}</td> 244 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
234 <td style="vertical-align: middle;">{{obj.report_DJGSJ}}</td> 245 <td style="vertical-align: middle;">{{obj.report_DJGSJ}}</td>
235 <td style="vertical-align: middle;">{{obj.report_DJGYY}}</td> 246 <td style="vertical-align: middle;">{{obj.report_DJGYY}}</td>
236 - <td style="vertical-align: middle;">{{obj.report_DWSBBM}}</td>  
237 - <td style="vertical-align: middle;">{{obj.report_DWSBSJ}}</td>  
238 </tr> 247 </tr>
239 {{/each}} 248 {{/each}}
240 </script> 249 </script>
@@ -261,8 +270,6 @@ @@ -261,8 +270,6 @@
261 <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td> 270 <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td>
262 <td style="vertical-align: middle;">{{obj.report_YXBC}}</td> 271 <td style="vertical-align: middle;">{{obj.report_YXBC}}</td>
263 <td style="vertical-align: middle;">{{obj.report_TZCS}}</td> 272 <td style="vertical-align: middle;">{{obj.report_TZCS}}</td>
264 - <td style="vertical-align: middle;">{{obj.report_DWSBBM}}</td>  
265 - <td style="vertical-align: middle;">{{obj.report_DWSBSJ}}</td>  
266 </tr> 273 </tr>
267 {{/each}} 274 {{/each}}
268 </script> 275 </script>
@@ -301,6 +308,33 @@ @@ -301,6 +308,33 @@
301 </tr> 308 </tr>
302 {{/each}} 309 {{/each}}
303 </script> 310 </script>
  311 + <script id="detour_table_body" type="text/html">
  312 + {{each data.list as obj i}}
  313 +
  314 + {{if obj.status == 2}}
  315 + <tr style="background-color: #ff5f78">
  316 + <td style="vertical-align: middle;">
  317 + <!--<input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.report_XL}}">-->
  318 + </td>
  319 + {{else}}
  320 + <tr>
  321 + <td style="vertical-align: middle;">
  322 + <input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.report_XL}}">
  323 + </td>
  324 + {{/if}}
  325 + <td style="vertical-align: middle;">{{i + 1}}</td>
  326 + <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
  327 + <td style="vertical-align: middle;display:none">{{obj.report_BBR}}</td>
  328 + <td style="vertical-align: middle;display:none">{{obj.report_GS}}</td>
  329 + <td style="vertical-align: middle;display:none">{{obj.report_FGS}}</td>
  330 + <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
  331 + <td style="vertical-align: middle;">{{obj.report_ROAD}}</td>
  332 + <td style="vertical-align: middle;">{{obj.report_XSFX}}</td>
  333 + <td style="vertical-align: middle;">{{obj.report_SGGK}}</td>
  334 + <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
  335 + </tr>
  336 + {{/each}}
  337 + </script>
304 <script id="rests_table_body" type="text/html"> 338 <script id="rests_table_body" type="text/html">
305 {{each data.list as obj i}} 339 {{each data.list as obj i}}
306 340
@@ -434,7 +468,7 @@ @@ -434,7 +468,7 @@
434 if (data.status == "SUCCESS") { 468 if (data.status == "SUCCESS") {
435 var list = data.list; 469 var list = data.list;
436 var tableList1 = [], tableList2 = [], tableList3 = [], tableList4 = [], tableList5 = [], 470 var tableList1 = [], tableList2 = [], tableList3 = [], tableList4 = [], tableList5 = [],
437 - tableList6 = []; 471 + tableList6 = [], tableList7 = [];
438 $.each(list, function (i, rr) { 472 $.each(list, function (i, rr) {
439 rr.report_DATE = formatDate(new Date(rr.report_DATE)); 473 rr.report_DATE = formatDate(new Date(rr.report_DATE));
440 if (rr.report_TYPE == 1) { 474 if (rr.report_TYPE == 1) {
@@ -449,6 +483,8 @@ @@ -449,6 +483,8 @@
449 tableList5.push(rr); 483 tableList5.push(rr);
450 } else if (rr.report_TYPE == 6) { 484 } else if (rr.report_TYPE == 6) {
451 tableList6.push(rr); 485 tableList6.push(rr);
  486 + } else if (rr.report_TYPE == 7) {
  487 + tableList7.push(rr);
452 } 488 }
453 }); 489 });
454 var htmlStr = template('first_last_late_table_body', {'data':{'list': tableList1,'line':lineList}}); 490 var htmlStr = template('first_last_late_table_body', {'data':{'list': tableList1,'line':lineList}});
@@ -459,6 +495,8 @@ @@ -459,6 +495,8 @@
459 $('#emergency_table .table_body', modal).html(htmlStr); 495 $('#emergency_table .table_body', modal).html(htmlStr);
460 htmlStr = template('accident_table_body', {'data':{'list': tableList4,'line':lineList}}); 496 htmlStr = template('accident_table_body', {'data':{'list': tableList4,'line':lineList}});
461 $('#accident_table .table_body', modal).html(htmlStr); 497 $('#accident_table .table_body', modal).html(htmlStr);
  498 + htmlStr = template('detour_table_body', {'data':{'list': tableList7,'line':lineList}});
  499 + $('#detour_table .table_body', modal).html(htmlStr);
462 htmlStr = template('rests_table_body', {'data':{'list': tableList5,'line':lineList}}); 500 htmlStr = template('rests_table_body', {'data':{'list': tableList5,'line':lineList}});
463 $('#rests_table .table_body', modal).html(htmlStr); 501 $('#rests_table .table_body', modal).html(htmlStr);
464 htmlStr = template('consult_table_body', {'data':{'list': tableList6,'line':lineList}}); 502 htmlStr = template('consult_table_body', {'data':{'list': tableList6,'line':lineList}});
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/update.html
  View file @f1862e4
@@ -41,9 +41,10 @@ @@ -41,9 +41,10 @@
41 <option value="1">首末班误点</option> 41 <option value="1">首末班误点</option>
42 <option value="2">大间隔</option> 42 <option value="2">大间隔</option>
43 <option value="3">突发事件</option> 43 <option value="3">突发事件</option>
44 - <option value="4">事故</option> 44 + <option value="7">绕改道</option>
  45 +<!-- <option value="4">事故</option> -->
45 <option value="5">其他</option> 46 <option value="5">其他</option>
46 - <option value="6">咨询</option> 47 +<!-- <option value="6">咨询</option> -->
47 </select> 48 </select>
48 </div> 49 </div>
49 </div> 50 </div>
@@ -93,24 +94,6 @@ @@ -93,24 +94,6 @@
93 </div> 94 </div>
94 </div> 95 </div>
95 </div> 96 </div>
96 - <div class="uk-grid uk-width-2-3 uk-container-center">  
97 - <div class="uk-form-row">  
98 - <label class="uk-form-label">  
99 - 对外上报部门:  
100 - </label>  
101 - <div class="uk-form-controls">  
102 - <input type="text" class="form-control" name="REPORT_DWSBBM" placeholder="对外上报部门" required>  
103 - </div>  
104 - </div>  
105 - </div>  
106 - <div class="uk-grid uk-width-2-3 uk-container-center">  
107 - <div class="uk-form-row">  
108 - <label class="uk-form-label">对外上报时间:</label>  
109 - <div class="uk-form-controls">  
110 - <input type="text" class="form-control" name="REPORT_DWSBSJ" placeholder="对外上报时间" required>  
111 - </div>  
112 - </div>  
113 - </div>  
114 <div class="uk-modal-footer uk-text-right"> 97 <div class="uk-modal-footer uk-text-right">
115 <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span> 98 <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
116 <button type="button" class="uk-button uk-modal-close">取消</button> 99 <button type="button" class="uk-button uk-modal-close">取消</button>
@@ -125,7 +108,7 @@ @@ -125,7 +108,7 @@
125 路段: 108 路段:
126 </label> 109 </label>
127 <div class="uk-form-controls"> 110 <div class="uk-form-controls">
128 - <input type="text" class="form-control" name="REPORT_ROAD" placeholder="路段" required> 111 + <input type="text" class="form-control" name="REPORT_ROAD" placeholder="路段" >
129 </div> 112 </div>
130 </div> 113 </div>
131 </div> 114 </div>
@@ -135,7 +118,7 @@ @@ -135,7 +118,7 @@
135 行驶方向: 118 行驶方向:
136 </label> 119 </label>
137 <div class="uk-form-controls"> 120 <div class="uk-form-controls">
138 - <input type="text" class="form-control" name="REPORT_XSFX" placeholder="行驶方向" required> 121 + <input type="text" class="form-control" name="REPORT_XSFX" placeholder="行驶方向" >
139 </div> 122 </div>
140 </div> 123 </div>
141 </div> 124 </div>
@@ -145,7 +128,7 @@ @@ -145,7 +128,7 @@
145 站点: 128 站点:
146 </label> 129 </label>
147 <div class="uk-form-controls"> 130 <div class="uk-form-controls">
148 - <input type="text" class="form-control" name="REPORT_STATION" placeholder="站点" required > 131 + <input type="text" class="form-control" name="REPORT_STATION" placeholder="站点" >
149 </div> 132 </div>
150 </div> 133 </div>
151 </div> 134 </div>
@@ -169,24 +152,6 @@ @@ -169,24 +152,6 @@
169 </div> 152 </div>
170 </div> 153 </div>
171 </div> 154 </div>
172 - <div class="uk-grid uk-width-2-3 uk-container-center">  
173 - <div class="uk-form-row">  
174 - <label class="uk-form-label">  
175 - 对外上报部门:  
176 - </label>  
177 - <div class="uk-form-controls">  
178 - <input type="text" class="form-control" name="REPORT_DWSBBM" placeholder="对外上报部门" required>  
179 - </div>  
180 - </div>  
181 - </div>  
182 - <div class="uk-grid uk-width-2-3 uk-container-center">  
183 - <div class="uk-form-row">  
184 - <label class="uk-form-label">对外上报时间:</label>  
185 - <div class="uk-form-controls">  
186 - <input type="text" class="form-control" name="REPORT_DWSBSJ" placeholder="对外上报时间" required>  
187 - </div>  
188 - </div>  
189 - </div>  
190 <div class="uk-modal-footer uk-text-right"> 155 <div class="uk-modal-footer uk-text-right">
191 <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span> 156 <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
192 <button type="button" class="uk-button uk-modal-close">取消</button> 157 <button type="button" class="uk-button uk-modal-close">取消</button>
@@ -212,7 +177,7 @@ @@ -212,7 +177,7 @@
212 影响时间: 177 影响时间:
213 </label> 178 </label>
214 <div class="uk-form-controls"> 179 <div class="uk-form-controls">
215 - <input type="text" class="form-control" name="REPORT_YXSJ" placeholder="影响时间" required> 180 + <input type="text" class="form-control" name="REPORT_YXSJ" placeholder="影响时间" >
216 </div> 181 </div>
217 </div> 182 </div>
218 </div> 183 </div>
@@ -222,7 +187,7 @@ @@ -222,7 +187,7 @@
222 影响班次数: 187 影响班次数:
223 </label> 188 </label>
224 <div class="uk-form-controls"> 189 <div class="uk-form-controls">
225 - <input type="text" class="form-control" name="REPORT_YXBC" placeholder="影响班次数" required> 190 + <input type="text" class="form-control" name="REPORT_YXBC" placeholder="影响班次数" >
226 </div> 191 </div>
227 </div> 192 </div>
228 </div> 193 </div>
@@ -232,25 +197,7 @@ @@ -232,25 +197,7 @@
232 调整措施: 197 调整措施:
233 </label> 198 </label>
234 <div class="uk-form-controls"> 199 <div class="uk-form-controls">
235 - <input type="text" class="form-control" name="REPORT_TZCS" placeholder="调整措施" required>  
236 - </div>  
237 - </div>  
238 - </div>  
239 - <div class="uk-grid uk-width-2-3 uk-container-center">  
240 - <div class="uk-form-row">  
241 - <label class="uk-form-label">  
242 - 对外上报部门:  
243 - </label>  
244 - <div class="uk-form-controls">  
245 - <input type="text" class="form-control" name="REPORT_DWSBBM" placeholder="对外上报部门" required>  
246 - </div>  
247 - </div>  
248 - </div>  
249 - <div class="uk-grid uk-width-2-3 uk-container-center">  
250 - <div class="uk-form-row">  
251 - <label class="uk-form-label">对外上报时间:</label>  
252 - <div class="uk-form-controls">  
253 - <input type="text" class="form-control" name="REPORT_DWSBSJ" placeholder="对外上报时间" required> 200 + <input type="text" class="form-control" name="REPORT_TZCS" placeholder="调整措施" >
254 </div> 201 </div>
255 </div> 202 </div>
256 </div> 203 </div>
@@ -396,6 +343,55 @@ @@ -396,6 +343,55 @@
396 <button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button> 343 <button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
397 </div> 344 </div>
398 </form> 345 </form>
  346 + <!-- 绕改道-->
  347 + <form id="add_detour_table" class="c_register_form" style="display:none; margin-top: 35px;">
  348 + <div class="uk-grid uk-width-2-3 uk-container-center">
  349 + <div class="uk-form-row">
  350 + <label class="uk-form-label">
  351 + 路段:
  352 + </label>
  353 + <div class="uk-form-controls">
  354 + <input type="text" class="form-control" name="REPORT_ROAD" placeholder="路段" >
  355 + </div>
  356 + </div>
  357 + </div>
  358 + <div class="uk-grid uk-width-2-3 uk-container-center">
  359 + <div class="uk-form-row">
  360 + <label class="uk-form-label">
  361 + 行驶方向:
  362 + </label>
  363 + <div class="uk-form-controls">
  364 + <input type="text" class="form-control" name="REPORT_XSFX" placeholder="行驶方向" >
  365 + </div>
  366 + </div>
  367 + </div>
  368 + <div class="uk-grid uk-width-2-3 uk-container-center">
  369 + <div class="uk-form-row">
  370 + <label class="uk-form-label">
  371 + 跳站:
  372 + </label>
  373 + <div class="uk-form-controls">
  374 + <input type="text" class="form-control" name="REPORT_SGGK" placeholder="跳站" >
  375 + </div>
  376 + </div>
  377 + </div>
  378 + <div class="uk-grid uk-width-2-3 uk-container-center">
  379 + <div class="uk-form-row">
  380 + <label class="uk-form-label">
  381 + 原因:
  382 + </label>
  383 + <div class="uk-form-controls">
  384 + <textarea type="text" class="form-control" name="REPORT_BZ" placeholder="原因" required>
  385 + </textarea>
  386 + </div>
  387 + </div>
  388 + </div>
  389 + <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
  390 + <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
  391 + <button type="button" class="uk-button uk-modal-close">取消</button>
  392 + <button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
  393 + </div>
  394 + </form>
399 <!-- 其他--> 395 <!-- 其他-->
400 <form id="add_rests_table" class="c_register_form" style="display:none; margin-top: 35px;"> 396 <form id="add_rests_table" class="c_register_form" style="display:none; margin-top: 35px;">
401 397
@@ -405,7 +401,8 @@ @@ -405,7 +401,8 @@
405 报备内容: 401 报备内容:
406 </label> 402 </label>
407 <div class="uk-form-controls"> 403 <div class="uk-form-controls">
408 - <input type="text" class="form-control" name="REPORT_BZ" placeholder="报备内容" required> 404 + <textarea type="text" class="form-control" name="REPORT_BZ" placeholder="报备内容" required>
  405 + </textarea>
409 </div> 406 </div>
410 </div> 407 </div>
411 </div> 408 </div>
@@ -495,6 +492,8 @@ @@ -495,6 +492,8 @@
495 typeInt = 5; 492 typeInt = 5;
496 } else if (tableActive == 'add_consult_table') { 493 } else if (tableActive == 'add_consult_table') {
497 typeInt = 6; 494 typeInt = 6;
  495 + } else if (tableActive == 'add_detour_table') {
  496 + typeInt = 7;
498 } 497 }
499 $('#REPORT_TYPE').val(typeInt); 498 $('#REPORT_TYPE').val(typeInt);
500 if(typeInt != rr.REPORT_TYPE ) { 499 if(typeInt != rr.REPORT_TYPE ) {
@@ -563,6 +562,8 @@ @@ -563,6 +562,8 @@
563 tableActive = 'add_rests_table'; 562 tableActive = 'add_rests_table';
564 } else if (REPORT_TYPE == 6) { 563 } else if (REPORT_TYPE == 6) {
565 tableActive = 'add_consult_table'; 564 tableActive = 'add_consult_table';
  565 + } else if (REPORT_TYPE == 7) {
  566 + tableActive = 'add_detour_table';
566 } 567 }
567 document.getElementById(tableActive).style.display = ""; 568 document.getElementById(tableActive).style.display = "";
568 changeType(tableActive); 569 changeType(tableActive);