update

徐烜
1 parent 14edc080
Showing 21 changed files with 228 additions and 223 deletions
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/index.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig.js
src/main/resources/static/pages/scheduleApp/module/core/busConfig/index.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/index.html
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/guideboardManage.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/index.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanInfoManage.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanManage.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/index.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/list.html
@@ -35,7 +35,7 @@
                     <div class="btn-group">
                         <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
                             <i class="fa fa-share"></i>
-                            <span>系统工具</span>
+                            <span>数据工具</span>
                             <i class="fa fa-angle-down"></i>
                         </a>
                         <ul class="dropdown-menu pull-right">
@@ -4,15 +4,15 @@
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th style="width: 40pt;">序号</th>
+                <th style="width: 5%;">序号</th>
                 <th >车辆编号</th>
                 <th >内部编号</th>
                 <th >设备编号</th>
                 <th >车牌号</th>
-                <th style="width: 105pt;">所在公司</th>
+                <th style="width: 15%;">所在公司</th>
                 <th >所在分公司</th>
-                <th style="width: 60pt">是否电车</th>
-                <th style="width: 115pt">操作</th>
+                <th style="width: 10%">是否电车</th>
+                <th style="width: 21%">操作</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -27,7 +27,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeInfoManageService&#39;, [&#39;EmployeeInf
         resetSearchCondition: function() {
             var key;
             for (key in currentSearchCondition) {
-                currentSearchCondition[key] = null;
+                currentSearchCondition[key] = undefined;
             }
             currentPageNo = 1;
         },
@@ -35,7 +35,7 @@
                     <div class="btn-group">
                         <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
                             <i class="fa fa-share"></i>
-                            <span>系统工具</span>
+                            <span>数据工具</span>
                             <i class="fa fa-angle-down"></i>
                         </a>
                         <ul class="dropdown-menu pull-right">
@@ -4,14 +4,14 @@
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th style="width: 40pt;">序号</th>
+                <th style="width: 5%;">序号</th>
                 <th >姓名</th>
                 <th >工号</th>
-                <th style="width: 60pt;">性别</th>
-                <th style="width: 120pt;">所在公司</th>
+                <th style="width: 5%;">性别</th>
+                <th style="width: 15%;">所在公司</th>
                 <th >分公司</th>
-                <th style="width: 150pt;">工种</th>
-                <th style="width: 115pt;">操作</th>
+                <th style="width: 20%;">工种</th>
+                <th style="width: 21%">操作</th>
             </tr>
             <tr role="row" class="filter">
                 <td>
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService&#39;, [&#39;BusConfigService_g&#39;,
         resetSearchCondition: function() {
             var key;
             for (key in currentSearchCondition) {
-                currentSearchCondition[key] = null;
+                currentSearchCondition[key] = undefined;
             }
         },
         /**
@@ -35,7 +35,7 @@
                     <div class="btn-group">
                         <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
                             <i class="fa fa-share"></i>
-                            <span>系统工具</span>
+                            <span>数据工具</span>
                             <i class="fa fa-angle-down"></i>
                         </a>
                         <ul class="dropdown-menu pull-right">
 <!-- ui-route employeeInfoManage.list -->
 <div ng-controller="BusConfigListCtrl as ctrl">
-    <div style="width: 100%; height: 100%; overflow: auto">
+    <div class="fixDiv">
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th class="mixTd" width="50px">序号</th>
-                <th class="mixTd" width="150px">线路</th>
-                <th class="mixTd" width="80px">内部编号</th>
-                <th class="mixTd">启用日期</th>
-                <th class="mixTd">终止日期</th>
-                <th class="mixTd">停车点</th>
-                <th class="mixTd" width="150px">操作</th>
+                <th style="width: 5%;">序号</th>
+                <th style="width: 15%;">线路</th>
+                <th >内部编号</th>
+                <th >启用日期</th>
+                <th >终止日期</th>
+                <th >停车点</th>
+                <th style="width: 21%">操作</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -48,25 +48,25 @@
             </thead>
             <tbody>
             <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
-                <td class="mixTd">
+                <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.xl.name"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.cl.insideCode"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.qyrq | date: 'yyyy-MM-dd HH:mm:ss'"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.zzrq | date: 'yyyy-MM-dd HH:mm:ss'"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.tcd"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="busConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
@@ -35,7 +35,7 @@
                     <div class="btn-group">
                         <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
                             <i class="fa fa-share"></i>
-                            <span>系统工具</span>
+                            <span>数据工具</span>
                             <i class="fa fa-angle-down"></i>
                         </a>
                         <ul class="dropdown-menu pull-right">
 <!-- ui-route employeeInfoManage.list -->
 <div ng-controller="EmployeeConfigListCtrl as ctrl">
-    <div style="width: 100%; height: 100%; overflow: auto">
+    <div class="fixDiv">
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th class="mixTd" width="50px">序号</th>
-                <th class="mixTd" width="150px">线路</th>
-                <th class="mixTd" width="80px">搭班编码</th>
-                <th class="mixTd">驾驶员工号</th>
-                <th class="mixTd" width="150px">驾驶员</th>
-                <th class="mixTd">售票员工号</th>
-                <th class="mixTd">售票员</th>
-                <th class="mixTd" width="150px">操作</th>
+                <th style="width: 5%;">序号</th>
+                <th style="width: 15%;">线路</th>
+                <th style="width: 10%;">搭班编码</th>
+                <th >驾驶员工号</th>
+                <th style="width: 15%;">驾驶员</th>
+                <th >售票员工号</th>
+                <th >售票员</th>
+                <th style="width: 21%">操作</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -64,28 +64,28 @@
             </thead>
             <tbody>
             <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
-                <td class="mixTd">
+                <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.xl.name"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.dbbm"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.jsy.jobCode"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.jsy.personnelName"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.spy.jobCode"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.spy.personnelName"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="employeeConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
@@ -21,7 +21,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService&#39;, [&#39;GuideboardMan
         resetSearchCondition: function() {
             var key;
             for (key in currentSearchCondition) {
-                currentSearchCondition[key] = "";
+                currentSearchCondition[key] = undefined;
             }
         },
         /**
@@ -35,7 +35,7 @@
                     <div class="btn-group">
                         <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
                             <i class="fa fa-share"></i>
-                            <span>系统工具</span>
+                            <span>数据工具</span>
                             <i class="fa fa-angle-down"></i>
                         </a>
                         <ul class="dropdown-menu pull-right">
 <!-- ui-route employeeInfoManage.list -->
 <div ng-controller="GuideboardManageListCtrl as ctrl">
-    <div style="width: 100%; height: 100%; overflow: auto">
+    <div class="fixDiv">
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th class="mixTd" width="50px">序号</th>
-                <th class="mixTd" width="150px">线路</th>
-                <th class="mixTd">路牌编号</th>
-                <th class="mixTd">路牌名称</th>
-                <th class="mixTd">路牌类型</th>
-                <th class="mixTd" width="150px">操作</th>
+                <th style="width: 5%">序号</th>
+                <th style="width: 15%">线路</th>
+                <th >路牌编号</th>
+                <th >路牌名称</th>
+                <th >路牌类型</th>
+                <th style="width: 21%">操作</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -42,22 +42,22 @@
             </thead>
             <tbody>
             <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
-                <td class="mixTd">
+                <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.xl.name"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.lpNo"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.lpName"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <span ng-bind="info.lpType"></span>
                 </td>
-                <td class="mixTd">
+                <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="guideboardManage_detail({id : info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
 <!-- ui-route employeeInfoManage.list -->
 <div ng-controller="SchedulePlanManageListCtrl as ctrl">
-    <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
-        <thead>
-        <tr role="row" class="heading">
-            <th style="width: 40pt;">序号</th>
-            <th style="width: 115pt;">线路</th>
-            <th style="width: 200pt;">时刻表</th>
-            <th>排班开始时间</th>
-            <th>排班结束时间</th>
-            <th>修改人</th>
-            <th>修改时间</th>
-            <th style="width: 115pt;">操作</th>
-        </tr>
-        <tr role="row" class="filter">
-            <td></td>
-            <td>
-                <sa-Select3 model="ctrl.searchCondition()"
-                            name="xl"
-                            placeholder="请输拼音..."
-                            dcvalue="{{ctrl.searchCondition()['xl.id_eq']}}"
-                            dcname="xl.id_eq"
-                            icname="id"
-                            icnames="name"
-                            datatype="xl">
-                </sa-Select3>
-            </td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>
-                <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
-                        ng-click="ctrl.pageChanaged()">
-                    <i class="fa fa-search"></i> 搜索</button>
+    <div class="fixDiv">
+        <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
+            <thead>
+            <tr role="row" class="heading">
+                <th style="width: 5%;">序号</th>
+                <th style="width: 15%;">线路</th>
+                <th style="width: 20%;">时刻表</th>
+                <th>排班开始时间</th>
+                <th>排班结束时间</th>
+                <th>修改人</th>
+                <th>修改时间</th>
+                <th style="width: 21%">操作</th>
+            </tr>
+            <tr role="row" class="filter">
+                <td></td>
+                <td>
+                    <sa-Select3 model="ctrl.searchCondition()"
+                                name="xl"
+                                placeholder="请输拼音..."
+                                dcvalue="{{ctrl.searchCondition()['xl.id_eq']}}"
+                                dcname="xl.id_eq"
+                                icname="id"
+                                icnames="name"
+                                datatype="xl">
+                    </sa-Select3>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td>
+                    <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
+                            ng-click="ctrl.pageChanaged()">
+                        <i class="fa fa-search"></i> 搜索</button>
  
-                <button class="btn btn-sm red btn-outline filter-cancel"
-                        ng-click="ctrl.resetSearchCondition()">
-                    <i class="fa fa-times"></i> 重置</button>
-            </td>
+                    <button class="btn btn-sm red btn-outline filter-cancel"
+                            ng-click="ctrl.resetSearchCondition()">
+                        <i class="fa fa-times"></i> 重置</button>
+                </td>
+
+            </tr>
+            </thead>
+            <tbody>
+            <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
+                <td>
+                    <span ng-bind="$index + 1"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.xl.name"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.ttInfo.name"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.scheduleFromTime | date: 'yyyy-MM-dd '"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.scheduleToTime | date: 'yyyy-MM-dd '"></span>
+                </td>
+                <td>
+                    <span ng-bind=""></span>
+                </td>
+                <td>
+                    <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
+                </td>
+                <td>
+                    <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
+                    <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
+                    <a ui-sref="schedulePlanInfoManage({spid : info.id, xlname : info.xl.name, ttname : info.ttInfo.name, stime : info.scheduleFromTime, etime : info.scheduleToTime})"
+                       class="btn default blue-stripe btn-sm"> 排班明细 </a>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
  
-        </tr>
-        </thead>
-        <tbody>
-        <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
-            <td>
-                <span ng-bind="$index + 1"></span>
-            </td>
-            <td>
-                <span ng-bind="info.xl.name"></span>
-            </td>
-            <td>
-                <span ng-bind="info.ttInfo.name"></span>
-            </td>
-            <td>
-                <span ng-bind="info.scheduleFromTime | date: 'yyyy-MM-dd '"></span>
-            </td>
-            <td>
-                <span ng-bind="info.scheduleToTime | date: 'yyyy-MM-dd '"></span>
-            </td>
-            <td>
-                <span ng-bind=""></span>
-            </td>
-            <td>
-                <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
-            </td>
-            <td>
-                <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
-                <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
-                <a ui-sref="schedulePlanInfoManage({spid : info.id, xlname : info.xl.name, ttname : info.ttInfo.name, stime : info.scheduleFromTime, etime : info.scheduleToTime})"
-                   class="btn default blue-stripe btn-sm"> 排班明细 </a>
-            </td>
-        </tr>
-        </tbody>
-    </table>
  
     <div style="text-align: right;">
         <uib-pagination total-items="ctrl.pageInfo.totalItems"
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService&#39;, [&#39;Schedul
         resetSearchCondition: function() {
             var key;
             for (key in currentSearchCondition) {
-                currentSearchCondition[key] = "";
+                currentSearchCondition[key] = undefined;
             }
         },
         /**
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanManageService&#39;, [&#39;SchedulePla
         resetSearchCondition: function() {
             var key;
             for (key in currentSearchCondition) {
-                currentSearchCondition[key] = "";
+                currentSearchCondition[key] = undefined;
             }
         },
         /**
@@ -35,7 +35,7 @@
                     <div class="btn-group">
                         <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
                             <i class="fa fa-share"></i>
-                            <span>系统工具</span>
+                            <span>数据工具</span>
                             <i class="fa fa-angle-down"></i>
                         </a>
                         <ul class="dropdown-menu pull-right">
 <div ng-controller="ScheduleRuleManageListCtrl as ctrl">
-    <div style="width: 100%; height: 100%; overflow: auto">
+    <div class="fixDiv">
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th style="width: 40pt;">序号</th>
-                <th style="width: 115pt;">线路</th>
-                <th style="width: 115pt;">修改时间</th>
-                <th style="width: 70pt;">启用日期</th>
+                <th style="width: 5%;">序号</th>
+                <th style="width: 15%;">线路</th>
+                <th style="width: 15%;">修改时间</th>
+                <th style="width: 12%;">启用日期</th>
                 <th>车辆</th>
                 <th>翻版模式</th>
                 <th>起始路牌</th>
                 <th>路牌范围</th>
                 <th>起始人员</th>
                 <th>人员范围</th>
-                <th style="width: 115pt;">操作</th>
+                <th style="width: 21%">操作</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService&#39;, [&#39;ScheduleRul
         resetSearchCondition: function() {
             var key;
             for (key in currentSearchCondition) {
-                currentSearchCondition[key] = null;
+                currentSearchCondition[key] = undefined;
             }
         },
         /**
 <!-- ui-route employeeInfoManage.list -->
 <div ng-controller="TimeTableManageListCtrl as ctrl">
-    <table class="table table-striped table-bordered table-hover table-checkable order-column">
-        <thead>
-        <tr role="row" class="heading">
-            <th>序号</th>
-            <th>线路</th>
-            <th>时刻表名称</th>
-            <th>路牌数</th>
-            <th>圈数</th>
-            <th>上下行</th>
-            <th>启用</th>
-            <th>修改时间</th>
-            <th>时刻表明细</th>
-            <th width="14%">操作</th>
-        </tr>
-        <tr role="row" class="filter">
-            <td></td>
-            <td></td>
-            <td>
-                <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().name_like"/>
-            </td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>
-                <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
-                        ng-click="ctrl.pageChanaged()">
-                    <i class="fa fa-search"></i> 搜索</button>
+    <div class="fixDiv">
+        <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
+            <thead>
+            <tr role="row" class="heading">
+                <th style="width: 5%;">序号</th>
+                <th style="width: 8%;">线路</th>
+                <th >名称</th>
+                <th>路牌数</th>
+                <th>圈数</th>
+                <th>上下行</th>
+                <th>启用</th>
+                <th style="width: 15%">修改时间</th>
+                <th style="width: 25%">时刻表明细</th>
+                <th style="width: 21%">操作</th>
+            </tr>
+            <tr role="row" class="filter">
+                <td></td>
+                <td></td>
+                <td>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().name_like"/>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td>
+                    <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
+                            ng-click="ctrl.pageChanaged()">
+                        <i class="fa fa-search"></i> 搜索</button>
  
-                <button class="btn btn-sm red btn-outline filter-cancel"
-                        ng-click="ctrl.resetSearchCondition()">
-                    <i class="fa fa-times"></i> 重置</button>
-            </td>
-        </tr>
+                    <button class="btn btn-sm red btn-outline filter-cancel"
+                            ng-click="ctrl.resetSearchCondition()">
+                        <i class="fa fa-times"></i> 重置</button>
+                </td>
+            </tr>
  
-        </thead>
-        <tbody>
-        <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
-            <td>
-                <span ng-bind="$index + 1"></span>
-            </td>
-            <td>
-                <span ng-bind="info.xl.name"></span>
-            </td>
-            <td>
-                <span ng-bind="info.name"></span>
-            </td>
-            <td>
-                <span ng-bind="info.lpCount"></span>
-            </td>
-            <td>
-                <span ng-bind="info.loopCount"></span>
-            </td>
-            <td>
-                <span ng-bind="info.xlDir | dict:'LineTrend':'未知'"></span>
-            </td>
-            <td>
-                <span ng-bind="info.isEnableDisTemplate"></span>
-            </td>
-            <td>
-                <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
-            </td>
-            <td>
-                <a ui-sref="timeTableDetailInfoManage({xlid: info.xl.id, ttid : info.id})"
-                   class="btn default blue-stripe btn-sm"> 编辑 </a>
-                <a ng-click="ctrl.importData($index)" class="btn default blue-stripe btn-sm"> 导入 </a>
-                <a href="javascript:" class="btn default blue-stripe btn-sm"> 导出 </a>
-                <a href="javascript:" class="btn default blue-stripe btn-sm"> 模版 </a>
-            </td>
-            <td>
-                <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
-                <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
-                <a ui-sref="busConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
-                <a ui-sref="busConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
-            </td>
-        </tr>
-        </tbody>
-    </table>
+            </thead>
+            <tbody>
+            <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
+                <td>
+                    <span ng-bind="$index + 1"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.xl.name"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.name"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.lpCount"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.loopCount"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.xlDir | dict:'LineTrend':'未知'"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.isEnableDisTemplate"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
+                </td>
+                <td>
+                    <a ui-sref="timeTableDetailInfoManage({xlid: info.xl.id, ttid : info.id})"
+                       class="btn default blue-stripe btn-sm"> 编辑 </a>
+                    <a ng-click="ctrl.importData($index)" class="btn default blue-stripe btn-sm"> 导入 </a>
+                    <a href="javascript:" class="btn default blue-stripe btn-sm"> 导出 </a>
+                    <a href="javascript:" class="btn default blue-stripe btn-sm"> 模版 </a>
+                </td>
+                <td>
+                    <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
+                    <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
+                    <a ui-sref="busConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
+                    <a ui-sref="busConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
  
     <div style="text-align: right;">
         <uib-pagination total-items="ctrl.pageInfo.totalItems"
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;TimeTableManageService&#39;, [&#39;TimeTableManag
         resetSearchCondition: function() {
             var key;
             for (key in currentSearchCondition) {
-                currentSearchCondition[key] = "";
+                currentSearchCondition[key] = undefined;
             }
         },
         /**