Update

徐烜
1 parent 42569d5a
Showing 3 changed files with 39 additions and 11 deletions
src/main/resources/static/pages/scheduleApp/module/common/dts1/select/saSelect5.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/list.html
@@ -143,7 +143,13 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                 if (mc.indexOf('_') > 0) {
                                     scope[ctrlAs].model[mc] = $item[ic];
                                 } else {
-                                    eval("scope[ctrlAs].model" + "." + mc + " = $item" + "." + ic + ";");
+                                    try {
+                                        eval("scope[ctrlAs].model" + "." + mc + " = $item" + "." + ic + ";");
+                                    } catch (e) {
+                                        // TODO：
+                                        eval("scope[ctrlAs].model" + "." + mc + " = null;");
+                                    }
+
                                 }
                             }
                         };
@@ -1563,7 +1563,13 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                 if (mc.indexOf('_') > 0) {
                                     scope[ctrlAs].model[mc] = $item[ic];
                                 } else {
-                                    eval("scope[ctrlAs].model" + "." + mc + " = $item" + "." + ic + ";");
+                                    try {
+                                        eval("scope[ctrlAs].model" + "." + mc + " = $item" + "." + ic + ";");
+                                    } catch (e) {
+                                        // TODO：
+                                        eval("scope[ctrlAs].model" + "." + mc + " = null;");
+                                    }
+
                                 }
                             }
                         };
@@ -5,12 +5,11 @@
             <tr role="row" class="heading">
                 <th style="width: 50px;">序号</th>
                 <th style="width: 150px;">套跑线路</th>
-                <th style="width: 80px">套跑路牌</th>
-                <th >时刻表</th>
+                <th style="width: 180px">套跑时刻表/路牌</th>
+                <th style="width: 100px">套跑类型</th>
                 <th style="width: 150px;">线路</th>
                 <th style="width: 50px">路牌</th>
                 <th width="100px">车辆</th>
-                <th width="100px">套跑类型</th>
                 <th width="80px">状态</th>
                 <th style="width: 21%">操作</th>
             </tr>
@@ -35,7 +34,6 @@
                 <td></td>
                 <td></td>
                 <td></td>
-                <td></td>
                 <td>
                     <label class="checkbox-inline">
                         <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>已作废
@@ -62,10 +60,31 @@
                     <span ng-bind="info.rerunXl.name"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.rerunLp.lpName"></span>
+                    <div>
+                        <a href="#"
+                           tooltip-animation="false"
+                           tooltip-placement="top"
+                           uib-tooltip="{{'套跑时刻表：' + info.rerunTtinfo.name}}"
+                           tooltip-class="headClass">
+                            <i class="fa fa-table" aria-hidden="true"></i>
+                            <span ng-bind="info.rerunTtinfo.name"></span>
+                        </a>
+                    </div>
+                    <div>
+                        <a href="#"
+                           tooltip-animation="false"
+                           tooltip-placement="top"
+                           uib-tooltip="{{'套跑路牌：' + info.rerunLp.lpName}}"
+                           tooltip-class="headClass">
+                            <i class="fa fa-map-signs" aria-hidden="true"></i>
+                            <span ng-bind="info.rerunLp.lpName"></span>
+                        </a>
+
+                    </div>
+
                 </td>
                 <td>
-                    <span ng-bind="info.rerunTtinfo.name"></span>
+                    <span ng-bind="info.rerunType | dict:'rerunType':'未知' "></span>
                 </td>
                 <td>
                     <span ng-bind="info.useXl.name"></span>
@@ -77,9 +96,6 @@
                     <span ng-bind="info.useCarConfig.cl.insideCode"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.rerunType | dict:'rerunType':'未知' "></span>
-                </td>
-                <td>
                     <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
                     <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
                 </td>