Commit 2dc637005f2f4b6ca15a96ac7e78a43bc67e81bf
1 parent
29e324be
Update
Showing
4 changed files
with
31 additions
and
1 deletions
src/main/java/com/bsth/entity/schedule/rule/RerunRule.java
| ... | ... | @@ -53,6 +53,8 @@ public class RerunRule extends BEntity { |
| 53 | 53 | private GuideboardInfo rerunLp; |
| 54 | 54 | /** 套跑班次（时刻表明细ids，使用逗号连接） */ |
| 55 | 55 | private String rerunTtinfodetailIds; |
| 56 | + /** 套跑班次（对应具体班次的发车时间，使用逗号连接，重复的时间会去除） */ | |
| 57 | + private String rerunTtinfodetailFcsjs; | |
| 56 | 58 | |
| 57 | 59 | |
| 58 | 60 | /** 套跑类型（dylp；对应路牌，dybc：对应班车） */ |
| ... | ... | @@ -167,4 +169,11 @@ public class RerunRule extends BEntity { |
| 167 | 169 | this.isCancel = isCancel; |
| 168 | 170 | } |
| 169 | 171 | |
| 172 | + public String getRerunTtinfodetailFcsjs() { | |
| 173 | + return rerunTtinfodetailFcsjs; | |
| 174 | + } | |
| 175 | + | |
| 176 | + public void setRerunTtinfodetailFcsjs(String rerunTtinfodetailFcsjs) { | |
| 177 | + this.rerunTtinfodetailFcsjs = rerunTtinfodetailFcsjs; | |
| 178 | + } | |
| 170 | 179 | } | ... | ... |
src/main/resources/static/index.html
| ... | ... | @@ -68,6 +68,9 @@ |
| 68 | 68 | <!-- handsontable样式 --> |
| 69 | 69 | <link rel="stylesheet" |
| 70 | 70 | href="/assets/bower_components/handsontable/dist/handsontable.full.css" /> |
| 71 | +<!-- sweetalert样式 --> | |
| 72 | +<link rel="stylesheet" | |
| 73 | + href="/assets/bower_components/sweetalert/dist/sweetalert.css" /> | |
| 71 | 74 | <!-- schedule计划调度AngularJS模块主css --> |
| 72 | 75 | <link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css" |
| 73 | 76 | type="text/css" /> |
| ... | ... | @@ -285,7 +288,7 @@ tr.row-active td { |
| 285 | 288 | </div> |
| 286 | 289 | </div> |
| 287 | 290 | |
| 288 | - <div ui-view class="fade-in-up"></div> | |
| 291 | + <div ui-view class="uv"></div> | |
| 289 | 292 | </div> |
| 290 | 293 | </div> |
| 291 | 294 | </div> |
| ... | ... | @@ -558,6 +561,9 @@ tr.row-active td { |
| 558 | 561 | <script |
| 559 | 562 | src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js" |
| 560 | 563 | data-exclude=1></script> |
| 564 | + <script | |
| 565 | + src="/assets/bower_components/angular-animate/angular-animate.min.js" | |
| 566 | + data-exclude=1></script> | |
| 561 | 567 | <script |
| 562 | 568 | src="/assets/bower_components/angular-touch/angular-touch.min.js" |
| 563 | 569 | data-exclude=1></script> |
| ... | ... | @@ -575,6 +581,9 @@ tr.row-active td { |
| 575 | 581 | src="/assets/bower_components/handsontable/dist/handsontable.full.js"></script> |
| 576 | 582 | <script |
| 577 | 583 | src="/assets/bower_components/ngHandsontable/dist/ngHandsontable.js"></script> |
| 584 | + <!-- sweetalert相关js --> | |
| 585 | + <script src="/assets/bower_components/sweetalert/dist/sweetalert.min.js"></script> | |
| 586 | + <script src="/assets/bower_components/ng-sweet-alert/ng-sweet-alert.js"></script> | |
| 578 | 587 | |
| 579 | 588 | <!-- schedule计划调度AngularJS模块主JS --> |
| 580 | 589 | <script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script> | ... | ... |
src/main/resources/static/pages/scheduleApp/module/common/main.css
| ... | ... | @@ -73,3 +73,14 @@ form input.ng-valid.ng-dirty.ng-valid-required { |
| 73 | 73 | background: black; |
| 74 | 74 | z-index: 1049; |
| 75 | 75 | } |
| 76 | + | |
| 77 | +/* route-container ui-route的样式 */ | |
| 78 | +/* 开始时的样式 */ | |
| 79 | +.uv.ng-enter { | |
| 80 | + transition: .5s; /* 当使用css transition实现动画效果时，在开始时的样式中必须包含transition的设置 */ | |
| 81 | + opacity: 0; | |
| 82 | +} | |
| 83 | +/* 结束时的样式 */ | |
| 84 | +.uv.ng-enter.ng-enter-active { | |
| 85 | + opacity: 1; | |
| 86 | +} | |
| 76 | 87 | \ No newline at end of file | ... | ... |
src/main/resources/static/pages/scheduleApp/module/common/main.js