Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control

潘钊
2 parents 4221b38f bf160935
Showing 66 changed files with 308 additions and 0 deletions
src/main/java/com/bsth/entity/Cars.java
src/main/resources/static/index.html
src/main/resources/static/pages/schedulePlan/.bowerrc → src/main/resources/static/pages/scheduleApp/.bowerrc
src/main/resources/static/pages/schedulePlan/.jshintrc → src/main/resources/static/pages/scheduleApp/.jshintrc
src/main/resources/static/pages/schedulePlan/Gruntfile.js → src/main/resources/static/pages/scheduleApp/Gruntfile.js
src/main/resources/static/pages/schedulePlan/bower.json → src/main/resources/static/pages/scheduleApp/bower.json
src/main/resources/static/pages/schedulePlan/app/basicInfo/busInfoManage/busInfoManage.html → src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.html
src/main/resources/static/pages/schedulePlan/app/core/busConfig/busConfig.html → src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig2.html
src/main/resources/static/pages/schedulePlan/app/core/busConfig/controller.js → src/main/resources/static/pages/scheduleApp/module/core/busConfig/controller.js
src/main/resources/static/pages/scheduleApp/module/core/busConfig/controller2.js
src/main/resources/static/pages/schedulePlan/app/core/busConfig/dist/busConfig.dist.html → src/main/resources/static/pages/scheduleApp/module/core/busConfig/dist/busConfig.dist.html
src/main/resources/static/pages/schedulePlan/app/core/busConfig/dist/controller.min.js → src/main/resources/static/pages/scheduleApp/module/core/busConfig/dist/controller.min.js
src/main/resources/static/pages/schedulePlan/app/core/busConfig/dist/service.min.js → src/main/resources/static/pages/scheduleApp/module/core/busConfig/dist/service.min.js
src/main/resources/static/pages/schedulePlan/app/core/busConfig/service.js → src/main/resources/static/pages/scheduleApp/module/core/busConfig/service.js
src/main/resources/static/pages/scheduleApp/module/core/busConfig/service2.js
src/main/resources/static/pages/schedulePlan/app/core/busLineInfoOverview/controller.js → src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/controller.js
src/main/resources/static/pages/schedulePlan/app/core/busLineInfoOverview/dist/controller.min.js → src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/dist/controller.min.js
src/main/resources/static/pages/schedulePlan/app/core/busLineInfoOverview/dist/service.min.js → src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/dist/service.min.js
src/main/resources/static/pages/schedulePlan/app/core/busLineInfoOverview/service.js → src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/service.js
@@ -7,6 +7,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
  
 /**
@@ -137,6 +138,9 @@ public class Cars {
 	// 报废日期
 	private Date scrapDate;
  
+	// 是否切换
+	private Integer isSwitch;
+	
 	// 描述
 	private String descriptions;
  
@@ -153,6 +157,10 @@ public class Cars {
 	// 修改日期
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
+	
+	// 线路ID
+	@OneToOne
+	private Line lineid;
  
 	public Integer getId() {
 		return id;
@@ -442,6 +450,14 @@ public class Cars {
 		this.scrapDate = scrapDate;
 	}
  
+	public Integer getIsSwitch() {
+		return isSwitch;
+	}
+
+	public void setIsSwitch(Integer isSwitch) {
+		this.isSwitch = isSwitch;
+	}
+
 	public String getDescriptions() {
 		return descriptions;
 	}
@@ -481,4 +497,12 @@ public class Cars {
 	public void setUpdateDate(Date updateDate) {
 		this.updateDate = updateDate;
 	}
+
+	public Line getLineid() {
+		return lineid;
+	}
+
+	public void setLineid(Line lineid) {
+		this.lineid = lineid;
+	}
 }
@@ -90,6 +90,10 @@ tr.row-active td {
     padding: 3.3px 0;
 }
 </style>
+
+<!-- ocLazyLoading载入文件的位置 -->
+<link id="ng_load_plugins_before" />
+
 </head>
 <body class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
     <div class="page-header navbar navbar-fixed-top">
@@ -194,6 +198,13 @@ tr.row-active td {
         </div>
         <div class="page-content-wrapper">
             <div class="page-content" id="pjax-container"></div>
+
+            <div class="page-content" ng-app="ScheduleApp" id="route-container">
+                <div ng-controller="ScheduleAppController">
+                    <div ui-view class="fade-in-up"> </div>
+                </div>
+            </div>
+
         </div>
     </div>
  
@@ -221,6 +232,26 @@ tr.row-active td {
  		</li>
 	{{/each}}
 {{/each}}
+
+<li class="heading">
+    <h3 class="uppercase">测试用例</h3>
+</li>
+<li class="nav-item">
+    <a href="javascript:;" class="nav-link nav-toggle ">
+        <i class="fa fa-cloud"></i>
+        <span class="title">用例组1</span>
+        <span class="arrow"></span>
+    </a>
+    <ul class="sub-menu">
+        <li class="nav-item  ">
+            <a href="#/busConfig.html" class="nav-link ">
+                <span class="title">用例1</span>
+            </a>
+        </li>
+    </ul>
+</li>
+
+
 </script>
  <!--[if lt IE 9]>
 <script src="assets/plugins/respond.min.js"></script>
@@ -291,6 +322,9 @@ tr.row-active td {
 <script src="assets/bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>
 <script src="assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
  
+<!-- schedule计划调度AngularJS模块主js -->
+<script src="pages/scheduleApp/module/main.js"></script>
+
  
 <script type="text/javascript">
  
+<div class="page-head">
+    <div class="page-title">
+        <h1>车辆配置</h1>
+    </div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+    <li>
+        <a href="/pages/home.html" data-pjax>首页</a>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <span class="active">运营计划管理</span>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <span class="active">车俩配置</span>
+    </li>
+</ul>
+
+<div class="col-md-12" ng-controller="busConfigCtrl as bcc">
+    <div class="portlet light bordered">
+        <div class="portlet-title">
+            <div class="caption font-dark">
+                <i class="fa fa-database font-dark"></i>
+                <span class="caption-subject bold uppercase">配置表</span>
+            </div>
+            <div class="actions">
+                <a href="javascirpt:" class="btn btn-circle blue">
+                    <i class="fa fa-plus"></i>
+                    添加配置
+                </a>
+                <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>
+                        <i class="fa fa-angle-down"></i>
+                    </a>
+                    <ul class="dropdown-menu pull-right">
+                        <li>
+                            <a href="javascript:" class="tool-action">
+                                <i class="fa fa-file-excel-o"></i>
+                                导出excel
+                            </a>
+                        </li>
+                        <li class="divider"></li>
+                        <li>
+                            <a href="javascript:" class="tool-action">
+                                <i class="fa fa-refresh"></i>
+                                刷行数据
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+
+        <div class="portlet-body">
+            <table class="table table-striped table-bordered table-hover table-checkable order-column" id="busConfigInfoTable">
+                <thead>
+                    <tr>
+                        <th>
+                            <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>
+                        </th>
+                        <th>线路名称</th>
+                        <th>自编号</th>
+                        <th>设备编号</th>
+                        <th>启用日期</th>
+                        <th>终止日期</th>
+                        <th>停车点</th>
+                        <th>操作</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr ng-repeat="info in bcc.infos" class="odd gradeX">
+                        <td>
+                            <input type="checkbox" class="checkboxes"/>
+                        </td>
+                        <td>
+                            <span ng-bind="info.xl"></span>
+                        </td>
+                        <td>
+                            <span ng-bind="info.zbh"></span>
+                        </td>
+                        <td>
+                            <span ng-bind="info.sbbh"></span>
+                        </td>
+                        <td>
+                            <span ng-bind="info.qyrq | date:'yyyy-MM-dd HH:mm:ss'"></span>
+                        </td>
+                        <td>
+                            <span ng-bind="info.zzrq | date:'yyyy-MM-dd HH:mm:ss'"></span>
+                        </td>
+                        <td>
+                            <span ng-bind="info.tcd"></span>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+
+            <div style="text-align: right;">
+                <uib-pagination total-items="bcc.totalItems"
+                                ng-model="bcc.currentPage"
+                                ng-change="bcc.pageChanged()"
+                                previous-text="上一页"
+                                next-text="下一页">
+                </uib-pagination>
+            </div>
+
+        </div>
+    </div>
+</div>
 \ No newline at end of file
+// 车辆配置控制器放在这里
+
+angular.module('ScheduleApp')
+    .controller('busConfigCtrl', ['BusConfigInfo', function(BusConfigInfo) {
+        var self = this;
+        self.totalItems = 64;
+        self.currentPage = 4;
+        self.infos = [];
+        self.pageChanged = function() {
+            console.log("页面调转到：" + self.currentPage);
+        };
+
+        BusConfigInfo.list(function(result) {
+            console.log("后台返回记录数：" + result.content.length);
+            self.infos = result.content;
+        });
+    }]);
 \ No newline at end of file
+// 车辆配置服务放在这里
+
+angular.module('ScheduleApp').factory('BusConfigInfo', ['$resource', function($resource) {
+    return $resource(
+        '/cci',
+        {},
+        {
+            list: {
+                method: 'GET'
+            }
+        }
+    );
+}]);
+/** shcedule 营运计划App module */
+
+var ScheduleApp = angular.module('ScheduleApp', [
+    'ui.router', // ui-route跳转
+    'ui.bootstrap', // ui bootstrap封装
+    'oc.lazyLoad', // 动态加载模块（html，js，css等）
+    'ngSanitize', // 净化html标签，配合ng-bind-html使用
+    'ngResource' // resource服务
+]);
+
+ScheduleApp.config(['$httpProvider', function($httpProvider) {
+    $httpProvider.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
+}]);
+
+/** ocLazyLoader 配置 */
+ScheduleApp.config(['$ocLazyLoadProvider', function($ocLazyLoadProvider) {
+    $ocLazyLoadProvider.config({
+        // TODO：全局配置在这里
+    });
+}]);
+
+/** 配置全局配置信息 */
+ScheduleApp.factory('settings', ['$rootScope', function($rootScope) {
+    // 封装 settings服务，并设置给 $rootScope同名对象
+    var settings = {
+        // TODO：
+    };
+
+    $rootScope.settings = settings;
+
+    return settings;
+}]);
+
+/** Schedule App 主应用控制器 */
+ScheduleApp.controller('ScheduleAppController', ['$scope', function($scope) {
+    $scope.$on('$viewContentLoaded', function(event) {
+        console.log("子页面已载入：" + event);
+    });
+}]);
+
+/** 配置所有模块页面route */
+ScheduleApp.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {
+    // 默认路由
+    //$urlRouterProvider.otherwise('/busConfig.html');
+
+    $stateProvider
+        // 车辆配置模块
+        .state('busConfig', {
+            url: '/busConfig.html',
+            templateUrl: 'pages/scheduleApp/module/core/busConfig/busConfig2.html',
+            data: {},
+            controller: 'busConfigCtrl',
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'busConfig_module',
+                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                        files: [
+                            'pages/scheduleApp/module/core/busConfig/service2.js',
+                            'pages/scheduleApp/module/core/busConfig/controller2.js'
+                        ]
+                    });
+                }]
+            }
+        })
+        // 路牌管理
+        .state('guideboardManage', {
+            url: '/guideboardManage.html',
+            templateUrl: 'pages/scheduleApp/module/core/guideboardManage/guideboardManage.html',
+            data: {},
+            controller: 'guideboardManageCtrl',
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: ''
+                    });
+                }]
+            }
+        });
+}]);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+