潘钊 / bsth_control · Commits

Commit 555e96c636acf81730e5ff6449bd20aec5e687c9

Authored by 徐烜
1 parent d6e8bd55
build: skipped

update

Inline Side-by-side
Showing 8 changed files with 335 additions and 5 deletions
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/index_info.html 0 → 100644
  View file @555e96c
  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 + <a ui-sref="schedulePlanManage">排班计划管理</a>
  18 + <i class="fa fa-circle"></i>
  19 + </li>
  20 + <li>
  21 + <span class="active">排班明细管理</span>
  22 + </li>
  23 +</ul>
  24 +
  25 +<div class="row">
  26 + <div class="col-md-12" ng-controller="SchedulePlanInfoManageCtrl as ctrl">
  27 + <div class="portlet light bordered">
  28 + <div class="portlet-title">
  29 + <div class="caption font-dark">
  30 + <i class="fa fa-database font-dark"></i>
  31 + <span class="caption-subject bold uppercase">85路（85路0328平表-时刻表）排班明细</span>
  32 + </div>
  33 + <div class="actions">
  34 + <a href="javascirpt:" class="btn btn-circle blue" >
  35 + <i class="fa fa-plus"></i>
  36 + 添加
  37 + </a>
  38 +
  39 + <div class="btn-group">
  40 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  41 + <i class="fa fa-share"></i>
  42 + <span>系统工具</span>
  43 + <i class="fa fa-angle-down"></i>
  44 + </a>
  45 + <ul class="dropdown-menu pull-right">
  46 + <li>
  47 + <a href="javascript:" class="tool-action">
  48 + <i class="fa fa-file-excel-o"></i>
  49 + 导出excel
  50 + </a>
  51 + </li>
  52 + <li class="divider"></li>
  53 + <li>
  54 + <a href="javascript:" class="tool-action">
  55 + <i class="fa fa-refresh"></i>
  56 + 刷行数据
  57 + </a>
  58 + </li>
  59 + </ul>
  60 + </div>
  61 + </div>
  62 + </div>
  63 +
  64 + <div class="portlet-body">
  65 + <div ui-view="schedulePlanInfoManage_list"></div>
  66 + </div>
  67 + </div>
  68 + </div>
  69 +</div>
0 \ No newline at end of file 70 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
  View file @555e96c
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 <td> 58 <td>
59 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> 59 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
60 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> 60 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
61 - <a ui-sref="#" class="btn default blue-stripe btn-sm"> 排班明细 </a> 61 + <a ui-sref="schedulePlanInfoManage" class="btn default blue-stripe btn-sm"> 排班明细 </a>
62 </td> 62 </td>
63 </tr> 63 </tr>
64 </tbody> 64 </tbody>
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/listInfo.html 0 → 100644
  View file @555e96c
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list_info.html 0 → 100644
  View file @555e96c
  1 +<!-- ui-route busInfoManage.list -->
  2 +<div ng-controller="SchedulePlanInfoManageListCtrl as ctrl">
  3 + <table class="table table-striped table-bordered table-hover table-checkable order-column">
  4 + <thead>
  5 + <tr role="row" class="heading">
  6 + <th>
  7 + <input type="checkbox" class="group-checkable"/>
  8 + </th>
  9 + <th width="50">序号</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 + <th>工号</th>
  21 + <th>班次类型</th>
  22 + <th>发车时间</th>
  23 +
  24 + <!-- TODO：还有其他的 -->
  25 +
  26 + <th width="14%">操作</th>
  27 + </tr>
  28 + <tr role="row" class="filter">
  29 + <td></td>
  30 + <td></td>
  31 + <td></td>
  32 + <td></td>
  33 + <td></td>
  34 + <td></td>
  35 + <td></td>
  36 + <td></td>
  37 + <td></td>
  38 + <td></td>
  39 + <td></td>
  40 + <td></td>
  41 + <td></td>
  42 + <td></td>
  43 + <td></td>
  44 +
  45 + <td>
  46 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
  47 + ng-click="ctrl.pageChanaged()">
  48 + <i class="fa fa-search"></i> 搜索</button>
  49 +
  50 + <button class="btn btn-sm red btn-outline filter-cancel"
  51 + ng-click="ctrl.resetSearchCondition()">
  52 + <i class="fa fa-times"></i> 重置</button>
  53 + </td>
  54 +
  55 + </tr>
  56 + </thead>
  57 + <tbody>
  58 + <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
  59 + <td>
  60 + <input type="checkbox"/>
  61 + </td>
  62 + <td>
  63 + <span ng-bind="$index + 1"></span>
  64 + </td>
  65 +
  66 + <td>
  67 + <span ng-bind="info.xlName"></span>
  68 + </td>
  69 + <td>
  70 + <span ng-bind="info.scheduleDate | date: 'yyyy-MM-dd'"></span>
  71 + </td>
  72 + <td>
  73 + <span ng-bind="info.lpName"></span>
  74 + </td>
  75 + <td>
  76 + <span ng-bind="info.clZbh"></span>
  77 + </td>
  78 + <td></td>
  79 + <td>
  80 + <span ng-bind="info.bdTime"></span>
  81 + </td>
  82 + <td>
  83 + <span ng-bind="info.ccTime"></span>
  84 + </td>
  85 + <td>
  86 + <span ng-bind="info.jName"></span>
  87 + </td>
  88 + <td>
  89 + <span ng-bind="info.jGh"></span>
  90 + </td>
  91 + <td>
  92 + <span ng-bind="info.sName"></span>
  93 + </td>
  94 + <td>
  95 + <span ng-bind="info.sGh"></span>
  96 + </td>
  97 + <td>
  98 + <span ng-bind="info.bcType"></span>
  99 + </td>
  100 + <td>
  101 + <span ng-bind="info.fcsj"></span>
  102 + </td>
  103 +
  104 + <td>
  105 + <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
  106 + <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
  107 + <a ui-sref="#" class="btn default blue-stripe btn-sm"> 详细 </a>
  108 + <a ui-sref="#" class="btn default blue-stripe btn-sm"> 修改 </a>
  109 + </td>
  110 + </tr>
  111 + </tbody>
  112 +
  113 + </table>
  114 +
  115 + <div style="text-align: right;">
  116 + <uib-pagination total-items="ctrl.pageInfo.totalItems"
  117 + ng-model="ctrl.pageInfo.currentPage"
  118 + ng-change="ctrl.pageChanaged()"
  119 + rotate="false"
  120 + max-size="10"
  121 + boundary-links="true"
  122 + first-text="首页"
  123 + previous-text="上一页"
  124 + next-text="下一页"
  125 + last-text="尾页">
  126 + </uib-pagination>
  127 + </div>
  128 +</div>
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanInfoManage.js 0 → 100644
  View file @555e96c
  1 +// 车辆配置管理 service controller 等写在一起
  2 +angular.module('ScheduleApp').factory('SchedulePlanInfoManageService', ['SchedulePlanManageService_g', function(service) {
  3 + /** 当前的查询条件信息 */
  4 + var currentSearchCondition = {};
  5 +
  6 + /** 当前第几页 */
  7 + var currentPageNo = 1;
  8 +
  9 + return {
  10 + /**
  11 + * 获取查询条件信息，
  12 + * 用于给controller用来和页面数据绑定。
  13 + */
  14 + getSearchCondition: function() {
  15 + return currentSearchCondition;
  16 + },
  17 + /**
  18 + * 重置查询条件信息。
  19 + */
  20 + resetSearchCondition: function() {
  21 + var key;
  22 + for (key in currentSearchCondition) {
  23 + currentSearchCondition[key] = "";
  24 + }
  25 + },
  26 + /**
  27 + * 设置当前页码。
  28 + * @param cpn 从1开始，后台是从0开始的
  29 + */
  30 + setCurrentPageNo: function(cpn) {
  31 + currentPageNo = cpn;
  32 + },
  33 + /**
  34 + * 组装查询参数，返回一个promise查询结果。
  35 + * @param params 查询参数
  36 + * @return 返回一个 promise
  37 + */
  38 + getPage: function() {
  39 + var params = currentSearchCondition; // 查询条件
  40 + params.page = currentPageNo - 1; // 服务端页码从0开始
  41 + return service.detail.list(params).$promise;
  42 + }
  43 +
  44 + };
  45 +
  46 +}]);
  47 +
  48 +angular.module('ScheduleApp').controller('SchedulePlanInfoManageCtrl', ['SchedulePlanInfoManageService', '$state', function(schedulePlanInfoManageService, $state) {
  49 + var self = this;
  50 +
  51 + // 切换到form状态
  52 + self.goForm = function() {
  53 + alert("等待生成");
  54 +
  55 + }
  56 +}]);
  57 +
  58 +angular.module('ScheduleApp').controller('SchedulePlanInfoManageListCtrl', ['SchedulePlanInfoManageService', function(schedulePlanInfoManageService) {
  59 + var self = this;
  60 + self.pageInfo = {
  61 + totalItems : 0,
  62 + currentPage : 1,
  63 + infos: []
  64 + };
  65 +
  66 + // 初始创建的时候，获取一次列表数据
  67 + schedulePlanInfoManageService.getPage().then(
  68 + function(result) {
  69 + self.pageInfo.totalItems = result.totalElements;
  70 + self.pageInfo.currentPage = result.number + 1;
  71 + self.pageInfo.infos = result.content;
  72 + schedulePlanInfoManageService.setCurrentPageNo(result.number + 1);
  73 + },
  74 + function(result) {
  75 + alert("出错啦！");
  76 + }
  77 + );
  78 +
  79 + //$scope.$watch("ctrl.pageInfo.currentPage", function() {
  80 + // alert("dfdfdf");
  81 + //});
  82 +
  83 + // 翻页的时候调用
  84 + self.pageChanaged = function() {
  85 + schedulePlanInfoManageService.setCurrentPageNo(self.pageInfo.currentPage);
  86 + schedulePlanInfoManageService.getPage().then(
  87 + function(result) {
  88 + self.pageInfo.totalItems = result.totalElements;
  89 + self.pageInfo.currentPage = result.number + 1;
  90 + self.pageInfo.infos = result.content;
  91 + schedulePlanInfoManageService.setCurrentPageNo(result.number + 1);
  92 + },
  93 + function(result) {
  94 + alert("出错啦！");
  95 + }
  96 + );
  97 + };
  98 + // 获取查询条件数据
  99 + self.searchCondition = function() {
  100 + return schedulePlanInfoManageService.getSearchCondition();
  101 + };
  102 + // 重置查询条件
  103 + self.resetSearchCondition = function() {
  104 + return schedulePlanInfoManageService.resetSearchCondition();
  105 + };
  106 +
  107 +}]);
  108 +
  109 +
  110 +
  111 +
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/index.html
  View file @555e96c
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <div class="actions"> 29 <div class="actions">
30 <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.goForm()"> 30 <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.goForm()">
31 <i class="fa fa-plus"></i> 31 <i class="fa fa-plus"></i>
32 - 添加时刻表基础信息 32 + 添加基础信息
33 </a> 33 </a>
34 34
35 <div class="btn-group"> 35 <div class="btn-group">
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/list.html
  View file @555e96c
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <th>圈数</th> 10 <th>圈数</th>
11 <th>是否启用</th> 11 <th>是否启用</th>
12 <th>修改时间</th> 12 <th>修改时间</th>
13 - <th width="25%">操作</th> 13 + <th width="16%">操作</th>
14 </tr> 14 </tr>
15 <tr role="row" class="filter"> 15 <tr role="row" class="filter">
16 <td></td> 16 <td></td>
@@ -60,8 +60,8 @@ @@ -60,8 +60,8 @@
60 <td> 60 <td>
61 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> 61 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
62 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> 62 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
63 - <a ui-sref="busConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改基础信息 </a>  
64 - <a ui-sref="#" class="btn default blue-stripe btn-sm"> 修改时刻表明细 </a> 63 + <a ui-sref="busConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
  64 + <a ui-sref="#" class="btn default blue-stripe btn-sm"> 时刻表明细 </a>
65 </td> 65 </td>
66 </tr> 66 </tr>
67 </tbody> 67 </tbody>
src/main/resources/static/pages/scheduleApp/module/main.js
  View file @555e96c
@@ -531,7 +531,29 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi @@ -531,7 +531,29 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
531 }] 531 }]
532 } 532 }
533 }) 533 })
  534 + .state("schedulePlanInfoManage", {
  535 + url: '/schedulePlanInfoManage',
  536 + views: {
  537 + "": {
  538 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index_info.html'
  539 + },
  540 + "schedulePlanInfoManage_list@schedulePlanInfoManage": {
  541 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/list_info.html'
  542 + }
  543 + },
534 544
  545 + resolve: {
  546 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  547 + return $ocLazyLoad.load({
  548 + name: 'schedulePlanInfoManage_module',
  549 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  550 + files: [
  551 + "pages/scheduleApp/module/core/schedulePlanManage/schedulePlanInfoManage.js"
  552 + ]
  553 + });
  554 + }]
  555 + }
  556 + })
535 557
536 558
537 559