Update

徐烜
1 parent 29e324be
Showing 4 changed files with 31 additions and 1 deletions
src/main/java/com/bsth/entity/schedule/rule/RerunRule.java
src/main/resources/static/index.html
src/main/resources/static/pages/scheduleApp/module/common/main.css
src/main/resources/static/pages/scheduleApp/module/common/main.js
@@ -53,6 +53,8 @@ public class RerunRule extends BEntity {
     private GuideboardInfo rerunLp;
     /** 套跑班次（时刻表明细ids，使用逗号连接） */
     private String rerunTtinfodetailIds;
+    /** 套跑班次（对应具体班次的发车时间，使用逗号连接，重复的时间会去除） */
+    private String rerunTtinfodetailFcsjs;
     /** 套跑类型（dylp；对应路牌，dybc：对应班车） */
@@ -167,4 +169,11 @@ public class RerunRule extends BEntity {
         this.isCancel = isCancel;
     }
+    public String getRerunTtinfodetailFcsjs() {
+        return rerunTtinfodetailFcsjs;
+    }
+
+    public void setRerunTtinfodetailFcsjs(String rerunTtinfodetailFcsjs) {
+        this.rerunTtinfodetailFcsjs = rerunTtinfodetailFcsjs;
+    }
 }
@@ -68,6 +68,9 @@
 <!-- handsontable样式 -->
 <link rel="stylesheet"
 	href="/assets/bower_components/handsontable/dist/handsontable.full.css" />
+<!-- sweetalert样式 -->
+<link rel="stylesheet"
+      href="/assets/bower_components/sweetalert/dist/sweetalert.css" />
 <!-- schedule计划调度AngularJS模块主css -->
 <link rel="stylesheet" href="/pages/scheduleApp/module/common/main.css"
 	type="text/css" />
@@ -285,7 +288,7 @@ tr.row-active td {
 							</div>
 						</div>
-						<div ui-view class="fade-in-up"></div>
+						<div ui-view class="uv"></div>
 					</div>
 				</div>
 			</div>
@@ -558,6 +561,9 @@ tr.row-active td {
 	<script
 		src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js"
 		data-exclude=1></script>
+    <script
+        src="/assets/bower_components/angular-animate/angular-animate.min.js"
+        data-exclude=1></script>
 	<script
 		src="/assets/bower_components/angular-touch/angular-touch.min.js"
 		data-exclude=1></script>
@@ -575,6 +581,9 @@ tr.row-active td {
 		src="/assets/bower_components/handsontable/dist/handsontable.full.js"></script>
 	<script
 		src="/assets/bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
+    <!-- sweetalert相关js -->
+    <script src="/assets/bower_components/sweetalert/dist/sweetalert.min.js"></script>
+    <script src="/assets/bower_components/ng-sweet-alert/ng-sweet-alert.js"></script>
 	<!-- schedule计划调度AngularJS模块主JS -->
 	<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>
@@ -73,3 +73,14 @@ form input.ng-valid.ng-dirty.ng-valid-required {
     background: black;
     z-index: 1049;
 }
+
+/* route-container ui-route的样式 */
+/* 开始时的样式 */
+.uv.ng-enter {
+    transition: .5s;  /* 当使用css transition实现动画效果时，在开始时的样式中必须包含transition的设置 */
+    opacity: 0;
+}
+/* 结束时的样式 */
+.uv.ng-enter.ng-enter-active {
+     opacity: 1;
+}
 \ No newline at end of file
@@ -2,6 +2,7 @@
 var ScheduleApp = angular.module('ScheduleApp', [
     'ui.router', // ui-route跳转
+    'ngAnimate', // ng动画
     'ui.bootstrap', // ui bootstrap封装
     'oc.lazyLoad', // 动态加载模块（html，js，css等）
     'ngSanitize', // 净化html标签，配合ng-bind-html使用