潘钊 / bsth_control · Commits

Commit ec509c372a8dd4304395d3158ba6d380b66a6ba7

Authored by 潘钊
2 parents 3735077c 5a65f994
build: skipped

Merge branch 'master' of http://222.66.0.204:8090/panzhaov5/bsth_control

Inline Side-by-side
Showing 38 changed files with 467 additions and 341 deletions
src/main/resources/static/pages/base/section/js/add-form-wizard.js
  View file @ec509c3
@@ -46,9 +46,7 @@ var FormWizard = function() { @@ -46,9 +46,7 @@ var FormWizard = function() {
46 46
47 // 必填项 47 // 必填项
48 required : true, 48 required : true,
49 -  
50 - // 最大长度  
51 - maxlength: 20 49 +
52 }, 50 },
53 51
54 // 终点 52 // 终点
@@ -56,9 +54,7 @@ var FormWizard = function() { @@ -56,9 +54,7 @@ var FormWizard = function() {
56 54
57 // 必填项 55 // 必填项
58 required : true, 56 required : true,
59 -  
60 - // 最大长度  
61 - maxlength: 20 57 +
62 }, 58 },
63 59
64 // 线路名称 60 // 线路名称
src/main/resources/static/pages/base/station/add.html
  View file @ec509c3
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 <div class="form-group"> 115 <div class="form-group">
116 <div class="alert alert-info font-blue-chambray" style="background-color: #2C3E50"> 116 <div class="alert alert-info font-blue-chambray" style="background-color: #2C3E50">
117 <h5 class="block"><span class="help-block" style="color:#1bbc9b;"> *　新增方式说明： </span></h5> 117 <h5 class="block"><span class="help-block" style="color:#1bbc9b;"> *　新增方式说明： </span></h5>
118 - <p><span class="help-block" style="color:#1bbc9b;"> a)系统生成：根据站点名称自动生成以150米为半径范围的圆.</span> </p> 118 + <p><span class="help-block" style="color:#1bbc9b;"> a)系统生成：根据站点名称自动生成以100米为半径范围的圆.</span> </p>
119 <p><span class="help-block" style="color:#1bbc9b;"> b)手动添加：手动在地图上画出站点范围，然后双击鼠标右键保存.</span> </p> 119 <p><span class="help-block" style="color:#1bbc9b;"> b)手动添加：手动在地图上画出站点范围，然后双击鼠标右键保存.</span> </p>
120 <!-- <p><span class="help-block" style="color:#1bbc9b;"> c)选择引用：从系统中选择已有的站点进行引用.</span> </p> --> 120 <!-- <p><span class="help-block" style="color:#1bbc9b;"> c)选择引用：从系统中选择已有的站点进行引用.</span> </p> -->
121 </div> 121 </div>
src/main/resources/static/pages/base/station/js/add-form-wizard.js
  View file @ec509c3
@@ -47,8 +47,6 @@ var FormWizard = function() { @@ -47,8 +47,6 @@ var FormWizard = function() {
47 // 必填项 47 // 必填项
48 required : true, 48 required : true,
49 49
50 - // 最大长度  
51 - maxlength: 20  
52 }, 50 },
53 51
54 // 线路名称 52 // 线路名称
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
  View file @ec509c3
@@ -267,15 +267,39 @@ var WorldsBMap = function () { @@ -267,15 +267,39 @@ var WorldsBMap = function () {
267 enableCloseOnClick : false 267 enableCloseOnClick : false
268 }; 268 };
269 269
  270 + var markTypeStr = '';
  271 +
  272 + if(objStation.stationRouteStationMark=='B') {
  273 +
  274 + markTypeStr='起点站';
  275 +
  276 + }else if(objStation.stationRouteStationMark=='Z') {
  277 +
  278 + markTypeStr ='中途站';
  279 +
  280 +
  281 + }else if(objStation.stationRouteStationMark=='E') {
  282 +
  283 + markTypeStr='终点站';
  284 +
  285 + }
  286 +
  287 + var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
  288 + '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
  289 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
  290 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
  291 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
  292 + '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
  293 + '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
  294 + '<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
  295 + '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
  296 + '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationRouteVersions + '</span>' +
  297 + '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
  298 + 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
  299 + objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
  300 +
270 // 创建信息窗口 301 // 创建信息窗口
271 - var infoWindow_target = new BMap.InfoWindow('<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+  
272 - '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +  
273 - '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +  
274 - '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +  
275 - '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +  
276 - '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +  
277 - '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationVersions + '</span>' +  
278 - '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+ 'ddd' +'" >说明/描述：' + 'ddd' + '</span>' , opts_polygon); 302 + var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
279 // 自定义标注物图片 303 // 自定义标注物图片
280 var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20)); 304 var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
281 305
@@ -343,6 +367,9 @@ var WorldsBMap = function () { @@ -343,6 +367,9 @@ var WorldsBMap = function () {
343 // 画圆 367 // 画圆
344 pointsCircle : function(objStation) { 368 pointsCircle : function(objStation) {
345 369
  370 +
  371 + console.log(objStation);
  372 +
346 // 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增） 373 // 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
347 mapBValue.setZoom(16); 374 mapBValue.setZoom(16);
348 375
@@ -391,15 +418,39 @@ var WorldsBMap = function () { @@ -391,15 +418,39 @@ var WorldsBMap = function () {
391 enableAutoPan:false 418 enableAutoPan:false
392 }; 419 };
393 420
  421 + var markTypeStr = '';
  422 +
  423 + if(objStation.stationRouteStationMark=='B') {
  424 +
  425 + markTypeStr='起点站';
  426 +
  427 + }else if(objStation.stationRouteStationMark=='Z') {
  428 +
  429 + markTypeStr ='中途站';
  430 +
  431 +
  432 + }else if(objStation.stationRouteStationMark=='E') {
  433 +
  434 + markTypeStr='终点站';
  435 +
  436 + }
  437 +
  438 + var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
  439 + '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
  440 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
  441 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
  442 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
  443 + '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
  444 + '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
  445 + '<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
  446 + '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
  447 + '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationRouteVersions + '</span>' +
  448 + '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
  449 + 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
  450 + objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
  451 +
394 // 创建信息窗口 452 // 创建信息窗口
395 - var infoWindow_target = new BMap.InfoWindow('<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+  
396 - '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +  
397 - '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +  
398 - '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +  
399 - '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +  
400 - '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +  
401 - '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationVersions + '</span>' +  
402 - '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+ 'ddd' +'" >说明/描述：' + 'ddd' + '</span>' , opts); 453 + var infoWindow_target = new BMap.InfoWindow(htm, opts);
403 // 自定义标注物图片 454 // 自定义标注物图片
404 var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20)); 455 var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
405 456
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
  View file @ec509c3
@@ -213,7 +213,7 @@ @@ -213,7 +213,7 @@
213 name="scrapDate" placeholder="请选择报废日期..." 213 name="scrapDate" placeholder="请选择报废日期..."
214 uib-datepicker-popup="yyyy年MM月dd日" 214 uib-datepicker-popup="yyyy年MM月dd日"
215 is-open="ctrl.scrapDateOpen" 215 is-open="ctrl.scrapDateOpen"
216 - ng-model="ctrl.busInfoForSave.scrapDate"/> 216 + ng-model="ctrl.busInfoForSave.scrapDate" readonly/>
217 <span class="input-group-btn"> 217 <span class="input-group-btn">
218 <button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()"> 218 <button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()">
219 <i class="glyphicon glyphicon-calendar"></i> 219 <i class="glyphicon glyphicon-calendar"></i>
@@ -286,7 +286,7 @@ @@ -286,7 +286,7 @@
286 name="openDate" placeholder="请选择启用日期..." 286 name="openDate" placeholder="请选择启用日期..."
287 uib-datepicker-popup="yyyy年MM月dd日" 287 uib-datepicker-popup="yyyy年MM月dd日"
288 is-open="ctrl.openDateOpen" 288 is-open="ctrl.openDateOpen"
289 - ng-model="ctrl.busInfoForSave.openDate"/> 289 + ng-model="ctrl.busInfoForSave.openDate" readonly/>
290 <span class="input-group-btn"> 290 <span class="input-group-btn">
291 <button type="button" class="btn btn-default" ng-click="ctrl.openDate_open()"> 291 <button type="button" class="btn btn-default" ng-click="ctrl.openDate_open()">
292 <i class="glyphicon glyphicon-calendar"></i> 292 <i class="glyphicon glyphicon-calendar"></i>
@@ -303,7 +303,7 @@ @@ -303,7 +303,7 @@
303 name="closeDate" placeholder="请选择取消日期..." 303 name="closeDate" placeholder="请选择取消日期..."
304 uib-datepicker-popup="yyyy年MM月dd日" 304 uib-datepicker-popup="yyyy年MM月dd日"
305 is-open="ctrl.closeDateOpen" 305 is-open="ctrl.closeDateOpen"
306 - ng-model="ctrl.busInfoForSave.closeDate"/> 306 + ng-model="ctrl.busInfoForSave.closeDate" readonly/>
307 <span class="input-group-btn"> 307 <span class="input-group-btn">
308 <button type="button" class="btn btn-default" ng-click="ctrl.closeDate_open()"> 308 <button type="button" class="btn btn-default" ng-click="ctrl.closeDate_open()">
309 <i class="glyphicon glyphicon-calendar"></i> 309 <i class="glyphicon glyphicon-calendar"></i>
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
  View file @ec509c3
@@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
214 name="scrapDate" placeholder="请选择报废日期..." 214 name="scrapDate" placeholder="请选择报废日期..."
215 uib-datepicker-popup="yyyy年MM月dd日" 215 uib-datepicker-popup="yyyy年MM月dd日"
216 is-open="ctrl.scrapDateOpen" 216 is-open="ctrl.scrapDateOpen"
217 - ng-model="ctrl.busInfoForSave.scrapDate"/> 217 + ng-model="ctrl.busInfoForSave.scrapDate" readonly/>
218 <span class="input-group-btn"> 218 <span class="input-group-btn">
219 <button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()"> 219 <button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()">
220 <i class="glyphicon glyphicon-calendar"></i> 220 <i class="glyphicon glyphicon-calendar"></i>
@@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
287 name="openDate" placeholder="请选择启用日期..." 287 name="openDate" placeholder="请选择启用日期..."
288 uib-datepicker-popup="yyyy年MM月dd日" 288 uib-datepicker-popup="yyyy年MM月dd日"
289 is-open="ctrl.openDateOpen" 289 is-open="ctrl.openDateOpen"
290 - ng-model="ctrl.busInfoForSave.openDate"/> 290 + ng-model="ctrl.busInfoForSave.openDate" readonly/>
291 <span class="input-group-btn"> 291 <span class="input-group-btn">
292 <button type="button" class="btn btn-default" ng-click="ctrl.openDate_open()"> 292 <button type="button" class="btn btn-default" ng-click="ctrl.openDate_open()">
293 <i class="glyphicon glyphicon-calendar"></i> 293 <i class="glyphicon glyphicon-calendar"></i>
@@ -304,7 +304,7 @@ @@ -304,7 +304,7 @@
304 name="closeDate" placeholder="请选择取消日期..." 304 name="closeDate" placeholder="请选择取消日期..."
305 uib-datepicker-popup="yyyy年MM月dd日" 305 uib-datepicker-popup="yyyy年MM月dd日"
306 is-open="ctrl.closeDateOpen" 306 is-open="ctrl.closeDateOpen"
307 - ng-model="ctrl.busInfoForSave.closeDate"/> 307 + ng-model="ctrl.busInfoForSave.closeDate" readonly/>
308 <span class="input-group-btn"> 308 <span class="input-group-btn">
309 <button type="button" class="btn btn-default" ng-click="ctrl.closeDate_open()"> 309 <button type="button" class="btn btn-default" ng-click="ctrl.closeDate_open()">
310 <i class="glyphicon glyphicon-calendar"></i> 310 <i class="glyphicon glyphicon-calendar"></i>
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/index.html
  View file @ec509c3
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="btn-group"> 35 <div class="btn-group">
36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown"> 36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
37 <i class="fa fa-share"></i> 37 <i class="fa fa-share"></i>
38 - <span>系统工具</span> 38 + <span>数据工具</span>
39 <i class="fa fa-angle-down"></i> 39 <i class="fa fa-angle-down"></i>
40 </a> 40 </a>
41 <ul class="dropdown-menu pull-right"> 41 <ul class="dropdown-menu pull-right">
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
  View file @ec509c3
@@ -4,15 +4,15 @@ @@ -4,15 +4,15 @@
4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column"> 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 <thead> 5 <thead>
6 <tr role="row" class="heading"> 6 <tr role="row" class="heading">
7 - <th style="width: 40pt;">序号</th> 7 + <th style="width: 5%;">序号</th>
8 <th >车辆编号</th> 8 <th >车辆编号</th>
9 <th >内部编号</th> 9 <th >内部编号</th>
10 <th >设备编号</th> 10 <th >设备编号</th>
11 <th >车牌号</th> 11 <th >车牌号</th>
12 - <th style="width: 105pt;">所在公司</th> 12 + <th style="width: 15%;">所在公司</th>
13 <th >所在分公司</th> 13 <th >所在分公司</th>
14 - <th style="width: 60pt">是否电车</th>  
15 - <th style="width: 115pt">操作</th> 14 + <th style="width: 10%">是否电车</th>
  15 + <th style="width: 21%">操作</th>
16 </tr> 16 </tr>
17 <tr role="row" class="filter"> 17 <tr role="row" class="filter">
18 <td></td> 18 <td></td>
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js
  View file @ec509c3
@@ -27,7 +27,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeInfoManageService&#39;, [&#39;EmployeeInf @@ -27,7 +27,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeInfoManageService&#39;, [&#39;EmployeeInf
27 resetSearchCondition: function() { 27 resetSearchCondition: function() {
28 var key; 28 var key;
29 for (key in currentSearchCondition) { 29 for (key in currentSearchCondition) {
30 - currentSearchCondition[key] = null; 30 + currentSearchCondition[key] = undefined;
31 } 31 }
32 currentPageNo = 1; 32 currentPageNo = 1;
33 }, 33 },
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html
  View file @ec509c3
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="btn-group"> 35 <div class="btn-group">
36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown"> 36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
37 <i class="fa fa-share"></i> 37 <i class="fa fa-share"></i>
38 - <span>系统工具</span> 38 + <span>数据工具</span>
39 <i class="fa fa-angle-down"></i> 39 <i class="fa fa-angle-down"></i>
40 </a> 40 </a>
41 <ul class="dropdown-menu pull-right"> 41 <ul class="dropdown-menu pull-right">
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
  View file @ec509c3
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column"> 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 <thead> 5 <thead>
6 <tr role="row" class="heading"> 6 <tr role="row" class="heading">
7 - <th style="width: 40pt;">序号</th> 7 + <th style="width: 5%;">序号</th>
8 <th >姓名</th> 8 <th >姓名</th>
9 <th >工号</th> 9 <th >工号</th>
10 - <th style="width: 60pt;">性别</th>  
11 - <th style="width: 120pt;">所在公司</th> 10 + <th style="width: 5%;">性别</th>
  11 + <th style="width: 15%;">所在公司</th>
12 <th >分公司</th> 12 <th >分公司</th>
13 - <th style="width: 150pt;">工种</th>  
14 - <th style="width: 115pt;">操作</th> 13 + <th style="width: 20%;">工种</th>
  14 + <th style="width: 21%">操作</th>
15 </tr> 15 </tr>
16 <tr role="row" class="filter"> 16 <tr role="row" class="filter">
17 <td> 17 <td>
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @ec509c3
@@ -339,6 +339,16 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun @@ -339,6 +339,16 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
339 } 339 }
340 } 340 }
341 341
  342 + ),
  343 + cci2: $resource(
  344 + '/cci/:type',
  345 + {},
  346 + {
  347 + list: {
  348 + method: 'GET',
  349 + isArray: true
  350 + }
  351 + }
342 ) 352 )
343 } 353 }
344 }]); 354 }]);
@@ -537,6 +547,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect2&quot;, [ @@ -537,6 +547,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect2&quot;, [
537 * datatype（必须）：业务数据类型，有字典类型，动态数据类型，暂时写的死点 547 * datatype（必须）：业务数据类型，有字典类型，动态数据类型，暂时写的死点
538 * mlp（可选）：是否多级属性（这里假设外部model如果多级，内部model也是多级） 548 * mlp（可选）：是否多级属性（这里假设外部model如果多级，内部model也是多级）
539 * 549 *
  550 + * 高级属性：
  551 + * dataassociate（可选）：数据源是否关联属性（内部数据随外部指定的参数变化而变化）
  552 + * dataparam（可选）：数据源关联的外部参数对象
  553 + *
540 */ 554 */
541 angular.module('ScheduleApp').directive("saSelect3", [ 555 angular.module('ScheduleApp').directive("saSelect3", [
542 '$timeout', 556 '$timeout',
@@ -575,6 +589,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [ @@ -575,6 +589,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
575 var $datatype_attr = tAttrs["datatype"]; // 内部业务数据类型 589 var $datatype_attr = tAttrs["datatype"]; // 内部业务数据类型
576 var $required_attr = tAttrs["required"]; // 是否需要required验证 590 var $required_attr = tAttrs["required"]; // 是否需要required验证
577 var $mlp_attr = tAttrs["mlp"]; // 是否多级属性 591 var $mlp_attr = tAttrs["mlp"]; // 是否多级属性
  592 + var $dataassociate_attr = tAttrs["dataassociate"]; // 数据源是否关联属性
578 593
579 // controlAs名字 594 // controlAs名字
580 var ctrlAs = "$saSelectCtrl"; 595 var ctrlAs = "$saSelectCtrl";
@@ -679,43 +694,30 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [ @@ -679,43 +694,30 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
679 //console.log("start"); 694 //console.log("start");
680 // 清空内部数据 695 // 清空内部数据
681 scope[ctrlAs].$$data_real = []; 696 scope[ctrlAs].$$data_real = [];
  697 + scope[ctrlAs].$$data = []
682 for (var i = 0; i < result.length; i ++) { 698 for (var i = 0; i < result.length; i ++) {
683 - var data = {}; // data是result的一部分属性集合，根据配置来确定  
684 - if ($icname_attr) {  
685 - if ($mlp_attr) {  
686 - eval("data" + "." + $icname_attr + " = result[i]" + "." + $icname_attr + ";");  
687 - } else {  
688 - data[$icname_attr] = result[i][$icname_attr];  
689 - }  
690 - }  
691 - if ($icname2_attr) {  
692 - if ($mlp_attr) {  
693 - eval("data" + "." + $icname2_attr + " = result[i]" + "." + $icname2_attr + ";");  
694 - } else {  
695 - data[$icname2_attr] = result[i][$icname2_attr];  
696 - }  
697 - }  
698 if ($icname_s_attr) { 699 if ($icname_s_attr) {
699 - // 动态添加基于名字的拼音  
700 if ($mlp_attr) { 700 if ($mlp_attr) {
701 - eval("data" + "." + $icname_s_attr + " = result[i]" + "." + $icname_s_attr + ";");  
702 - if (eval("data" + "." + $icname_s_attr)) { 701 + if (eval("result[i]" + "." + $icname_s_attr)) {
703 // 全拼 702 // 全拼
704 - data["fullChars"] = pinyin.getFullChars(eval("result[i]" + "." + $icname_s_attr)).toUpperCase(); 703 + result[i]["fullChars"] = pinyin.getFullChars(eval("result[i]" + "." + $icname_s_attr)).toUpperCase();
705 // 简拼 704 // 简拼
706 - data["camelChars"] = pinyin.getCamelChars(eval("result[i]" + "." + $icname_s_attr)); 705 + result[i]["camelChars"] = pinyin.getCamelChars(eval("result[i]" + "." + $icname_s_attr));
707 } 706 }
708 } else { 707 } else {
709 - data[$icname_s_attr] = result[i][$icname_s_attr];  
710 - if (data[$icname_s_attr]) {  
711 - data["fullChars"] = pinyin.getFullChars(result[i][$icname_s_attr]).toUpperCase(); // 全拼  
712 - data["camelChars"] = pinyin.getCamelChars(result[i][$icname_s_attr]); // 简拼 708 + if (result[i][$icname_s_attr]) {
  709 + // 全拼
  710 + result[i]["fullChars"] = pinyin.getFullChars(result[i][$icname_s_attr]).toUpperCase();
  711 + // 简拼
  712 + result[i]["camelChars"] = pinyin.getCamelChars(result[i][$icname_s_attr]);
713 } 713 }
714 } 714 }
715 } 715 }
716 - if (data["fullChars"]) { // 有拼音的加入数据源  
717 - scope[ctrlAs].$$data_real.push(data); 716 +
  717 + if (result[i]["fullChars"]) { // 有拼音的加入数据源
  718 + scope[ctrlAs].$$data_real.push(result[i]);
718 } 719 }
  720 +
719 } 721 }
720 //console.log("start2"); 722 //console.log("start2");
721 723
@@ -753,6 +755,25 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [ @@ -753,6 +755,25 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
753 //console.log("end"); 755 //console.log("end");
754 }; 756 };
755 757
  758 + /**
  759 + * 判定一个对象是否为空对象。
  760 + * @param Obj
  761 + */
  762 + scope[ctrlAs].$$internal_isEmpty_obj = function(obj) {
  763 + console.log(typeof obj);
  764 +
  765 + if (typeof obj === "object" && !(obj instanceof Array)) {
  766 + for (var prop in obj) {
  767 + if (obj.hasOwnProperty(prop)) {
  768 + return false;
  769 + }
  770 + }
  771 + return true;
  772 + } else {
  773 + throw "必须是对象";
  774 + }
  775 + };
  776 +
756 // 刷新数据 777 // 刷新数据
757 scope[ctrlAs].$$internal_refresh_fn = function(search) { 778 scope[ctrlAs].$$internal_refresh_fn = function(search) {
758 // 绑定的model字段值，此属性是绑定属性，只能在link阶段获取 779 // 绑定的model字段值，此属性是绑定属性，只能在link阶段获取
@@ -768,22 +789,24 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [ @@ -768,22 +789,24 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
768 scope[ctrlAs].$$internalmodel = $dcvalue_attr; 789 scope[ctrlAs].$$internalmodel = $dcvalue_attr;
769 } 790 }
770 } else { // 非字典类型数据源 791 } else { // 非字典类型数据源
771 - $$searchInfoService_g[$datatype_attr].list(  
772 - {type: "all"},  
773 - function(result) {  
774 - //console.log("ok：" + $datatype_attr);  
775 - scope[ctrlAs].$$internal_other_data(result, $dcvalue_attr);  
776 - //console.log("ok2：" + $datatype_attr);  
777 - if ($dcvalue_attr) {  
778 - scope[ctrlAs].$$internalmodel = $dcvalue_attr;  
779 - } 792 + if (!$dataassociate_attr) {
  793 + $$searchInfoService_g[$datatype_attr].list(
  794 + {type: "all"},
  795 + function(result) {
  796 + //console.log("ok：" + $datatype_attr);
  797 + scope[ctrlAs].$$internal_other_data(result, $dcvalue_attr);
  798 + //console.log("ok2：" + $datatype_attr);
  799 + if ($dcvalue_attr) {
  800 + scope[ctrlAs].$$internalmodel = $dcvalue_attr;
  801 + }
780 802
781 - $$data_init = true;  
782 - },  
783 - function(result) { 803 + $$data_init = true;
  804 + },
  805 + function(result) {
784 806
785 - }  
786 - ); 807 + }
  808 + );
  809 + }
787 } 810 }
788 } 811 }
789 812
@@ -825,18 +848,47 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [ @@ -825,18 +848,47 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
825 848
826 // dom全部载入后调用 849 // dom全部载入后调用
827 $timeout(function() { 850 $timeout(function() {
828 - // TODO：  
829 -  
830 console.log("dom全部载入后调用"); 851 console.log("dom全部载入后调用");
831 }, 0); 852 }, 0);
832 // 监控dcvalue model值变换 853 // 监控dcvalue model值变换
833 attr.$observe("dcvalue", function(value) { 854 attr.$observe("dcvalue", function(value) {
834 - // TODO：  
835 -  
836 console.log("监控dc1 model值变换：" + value); 855 console.log("监控dc1 model值变换：" + value);
837 scope[ctrlAs].$$internalmodel = value; 856 scope[ctrlAs].$$internalmodel = value;
838 } 857 }
839 ); 858 );
  859 + // 监控获取数据参数变换
  860 + attr.$observe("dataparam", function(value) {
  861 + // 判定是否空对象
  862 + console.log(value);
  863 + var obj = JSON.parse(value);
  864 + var $dcvalue_attr = attr["dcvalue"];
  865 + if (!scope[ctrlAs].$$internal_isEmpty_obj(obj)) {
  866 + console.log("dataparam：" + obj);
  867 +
  868 + //
  869 +
  870 + obj["type"] = "all";
  871 +
  872 + $$data_init = false;
  873 + $$searchInfoService_g[$datatype_attr].list(
  874 + obj,
  875 + function(result) {
  876 + //console.log("ok：" + $datatype_attr);
  877 + scope[ctrlAs].$$internal_other_data(result, $dcvalue_attr);
  878 + //console.log("ok2：" + $datatype_attr);
  879 + if ($dcvalue_attr) {
  880 + scope[ctrlAs].$$internalmodel = $dcvalue_attr;
  881 + }
  882 +
  883 + $$data_init = true;
  884 + },
  885 + function(result) {
  886 +
  887 + }
  888 + );
  889 + }
  890 + }
  891 + );
840 } 892 }
841 }; 893 };
842 } 894 }
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig.js
  View file @ec509c3
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService&#39;, [&#39;BusConfigService_g&#39;, @@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService&#39;, [&#39;BusConfigService_g&#39;,
20 resetSearchCondition: function() { 20 resetSearchCondition: function() {
21 var key; 21 var key;
22 for (key in currentSearchCondition) { 22 for (key in currentSearchCondition) {
23 - currentSearchCondition[key] = null; 23 + currentSearchCondition[key] = undefined;
24 } 24 }
25 }, 25 },
26 /** 26 /**
src/main/resources/static/pages/scheduleApp/module/core/busConfig/detail.html
  View file @ec509c3
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 </div> 57 </div>
58 </div> 58 </div>
59 59
60 - <div class="form-group"> 60 + <div class="form-group has-success has-feedback">
61 <label class="col-md-2 control-label">启用日期*：</label> 61 <label class="col-md-2 control-label">启用日期*：</label>
62 <div class="col-md-4"> 62 <div class="col-md-4">
63 <input type="text" class="form-control" 63 <input type="text" class="form-control"
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 </div> 74 </div>
75 </div> 75 </div>
76 76
77 - <div class="form-group"> 77 + <div class="form-group has-success has-feedback">
78 <label class="col-md-2 control-label">停车点*：</label> 78 <label class="col-md-2 control-label">停车点*：</label>
79 <div class="col-md-4"> 79 <div class="col-md-4">
80 <input type="text" class="form-control" 80 <input type="text" class="form-control"
src/main/resources/static/pages/scheduleApp/module/core/busConfig/edit.html
  View file @ec509c3
@@ -71,6 +71,8 @@ @@ -71,6 +71,8 @@
71 icname="id" 71 icname="id"
72 icnames="insideCode" 72 icnames="insideCode"
73 datatype="cl" 73 datatype="cl"
  74 + dataassociate="true"
  75 + dataparam="{{ {'businessCode_eq': ctrl.busConfigForSave.xl.company} | json }}"
74 mlp="true" 76 mlp="true"
75 required > 77 required >
76 </sa-Select3> 78 </sa-Select3>
@@ -81,15 +83,15 @@ @@ -81,15 +83,15 @@
81 </div> 83 </div>
82 </div> 84 </div>
83 85
84 - <div class="form-group">  
85 - <label class="col-md-2 control-label">启用日期：</label> 86 + <div class="form-group has-success has-feedback">
  87 + <label class="col-md-2 control-label">启用日期*：</label>
86 <div class="col-md-3"> 88 <div class="col-md-3">
87 <div class="input-group"> 89 <div class="input-group">
88 <input type="text" class="form-control" 90 <input type="text" class="form-control"
89 name="qyrq" placeholder="请选择启用日期..." 91 name="qyrq" placeholder="请选择启用日期..."
90 uib-datepicker-popup="yyyy年MM月dd日" 92 uib-datepicker-popup="yyyy年MM月dd日"
91 is-open="ctrl.qyrqOpen" required 93 is-open="ctrl.qyrqOpen" required
92 - ng-model="ctrl.busConfigForSave.qyrq"/> 94 + ng-model="ctrl.busConfigForSave.qyrq" readonly/>
93 <span class="input-group-btn"> 95 <span class="input-group-btn">
94 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()"> 96 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
95 <i class="glyphicon glyphicon-calendar"></i> 97 <i class="glyphicon glyphicon-calendar"></i>
@@ -111,7 +113,7 @@ @@ -111,7 +113,7 @@
111 name="zzrq" placeholder="请选择启用日期..." 113 name="zzrq" placeholder="请选择启用日期..."
112 uib-datepicker-popup="yyyy年MM月dd日" 114 uib-datepicker-popup="yyyy年MM月dd日"
113 is-open="ctrl.zzrqOpen" 115 is-open="ctrl.zzrqOpen"
114 - ng-model="ctrl.busConfigForSave.zzrq"/> 116 + ng-model="ctrl.busConfigForSave.zzrq" readonly/>
115 <span class="input-group-btn"> 117 <span class="input-group-btn">
116 <button type="button" class="btn btn-default" ng-click="ctrl.zzrq_open()"> 118 <button type="button" class="btn btn-default" ng-click="ctrl.zzrq_open()">
117 <i class="glyphicon glyphicon-calendar"></i> 119 <i class="glyphicon glyphicon-calendar"></i>
@@ -122,7 +124,7 @@ @@ -122,7 +124,7 @@
122 </div> 124 </div>
123 125
124 126
125 - <div class="form-group"> 127 + <div class="form-group has-success has-feedback">
126 <label class="col-md-2 control-label">停车场*：</label> 128 <label class="col-md-2 control-label">停车场*：</label>
127 <div class="col-md-3"> 129 <div class="col-md-3">
128 <input type="text" class="form-control" name="tcd" ng-model="ctrl.busConfigForSave.tcd" required 130 <input type="text" class="form-control" name="tcd" ng-model="ctrl.busConfigForSave.tcd" required
src/main/resources/static/pages/scheduleApp/module/core/busConfig/form.html
  View file @ec509c3
@@ -49,6 +49,8 @@ @@ -49,6 +49,8 @@
49 dcvalue="{{ctrl.busConfigForSave.xl.id}}" 49 dcvalue="{{ctrl.busConfigForSave.xl.id}}"
50 dcname="xl.id" 50 dcname="xl.id"
51 icname="id" 51 icname="id"
  52 + dcname2="xl.company"
  53 + icname2="company"
52 icnames="name" 54 icnames="name"
53 datatype="xl" 55 datatype="xl"
54 mlp="true" 56 mlp="true"
@@ -71,6 +73,8 @@ @@ -71,6 +73,8 @@
71 icname="id" 73 icname="id"
72 icnames="insideCode" 74 icnames="insideCode"
73 datatype="cl" 75 datatype="cl"
  76 + dataassociate="true"
  77 + dataparam="{{ {'businessCode_eq': ctrl.busConfigForSave.xl.company} | json }}"
74 mlp="true" 78 mlp="true"
75 required > 79 required >
76 </sa-Select3> 80 </sa-Select3>
@@ -81,15 +85,15 @@ @@ -81,15 +85,15 @@
81 </div> 85 </div>
82 </div> 86 </div>
83 87
84 - <div class="form-group">  
85 - <label class="col-md-2 control-label">启用日期：</label> 88 + <div class="form-group has-success has-feedback">
  89 + <label class="col-md-2 control-label">启用日期*：</label>
86 <div class="col-md-3"> 90 <div class="col-md-3">
87 <div class="input-group"> 91 <div class="input-group">
88 <input type="text" class="form-control" 92 <input type="text" class="form-control"
89 name="qyrq" placeholder="请选择启用日期..." 93 name="qyrq" placeholder="请选择启用日期..."
90 uib-datepicker-popup="yyyy年MM月dd日" 94 uib-datepicker-popup="yyyy年MM月dd日"
91 is-open="ctrl.qyrqOpen" required 95 is-open="ctrl.qyrqOpen" required
92 - ng-model="ctrl.busConfigForSave.qyrq"/> 96 + ng-model="ctrl.busConfigForSave.qyrq" readonly/>
93 <span class="input-group-btn"> 97 <span class="input-group-btn">
94 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()"> 98 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
95 <i class="glyphicon glyphicon-calendar"></i> 99 <i class="glyphicon glyphicon-calendar"></i>
@@ -111,7 +115,7 @@ @@ -111,7 +115,7 @@
111 name="zzrq" placeholder="请选择启用日期..." 115 name="zzrq" placeholder="请选择启用日期..."
112 uib-datepicker-popup="yyyy年MM月dd日" 116 uib-datepicker-popup="yyyy年MM月dd日"
113 is-open="ctrl.zzrqOpen" 117 is-open="ctrl.zzrqOpen"
114 - ng-model="ctrl.busConfigForSave.zzrq"/> 118 + ng-model="ctrl.busConfigForSave.zzrq" readonly/>
115 <span class="input-group-btn"> 119 <span class="input-group-btn">
116 <button type="button" class="btn btn-default" ng-click="ctrl.zzrq_open()"> 120 <button type="button" class="btn btn-default" ng-click="ctrl.zzrq_open()">
117 <i class="glyphicon glyphicon-calendar"></i> 121 <i class="glyphicon glyphicon-calendar"></i>
@@ -122,7 +126,7 @@ @@ -122,7 +126,7 @@
122 </div> 126 </div>
123 127
124 128
125 - <div class="form-group"> 129 + <div class="form-group has-success has-feedback">
126 <label class="col-md-2 control-label">停车场*：</label> 130 <label class="col-md-2 control-label">停车场*：</label>
127 <div class="col-md-3"> 131 <div class="col-md-3">
128 <input type="text" class="form-control" name="tcd" ng-model="ctrl.busConfigForSave.tcd" required 132 <input type="text" class="form-control" name="tcd" ng-model="ctrl.busConfigForSave.tcd" required
src/main/resources/static/pages/scheduleApp/module/core/busConfig/index.html
  View file @ec509c3
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="btn-group"> 35 <div class="btn-group">
36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown"> 36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
37 <i class="fa fa-share"></i> 37 <i class="fa fa-share"></i>
38 - <span>系统工具</span> 38 + <span>数据工具</span>
39 <i class="fa fa-angle-down"></i> 39 <i class="fa fa-angle-down"></i>
40 </a> 40 </a>
41 <ul class="dropdown-menu pull-right"> 41 <ul class="dropdown-menu pull-right">
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
  View file @ec509c3
1 <!-- ui-route employeeInfoManage.list --> 1 <!-- ui-route employeeInfoManage.list -->
2 <div ng-controller="BusConfigListCtrl as ctrl"> 2 <div ng-controller="BusConfigListCtrl as ctrl">
3 - <div style="width: 100%; height: 100%; overflow: auto"> 3 + <div class="fixDiv">
4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column"> 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 <thead> 5 <thead>
6 <tr role="row" class="heading"> 6 <tr role="row" class="heading">
7 - <th class="mixTd" width="50px">序号</th>  
8 - <th class="mixTd" width="150px">线路</th>  
9 - <th class="mixTd" width="80px">内部编号</th>  
10 - <th class="mixTd">启用日期</th>  
11 - <th class="mixTd">终止日期</th>  
12 - <th class="mixTd">停车点</th>  
13 - <th class="mixTd" width="150px">操作</th> 7 + <th style="width: 5%;">序号</th>
  8 + <th style="width: 15%;">线路</th>
  9 + <th >内部编号</th>
  10 + <th >启用日期</th>
  11 + <th >终止日期</th>
  12 + <th >停车点</th>
  13 + <th style="width: 21%">操作</th>
14 </tr> 14 </tr>
15 <tr role="row" class="filter"> 15 <tr role="row" class="filter">
16 <td></td> 16 <td></td>
@@ -48,25 +48,25 @@ @@ -48,25 +48,25 @@
48 </thead> 48 </thead>
49 <tbody> 49 <tbody>
50 <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX"> 50 <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
51 - <td class="mixTd"> 51 + <td>
52 <span ng-bind="$index + 1"></span> 52 <span ng-bind="$index + 1"></span>
53 </td> 53 </td>
54 - <td class="mixTd"> 54 + <td>
55 <span ng-bind="info.xl.name"></span> 55 <span ng-bind="info.xl.name"></span>
56 </td> 56 </td>
57 - <td class="mixTd"> 57 + <td>
58 <span ng-bind="info.cl.insideCode"></span> 58 <span ng-bind="info.cl.insideCode"></span>
59 </td> 59 </td>
60 - <td class="mixTd"> 60 + <td>
61 <span ng-bind="info.qyrq | date: 'yyyy-MM-dd HH:mm:ss'"></span> 61 <span ng-bind="info.qyrq | date: 'yyyy-MM-dd HH:mm:ss'"></span>
62 </td> 62 </td>
63 - <td class="mixTd"> 63 + <td>
64 <span ng-bind="info.zzrq | date: 'yyyy-MM-dd HH:mm:ss'"></span> 64 <span ng-bind="info.zzrq | date: 'yyyy-MM-dd HH:mm:ss'"></span>
65 </td> 65 </td>
66 - <td class="mixTd"> 66 + <td>
67 <span ng-bind="info.tcd"></span> 67 <span ng-bind="info.tcd"></span>
68 </td> 68 </td>
69 - <td class="mixTd"> 69 + <td>
70 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> 70 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
71 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> 71 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
72 <a ui-sref="busConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a> 72 <a ui-sref="busConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/detail.html
  View file @ec509c3
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 </div> 72 </div>
73 </div> 73 </div>
74 74
75 - <div class="form-group has-success has-feedback"> 75 + <div class="form-group">
76 <label class="col-md-2 control-label">售票员姓名：</label> 76 <label class="col-md-2 control-label">售票员姓名：</label>
77 <div class="col-md-3"> 77 <div class="col-md-3">
78 <input type="text" class="form-control" name="spy_name" 78 <input type="text" class="form-control" name="spy_name"
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 </div> 80 </div>
81 </div> 81 </div>
82 82
83 - <div class="form-group has-success has-feedback"> 83 + <div class="form-group">
84 <label class="col-md-2 control-label">售票员工号：</label> 84 <label class="col-md-2 control-label">售票员工号：</label>
85 <div class="col-md-3"> 85 <div class="col-md-3">
86 <input type="text" class="form-control" name="spy_code" 86 <input type="text" class="form-control" name="spy_code"
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
  View file @ec509c3
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </div> 61 </div>
62 </div> 62 </div>
63 63
64 - <div class="form-group"> 64 + <div class="form-group has-success has-feedback">
65 <label class="col-md-2 control-label">搭班编码*：</label> 65 <label class="col-md-2 control-label">搭班编码*：</label>
66 <div class="col-md-3"> 66 <div class="col-md-3">
67 <input type="text" class="form-control" name="dbbm" ng-model="ctrl.employeeConfigForSave.dbbm" required 67 <input type="text" class="form-control" name="dbbm" ng-model="ctrl.employeeConfigForSave.dbbm" required
@@ -84,6 +84,8 @@ @@ -84,6 +84,8 @@
84 icname="id" 84 icname="id"
85 icnames="personnelName" 85 icnames="personnelName"
86 datatype="ry" 86 datatype="ry"
  87 + dataassociate="true"
  88 + dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"
87 mlp="true" 89 mlp="true"
88 required > 90 required >
89 </sa-Select3> 91 </sa-Select3>
@@ -94,7 +96,7 @@ @@ -94,7 +96,7 @@
94 </div> 96 </div>
95 </div> 97 </div>
96 98
97 - <div class="form-group has-success has-feedback"> 99 + <div class="form-group">
98 <label class="col-md-2 control-label">售票员：</label> 100 <label class="col-md-2 control-label">售票员：</label>
99 <div class="col-md-3"> 101 <div class="col-md-3">
100 <sa-Select3 model="ctrl.employeeConfigForSave" 102 <sa-Select3 model="ctrl.employeeConfigForSave"
@@ -105,6 +107,8 @@ @@ -105,6 +107,8 @@
105 icname="id" 107 icname="id"
106 icnames="personnelName" 108 icnames="personnelName"
107 datatype="ry" 109 datatype="ry"
  110 + dataassociate="true"
  111 + dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"
108 mlp="true" > 112 mlp="true" >
109 </sa-Select3> 113 </sa-Select3>
110 </div> 114 </div>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/employeeConfig.js
  View file @ec509c3
@@ -21,7 +21,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService&#39;, [&#39;EmployeeConfigS @@ -21,7 +21,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService&#39;, [&#39;EmployeeConfigS
21 resetSearchCondition: function() { 21 resetSearchCondition: function() {
22 var key; 22 var key;
23 for (key in currentSearchCondition) { 23 for (key in currentSearchCondition) {
24 - currentSearchCondition[key] = null; 24 + currentSearchCondition[key] = undefined;
25 } 25 }
26 }, 26 },
27 /** 27 /**
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/form.html
  View file @ec509c3
@@ -49,6 +49,8 @@ @@ -49,6 +49,8 @@
49 dcvalue="{{ctrl.employeeConfigForSave.xl.id}}" 49 dcvalue="{{ctrl.employeeConfigForSave.xl.id}}"
50 dcname="xl.id" 50 dcname="xl.id"
51 icname="id" 51 icname="id"
  52 + dcname2="xl.company"
  53 + icname2="company"
52 icnames="name" 54 icnames="name"
53 datatype="xl" 55 datatype="xl"
54 mlp="true" 56 mlp="true"
@@ -61,7 +63,7 @@ @@ -61,7 +63,7 @@
61 </div> 63 </div>
62 </div> 64 </div>
63 65
64 - <div class="form-group"> 66 + <div class="form-group has-success has-feedback">
65 <label class="col-md-2 control-label">搭班编码*：</label> 67 <label class="col-md-2 control-label">搭班编码*：</label>
66 <div class="col-md-3"> 68 <div class="col-md-3">
67 <input type="text" class="form-control" name="dbbm" ng-model="ctrl.employeeConfigForSave.dbbm" required 69 <input type="text" class="form-control" name="dbbm" ng-model="ctrl.employeeConfigForSave.dbbm" required
@@ -84,6 +86,8 @@ @@ -84,6 +86,8 @@
84 icname="id" 86 icname="id"
85 icnames="personnelName" 87 icnames="personnelName"
86 datatype="ry" 88 datatype="ry"
  89 + dataassociate="true"
  90 + dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"
87 mlp="true" 91 mlp="true"
88 required > 92 required >
89 </sa-Select3> 93 </sa-Select3>
@@ -94,7 +98,7 @@ @@ -94,7 +98,7 @@
94 </div> 98 </div>
95 </div> 99 </div>
96 100
97 - <div class="form-group has-success has-feedback"> 101 + <div class="form-group">
98 <label class="col-md-2 control-label">售票员：</label> 102 <label class="col-md-2 control-label">售票员：</label>
99 <div class="col-md-3"> 103 <div class="col-md-3">
100 <sa-Select3 model="ctrl.employeeConfigForSave" 104 <sa-Select3 model="ctrl.employeeConfigForSave"
@@ -105,6 +109,8 @@ @@ -105,6 +109,8 @@
105 icname="id" 109 icname="id"
106 icnames="personnelName" 110 icnames="personnelName"
107 datatype="ry" 111 datatype="ry"
  112 + dataassociate="true"
  113 + dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"
108 mlp="true" > 114 mlp="true" >
109 </sa-Select3> 115 </sa-Select3>
110 </div> 116 </div>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/index.html
  View file @ec509c3
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="btn-group"> 35 <div class="btn-group">
36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown"> 36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
37 <i class="fa fa-share"></i> 37 <i class="fa fa-share"></i>
38 - <span>系统工具</span> 38 + <span>数据工具</span>
39 <i class="fa fa-angle-down"></i> 39 <i class="fa fa-angle-down"></i>
40 </a> 40 </a>
41 <ul class="dropdown-menu pull-right"> 41 <ul class="dropdown-menu pull-right">
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
  View file @ec509c3
1 <!-- ui-route employeeInfoManage.list --> 1 <!-- ui-route employeeInfoManage.list -->
2 <div ng-controller="EmployeeConfigListCtrl as ctrl"> 2 <div ng-controller="EmployeeConfigListCtrl as ctrl">
3 - <div style="width: 100%; height: 100%; overflow: auto"> 3 + <div class="fixDiv">
4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column"> 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 <thead> 5 <thead>
6 <tr role="row" class="heading"> 6 <tr role="row" class="heading">
7 - <th class="mixTd" width="50px">序号</th>  
8 - <th class="mixTd" width="150px">线路</th>  
9 - <th class="mixTd" width="80px">搭班编码</th>  
10 - <th class="mixTd">驾驶员工号</th>  
11 - <th class="mixTd" width="150px">驾驶员</th>  
12 - <th class="mixTd">售票员工号</th>  
13 - <th class="mixTd">售票员</th>  
14 - <th class="mixTd" width="150px">操作</th> 7 + <th style="width: 5%;">序号</th>
  8 + <th style="width: 15%;">线路</th>
  9 + <th style="width: 10%;">搭班编码</th>
  10 + <th >驾驶员工号</th>
  11 + <th style="width: 15%;">驾驶员</th>
  12 + <th >售票员工号</th>
  13 + <th >售票员</th>
  14 + <th style="width: 21%">操作</th>
15 </tr> 15 </tr>
16 <tr role="row" class="filter"> 16 <tr role="row" class="filter">
17 <td></td> 17 <td></td>
@@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
23 dcvalue="{{ctrl.searchCondition()['xl.lineCode_eq']}}" 23 dcvalue="{{ctrl.searchCondition()['xl.lineCode_eq']}}"
24 dcname="xl.lineCode_eq" 24 dcname="xl.lineCode_eq"
25 icname="lineCode" 25 icname="lineCode"
  26 + dcname2="xl.company_eq"
  27 + icname2="company"
26 icnames="name" 28 icnames="name"
27 datatype="xl"> 29 datatype="xl">
28 </sa-Select3> 30 </sa-Select3>
@@ -39,7 +41,9 @@ @@ -39,7 +41,9 @@
39 dcname="jsy.id_eq" 41 dcname="jsy.id_eq"
40 icname="id" 42 icname="id"
41 icnames="personnelName" 43 icnames="personnelName"
42 - datatype="ry"> 44 + datatype="ry"
  45 + dataassociate="true"
  46 + dataparam="{{ {'companyCode_eq': ctrl.searchCondition()['xl.company_eq']} | json }}" >
43 </sa-Select3> 47 </sa-Select3>
44 </div> 48 </div>
45 </td> 49 </td>
@@ -60,28 +64,28 @@ @@ -60,28 +64,28 @@
60 </thead> 64 </thead>
61 <tbody> 65 <tbody>
62 <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX"> 66 <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
63 - <td class="mixTd"> 67 + <td>
64 <span ng-bind="$index + 1"></span> 68 <span ng-bind="$index + 1"></span>
65 </td> 69 </td>
66 - <td class="mixTd"> 70 + <td>
67 <span ng-bind="info.xl.name"></span> 71 <span ng-bind="info.xl.name"></span>
68 </td> 72 </td>
69 - <td class="mixTd"> 73 + <td>
70 <span ng-bind="info.dbbm"></span> 74 <span ng-bind="info.dbbm"></span>
71 </td> 75 </td>
72 - <td class="mixTd"> 76 + <td>
73 <span ng-bind="info.jsy.jobCode"></span> 77 <span ng-bind="info.jsy.jobCode"></span>
74 </td> 78 </td>
75 - <td class="mixTd"> 79 + <td>
76 <span ng-bind="info.jsy.personnelName"></span> 80 <span ng-bind="info.jsy.personnelName"></span>
77 </td> 81 </td>
78 - <td class="mixTd"> 82 + <td>
79 <span ng-bind="info.spy.jobCode"></span> 83 <span ng-bind="info.spy.jobCode"></span>
80 </td> 84 </td>
81 - <td class="mixTd"> 85 + <td>
82 <span ng-bind="info.spy.personnelName"></span> 86 <span ng-bind="info.spy.personnelName"></span>
83 </td> 87 </td>
84 - <td class="mixTd"> 88 + <td>
85 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> 89 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
86 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> 90 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
87 <a ui-sref="employeeConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a> 91 <a ui-sref="employeeConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/guideboardManage.js
  View file @ec509c3
@@ -21,7 +21,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService&#39;, [&#39;GuideboardMan @@ -21,7 +21,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService&#39;, [&#39;GuideboardMan
21 resetSearchCondition: function() { 21 resetSearchCondition: function() {
22 var key; 22 var key;
23 for (key in currentSearchCondition) { 23 for (key in currentSearchCondition) {
24 - currentSearchCondition[key] = ""; 24 + currentSearchCondition[key] = undefined;
25 } 25 }
26 }, 26 },
27 /** 27 /**
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/index.html
  View file @ec509c3
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="btn-group"> 35 <div class="btn-group">
36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown"> 36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
37 <i class="fa fa-share"></i> 37 <i class="fa fa-share"></i>
38 - <span>系统工具</span> 38 + <span>数据工具</span>
39 <i class="fa fa-angle-down"></i> 39 <i class="fa fa-angle-down"></i>
40 </a> 40 </a>
41 <ul class="dropdown-menu pull-right"> 41 <ul class="dropdown-menu pull-right">
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/list.html
  View file @ec509c3
1 <!-- ui-route employeeInfoManage.list --> 1 <!-- ui-route employeeInfoManage.list -->
2 <div ng-controller="GuideboardManageListCtrl as ctrl"> 2 <div ng-controller="GuideboardManageListCtrl as ctrl">
3 - <div style="width: 100%; height: 100%; overflow: auto"> 3 + <div class="fixDiv">
4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column"> 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 <thead> 5 <thead>
6 <tr role="row" class="heading"> 6 <tr role="row" class="heading">
7 - <th class="mixTd" width="50px">序号</th>  
8 - <th class="mixTd" width="150px">线路</th>  
9 - <th class="mixTd">路牌编号</th>  
10 - <th class="mixTd">路牌名称</th>  
11 - <th class="mixTd">路牌类型</th>  
12 - <th class="mixTd" width="150px">操作</th> 7 + <th style="width: 5%">序号</th>
  8 + <th style="width: 15%">线路</th>
  9 + <th >路牌编号</th>
  10 + <th >路牌名称</th>
  11 + <th >路牌类型</th>
  12 + <th style="width: 21%">操作</th>
13 </tr> 13 </tr>
14 <tr role="row" class="filter"> 14 <tr role="row" class="filter">
15 <td></td> 15 <td></td>
@@ -42,22 +42,22 @@ @@ -42,22 +42,22 @@
42 </thead> 42 </thead>
43 <tbody> 43 <tbody>
44 <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX"> 44 <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
45 - <td class="mixTd"> 45 + <td>
46 <span ng-bind="$index + 1"></span> 46 <span ng-bind="$index + 1"></span>
47 </td> 47 </td>
48 - <td class="mixTd"> 48 + <td>
49 <span ng-bind="info.xl.name"></span> 49 <span ng-bind="info.xl.name"></span>
50 </td> 50 </td>
51 - <td class="mixTd"> 51 + <td>
52 <span ng-bind="info.lpNo"></span> 52 <span ng-bind="info.lpNo"></span>
53 </td> 53 </td>
54 - <td class="mixTd"> 54 + <td>
55 <span ng-bind="info.lpName"></span> 55 <span ng-bind="info.lpName"></span>
56 </td> 56 </td>
57 - <td class="mixTd"> 57 + <td>
58 <span ng-bind="info.lpType"></span> 58 <span ng-bind="info.lpType"></span>
59 </td> 59 </td>
60 - <td class="mixTd"> 60 + <td>
61 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> 61 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
62 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> 62 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
63 <a ui-sref="guideboardManage_detail({id : info.id})" class="btn default blue-stripe btn-sm"> 详细 </a> 63 <a ui-sref="guideboardManage_detail({id : info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
  View file @ec509c3
1 <!-- ui-route employeeInfoManage.list --> 1 <!-- ui-route employeeInfoManage.list -->
2 <div ng-controller="SchedulePlanManageListCtrl as ctrl"> 2 <div ng-controller="SchedulePlanManageListCtrl as ctrl">
3 - <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">  
4 - <thead>  
5 - <tr role="row" class="heading">  
6 - <th style="width: 40pt;">序号</th>  
7 - <th style="width: 115pt;">线路</th>  
8 - <th style="width: 200pt;">时刻表</th>  
9 - <th>排班开始时间</th>  
10 - <th>排班结束时间</th>  
11 - <th>修改人</th>  
12 - <th>修改时间</th>  
13 - <th style="width: 115pt;">操作</th>  
14 - </tr>  
15 - <tr role="row" class="filter">  
16 - <td></td>  
17 - <td>  
18 - <sa-Select3 model="ctrl.searchCondition()"  
19 - name="xl"  
20 - placeholder="请输拼音..."  
21 - dcvalue="{{ctrl.searchCondition()['xl.id_eq']}}"  
22 - dcname="xl.id_eq"  
23 - icname="id"  
24 - icnames="name"  
25 - datatype="xl">  
26 - </sa-Select3>  
27 - </td>  
28 - <td></td>  
29 - <td></td>  
30 - <td></td>  
31 - <td></td>  
32 - <td></td>  
33 - <td>  
34 - <button class="btn btn-sm green btn-outline filter-submit margin-bottom"  
35 - ng-click="ctrl.pageChanaged()">  
36 - <i class="fa fa-search"></i> 搜索</button> 3 + <div class="fixDiv">
  4 + <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
  5 + <thead>
  6 + <tr role="row" class="heading">
  7 + <th style="width: 5%;">序号</th>
  8 + <th style="width: 15%;">线路</th>
  9 + <th style="width: 20%;">时刻表</th>
  10 + <th>排班开始时间</th>
  11 + <th>排班结束时间</th>
  12 + <th>修改人</th>
  13 + <th>修改时间</th>
  14 + <th style="width: 21%">操作</th>
  15 + </tr>
  16 + <tr role="row" class="filter">
  17 + <td></td>
  18 + <td>
  19 + <sa-Select3 model="ctrl.searchCondition()"
  20 + name="xl"
  21 + placeholder="请输拼音..."
  22 + dcvalue="{{ctrl.searchCondition()['xl.id_eq']}}"
  23 + dcname="xl.id_eq"
  24 + icname="id"
  25 + icnames="name"
  26 + datatype="xl">
  27 + </sa-Select3>
  28 + </td>
  29 + <td></td>
  30 + <td></td>
  31 + <td></td>
  32 + <td></td>
  33 + <td></td>
  34 + <td>
  35 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
  36 + ng-click="ctrl.pageChanaged()">
  37 + <i class="fa fa-search"></i> 搜索</button>
37 38
38 - <button class="btn btn-sm red btn-outline filter-cancel"  
39 - ng-click="ctrl.resetSearchCondition()">  
40 - <i class="fa fa-times"></i> 重置</button>  
41 - </td> 39 + <button class="btn btn-sm red btn-outline filter-cancel"
  40 + ng-click="ctrl.resetSearchCondition()">
  41 + <i class="fa fa-times"></i> 重置</button>
  42 + </td>
  43 +
  44 + </tr>
  45 + </thead>
  46 + <tbody>
  47 + <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
  48 + <td>
  49 + <span ng-bind="$index + 1"></span>
  50 + </td>
  51 + <td>
  52 + <span ng-bind="info.xl.name"></span>
  53 + </td>
  54 + <td>
  55 + <span ng-bind="info.ttInfo.name"></span>
  56 + </td>
  57 + <td>
  58 + <span ng-bind="info.scheduleFromTime | date: 'yyyy-MM-dd '"></span>
  59 + </td>
  60 + <td>
  61 + <span ng-bind="info.scheduleToTime | date: 'yyyy-MM-dd '"></span>
  62 + </td>
  63 + <td>
  64 + <span ng-bind=""></span>
  65 + </td>
  66 + <td>
  67 + <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  68 + </td>
  69 + <td>
  70 + <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
  71 + <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
  72 + <a ui-sref="schedulePlanInfoManage({spid : info.id, xlname : info.xl.name, ttname : info.ttInfo.name, stime : info.scheduleFromTime, etime : info.scheduleToTime})"
  73 + class="btn default blue-stripe btn-sm"> 排班明细 </a>
  74 + </td>
  75 + </tr>
  76 + </tbody>
  77 + </table>
  78 + </div>
42 79
43 - </tr>  
44 - </thead>  
45 - <tbody>  
46 - <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">  
47 - <td>  
48 - <span ng-bind="$index + 1"></span>  
49 - </td>  
50 - <td>  
51 - <span ng-bind="info.xl.name"></span>  
52 - </td>  
53 - <td>  
54 - <span ng-bind="info.ttInfo.name"></span>  
55 - </td>  
56 - <td>  
57 - <span ng-bind="info.scheduleFromTime | date: 'yyyy-MM-dd '"></span>  
58 - </td>  
59 - <td>  
60 - <span ng-bind="info.scheduleToTime | date: 'yyyy-MM-dd '"></span>  
61 - </td>  
62 - <td>  
63 - <span ng-bind=""></span>  
64 - </td>  
65 - <td>  
66 - <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>  
67 - </td>  
68 - <td>  
69 - <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->  
70 - <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->  
71 - <a ui-sref="schedulePlanInfoManage({spid : info.id, xlname : info.xl.name, ttname : info.ttInfo.name, stime : info.scheduleFromTime, etime : info.scheduleToTime})"  
72 - class="btn default blue-stripe btn-sm"> 排班明细 </a>  
73 - </td>  
74 - </tr>  
75 - </tbody>  
76 - </table>  
77 80
78 <div style="text-align: right;"> 81 <div style="text-align: right;">
79 <uib-pagination total-items="ctrl.pageInfo.totalItems" 82 <uib-pagination total-items="ctrl.pageInfo.totalItems"
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanInfoManage.js
  View file @ec509c3
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService&#39;, [&#39;Schedul @@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService&#39;, [&#39;Schedul
20 resetSearchCondition: function() { 20 resetSearchCondition: function() {
21 var key; 21 var key;
22 for (key in currentSearchCondition) { 22 for (key in currentSearchCondition) {
23 - currentSearchCondition[key] = ""; 23 + currentSearchCondition[key] = undefined;
24 } 24 }
25 }, 25 },
26 /** 26 /**
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanManage.js
  View file @ec509c3
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanManageService&#39;, [&#39;SchedulePla @@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanManageService&#39;, [&#39;SchedulePla
20 resetSearchCondition: function() { 20 resetSearchCondition: function() {
21 var key; 21 var key;
22 for (key in currentSearchCondition) { 22 for (key in currentSearchCondition) {
23 - currentSearchCondition[key] = ""; 23 + currentSearchCondition[key] = undefined;
24 } 24 }
25 }, 25 },
26 /** 26 /**
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/detail.html
  View file @ec509c3
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 </div> 57 </div>
58 </div> 58 </div>
59 59
60 - <div class="form-group"> 60 + <div class="form-group has-success has-feedback">
61 <label class="col-md-2 control-label">启用日期*：</label> 61 <label class="col-md-2 control-label">启用日期*：</label>
62 <div class="col-md-4"> 62 <div class="col-md-4">
63 <input type="text" class="form-control" 63 <input type="text" class="form-control"
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 </div> 66 </div>
67 </div> 67 </div>
68 68
69 - <div class="form-group"> 69 + <div class="form-group has-success has-feedback">
70 <label class="col-md-2 control-label">路牌范围*：</label> 70 <label class="col-md-2 control-label">路牌范围*：</label>
71 <div class="col-md-4"> 71 <div class="col-md-4">
72 <input type="text" class="form-control" 72 <input type="text" class="form-control"
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 </div> 74 </div>
75 </div> 75 </div>
76 76
77 - <div class="form-group"> 77 + <div class="form-group has-success has-feedback">
78 <label class="col-md-2 control-label">起始路牌*：</label> 78 <label class="col-md-2 control-label">起始路牌*：</label>
79 <div class="col-md-4"> 79 <div class="col-md-4">
80 <input type="text" class="form-control" 80 <input type="text" class="form-control"
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 </div> 82 </div>
83 </div> 83 </div>
84 84
85 - <div class="form-group"> 85 + <div class="form-group has-success has-feedback">
86 <label class="col-md-2 control-label">人员范围*：</label> 86 <label class="col-md-2 control-label">人员范围*：</label>
87 <div class="col-md-4"> 87 <div class="col-md-4">
88 <input type="text" class="form-control" 88 <input type="text" class="form-control"
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 </div> 90 </div>
91 </div> 91 </div>
92 92
93 - <div class="form-group"> 93 + <div class="form-group has-success has-feedback">
94 <label class="col-md-2 control-label">起始人员*：</label> 94 <label class="col-md-2 control-label">起始人员*：</label>
95 <div class="col-md-4"> 95 <div class="col-md-4">
96 <input type="text" class="form-control" 96 <input type="text" class="form-control"
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/edit.html
  View file @ec509c3
@@ -69,8 +69,10 @@ @@ -69,8 +69,10 @@
69 dcvalue="{{ctrl.scheduleRuleManageForSave.carConfigInfo.id}}" 69 dcvalue="{{ctrl.scheduleRuleManageForSave.carConfigInfo.id}}"
70 dcname="carConfigInfo.id" 70 dcname="carConfigInfo.id"
71 icname="id" 71 icname="id"
72 - icnames="nbbm"  
73 - datatype="cci" 72 + icnames="cl.insideCode"
  73 + datatype="cci2"
  74 + dataassociate="true"
  75 + dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id} | json }}"
74 mlp="true" 76 mlp="true"
75 required > 77 required >
76 </sa-Select3> 78 </sa-Select3>
@@ -81,15 +83,15 @@ @@ -81,15 +83,15 @@
81 </div> 83 </div>
82 </div> 84 </div>
83 85
84 - <div class="form-group">  
85 - <label class="col-md-2 control-label">启用日期：</label> 86 + <div class="form-group has-success has-feedback">
  87 + <label class="col-md-2 control-label">启用日期*：</label>
86 <div class="col-md-3"> 88 <div class="col-md-3">
87 <div class="input-group"> 89 <div class="input-group">
88 <input type="text" class="form-control" 90 <input type="text" class="form-control"
89 name="qyrq" placeholder="请选择启用日期..." 91 name="qyrq" placeholder="请选择启用日期..."
90 uib-datepicker-popup="yyyy年MM月dd日" 92 uib-datepicker-popup="yyyy年MM月dd日"
91 is-open="ctrl.qyrqOpen" required 93 is-open="ctrl.qyrqOpen" required
92 - ng-model="ctrl.scheduleRuleManageForSave.qyrq"/> 94 + ng-model="ctrl.scheduleRuleManageForSave.qyrq" readonly/>
93 <span class="input-group-btn"> 95 <span class="input-group-btn">
94 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()"> 96 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
95 <i class="glyphicon glyphicon-calendar"></i> 97 <i class="glyphicon glyphicon-calendar"></i>
@@ -103,7 +105,7 @@ @@ -103,7 +105,7 @@
103 </div> 105 </div>
104 </div> 106 </div>
105 107
106 - <div class="form-group"> 108 + <div class="form-group has-success has-feedback">
107 <label class="col-md-2 control-label">路牌范围*：</label> 109 <label class="col-md-2 control-label">路牌范围*：</label>
108 <div class="col-md-3"> 110 <div class="col-md-3">
109 <input type="text" class="form-control" name="lpNames" ng-model="ctrl.scheduleRuleManageForSave.lpNames" required 111 <input type="text" class="form-control" name="lpNames" ng-model="ctrl.scheduleRuleManageForSave.lpNames" required
@@ -115,7 +117,7 @@ @@ -115,7 +117,7 @@
115 </div> 117 </div>
116 </div> 118 </div>
117 119
118 - <div class="form-group"> 120 + <div class="form-group has-success has-feedback">
119 <label class="col-md-2 control-label">起始路牌*：</label> 121 <label class="col-md-2 control-label">起始路牌*：</label>
120 <div class="col-md-3"> 122 <div class="col-md-3">
121 <input type="text" class="form-control" name="lpStart" ng-model="ctrl.scheduleRuleManageForSave.lpStart" required 123 <input type="text" class="form-control" name="lpStart" ng-model="ctrl.scheduleRuleManageForSave.lpStart" required
@@ -127,7 +129,7 @@ @@ -127,7 +129,7 @@
127 </div> 129 </div>
128 </div> 130 </div>
129 131
130 - <div class="form-group"> 132 + <div class="form-group has-success has-feedback">
131 <label class="col-md-2 control-label">人员范围*：</label> 133 <label class="col-md-2 control-label">人员范围*：</label>
132 <div class="col-md-3"> 134 <div class="col-md-3">
133 <input type="text" class="form-control" name="ryDbbms" ng-model="ctrl.scheduleRuleManageForSave.ryDbbms" required 135 <input type="text" class="form-control" name="ryDbbms" ng-model="ctrl.scheduleRuleManageForSave.ryDbbms" required
@@ -139,7 +141,7 @@ @@ -139,7 +141,7 @@
139 </div> 141 </div>
140 </div> 142 </div>
141 143
142 - <div class="form-group"> 144 + <div class="form-group has-success has-feedback">
143 <label class="col-md-2 control-label">起始人员*：</label> 145 <label class="col-md-2 control-label">起始人员*：</label>
144 <div class="col-md-3"> 146 <div class="col-md-3">
145 <input type="text" class="form-control" name="ryStart" ng-model="ctrl.scheduleRuleManageForSave.ryStart" required 147 <input type="text" class="form-control" name="ryStart" ng-model="ctrl.scheduleRuleManageForSave.ryStart" required
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/form.html
  View file @ec509c3
@@ -69,8 +69,10 @@ @@ -69,8 +69,10 @@
69 dcvalue="{{ctrl.scheduleRuleManageForSave.carConfigInfo.id}}" 69 dcvalue="{{ctrl.scheduleRuleManageForSave.carConfigInfo.id}}"
70 dcname="carConfigInfo.id" 70 dcname="carConfigInfo.id"
71 icname="id" 71 icname="id"
72 - icnames="nbbm"  
73 - datatype="cci" 72 + icnames="cl.insideCode"
  73 + datatype="cci2"
  74 + dataassociate="true"
  75 + dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id} | json }}"
74 mlp="true" 76 mlp="true"
75 required > 77 required >
76 </sa-Select3> 78 </sa-Select3>
@@ -81,15 +83,15 @@ @@ -81,15 +83,15 @@
81 </div> 83 </div>
82 </div> 84 </div>
83 85
84 - <div class="form-group">  
85 - <label class="col-md-2 control-label">启用日期：</label> 86 + <div class="form-group has-success has-feedback">
  87 + <label class="col-md-2 control-label">启用日期*：</label>
86 <div class="col-md-3"> 88 <div class="col-md-3">
87 <div class="input-group"> 89 <div class="input-group">
88 <input type="text" class="form-control" 90 <input type="text" class="form-control"
89 name="qyrq" placeholder="请选择启用日期..." 91 name="qyrq" placeholder="请选择启用日期..."
90 uib-datepicker-popup="yyyy年MM月dd日" 92 uib-datepicker-popup="yyyy年MM月dd日"
91 is-open="ctrl.qyrqOpen" required 93 is-open="ctrl.qyrqOpen" required
92 - ng-model="ctrl.scheduleRuleManageForSave.qyrq"/> 94 + ng-model="ctrl.scheduleRuleManageForSave.qyrq" readonly/>
93 <span class="input-group-btn"> 95 <span class="input-group-btn">
94 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()"> 96 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
95 <i class="glyphicon glyphicon-calendar"></i> 97 <i class="glyphicon glyphicon-calendar"></i>
@@ -103,7 +105,7 @@ @@ -103,7 +105,7 @@
103 </div> 105 </div>
104 </div> 106 </div>
105 107
106 - <div class="form-group"> 108 + <div class="form-group has-success has-feedback">
107 <label class="col-md-2 control-label">路牌范围*：</label> 109 <label class="col-md-2 control-label">路牌范围*：</label>
108 <div class="col-md-3"> 110 <div class="col-md-3">
109 <input type="text" class="form-control" name="lpNames" ng-model="ctrl.scheduleRuleManageForSave.lpNames" required 111 <input type="text" class="form-control" name="lpNames" ng-model="ctrl.scheduleRuleManageForSave.lpNames" required
@@ -115,7 +117,7 @@ @@ -115,7 +117,7 @@
115 </div> 117 </div>
116 </div> 118 </div>
117 119
118 - <div class="form-group"> 120 + <div class="form-group has-success has-feedback">
119 <label class="col-md-2 control-label">起始路牌*：</label> 121 <label class="col-md-2 control-label">起始路牌*：</label>
120 <div class="col-md-3"> 122 <div class="col-md-3">
121 <input type="text" class="form-control" name="lpStart" ng-model="ctrl.scheduleRuleManageForSave.lpStart" required 123 <input type="text" class="form-control" name="lpStart" ng-model="ctrl.scheduleRuleManageForSave.lpStart" required
@@ -127,7 +129,7 @@ @@ -127,7 +129,7 @@
127 </div> 129 </div>
128 </div> 130 </div>
129 131
130 - <div class="form-group"> 132 + <div class="form-group has-success has-feedback">
131 <label class="col-md-2 control-label">人员范围*：</label> 133 <label class="col-md-2 control-label">人员范围*：</label>
132 <div class="col-md-3"> 134 <div class="col-md-3">
133 <input type="text" class="form-control" name="ryDbbms" ng-model="ctrl.scheduleRuleManageForSave.ryDbbms" required 135 <input type="text" class="form-control" name="ryDbbms" ng-model="ctrl.scheduleRuleManageForSave.ryDbbms" required
@@ -139,7 +141,7 @@ @@ -139,7 +141,7 @@
139 </div> 141 </div>
140 </div> 142 </div>
141 143
142 - <div class="form-group"> 144 + <div class="form-group has-success has-feedback">
143 <label class="col-md-2 control-label">起始人员*：</label> 145 <label class="col-md-2 control-label">起始人员*：</label>
144 <div class="col-md-3"> 146 <div class="col-md-3">
145 <input type="text" class="form-control" name="ryStart" ng-model="ctrl.scheduleRuleManageForSave.ryStart" required 147 <input type="text" class="form-control" name="ryStart" ng-model="ctrl.scheduleRuleManageForSave.ryStart" required
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/index.html
  View file @ec509c3
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="btn-group"> 35 <div class="btn-group">
36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown"> 36 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
37 <i class="fa fa-share"></i> 37 <i class="fa fa-share"></i>
38 - <span>系统工具</span> 38 + <span>数据工具</span>
39 <i class="fa fa-angle-down"></i> 39 <i class="fa fa-angle-down"></i>
40 </a> 40 </a>
41 <ul class="dropdown-menu pull-right"> 41 <ul class="dropdown-menu pull-right">
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
  View file @ec509c3
1 <div ng-controller="ScheduleRuleManageListCtrl as ctrl"> 1 <div ng-controller="ScheduleRuleManageListCtrl as ctrl">
2 - <div style="width: 100%; height: 100%; overflow: auto"> 2 + <div class="fixDiv">
3 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column"> 3 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
4 <thead> 4 <thead>
5 <tr role="row" class="heading"> 5 <tr role="row" class="heading">
6 - <th style="width: 40pt;">序号</th>  
7 - <th style="width: 115pt;">线路</th>  
8 - <th style="width: 115pt;">修改时间</th>  
9 - <th style="width: 70pt;">启用日期</th> 6 + <th style="width: 5%;">序号</th>
  7 + <th style="width: 15%;">线路</th>
  8 + <th style="width: 15%;">修改时间</th>
  9 + <th style="width: 12%;">启用日期</th>
10 <th>车辆</th> 10 <th>车辆</th>
11 <th>翻版模式</th> 11 <th>翻版模式</th>
12 <th>起始路牌</th> 12 <th>起始路牌</th>
13 <th>路牌范围</th> 13 <th>路牌范围</th>
14 <th>起始人员</th> 14 <th>起始人员</th>
15 <th>人员范围</th> 15 <th>人员范围</th>
16 - <th style="width: 115pt;">操作</th> 16 + <th style="width: 21%">操作</th>
17 </tr> 17 </tr>
18 <tr role="row" class="filter"> 18 <tr role="row" class="filter">
19 <td></td> 19 <td></td>
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js
  View file @ec509c3
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService&#39;, [&#39;ScheduleRul @@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService&#39;, [&#39;ScheduleRul
20 resetSearchCondition: function() { 20 resetSearchCondition: function() {
21 var key; 21 var key;
22 for (key in currentSearchCondition) { 22 for (key in currentSearchCondition) {
23 - currentSearchCondition[key] = null; 23 + currentSearchCondition[key] = undefined;
24 } 24 }
25 }, 25 },
26 /** 26 /**
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/list.html
  View file @ec509c3
1 <!-- ui-route employeeInfoManage.list --> 1 <!-- ui-route employeeInfoManage.list -->
2 <div ng-controller="TimeTableManageListCtrl as ctrl"> 2 <div ng-controller="TimeTableManageListCtrl as ctrl">
3 - <table class="table table-striped table-bordered table-hover table-checkable order-column">  
4 - <thead>  
5 - <tr role="row" class="heading">  
6 - <th>序号</th>  
7 - <th>线路</th>  
8 - <th>时刻表名称</th>  
9 - <th>路牌数</th>  
10 - <th>圈数</th>  
11 - <th>上下行</th>  
12 - <th>启用</th>  
13 - <th>修改时间</th>  
14 - <th>时刻表明细</th>  
15 - <th width="14%">操作</th>  
16 - </tr>  
17 - <tr role="row" class="filter">  
18 - <td></td>  
19 - <td></td>  
20 - <td>  
21 - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().name_like"/>  
22 - </td>  
23 - <td></td>  
24 - <td></td>  
25 - <td></td>  
26 - <td></td>  
27 - <td></td>  
28 - <td></td>  
29 - <td>  
30 - <button class="btn btn-sm green btn-outline filter-submit margin-bottom"  
31 - ng-click="ctrl.pageChanaged()">  
32 - <i class="fa fa-search"></i> 搜索</button> 3 + <div class="fixDiv">
  4 + <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
  5 + <thead>
  6 + <tr role="row" class="heading">
  7 + <th style="width: 5%;">序号</th>
  8 + <th style="width: 8%;">线路</th>
  9 + <th >名称</th>
  10 + <th>路牌数</th>
  11 + <th>圈数</th>
  12 + <th>上下行</th>
  13 + <th>启用</th>
  14 + <th style="width: 15%">修改时间</th>
  15 + <th style="width: 25%">时刻表明细</th>
  16 + <th style="width: 21%">操作</th>
  17 + </tr>
  18 + <tr role="row" class="filter">
  19 + <td></td>
  20 + <td></td>
  21 + <td>
  22 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().name_like"/>
  23 + </td>
  24 + <td></td>
  25 + <td></td>
  26 + <td></td>
  27 + <td></td>
  28 + <td></td>
  29 + <td></td>
  30 + <td>
  31 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
  32 + ng-click="ctrl.pageChanaged()">
  33 + <i class="fa fa-search"></i> 搜索</button>
33 34
34 - <button class="btn btn-sm red btn-outline filter-cancel"  
35 - ng-click="ctrl.resetSearchCondition()">  
36 - <i class="fa fa-times"></i> 重置</button>  
37 - </td>  
38 - </tr> 35 + <button class="btn btn-sm red btn-outline filter-cancel"
  36 + ng-click="ctrl.resetSearchCondition()">
  37 + <i class="fa fa-times"></i> 重置</button>
  38 + </td>
  39 + </tr>
39 40
40 - </thead>  
41 - <tbody>  
42 - <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">  
43 - <td>  
44 - <span ng-bind="$index + 1"></span>  
45 - </td>  
46 - <td>  
47 - <span ng-bind="info.xl.name"></span>  
48 - </td>  
49 - <td>  
50 - <span ng-bind="info.name"></span>  
51 - </td>  
52 - <td>  
53 - <span ng-bind="info.lpCount"></span>  
54 - </td>  
55 - <td>  
56 - <span ng-bind="info.loopCount"></span>  
57 - </td>  
58 - <td>  
59 - <span ng-bind="info.xlDir | dict:'LineTrend':'未知'"></span>  
60 - </td>  
61 - <td>  
62 - <span ng-bind="info.isEnableDisTemplate"></span>  
63 - </td>  
64 - <td>  
65 - <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>  
66 - </td>  
67 - <td>  
68 - <a ui-sref="timeTableDetailInfoManage({xlid: info.xl.id, ttid : info.id})"  
69 - class="btn default blue-stripe btn-sm"> 编辑 </a>  
70 - <a ng-click="ctrl.importData($index)" class="btn default blue-stripe btn-sm"> 导入 </a>  
71 - <a href="javascript:" class="btn default blue-stripe btn-sm"> 导出 </a>  
72 - <a href="javascript:" class="btn default blue-stripe btn-sm"> 模版 </a>  
73 - </td>  
74 - <td>  
75 - <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->  
76 - <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->  
77 - <a ui-sref="busConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>  
78 - <a ui-sref="busConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>  
79 - </td>  
80 - </tr>  
81 - </tbody>  
82 - </table> 41 + </thead>
  42 + <tbody>
  43 + <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
  44 + <td>
  45 + <span ng-bind="$index + 1"></span>
  46 + </td>
  47 + <td>
  48 + <span ng-bind="info.xl.name"></span>
  49 + </td>
  50 + <td>
  51 + <span ng-bind="info.name"></span>
  52 + </td>
  53 + <td>
  54 + <span ng-bind="info.lpCount"></span>
  55 + </td>
  56 + <td>
  57 + <span ng-bind="info.loopCount"></span>
  58 + </td>
  59 + <td>
  60 + <span ng-bind="info.xlDir | dict:'LineTrend':'未知'"></span>
  61 + </td>
  62 + <td>
  63 + <span ng-bind="info.isEnableDisTemplate"></span>
  64 + </td>
  65 + <td>
  66 + <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  67 + </td>
  68 + <td>
  69 + <a ui-sref="timeTableDetailInfoManage({xlid: info.xl.id, ttid : info.id})"
  70 + class="btn default blue-stripe btn-sm"> 编辑 </a>
  71 + <a ng-click="ctrl.importData($index)" class="btn default blue-stripe btn-sm"> 导入 </a>
  72 + <a href="javascript:" class="btn default blue-stripe btn-sm"> 导出 </a>
  73 + <a href="javascript:" class="btn default blue-stripe btn-sm"> 模版 </a>
  74 + </td>
  75 + <td>
  76 + <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
  77 + <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
  78 + <a ui-sref="timeTableManage_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
  79 + <a ui-sref="timeTableManage_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
  80 + </td>
  81 + </tr>
  82 + </tbody>
  83 + </table>
  84 + </div>
83 85
84 <div style="text-align: right;"> 86 <div style="text-align: right;">
85 <uib-pagination total-items="ctrl.pageInfo.totalItems" 87 <uib-pagination total-items="ctrl.pageInfo.totalItems"
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableManage.js
  View file @ec509c3
@@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;TimeTableManageService&#39;, [&#39;TimeTableManag @@ -20,7 +20,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;TimeTableManageService&#39;, [&#39;TimeTableManag
20 resetSearchCondition: function() { 20 resetSearchCondition: function() {
21 var key; 21 var key;
22 for (key in currentSearchCondition) { 22 for (key in currentSearchCondition) {
23 - currentSearchCondition[key] = ""; 23 + currentSearchCondition[key] = undefined;
24 } 24 }
25 }, 25 },
26 /** 26 /**