潘钊 / bsth_control · Commits

Commit 815bc77993e5ab0675731b0e123c27eed3744ba6

Authored by 徐烜
1 parent 17670853
build: skipped

update

Inline Side-by-side
Showing 26 changed files with 686 additions and 67 deletions
src/main/java/com/bsth/entity/sys/CarDevice.java renamed to src/main/java/com/bsth/entity/CarDevice.java
  View file @815bc77
1   -package com.bsth.entity.sys;
  1 +package com.bsth.entity;
2 2  
3 3 import javax.persistence.*;
4 4 import java.util.Date;
... ... @@ -7,44 +7,40 @@ import java.util.Date;
7 7 * 车辆设备信息（记录车辆设备变更情况，因为是历史表，字段不做关联）
8 8 */
9 9 @Entity
10   -@Table(name = "bsth_c_cardevice")
  10 +@Table(name = "bsth_c_car_device")
11 11 public class CarDevice {
12 12  
13   - /** 主键Id */
  13 + /** 主键 */
14 14 @Id
15 15 @GeneratedValue
16 16 private Long id;
17 17  
18   - /** 公司名字 */
  18 + /** 公司名称 */
19 19 @Column(nullable = false)
20 20 private String gsName;
21   - /** 内部编号/自编号 */
22   - @Column(nullable = false)
23   - private String nbbh;
  21 + /** 内部编号（自编号） */
  22 + private String clZbh;
24 23 /** 线路名称 */
25   - @Column(nullable = false)
26 24 private String xlName;
27 25  
28 26 /** 旧终端号 */
29   - @Column(nullable = false)
30 27 private String oldDeviceNo;
31 28 /** 新终端号 */
32   - @Column(nullable = false)
33 29 private String newDeviceNo;
34   -
35   - /** 旧sim卡号 */
  30 + /** 旧SIM卡号 */
36 31 private String oldSimNo;
37   - /** 新sim卡号 */
  32 + /** 新SIM卡号 */
38 33 private String newSimNo;
39 34  
40 35 /** 故障描述 */
41   - private String gzDesc;
  36 + private String troubleDesc;
42 37 /** 保修描述 */
43   - private String bxDesc;
  38 + private String guaranteeDesc;
44 39  
45 40 // 创建日期
46 41 @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
47 42 private Date createDate;
  43 +
48 44 // 修改日期
49 45 @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
50 46 private Date updateDate;
... ... @@ -65,12 +61,12 @@ public class CarDevice {
65 61 this.gsName = gsName;
66 62 }
67 63  
68   - public String getNbbh() {
69   - return nbbh;
  64 + public String getClZbh() {
  65 + return clZbh;
70 66 }
71 67  
72   - public void setNbbh(String nbbh) {
73   - this.nbbh = nbbh;
  68 + public void setClZbh(String clZbh) {
  69 + this.clZbh = clZbh;
74 70 }
75 71  
76 72 public String getXlName() {
... ... @@ -113,20 +109,20 @@ public class CarDevice {
113 109 this.newSimNo = newSimNo;
114 110 }
115 111  
116   - public String getGzDesc() {
117   - return gzDesc;
  112 + public String getTroubleDesc() {
  113 + return troubleDesc;
118 114 }
119 115  
120   - public void setGzDesc(String gzDesc) {
121   - this.gzDesc = gzDesc;
  116 + public void setTroubleDesc(String troubleDesc) {
  117 + this.troubleDesc = troubleDesc;
122 118 }
123 119  
124   - public String getBxDesc() {
125   - return bxDesc;
  120 + public String getGuaranteeDesc() {
  121 + return guaranteeDesc;
126 122 }
127 123  
128   - public void setBxDesc(String bxDesc) {
129   - this.bxDesc = bxDesc;
  124 + public void setGuaranteeDesc(String guaranteeDesc) {
  125 + this.guaranteeDesc = guaranteeDesc;
130 126 }
131 127  
132 128 public Date getCreateDate() {
... ... @@ -145,4 +141,3 @@ public class CarDevice {
145 141 this.updateDate = updateDate;
146 142 }
147 143 }
148   -
... ...
src/main/resources/static/index.html
  View file @815bc77
... ... @@ -283,7 +283,8 @@ tr.row-active td {
283 283 <!-- TODO：angularJS相关库 -->
284 284  
285 285 <!-- angularJS相关库 -->
286   -<script src="/assets/bower_components/angular/angular.js"></script>
  286 +<!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
  287 +<script src="/assets/js/angular.js"></script>
287 288 <script src="/assets/bower_components/angular-resource/angular-resource.min.js"></script>
288 289 <script src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js"></script>
289 290 <script src="/assets/bower_components/angular-touch/angular-touch.min.js"></script>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.html deleted 100644 → 0
  View file @1767085
1   -<div class="page-head">
2   - <div class="page-title">
3   - <h1>车辆信息管理</h1>
4   - </div>
5   -</div>
6   -
7   -<ul class="page-breadcrumb breadcrumb">
8   - <li>
9   - <a href="/pages/home.html" data-pjax>首页</a>
10   - <i class="fa fa-circle"></i>
11   - </li>
12   - <li>
13   - <span class="active">基础信息</span>
14   - <i class="fa fa-circle"></i>
15   - </li>
16   - <li>
17   - <span class="active">车辆信息管理</span>
18   - </li>
19   -
20   -</ul>
21   -
22   -<div class="row">
23   - <div class="col-md-12">
24   - dfdfdfdfdf
25   - </div>
26   -</div>
27 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js 0 → 100644
  View file @815bc77
  1 +// 车辆基础信息维护 service controller等写在一起
  2 +
  3 +angular.module('ScheduleApp').factory('BusInfoManageService', ['$resource', function($resource) {
  4 + // TODO：测试
  5 + var pageInfo = {
  6 + totalItems : 64,
  7 + currentPage : 4,
  8 + infos: []
  9 + };
  10 +
  11 + return {
  12 + pi: function() {
  13 + console.log("pi");
  14 + return pageInfo;
  15 + },
  16 + setCP: function(cp) {
  17 + console.log("setCP");
  18 + pageInfo.currentPage = cp;
  19 + }
  20 + };
  21 +
  22 + //return $resource( // TODO：后面再改
  23 + // '/cci',
  24 + // {},
  25 + // {
  26 + // list: {
  27 + // method: 'GET'
  28 + // }
  29 + // }
  30 + //);
  31 +}]);
  32 +
  33 +angular.module('ScheduleApp').controller('BusInfoManageCtrl', ['BusInfoManageService', function(busInfoManageService) {
  34 +
  35 +}]);
  36 +
  37 +angular.module('ScheduleApp').controller('BusInfoManageListCtrl', ['BusInfoManageService', function(busInfoManageService) {
  38 + // TODO：模拟数据
  39 + var self = this;
  40 + self.pi = busInfoManageService.pi();
  41 + //self.totalItems = pi.totalItems;
  42 + //self.currentPage = pi.currentPage;
  43 + //self.infos = pi.infos;
  44 + self.pageChanaged = function() {
  45 + console.log("页面跳转到：" + busInfoManageService.pi().currentPage);
  46 + }
  47 +}]);
  48 +
  49 +angular.module('ScheduleApp').controller('BusInfoManageFormCtrl', ['BusInfoManageService', function(busInfoManageService) {
  50 +
  51 +}]);
  52 +
  53 +angular.module('ScheduleApp').controller('BusInfoManageDetailCtrl', ['BusInfoManageService', function(busInfoManageService) {
  54 +
  55 +}]);
0 56 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/detail.html 0 → 100644
  View file @815bc77
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html 0 → 100644
  View file @815bc77
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/index.html 0 → 100644
  View file @815bc77
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>车辆信息管理</h1>
  4 + </div>
  5 +</div>
  6 +
  7 +<ul class="page-breadcrumb breadcrumb">
  8 + <li>
  9 + <a href="/pages/home.html" data-pjax>首页</a>
  10 + <i class="fa fa-circle"></i>
  11 + </li>
  12 + <li>
  13 + <span class="active">基础信息</span>
  14 + <i class="fa fa-circle"></i>
  15 + </li>
  16 + <li>
  17 + <span class="active">车辆信息管理</span>
  18 + </li>
  19 +</ul>
  20 +
  21 +<div class="col-md-12" ng-controller="BusInfoManageCtrl as ctrl">
  22 + <div class="portlet light bordered">
  23 + <div class="portlet-title">
  24 + <div class="caption font-dark">
  25 + <i class="fa fa-database font-dark"></i>
  26 + <span class="caption-subject bold uppercase">车辆信息表</span>
  27 + </div>
  28 + <div class="actions">
  29 + <a href="javascirpt:" class="btn btn-circle blue">
  30 + <i class="fa fa-plus"></i>
  31 + 添加车辆信息
  32 + </a>
  33 + <div class="btn-group">
  34 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  35 + <i class="fa fa-share"></i>
  36 + <span>系统工具</span>
  37 + <i class="fa fa-angle-down"></i>
  38 + </a>
  39 + <ul class="dropdown-menu pull-right">
  40 + <li>
  41 + <a href="javascript:" class="tool-action">
  42 + <i class="fa fa-file-excel-o"></i>
  43 + 导出excel
  44 + </a>
  45 + </li>
  46 + <li class="divider"></li>
  47 + <li>
  48 + <a href="javascript:" class="tool-action">
  49 + <i class="fa fa-refresh"></i>
  50 + 刷行数据
  51 + </a>
  52 + </li>
  53 + </ul>
  54 + </div>
  55 + </div>
  56 + </div>
  57 +
  58 + <div class="portlet-body">
  59 + <div ui-view="list"></div>
  60 + </div>
  61 + </div>
  62 +</div>
0 63 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html 0 → 100644
  View file @815bc77
  1 +<!-- ui-route busInfoManage.list -->
  2 +<div ng-controller="BusInfoManageListCtrl as ctrl">
  3 + <table class="table table-striped table-bordered table-hover table-checkable order-column">
  4 + <thead>
  5 + <tr>
  6 + <th>
  7 + <input type="checkbox" class="group-checkable"/>
  8 + </th>
  9 + <th>序号</th>
  10 + <th>车辆编号</th>
  11 + <th>内部编号</th>
  12 + <th>设备编号</th>
  13 + <th>车牌号</th>
  14 + <th>所在公司</th>
  15 + <th>所在分公司</th>
  16 + <th>是否电车</th>
  17 + <th>操作</th>
  18 + </tr>
  19 + </thead>
  20 + <tbody>
  21 + <tr ng-repeat="info in ctrl.infos" class="odd gradeX">
  22 + <td>
  23 + <input type="checkbox"/>
  24 + </td>
  25 + <td>
  26 + <span>todo</span>
  27 + </td>
  28 + <td>
  29 + <span ng-bind="info.carCode"></span>
  30 + </td>
  31 + <td>
  32 + <span ng-bind="info.insideCode"></span>
  33 + </td>
  34 + <td>
  35 + <span ng-bind="info.equipmentCode"></span>
  36 + </td>
  37 + <td>
  38 + <span ng-bind="info.carPlate"></span>
  39 + </td>
  40 + <td>
  41 + <span ng-bind="info.company"></span>
  42 + </td>
  43 + <td>
  44 + <span ng-bind="info.brancheCompany"></span>
  45 + </td>
  46 + <td>
  47 + <span>todo</span>
  48 + </td>
  49 + <td>
  50 + <span>todo</span>
  51 + </td>
  52 + </tr>
  53 + </tbody>
  54 +
  55 + </table>
  56 +
  57 + <div style="text-align: right;">
  58 + <uib-pagination total-items="ctrl.pi.totalItems"
  59 + ng-model="ctrl.pi.currentPage"
  60 + ng-change="ctrl.pageChanged()"
  61 + previous-text="上一页"
  62 + next-text="下一页">
  63 + </uib-pagination>
  64 + </div>
  65 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/detail.html 0 → 100644
  View file @815bc77
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/deviceInfoManage.html deleted 100644 → 0
  View file @1767085
1   -<div class="page-head">
2   - <div class="page-title">
3   - <h1>设备信息管理</h1>
4   - </div>
5   -</div>
6 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/deviceInfoManage.js 0 → 100644
  View file @815bc77
  1 +// 设备信息维护 service controller 等写在一起
  2 +
  3 +angular.module('ScheduleApp').factory('DeviceInfoManageService', ['$resource', function($resource) {
  4 + // TODO：测试
  5 + var pageInfo = {
  6 + totalItems: 64,
  7 + currentPage: 4,
  8 + infos: []
  9 + };
  10 +
  11 + return {
  12 + pi: function() {
  13 + console.log("pi");
  14 + return pageInfo;
  15 + },
  16 + setCP: function(cp) {
  17 + console.log("setCP");
  18 + pageInfo.currentPage = cp;
  19 + }
  20 + }
  21 +}]);
  22 +
  23 +angular.module('ScheduleApp').controller('DeviceInfoManageCtrl', ['DeviceInfoManageService', function(deviceInfoManageService) {
  24 +
  25 +}]);
  26 +
  27 +angular.module('ScheduleApp').controller('DeviceInfoManageListCtrl', ['DeviceInfoManageService', function(deviceInfoManageService) {
  28 + // TODO：模拟数据
  29 + var self = this;
  30 + self.pi = deviceInfoManageService.pi();
  31 + self.pageChanaged = function() {
  32 + console.log("go：" + deviceInfoManageService.pi().currentPage);
  33 + };
  34 +
  35 +}]);
  36 +
  37 +angular.module('ScheduleApp').controller('DeviceInfoManageFormCtrl', ['DeviceInfoManageService', function(deviceInfoManageService) {
  38 +
  39 +}]);
  40 +
  41 +angular.module('ScheduleApp').controller('DeviceInfoManageDetailCtrl', ['DeviceInfoManageService', function(deviceInfoManageService) {
  42 +
  43 +}]);
0 44 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html 0 → 100644
  View file @815bc77
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html 0 → 100644
  View file @815bc77
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>车辆设备信息管理</h1>
  4 + </div>
  5 +</div>
  6 +
  7 +<ul class="page-breadcrumb breadcrumb">
  8 + <li>
  9 + <a href="/pages/home.html" data-pjax>首页</a>
  10 + <i class="fa fa-circle"></i>
  11 + </li>
  12 + <li>
  13 + <span class="active">基础信息</span>
  14 + <i class="fa fa-circle"></i>
  15 + </li>
  16 + <li>
  17 + <span class="active">车辆设备信息管理</span>
  18 + </li>
  19 +</ul>
  20 +
  21 +<div class="col-md-12" ng-controller="DeviceInfoManageCtrl as ctrl">
  22 + <div class="portlet light bordered">
  23 + <div class="portlet-title">
  24 + <div class="caption font-dark">
  25 + <i class="fa fa-database font-dark"></i>
  26 + <span class="caption-subject bold uppercase">设备信息表</span>
  27 + </div>
  28 + <div class="actions">
  29 + <a href="javascirpt:" class="btn btn-circle blue">
  30 + <i class="fa fa-plus"></i>
  31 + 添加设备信息
  32 + </a>
  33 + <div class="btn-group">
  34 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  35 + <i class="fa fa-share"></i>
  36 + <span>系统工具</span>
  37 + <i class="fa fa-angle-down"></i>
  38 + </a>
  39 + <ul class="dropdown-menu pull-right">
  40 + <li>
  41 + <a href="javascript:" class="tool-action">
  42 + <i class="fa fa-file-excel-o"></i>
  43 + 导出excel
  44 + </a>
  45 + </li>
  46 + <li class="divider"></li>
  47 + <li>
  48 + <a href="javascript:" class="tool-action">
  49 + <i class="fa fa-refresh"></i>
  50 + 刷行数据
  51 + </a>
  52 + </li>
  53 + </ul>
  54 + </div>
  55 + </div>
  56 + </div>
  57 +
  58 + <div class="portlet-body">
  59 + <div ui-view="list"></div>
  60 + </div>
  61 + </div>
  62 +</div>
0 63 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html 0 → 100644
  View file @815bc77
  1 +<!-- ui-route deviceInfoManage.list -->
  2 +<div ng-controller="DeviceInfoManageListCtrl as ctrl">
  3 + <table class="table table-striped table-bordered table-hover table-checkable order-column">
  4 + <thead>
  5 + <tr>
  6 + <th>
  7 + <input type="checkbox" class="group-checkable"/>
  8 + </th>
  9 + <th>序号</th>
  10 + <th>线路名称</th>
  11 + <th>内部编号</th>
  12 + <th>创建时间</th>
  13 + <th>旧设备编号</th>
  14 + <th>新设备编号</th>
  15 + <th>旧SIM卡</th>
  16 + <th>新SIM卡</th>
  17 + <th>操作时间</th>
  18 + <th>操作</th>
  19 + </tr>
  20 + </thead>
  21 + <tbody>
  22 + <tr ng-repeat="info in ctrl.infos" class="odd gradeX">
  23 + <td>
  24 + <input type="checkbox"/>
  25 + </td>
  26 + <td>
  27 + <span>todo</span>
  28 + </td>
  29 + <td>
  30 + <span ng-bind="info.xlName"></span>
  31 + </td>
  32 + <td>
  33 + <span ng-bind="info.clZbh"></span>
  34 + </td>
  35 + <td>
  36 + <span ng-bind="info.createDate | date:'yyyy-MM-dd HH:mm:ss'"></span>
  37 + </td>
  38 + <td>
  39 + <span ng-bind="info.oldDeviceNo"></span>
  40 + </td>
  41 + <td>
  42 + <span ng-bind="info.newDeviceNo"></span>
  43 + </td>
  44 + <td>
  45 + <span ng-bind="info.oldSimNo"></span>
  46 + </td>
  47 + <td>
  48 + <span ng-bind="info.newSimNo"></span>
  49 + </td>
  50 + <td>
  51 + <span ng-bind="info.updateDate | date:'yyyy-MM-dd HH:mm:ss'"></span>
  52 + </td>
  53 + <td>
  54 + <span>todo</span>
  55 + </td>
  56 + </tr>
  57 + </tbody>
  58 +
  59 + </table>
  60 +
  61 + <div style="text-align: right;">
  62 + <uib-pagination total-items="ctrl.pi.totalItems"
  63 + ng-model="ctrl.pi.currentPage"
  64 + ng-change="ctrl.pageChanged()"
  65 + previous-text="上一页"
  66 + next-text="下一页">
  67 + </uib-pagination>
  68 + </div>
  69 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/detail.html 0 → 100644
  View file @815bc77
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.html deleted 100644 → 0
  View file @1767085
1   -人员信息管理
2 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js 0 → 100644
  View file @815bc77
  1 +// 人员信息管理 service controller等写在一起
  2 +
  3 +angular.module('ScheduleApp').factory('EmployeeInfoManageService', ['$resource', function($resource) {
  4 + // TODO：测试
  5 +
  6 +
  7 + return $resource(
  8 + '/cci',
  9 + {},
  10 + {
  11 + list: {
  12 + method: 'GET'
  13 + }
  14 + }
  15 + );
  16 +
  17 +}]);
  18 +
  19 +angular.module('ScheduleApp').controller('EmployeeInfoManageCtrl', ['EmployeeInfoManageService', function(employeeInfoManageService) {
  20 +
  21 +}]);
  22 +
  23 +angular.module('ScheduleApp').controller('EmployeeInfoManageListCtrl', ['EmployeeInfoManageService', function(employeeInfoManageService) {
  24 + // TODO：模拟数据
  25 + var self = this;
  26 + self.totalItems = 64;
  27 + self.currentPage = 4;
  28 + self.infos = {};
  29 + self.pageChanaged = function() {
  30 + console.log("页面跳转到：" + currentPage.currentPage);
  31 + }
  32 +}]);
  33 +
  34 +angular.module('ScheduleApp').controller('EmployeeInfoManageFormCtrl', ['EmployeeInfoManageService', function(employeeInfoManageService) {
  35 +
  36 +}]);
  37 +
  38 +angular.module('ScheduleApp').controller('EmployeeInfoManageDetailCtrl', ['EmployeeInfoManageService', function(employeeInfoManageService) {
  39 +
  40 +}]);
  41 +
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html 0 → 100644
  View file @815bc77
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html 0 → 100644
  View file @815bc77
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>人员信息管理</h1>
  4 + </div>
  5 +</div>
  6 +
  7 +<ul class="page-breadcrumb breadcrumb">
  8 + <li>
  9 + <a href="/pages/home.html" data-pjax>首页</a>
  10 + <i class="fa fa-circle"></i>
  11 + </li>
  12 + <li>
  13 + <span class="active">基础信息</span>
  14 + <i class="fa fa-circle"></i>
  15 + </li>
  16 + <li>
  17 + <span class="active">人员信息管理</span>
  18 + </li>
  19 +</ul>
  20 +
  21 +<div class="col-md-12" ng-controller="EmployeeInfoManageCtrl as ctrl">
  22 + <div class="portlet light bordered">
  23 + <div class="portlet-title">
  24 + <div class="caption font-dark">
  25 + <i class="fa fa-database font-dark"></i>
  26 + <span class="caption-subject bold uppercase">人员信息表</span>
  27 + </div>
  28 + <div class="actions">
  29 + <a href="javascirpt:" class="btn btn-circle blue">
  30 + <i class="fa fa-plus"></i>
  31 + 添加人员信息
  32 + </a>
  33 + <div class="btn-group">
  34 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  35 + <i class="fa fa-share"></i>
  36 + <span>系统工具</span>
  37 + <i class="fa fa-angle-down"></i>
  38 + </a>
  39 + <ul class="dropdown-menu pull-right">
  40 + <li>
  41 + <a href="javascript:" class="tool-action">
  42 + <i class="fa fa-file-excel-o"></i>
  43 + 导出excel
  44 + </a>
  45 + </li>
  46 + <li class="divider"></li>
  47 + <li>
  48 + <a href="javascript:" class="tool-action">
  49 + <i class="fa fa-refresh"></i>
  50 + 刷行数据
  51 + </a>
  52 + </li>
  53 + </ul>
  54 + </div>
  55 + </div>
  56 + </div>
  57 +
  58 + <div class="portlet-body">
  59 + <div ui-view="list"></div>
  60 + </div>
  61 + </div>
  62 +</div>
0 63 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html 0 → 100644
  View file @815bc77
  1 +<!-- ui-route employeeInfoManage.list -->
  2 +<div ng-controller="EmployeeInfoManageListCtrl as ctrl">
  3 + <table class="table table-striped table-bordered table-hover table-checkable order-column">
  4 + <thead>
  5 + <tr>
  6 + <th>
  7 + <input type="checkbox" class="group-checkable"/>
  8 + </th>
  9 + <th>序号</th>
  10 + <th>员工编号</th>
  11 + <th>姓名</th>
  12 + <th>工号</th>
  13 + <th>性别</th>
  14 + <th>所在公司</th>
  15 + <th>分公司</th>
  16 + <th>工种</th>
  17 + <th>一卡通号</th>
  18 + <th>运营服务证号</th>
  19 + <th>操作</th>
  20 + </tr>
  21 + </thead>
  22 + <tbody>
  23 + <tr ng-repeat="info in ctrl.infos" class="odd gradeX">
  24 + <td>
  25 + <input type="checkbox"/>
  26 + </td>
  27 + <td>
  28 + <span>TODO</span>
  29 + </td>
  30 + <td>
  31 + <span ng-bind="info.personnelCode"></span>
  32 + </td>
  33 + <td>
  34 + <span ng-bind="info.personnelName"></span>
  35 + </td>
  36 + <td>
  37 + <span ng-bind="info.jobCode"></span>
  38 + </td>
  39 + <td>
  40 + <span ng-bind="info.personnelType"></span>
  41 + </td>
  42 + <td>
  43 + <span ng-bind="info.company"></span>
  44 + </td>
  45 + <td>
  46 + <span ng-bind="info.brancheCompany"></span>
  47 + </td>
  48 + <td>
  49 + <span>TODO</span>
  50 + </td>
  51 + <td>
  52 + <span ng-bind="info.icCardCode"></span>
  53 + </td>
  54 + <td>
  55 + <span ng-bind="info.papersCode"></span>
  56 + </td>
  57 + <td>
  58 + <span>TODO</span>
  59 + </td>
  60 + </tr>
  61 + </tbody>
  62 + </table>
  63 +
  64 + <div style="text-align: right;">
  65 + <uib-pagination total-items="ctrl.totalItems"
  66 + ng-model="ctrl.currentPage"
  67 + ng-change="ctrl.pageChanged()"
  68 + previous-text="上一页"
  69 + next-text="下一页">
  70 + </uib-pagination>
  71 + </div>
  72 +</div>
0 73 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig.html
  View file @815bc77
... ... @@ -81,7 +81,7 @@
81 81 <span ng-bind="info.xl"></span>
82 82 </td>
83 83 <td>
84   - <span ng-bind="info.zbh"></span>
  84 + <span ng-bind="info.clZbh"></span>
85 85 </td>
86 86 <td>
87 87 <span ng-bind="info.sbbh"></span>
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig2.html
  View file @815bc77
... ... @@ -80,7 +80,7 @@
80 80 <span ng-bind="info.xl"></span>
81 81 </td>
82 82 <td>
83   - <span ng-bind="info.zbh"></span>
  83 + <span ng-bind="info.clZbh"></span>
84 84 </td>
85 85 <td>
86 86 <span ng-bind="info.sbbh"></span>
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/dist/busConfig.dist.html
  View file @815bc77
... ... @@ -81,7 +81,7 @@
81 81 <span ng-bind="info.xl"></span>
82 82 </td>
83 83 <td>
84   - <span ng-bind="info.zbh"></span>
  84 + <span ng-bind="info.clZbh"></span>
85 85 </td>
86 86 <td>
87 87 <span ng-bind="info.sbbh"></span>
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/dist/employeeConfig.dist.html
  View file @815bc77
... ... @@ -97,7 +97,7 @@
97 97 <span ng-bind="info.spy"></span>
98 98 </td>
99 99 <td>
100   - <span ng-bind="info.zbh"></span>
  100 + <span ng-bind="info.clZbh"></span>
101 101 </td>
102 102 </tr>
103 103 </tbody>
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/employeeConfig.html
  View file @815bc77
... ... @@ -97,7 +97,7 @@
97 97 <span ng-bind="info.spy"></span>
98 98 </td>
99 99 <td>
100   - <span ng-bind="info.zbh"></span>
  100 + <span ng-bind="info.clZbh"></span>
101 101 </td>
102 102 </tr>
103 103 </tbody>
... ...
src/main/resources/static/pages/scheduleApp/module/main.js
  View file @815bc77
... ... @@ -44,12 +44,136 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
44 44 //$urlRouterProvider.otherwise('/busConfig.html');
45 45  
46 46 $stateProvider
  47 + // 车辆基础信息模块配置
  48 + .state("busInfoManage", {
  49 + url: '/busInfoManage',
  50 + views: {
  51 + "": {
  52 + templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/index.html'
  53 + },
  54 + "list@busInfoManage": {
  55 + templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/list.html'
  56 + }
  57 + },
  58 +
  59 + resolve: {
  60 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  61 + return $ocLazyLoad.load({
  62 + name: 'busInfoManage_module',
  63 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  64 + files: [
  65 + "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"
  66 + ]
  67 + });
  68 + }]
  69 + }
  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 + //})
  120 +
  121 + // 人员基础信息模块配置
  122 + .state("employeeInfoManage", {
  123 + url: '/employeeInfoManage',
  124 + views: {
  125 + "": {
  126 + templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html'
  127 + },
  128 + "list@employeeInfoManage": {
  129 + templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html'
  130 + }
  131 + },
  132 +
  133 + resolve: {
  134 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  135 + return $ocLazyLoad.load({
  136 + name: 'employeeInfoManage_module',
  137 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  138 + files: [
  139 + "pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js"
  140 + ]
  141 + });
  142 + }]
  143 + }
  144 + })
  145 +
  146 + // 车辆设备信息模块配置
  147 + .state("deviceInfoManage", {
  148 + url: '/deviceInfoManage',
  149 + views: {
  150 + "": {
  151 + templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html'
  152 + },
  153 + "list@deviceInfoManage": {
  154 + templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html'
  155 + }
  156 + },
  157 +
  158 + resolve: {
  159 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  160 + return $ocLazyLoad.load({
  161 + name: 'deviceInfoManage_module',
  162 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  163 + files: [
  164 + "pages/scheduleApp/module/basicInfo/deviceInfoManage/deviceInfoManage.js"
  165 + ]
  166 + });
  167 + }]
  168 + }
  169 + })
  170 +
47 171 // 车辆配置模块
48 172 .state('busConfig', {
49 173 url: '/abc.html',
50 174 templateUrl: 'pages/scheduleApp/module/core/busConfig/busConfig2.html',
51 175 data: {},
52   - controller: 'busConfigCtrl',
  176 + //controller: 'busConfigCtrl',
53 177 resolve: {
54 178 deps: ['$ocLazyLoad', function($ocLazyLoad) {
55 179 return $ocLazyLoad.load({
... ...