潘钊 / 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 83 List<Iterator<?>> list4 = new ArrayList<>();
84 84 List<Iterator<?>> list5 = new ArrayList<>();
85 85 List<Iterator<?>> list6 = new ArrayList<>();
  86 + List<Iterator<?>> list7 = new ArrayList<>();
86 87 List<Map<String, Object>> resList1 = new ArrayList<Map<String, Object>>();
87 88 List<Map<String, Object>> resList2 = new ArrayList<Map<String, Object>>();
88 89 List<Map<String, Object>> resList3 = new ArrayList<Map<String, Object>>();
89 90 List<Map<String, Object>> resList4 = new ArrayList<Map<String, Object>>();
90 91 List<Map<String, Object>> resList5 = new ArrayList<Map<String, Object>>();
91 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 95 ReportUtils ee = new ReportUtils();
94 96 for (ReportRegister l : list) {
95 97 Map<String, Object> m = new HashMap<String, Object>();
... ... @@ -152,6 +154,10 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl&lt;ReportRegister, L
152 154 i6++;
153 155 m.put("i", i6);
154 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 163 try {
... ... @@ -163,6 +169,8 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl&lt;ReportRegister, L
163 169 lists.add(list3);
164 170 list4.add(resList4.iterator());
165 171 lists.add(list4);
  172 + list7.add(resList7.iterator());
  173 + lists.add(list7);
166 174 list5.add(resList5.iterator());
167 175 lists.add(list5);
168 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 40 <option value="1">首末班误点</option>
41 41 <option value="2">大间隔</option>
42 42 <option value="3">突发事件</option>
43   - <option value="4">事故</option>
  43 + <option value="7">绕改道</option>
  44 +<!-- <option value="4">事故</option> -->
44 45 <option value="5">其他</option>
45   - <option value="6">咨询</option>
  46 +<!-- <option value="6">咨询</option> -->
46 47 </select>
47 48 </div>
48 49 </div>
... ... @@ -88,25 +89,7 @@
88 89 首末班延误原因:
89 90 </label>
90 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 93 </div>
111 94 </div>
112 95 </div>
... ... @@ -124,7 +107,7 @@
124 107 路段:
125 108 </label>
126 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 111 </div>
129 112 </div>
130 113 </div>
... ... @@ -134,7 +117,7 @@
134 117 行驶方向:
135 118 </label>
136 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 121 </div>
139 122 </div>
140 123 </div>
... ... @@ -144,7 +127,7 @@
144 127 站点:
145 128 </label>
146 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 131 </div>
149 132 </div>
150 133 </div>
... ... @@ -168,24 +151,6 @@
168 151 </div>
169 152 </div>
170 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 154 <div class="uk-modal-footer uk-text-right">
190 155 <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
191 156 <button type="button" class="uk-button uk-modal-close">取消</button>
... ... @@ -211,7 +176,7 @@
211 176 影响时间:
212 177 </label>
213 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 180 </div>
216 181 </div>
217 182 </div>
... ... @@ -221,7 +186,7 @@
221 186 影响班次数:
222 187 </label>
223 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 190 </div>
226 191 </div>
227 192 </div>
... ... @@ -231,25 +196,7 @@
231 196 调整措施:
232 197 </label>
233 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 200 </div>
254 201 </div>
255 202 </div>
... ... @@ -395,6 +342,55 @@
395 342 <button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
396 343 </div>
397 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 395 <form id="add_rests_table" class="c_register_form" style="display:none; margin-top: 35px;">
400 396  
... ... @@ -404,7 +400,8 @@
404 400 报备内容:
405 401 </label>
406 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 405 </div>
409 406 </div>
410 407 </div>
... ... @@ -494,6 +491,8 @@
494 491 typeInt = 5;
495 492 } else if (tableActive == 'add_consult_table') {
496 493 typeInt = 6;
  494 + } else if (tableActive == 'add_detour_table') {
  495 + typeInt = 7;
497 496 } else {
498 497 UIkit.modal(modal).hide();
499 498 notify_err('您所选的数据有问题，请重新选择！');
... ... @@ -553,6 +552,8 @@
553 552 tableActive = 'add_rests_table';
554 553 } else if (REPORT_TYPE == 6) {
555 554 tableActive = 'add_consult_table';
  555 + } else if (REPORT_TYPE == 7) {
  556 + tableActive = 'add_detour_table';
556 557 }
557 558 document.getElementById(tableActive).style.display = "";
558 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 33 <li id="first_last_late" class="uk-active"><a>首末班误点</a></li>
34 34 <li id="large_interval"><a>大间隔</a></li>
35 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 38 <li id="rests"><a>其他</a></li>
38   - <li id="consult"><a>咨询</a></li>
  39 +<!-- <li id="consult"><a>咨询</a></li> -->
39 40 </ul>
40 41 </div>
41 42  
... ... @@ -68,8 +69,6 @@
68 69 <th width="7%">延误站点</th>
69 70 <th width="5%">延误时间</th>
70 71 <th width="10%">首末班延误原因</th>
71   - <th width="7%">对外上报部门</th>
72   - <th width="7%">对外上报时间</th>
73 72 </tr>
74 73 </thead>
75 74 <tbody class="table_body">
... ... @@ -90,8 +89,6 @@
90 89 <th width="7%">站点</th>
91 90 <th width="7%">大间隔时间</th>
92 91 <th width="7%">大间隔原因</th>
93   - <th width="7%">对外上报部门</th>
94   - <th width="7%">对外上报时间</th>
95 92 </tr>
96 93 </thead>
97 94 <tbody class="table_body">
... ... @@ -111,8 +108,6 @@
111 108 <th width="7%">影响时间</th>
112 109 <th width="7%">影响班次数</th>
113 110 <th width="7%">调整措施</th>
114   - <th width="7%">对外上报部门</th>
115   - <th width="7%">对外上报时间</th>
116 111 </tr>
117 112 </thead>
118 113 <tbody class="table_body">
... ... @@ -146,6 +141,25 @@
146 141 <tbody class="table_body">
147 142 </tbody>
148 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 164 <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="rests_table">
151 165 <tr role="row">
... ... @@ -202,8 +216,6 @@
202 216 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
203 217 <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td>
204 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 219 </tr>
208 220 {{/each}}
209 221 </script>
... ... @@ -225,8 +237,6 @@
225 237 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
226 238 <td style="vertical-align: middle;">{{obj.report_DJGSNAMEJ}}</td>
227 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 240 </tr>
231 241 {{/each}}
232 242 </script>
... ... @@ -247,8 +257,6 @@
247 257 <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td>
248 258 <td style="vertical-align: middle;">{{obj.report_YXBC}}</td>
249 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 260 </tr>
253 261 {{/each}}
254 262 </script>
... ... @@ -281,6 +289,26 @@
281 289 </tr>
282 290 {{/each}}
283 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 312 <script id="rests_table_body_list" type="text/html">
285 313 {{each data.list as obj i}}
286 314 {{if obj.status == 2}}
... ... @@ -410,7 +438,7 @@
410 438 if (data.status == "SUCCESS") {
411 439 var list = data.list;
412 440 var tableList1 = [], tableList2 = [], tableList3 = [], tableList4 = [], tableList5 = [],
413   - tableList6 = [];
  441 + tableList6 = [], tableList7 = [];
414 442 $.each(list, function (i, rr) {
415 443 rr.report_DATE = formatDate(new Date(rr.report_DATE));
416 444 if (rr.report_TYPE == 1) {
... ... @@ -425,6 +453,8 @@
425 453 tableList5.push(rr);
426 454 } else if (rr.report_TYPE == 6) {
427 455 tableList6.push(rr);
  456 + } else if (rr.report_TYPE == 7) {
  457 + tableList7.push(rr);
428 458 }
429 459 });
430 460 var htmlStr = template('first_last_late_table_body_list', {'data':{'list': tableList1,'line':lineList}});
... ... @@ -435,6 +465,8 @@
435 465 $('#emergency_table .table_body', modal).html(htmlStr);
436 466 htmlStr = template('accident_table_body_list', {'data':{'list': tableList4,'line':lineList}});
437 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 470 htmlStr = template('rests_table_body_list', {'data':{'list': tableList5,'line':lineList}});
439 471 $('#rests_table .table_body', modal).html(htmlStr);
440 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 43 <option value="1">首末班误点</option>
44 44 <option value="2">大间隔</option>
45 45 <option value="3">突发事件</option>
46   - <option value="4">事故</option>
  46 +<!-- <option value="4">事故</option> -->
47 47 <option value="5">其他</option>
48   - <option value="6">咨询</option>
  48 +<!-- <option value="6">咨询</option> -->
49 49 </select>
50 50 </div>
51 51 <div class="form-group">
... ... @@ -190,8 +190,6 @@
190 190 <th width="7%">延误站点</th>
191 191 <th width="5%">延误时间</th>
192 192 <th width="10%">首末班延误原因</th>
193   - <th width="7%">对外上报部门</th>
194   - <th width="7%">对外上报时间</th>
195 193 </tr>
196 194 </thead>
197 195 <tbody>
... ... @@ -206,8 +204,6 @@
206 204 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
207 205 <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td>
208 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 207 </tr>
212 208 {{/each}}
213 209 {{if list.length == 0}}
... ... @@ -228,8 +224,6 @@
228 224 <th width="7%">站点</th>
229 225 <th width="7%">大间隔时间</th>
230 226 <th width="7%">大间隔原因</th>
231   - <th width="7%">对外上报部门</th>
232   - <th width="7%">对外上报时间</th>
233 227 </tr>
234 228 </thead>
235 229 <tbody>
... ... @@ -246,8 +240,6 @@
246 240 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
247 241 <td style="vertical-align: middle;">{{obj.report_DJGSJ}}</td>
248 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 243 </tr>
252 244 {{/each}}
253 245 {{if list.length == 0}}
... ... @@ -267,8 +259,6 @@
267 259 <th width="7%">影响时间</th>
268 260 <th width="7%">影响班次数</th>
269 261 <th width="7%">调整措施</th>
270   - <th width="7%">对外上报部门</th>
271   - <th width="7%">对外上报时间</th>
272 262 </tr>
273 263 </thead>
274 264 <tbody>
... ... @@ -284,8 +274,6 @@
284 274 <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td>
285 275 <td style="vertical-align: middle;">{{obj.report_YXBC}}</td>
286 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 277 </tr>
290 278 {{/each}}
291 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 36 <li id="first_last_late" class="uk-active"><a>首末班误点</a></li>
37 37 <li id="large_interval"><a>大间隔</a></li>
38 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 41 <li id="rests"><a>其他</a></li>
41   - <li id="consult"><a>咨询</a></li>
  42 +<!-- <li id="consult"><a>咨询</a></li> -->
42 43 </ul>
43 44 </div>
44 45  
... ... @@ -68,8 +69,6 @@
68 69 <th width="7%">延误站点</th>
69 70 <th width="5%">延误时间</th>
70 71 <th width="10%">首末班延误原因</th>
71   - <th width="7%">对外上报部门</th>
72   - <th width="7%">对外上报时间</th>
73 72 </tr>
74 73 </thead>
75 74 <tbody class="table_body">
... ... @@ -89,8 +88,6 @@
89 88 <th width="7%">站点</th>
90 89 <th width="7%">大间隔时间</th>
91 90 <th width="7%">大间隔原因</th>
92   - <th width="7%">对外上报部门</th>
93   - <th width="7%">对外上报时间</th>
94 91 </tr>
95 92 </thead>
96 93 <tbody class="table_body">
... ... @@ -109,8 +106,6 @@
109 106 <th width="7%">影响时间</th>
110 107 <th width="7%">影响班次数</th>
111 108 <th width="7%">调整措施</th>
112   - <th width="7%">对外上报部门</th>
113   - <th width="7%">对外上报时间</th>
114 109 </tr>
115 110 </thead>
116 111 <tbody class="table_body">
... ... @@ -143,6 +138,24 @@
143 138 <tbody class="table_body">
144 139 </tbody>
145 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 160 <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="rests_table">
148 161 <thead class="">
... ... @@ -204,8 +217,6 @@
204 217 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
205 218 <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td>
206 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 220 </tr>
210 221 {{/each}}
211 222 </script>
... ... @@ -233,8 +244,6 @@
233 244 <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
234 245 <td style="vertical-align: middle;">{{obj.report_DJGSJ}}</td>
235 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 247 </tr>
239 248 {{/each}}
240 249 </script>
... ... @@ -261,8 +270,6 @@
261 270 <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td>
262 271 <td style="vertical-align: middle;">{{obj.report_YXBC}}</td>
263 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 273 </tr>
267 274 {{/each}}
268 275 </script>
... ... @@ -301,6 +308,33 @@
301 308 </tr>
302 309 {{/each}}
303 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 338 <script id="rests_table_body" type="text/html">
305 339 {{each data.list as obj i}}
306 340  
... ... @@ -434,7 +468,7 @@
434 468 if (data.status == "SUCCESS") {
435 469 var list = data.list;
436 470 var tableList1 = [], tableList2 = [], tableList3 = [], tableList4 = [], tableList5 = [],
437   - tableList6 = [];
  471 + tableList6 = [], tableList7 = [];
438 472 $.each(list, function (i, rr) {
439 473 rr.report_DATE = formatDate(new Date(rr.report_DATE));
440 474 if (rr.report_TYPE == 1) {
... ... @@ -449,6 +483,8 @@
449 483 tableList5.push(rr);
450 484 } else if (rr.report_TYPE == 6) {
451 485 tableList6.push(rr);
  486 + } else if (rr.report_TYPE == 7) {
  487 + tableList7.push(rr);
452 488 }
453 489 });
454 490 var htmlStr = template('first_last_late_table_body', {'data':{'list': tableList1,'line':lineList}});
... ... @@ -459,6 +495,8 @@
459 495 $('#emergency_table .table_body', modal).html(htmlStr);
460 496 htmlStr = template('accident_table_body', {'data':{'list': tableList4,'line':lineList}});
461 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 500 htmlStr = template('rests_table_body', {'data':{'list': tableList5,'line':lineList}});
463 501 $('#rests_table .table_body', modal).html(htmlStr);
464 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 41 <option value="1">首末班误点</option>
42 42 <option value="2">大间隔</option>
43 43 <option value="3">突发事件</option>
44   - <option value="4">事故</option>
  44 + <option value="7">绕改道</option>
  45 +<!-- <option value="4">事故</option> -->
45 46 <option value="5">其他</option>
46   - <option value="6">咨询</option>
  47 +<!-- <option value="6">咨询</option> -->
47 48 </select>
48 49 </div>
49 50 </div>
... ... @@ -93,24 +94,6 @@
93 94 </div>
94 95 </div>
95 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 97 <div class="uk-modal-footer uk-text-right">
115 98 <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
116 99 <button type="button" class="uk-button uk-modal-close">取消</button>
... ... @@ -125,7 +108,7 @@
125 108 路段:
126 109 </label>
127 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 112 </div>
130 113 </div>
131 114 </div>
... ... @@ -135,7 +118,7 @@
135 118 行驶方向:
136 119 </label>
137 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 122 </div>
140 123 </div>
141 124 </div>
... ... @@ -145,7 +128,7 @@
145 128 站点:
146 129 </label>
147 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 132 </div>
150 133 </div>
151 134 </div>
... ... @@ -169,24 +152,6 @@
169 152 </div>
170 153 </div>
171 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 155 <div class="uk-modal-footer uk-text-right">
191 156 <span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
192 157 <button type="button" class="uk-button uk-modal-close">取消</button>
... ... @@ -212,7 +177,7 @@
212 177 影响时间:
213 178 </label>
214 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 181 </div>
217 182 </div>
218 183 </div>
... ... @@ -222,7 +187,7 @@
222 187 影响班次数:
223 188 </label>
224 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 191 </div>
227 192 </div>
228 193 </div>
... ... @@ -232,25 +197,7 @@
232 197 调整措施:
233 198 </label>
234 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 201 </div>
255 202 </div>
256 203 </div>
... ... @@ -396,6 +343,55 @@
396 343 <button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
397 344 </div>
398 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 396 <form id="add_rests_table" class="c_register_form" style="display:none; margin-top: 35px;">
401 397  
... ... @@ -405,7 +401,8 @@
405 401 报备内容:
406 402 </label>
407 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 406 </div>
410 407 </div>
411 408 </div>
... ... @@ -495,6 +492,8 @@
495 492 typeInt = 5;
496 493 } else if (tableActive == 'add_consult_table') {
497 494 typeInt = 6;
  495 + } else if (tableActive == 'add_detour_table') {
  496 + typeInt = 7;
498 497 }
499 498 $('#REPORT_TYPE').val(typeInt);
500 499 if(typeInt != rr.REPORT_TYPE ) {
... ... @@ -563,6 +562,8 @@
563 562 tableActive = 'add_rests_table';
564 563 } else if (REPORT_TYPE == 6) {
565 564 tableActive = 'add_consult_table';
  565 + } else if (REPORT_TYPE == 7) {
  566 + tableActive = 'add_detour_table';
566 567 }
567 568 document.getElementById(tableActive).style.display = "";
568 569 changeType(tableActive);
... ...