潘钊 / bsth_control · Commits

Commit 1df69b8de1efe38bc6b4e383b06ac59532fc40b4

Authored by 徐烜
1 parent aceb99b2

update

Inline Side-by-side
Showing 7 changed files with 102 additions and 63 deletions
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
  View file @1df69b8
1 1 package com.bsth.entity.schedule;
2 2  
3   -import com.bsth.entity.Bus;
  3 +import com.bsth.entity.Cars;
4 4 import com.bsth.entity.Line;
5 5  
6 6 import javax.persistence.*;
... ... @@ -25,7 +25,7 @@ public class CarConfigInfo {
25 25 private Line xl;
26 26 /** 车辆关联 */
27 27 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
28   - private Bus cl;
  28 + private Cars cl;
29 29  
30 30  
31 31 /** 早班时间（格式：HH:mm） */
... ... @@ -67,11 +67,11 @@ public class CarConfigInfo {
67 67 this.xl = xl;
68 68 }
69 69  
70   - public Bus getCl() {
  70 + public Cars getCl() {
71 71 return cl;
72 72 }
73 73  
74   - public void setCl(Bus cl) {
  74 + public void setCl(Cars cl) {
75 75 this.cl = cl;
76 76 }
77 77  
... ...
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
  View file @1df69b8
1 1 package com.bsth.entity.schedule;
2 2  
3   -import com.bsth.entity.Bus;
  3 +import com.bsth.entity.Cars;
4 4 import com.bsth.entity.Line;
5 5 import com.bsth.entity.Personnel;
6 6  
... ... @@ -24,7 +24,7 @@ public class EmployeeConfigInfo {
24 24 private Line xl;
25 25 /** 车辆关联 */
26 26 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
27   - private Bus cl;
  27 + private Cars cl;
28 28 /** 人员关联（驾驶员） */
29 29 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
30 30 private Personnel jsy;
... ... @@ -58,11 +58,11 @@ public class EmployeeConfigInfo {
58 58 this.xl = xl;
59 59 }
60 60  
61   - public Bus getCl() {
  61 + public Cars getCl() {
62 62 return cl;
63 63 }
64 64  
65   - public void setCl(Bus cl) {
  65 + public void setCl(Cars cl) {
66 66 this.cl = cl;
67 67 }
68 68  
... ...
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1.java
  View file @1df69b8
1 1 package com.bsth.entity.schedule.rule;
2 2  
3   -import com.bsth.entity.Bus;
  3 +import com.bsth.entity.Cars;
4 4 import com.bsth.entity.Line;
5 5 import com.bsth.entity.Personnel;
6 6 import com.bsth.entity.schedule.GuideboardInfo;
... ... @@ -30,7 +30,7 @@ public class ScheduleRule1 {
30 30 private Line xl;
31 31 /** 关联车辆 */
32 32 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
33   - private Bus cl;
  33 + private Cars cl;
34 34 /** 启用日期 */
35 35 private Date qyrq;
36 36  
... ... @@ -89,11 +89,11 @@ public class ScheduleRule1 {
89 89 this.xl = xl;
90 90 }
91 91  
92   - public Bus getCl() {
  92 + public Cars getCl() {
93 93 return cl;
94 94 }
95 95  
96   - public void setCl(Bus cl) {
  96 + public void setCl(Cars cl) {
97 97 this.cl = cl;
98 98 }
99 99  
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js
  View file @1df69b8
... ... @@ -30,7 +30,14 @@ angular.module('ScheduleApp').factory('BusInfoManageService', ['$resource', func
30 30 //);
31 31 }]);
32 32  
33   -angular.module('ScheduleApp').controller('BusInfoManageCtrl', ['BusInfoManageService', function(busInfoManageService) {
  33 +angular.module('ScheduleApp').controller('BusInfoManageCtrl', ['BusInfoManageService','$state', function(busInfoManageService, $state) {
  34 + // TODO：测试state变换
  35 + var self = this;
  36 + self.testgo = function() {
  37 + //alert("切换");
  38 + $state.go("form");
  39 + }
  40 +
34 41  
35 42 }]);
36 43  
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
  View file @1df69b8
  1 +<!-- 导航式布局到时候再加 -->
  2 +
  3 +<div class="portlet light bordered" ng-controller="BusInfoManageFormCtrl as ctrl">
  4 + <div class="portlet-title">
  5 + <div class="caption">
  6 + <i class="icon-equalizer font-red-sunglo"></i> <span
  7 + class="caption-subject font-red-sunglo bold uppercase">表单</span>
  8 + </div>
  9 + </div>
  10 +
  11 + <div class="portlet-body form">
  12 +
  13 + </div>
  14 +
  15 +
  16 +
  17 +
  18 +
  19 +
  20 +
  21 +
  22 +
  23 +
  24 +
  25 +
  26 +
  27 +
  28 +
  29 +
  30 +
  31 +
  32 +</div>
0 33 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/index.html
  View file @1df69b8
... ... @@ -27,7 +27,7 @@
27 27 <span class="caption-subject bold uppercase">车辆信息表</span>
28 28 </div>
29 29 <div class="actions">
30   - <a href="javascirpt:" class="btn btn-circle blue">
  30 + <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.testgo()">
31 31 <i class="fa fa-plus"></i>
32 32 添加车辆信息
33 33 </a>
... ...
src/main/resources/static/pages/scheduleApp/module/main.js
  View file @1df69b8
... ... @@ -68,55 +68,55 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
68 68 }]
69 69 }
70 70 })
71   - //.state("busInfoManage.list", {
72   - // url: 'list',
73   - // templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/list.html',
74   - // resolve: {
75   - // deps: ['$ocLazyLoad', function($ocLazyLoad) {
76   - // return $ocLazyLoad.load({
77   - // name: 'busInfoManage_module',
78   - // insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
79   - // files: [
80   - // "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"
81   - // ]
82   - // });
83   - // }]
84   - // }
85   - //})
86   - //.state("busInfoManage.form", {
87   - // url: 'form',
88   - // views: {
89   - // "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/form.html'}
90   - // },
91   - // resolve: {
92   - // deps: ['$ocLazyLoad', function($ocLazyLoad) {
93   - // return $ocLazyLoad.load({
94   - // name: 'busInfoManage_module',
95   - // insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
96   - // files: [
97   - // "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"
98   - // ]
99   - // });
100   - // }]
101   - // }
102   - //})
103   - //.state("busInfoManage.detail", {
104   - // url: 'detail',
105   - // views: {
106   - // "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/detail.html'}
107   - // },
108   - // resolve: {
109   - // deps: ['$ocLazyLoad', function($ocLazyLoad) {
110   - // return $ocLazyLoad.load({
111   - // name: 'busInfoManage_module',
112   - // insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
113   - // files: [
114   - // "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"
115   - // ]
116   - // });
117   - // }]
118   - // }
119   - //})
  71 + .state("busInfoManage.list", {
  72 + url: 'list',
  73 + templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/list.html',
  74 + resolve: {
  75 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  76 + return $ocLazyLoad.load({
  77 + name: 'busInfoManage_list_module',
  78 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  79 + files: [
  80 + "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"
  81 + ]
  82 + });
  83 + }]
  84 + }
  85 + })
  86 + .state("form", {
  87 + url: '/form',
  88 + views: {
  89 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/form.html'}
  90 + },
  91 + resolve: {
  92 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  93 + return $ocLazyLoad.load({
  94 + name: 'busInfoManage_form_module',
  95 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  96 + files: [
  97 + "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"
  98 + ]
  99 + });
  100 + }]
  101 + }
  102 + })
  103 + .state("busInfoManage.detail", {
  104 + url: 'detail',
  105 + views: {
  106 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/detail.html'}
  107 + },
  108 + resolve: {
  109 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  110 + return $ocLazyLoad.load({
  111 + name: 'busInfoManage_module',
  112 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  113 + files: [
  114 + "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"
  115 + ]
  116 + });
  117 + }]
  118 + }
  119 + })
120 120  
121 121 // 人员基础信息模块配置
122 122 .state("employeeInfoManage", {
... ...