Commit 31632d32bb8e305794b06b06154eab53b2ac01b6
1 parent
42569d5a
Update
Showing
3 changed files
with
39 additions
and
11 deletions
src/main/resources/static/pages/scheduleApp/module/common/dts1/select/saSelect5.js
| ... | ... | @@ -143,7 +143,13 @@ angular.module('ScheduleApp').directive('saSelect5', [ |
| 143 | 143 | if (mc.indexOf('_') > 0) { |
| 144 | 144 | scope[ctrlAs].model[mc] = $item[ic]; |
| 145 | 145 | } else { |
| 146 | - eval("scope[ctrlAs].model" + "." + mc + " = $item" + "." + ic + ";"); | |
| 146 | + try { | |
| 147 | + eval("scope[ctrlAs].model" + "." + mc + " = $item" + "." + ic + ";"); | |
| 148 | + } catch (e) { | |
| 149 | + // TODO： | |
| 150 | + eval("scope[ctrlAs].model" + "." + mc + " = null;"); | |
| 151 | + } | |
| 152 | + | |
| 147 | 153 | } |
| 148 | 154 | } |
| 149 | 155 | }; | ... | ... |
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
| ... | ... | @@ -1563,7 +1563,13 @@ angular.module('ScheduleApp').directive('saSelect5', [ |
| 1563 | 1563 | if (mc.indexOf('_') > 0) { |
| 1564 | 1564 | scope[ctrlAs].model[mc] = $item[ic]; |
| 1565 | 1565 | } else { |
| 1566 | - eval("scope[ctrlAs].model" + "." + mc + " = $item" + "." + ic + ";"); | |
| 1566 | + try { | |
| 1567 | + eval("scope[ctrlAs].model" + "." + mc + " = $item" + "." + ic + ";"); | |
| 1568 | + } catch (e) { | |
| 1569 | + // TODO： | |
| 1570 | + eval("scope[ctrlAs].model" + "." + mc + " = null;"); | |
| 1571 | + } | |
| 1572 | + | |
| 1567 | 1573 | } |
| 1568 | 1574 | } |
| 1569 | 1575 | }; | ... | ... |
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/list.html
| ... | ... | @@ -5,12 +5,11 @@ |
| 5 | 5 | <tr role="row" class="heading"> |
| 6 | 6 | <th style="width: 50px;">序号</th> |
| 7 | 7 | <th style="width: 150px;">套跑线路</th> |
| 8 | - <th style="width: 80px">套跑路牌</th> | |
| 9 | - <th >时刻表</th> | |
| 8 | + <th style="width: 180px">套跑时刻表/路牌</th> | |
| 9 | + <th style="width: 100px">套跑类型</th> | |
| 10 | 10 | <th style="width: 150px;">线路</th> |
| 11 | 11 | <th style="width: 50px">路牌</th> |
| 12 | 12 | <th width="100px">车辆</th> |
| 13 | - <th width="100px">套跑类型</th> | |
| 14 | 13 | <th width="80px">状态</th> |
| 15 | 14 | <th style="width: 21%">操作</th> |
| 16 | 15 | </tr> |
| ... | ... | @@ -35,7 +34,6 @@ |
| 35 | 34 | <td></td> |
| 36 | 35 | <td></td> |
| 37 | 36 | <td></td> |
| 38 | - <td></td> | |
| 39 | 37 | <td> |
| 40 | 38 | <label class="checkbox-inline"> |
| 41 | 39 | <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>已作废 |
| ... | ... | @@ -62,10 +60,31 @@ |
| 62 | 60 | <span ng-bind="info.rerunXl.name"></span> |
| 63 | 61 | </td> |
| 64 | 62 | <td> |
| 65 | - <span ng-bind="info.rerunLp.lpName"></span> | |
| 63 | + <div> | |
| 64 | + <a href="#" | |
| 65 | + tooltip-animation="false" | |
| 66 | + tooltip-placement="top" | |
| 67 | + uib-tooltip="{{'套跑时刻表：' + info.rerunTtinfo.name}}" | |
| 68 | + tooltip-class="headClass"> | |
| 69 | + <i class="fa fa-table" aria-hidden="true"></i> | |
| 70 | + <span ng-bind="info.rerunTtinfo.name"></span> | |
| 71 | + </a> | |
| 72 | + </div> | |
| 73 | + <div> | |
| 74 | + <a href="#" | |
| 75 | + tooltip-animation="false" | |
| 76 | + tooltip-placement="top" | |
| 77 | + uib-tooltip="{{'套跑路牌：' + info.rerunLp.lpName}}" | |
| 78 | + tooltip-class="headClass"> | |
| 79 | + <i class="fa fa-map-signs" aria-hidden="true"></i> | |
| 80 | + <span ng-bind="info.rerunLp.lpName"></span> | |
| 81 | + </a> | |
| 82 | + | |
| 83 | + </div> | |
| 84 | + | |
| 66 | 85 | </td> |
| 67 | 86 | <td> |
| 68 | - <span ng-bind="info.rerunTtinfo.name"></span> | |
| 87 | + <span ng-bind="info.rerunType | dict:'rerunType':'未知' "></span> | |
| 69 | 88 | </td> |
| 70 | 89 | <td> |
| 71 | 90 | <span ng-bind="info.useXl.name"></span> |
| ... | ... | @@ -77,9 +96,6 @@ |
| 77 | 96 | <span ng-bind="info.useCarConfig.cl.insideCode"></span> |
| 78 | 97 | </td> |
| 79 | 98 | <td> |
| 80 | - <span ng-bind="info.rerunType | dict:'rerunType':'未知' "></span> | |
| 81 | - </td> | |
| 82 | - <td> | |
| 83 | 99 | <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span> |
| 84 | 100 | <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span> |
| 85 | 101 | </td> | ... | ... |