潘钊 / bsth_control · Commits

Commit 2412f0c0f4812e4a2bddc4278824b568fbe3a81b

Authored by 徐烜
1 parent d77a5cfd

PSM-8

Inline Side-by-side
Showing 5 changed files with 504 additions and 0 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
  View file @2412f0c
@@ -737,6 +737,33 @@ ScheduleApp.config(['$stateProvider', '$urlRouterProvider', function($stateProvi @@ -737,6 +737,33 @@ ScheduleApp.config(['$stateProvider', '$urlRouterProvider', function($stateProvi
737 } 737 }
738 }) 738 })
739 739
  740 + // 排班调度值勤日报模块
  741 + .state("schedulePlanReportManage", {
  742 + url: '/schedulePlanReportManage',
  743 + views: {
  744 + "": {
  745 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index_report.html'
  746 + },
  747 + "schedulePlanReportManage_list@schedulePlanReportManage": {
  748 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/list_report.html'
  749 + }
  750 + },
  751 +
  752 + resolve: {
  753 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  754 + return $ocLazyLoad.load({
  755 + name: 'schedulePlanManage_module',
  756 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  757 + files: [
  758 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  759 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  760 + "pages/scheduleApp/module/core/schedulePlanManage/schedulePlanReportManage.js"
  761 + ]
  762 + });
  763 + }]
  764 + }
  765 + })
  766 +
740 // 线路运营概览模块 767 // 线路运营概览模块
741 .state("busLineInfoStat", { 768 .state("busLineInfoStat", {
742 url: '/busLineInfoStat', 769 url: '/busLineInfoStat',
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/index_report.html 0 → 100644
  View file @2412f0c
  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="row">
  22 + <div class="col-md-12" ng-controller="SchedulePlanReportManageCtrl as ctrl">
  23 + <div class="portlet light bordered">
  24 + <div class="portlet-title">
  25 + <div class="caption font-dark">
  26 + <i class="fa fa-database font-dark"></i>
  27 + <span class="caption-subject bold uppercase">排班计划</span>
  28 + </div>
  29 + <div class="actions">
  30 + <div class="btn-group">
  31 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  32 + <i class="fa fa-share"></i>
  33 + <span>数据工具</span>
  34 + <i class="fa fa-angle-down"></i>
  35 + </a>
  36 + <ul class="dropdown-menu pull-right">
  37 + <li>
  38 + <a href="javascript:" class="tool-action">
  39 + <i class="fa fa-file-excel-o"></i>
  40 + 导出excel
  41 + </a>
  42 + </li>
  43 + <li class="divider"></li>
  44 + <li>
  45 + <a href="javascript:" class="tool-action">
  46 + <i class="fa fa-refresh"></i>
  47 + 刷行数据
  48 + </a>
  49 + </li>
  50 + </ul>
  51 + </div>
  52 + </div>
  53 + </div>
  54 +
  55 + <div class="portlet-body">
  56 + <div ui-view="schedulePlanReportManage_list"></div>
  57 + </div>
  58 + </div>
  59 + </div>
  60 +</div>
0 \ No newline at end of file 61 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/listInfo.html deleted 100644 → 0
  View file @d77a5cf
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list_report.html 0 → 100644
  View file @2412f0c
  1 +<!-- ui-route employeeInfoManage.list -->
  2 +<div ng-controller="SchedulePlanReportManageListCtrl as ctrl">
  3 + <div class="fixDiv">
  4 + <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column" style="width: 2000px">
  5 + <thead>
  6 + <tr role="row" class="heading">
  7 + <th style="width: 50px;">序号</th>
  8 + <th style="width: 230px;">线路</th>
  9 + <th style="width: 180px">日期</th>
  10 + <th>路牌</th>
  11 + <th style="width: 80px;">车辆</th>
  12 + <th>出场1</th>
  13 + <th style="width: 80px;">驾工1</th>
  14 + <th style="width: 80px;">驾1</th>
  15 + <th>售工1</th>
  16 + <th>售1</th>
  17 + <th>出场2</th>
  18 + <th>驾工2</th>
  19 + <th>驾2</th>
  20 + <th>售工2</th>
  21 + <th>售2</th>
  22 + <th>排班人</th>
  23 + <th style="width: 150px;">排班时间</th>
  24 + <th style="width: 300px;">时刻表</th>
  25 + <th style="width: 260px">操作</th>
  26 + </tr>
  27 + <tr role="row" class="filter">
  28 + <td></td>
  29 + <td>
  30 + <sa-Select3 model="ctrl.searchCondition()"
  31 + name="xl"
  32 + placeholder="请输拼音..."
  33 + dcvalue="{{ctrl.searchCondition()['xl.id_eq']}}"
  34 + dcname="xl.id_eq"
  35 + icname="id"
  36 + icnames="name"
  37 + datatype="xl">
  38 + </sa-Select3>
  39 + </td>
  40 + <td>
  41 + <div class="input-group">
  42 + <input type="text" class="form-control"
  43 + name="scrapDate" placeholder="选择日期..."
  44 + uib-datepicker-popup="yyyy年MM月dd日"
  45 + is-open="ctrl.scrapDateOpen"
  46 + ng-model="ctrl.busInfoForSave.scrapDate" readonly/>
  47 + <span class="input-group-btn">
  48 + <button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()">
  49 + <i class="glyphicon glyphicon-calendar"></i>
  50 + </button>
  51 + </span>
  52 + </div>
  53 + </td>
  54 + <td></td>
  55 + <td></td>
  56 + <td></td>
  57 + <td></td>
  58 + <td></td>
  59 + <td></td>
  60 + <td></td>
  61 + <td></td>
  62 + <td></td>
  63 + <td></td>
  64 + <td></td>
  65 + <td></td>
  66 + <td></td>
  67 + <td></td>
  68 + <td></td>
  69 + <td>
  70 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
  71 + ng-click="ctrl.pageChanaged()">
  72 + <i class="fa fa-search"></i> 搜索</button>
  73 +
  74 + <button class="btn btn-sm red btn-outline filter-cancel"
  75 + ng-click="ctrl.resetSearchCondition()">
  76 + <i class="fa fa-times"></i> 重置</button>
  77 + </td>
  78 +
  79 + </tr>
  80 + </thead>
  81 + <tbody>
  82 + <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
  83 + <td>
  84 + <span ng-bind="$index + 1"></span>
  85 + </td>
  86 + <td>
  87 + <span ng-bind="info.xlName"></span>
  88 + </td>
  89 + <td>
  90 + <span ng-bind="info.scheduleData"></span>
  91 + </td>
  92 + <td>
  93 + <span ng-bind="info.lpName"></span>
  94 + </td>
  95 + <td>
  96 + <span ng-bind="info.clZbh"></span>
  97 + </td>
  98 + <td>
  99 + <span ng-bind="info.ccsj1"></span>
  100 + </td>
  101 + <td>
  102 + <span ng-bind="info.jsy1Gh"></span>
  103 + </td>
  104 + <td>
  105 + <span ng-bind="info.jsy1Name"></span>
  106 + </td>
  107 + <td>
  108 + <span ng-bind="info.spy1Gh"></span>
  109 + </td>
  110 + <td>
  111 + <span ng-bind="info.spy1Name"></span>
  112 + </td>
  113 + <td>
  114 + <span ng-bind="info.ccsj2"></span>
  115 + </td>
  116 + <td>
  117 + <span ng-bind="info.jsy2Gh"></span>
  118 + </td>
  119 + <td>
  120 + <span ng-bind="info.jsy2Name"></span>
  121 + </td>
  122 + <td>
  123 + <span ng-bind="info.spy2Gh"></span>
  124 + </td>
  125 + <td>
  126 + <span ng-bind="info.spy2Name"></span>
  127 + </td>
  128 + <td>
  129 + <span ng-bind="info.createUser"></span>
  130 + </td>
  131 + <td>
  132 + <span ng-bind="info.createDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  133 + </td>
  134 + <td>
  135 + <span ng-bind="info.ttinfoName"></span>
  136 + </td>
  137 + <td>
  138 + <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
  139 + <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
  140 + <a ui-sref="schedulePlanInfoManage({spid : info.id, xlname : info.xl.name, ttname : info.ttInfo.name, stime : info.scheduleFromTime, etime : info.scheduleToTime})"
  141 + class="btn default blue-stripe btn-sm"> 排班明细 </a>
  142 + <a ng-click="ctrl.deletePlan(info.id)"
  143 + class="btn default blue-stripe btn-sm"> 修改 </a>
  144 + </td>
  145 + </tr>
  146 + </tbody>
  147 + </table>
  148 + </div>
  149 +
  150 +</div>
0 \ No newline at end of file 151 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanReportManage.js 0 → 100644
  View file @2412f0c
  1 +// 调度值勤日报管理 service controller 等写在一起
  2 +// TODO：使用的global服务需要修正
  3 +angular.module('ScheduleApp').factory('SchedulePlanReportManageService', ['BusLineInfoStatService_g', function(service) {
  4 + /** 当前的查询条件信息 */
  5 + var currentSearchCondition = {};
  6 +
  7 + return {
  8 + /**
  9 + * 获取查询条件信息，
  10 + * 用于给controller用来和页面数据绑定。
  11 + */
  12 + getSearchCondition: function() {
  13 + return currentSearchCondition;
  14 + },
  15 + /**
  16 + * 重置查询条件信息。
  17 + */
  18 + resetSearchCondition: function() {
  19 + var key;
  20 + for (key in currentSearchCondition) {
  21 + currentSearchCondition[key] = undefined;
  22 + }
  23 + },
  24 + /**
  25 + * 设置当前页码。
  26 + * @param cpn 从1开始，后台是从0开始的
  27 + */
  28 + setCurrentPageNo: function(cpn) {
  29 + currentPageNo = cpn;
  30 + },
  31 + /**
  32 + * 组装查询参数，返回一个promise查询结果。
  33 + * @param params 查询参数
  34 + * @return 返回一个 promise
  35 + */
  36 + getPage: function() {
  37 + var params = currentSearchCondition; // 查询条件
  38 + return service.list(params).$promise;
  39 + },
  40 + /**
  41 + * 获取明细信息。
  42 + * @param id 车辆id
  43 + * @return 返回一个 promise
  44 + */
  45 + getDetail: function(id) {
  46 + var params = {id: id};
  47 + return service.get(params).$promise;
  48 + },
  49 + /**
  50 + * 保存信息。
  51 + * @param obj 车辆详细信息
  52 + * @return 返回一个 promise
  53 + */
  54 + saveDetail: function(obj) {
  55 + return service.save(obj).$promise;
  56 + }
  57 + };
  58 +
  59 +}]);
  60 +
  61 +angular.module('ScheduleApp').controller('SchedulePlanReportManageCtrl', [
  62 + 'SchedulePlanReportManageService', '$state',
  63 + function(schedulePlanReportManageService, $state) {
  64 + var self = this;
  65 +
  66 + // 切换到form状态
  67 + self.goForm = function() {
  68 + alert("切换");
  69 + }
  70 +}]);
  71 +
  72 +angular.module('ScheduleApp').controller('SchedulePlanReportManageListCtrl', [
  73 + 'SchedulePlanReportManageService',
  74 + function(schedulePlanReportManageService) {
  75 + var self = this;
  76 + self.pageInfo = {
  77 + infos: []
  78 + };
  79 +
  80 + // 初始创建的时候，获取一次列表数据
  81 + schedulePlanReportManageService.getPage().then(
  82 + function(result) {
  83 + //self.pageInfo.totalItems = result.totalElements;
  84 + //self.pageInfo.currentPage = result.number + 1;
  85 + //self.pageInfo.infos = result.content;
  86 + //busLineInfoStatService.setCurrentPageNo(result.number + 1);
  87 +
  88 + // 模拟数据：
  89 + self.pageInfo.infos.push({
  90 + xlName: '闵行11路',
  91 + scheduleData: '2016-01-01',
  92 + lpName: '1',
  93 + clZbh: 'B-90948',
  94 + ccsj1: '04:50',
  95 + jsy1Gh: '089249',
  96 + jsy1Name: '瞿春明',
  97 + spy1Gh: '',
  98 + spy1Name: '',
  99 + ccsj2: '',
  100 + jsy2Gh: '',
  101 + jsy2Name: '',
  102 + spy2Gh: '',
  103 + spy2Name: '',
  104 + createUser: '',
  105 + createDate: '',
  106 + ttinfoName: '闵行11路时刻表0817'
  107 + });
  108 + self.pageInfo.infos.push({
  109 + xlName: '闵行11路',
  110 + scheduleData: '2016-01-01',
  111 + lpName: '2',
  112 + clZbh: 'B-91017',
  113 + ccsj1: '04:50',
  114 + jsy1Gh: '096532',
  115 + jsy1Name: '吴伟清',
  116 + spy1Gh: '',
  117 + spy1Name: '',
  118 + ccsj2: '',
  119 + jsy2Gh: '',
  120 + jsy2Name: '',
  121 + spy2Gh: '',
  122 + spy2Name: '',
  123 + createUser: '',
  124 + createDate: '',
  125 + ttinfoName: '闵行11路时刻表0817'
  126 + });
  127 + self.pageInfo.infos.push({
  128 + xlName: '闵行11路',
  129 + scheduleData: '2016-01-01',
  130 + lpName: '3',
  131 + clZbh: 'B-91029',
  132 + ccsj1: '05:20',
  133 + jsy1Gh: '093261',
  134 + jsy1Name: '施建强',
  135 + spy1Gh: '',
  136 + spy1Name: '',
  137 + ccsj2: '',
  138 + jsy2Gh: '',
  139 + jsy2Name: '',
  140 + spy2Gh: '',
  141 + spy2Name: '',
  142 + createUser: '',
  143 + createDate: '',
  144 + ttinfoName: '闵行11路时刻表0817'
  145 + });
  146 + self.pageInfo.infos.push({
  147 + xlName: '闵行11路',
  148 + scheduleData: '2016-01-01',
  149 + lpName: '4',
  150 + clZbh: 'B-91041',
  151 + ccsj1: '05:30',
  152 + jsy1Gh: '096153',
  153 + jsy1Name: '沈晓峰',
  154 + spy1Gh: '',
  155 + spy1Name: '',
  156 + ccsj2: '',
  157 + jsy2Gh: '',
  158 + jsy2Name: '',
  159 + spy2Gh: '',
  160 + spy2Name: '',
  161 + createUser: '',
  162 + createDate: '',
  163 + ttinfoName: '闵行11路时刻表0817'
  164 + });
  165 + self.pageInfo.infos.push({
  166 + xlName: '闵行11路',
  167 + scheduleData: '2016-01-01',
  168 + lpName: '5',
  169 + clZbh: 'B-91063',
  170 + ccsj1: '05:40',
  171 + jsy1Gh: '084890',
  172 + jsy1Name: '陆海国',
  173 + spy1Gh: '',
  174 + spy1Name: '',
  175 + ccsj2: '',
  176 + jsy2Gh: '',
  177 + jsy2Name: '',
  178 + spy2Gh: '',
  179 + spy2Name: '',
  180 + createUser: '',
  181 + createDate: '',
  182 + ttinfoName: '闵行11路时刻表0817'
  183 + });
  184 + self.pageInfo.infos.push({
  185 + xlName: '闵行11路',
  186 + scheduleData: '2016-01-01',
  187 + lpName: '6',
  188 + clZbh: 'B-91071',
  189 + ccsj1: '05:50',
  190 + jsy1Gh: '096020',
  191 + jsy1Name: '唐斌',
  192 + spy1Gh: '',
  193 + spy1Name: '',
  194 + ccsj2: '',
  195 + jsy2Gh: '',
  196 + jsy2Name: '',
  197 + spy2Gh: '',
  198 + spy2Name: '',
  199 + createUser: '',
  200 + createDate: '',
  201 + ttinfoName: '闵行11路时刻表0817'
  202 + });
  203 + self.pageInfo.infos.push({
  204 + xlName: '闵行11路',
  205 + scheduleData: '2016-01-01',
  206 + lpName: '7',
  207 + clZbh: 'B-91075',
  208 + ccsj1: '06:00',
  209 + jsy1Gh: '092228',
  210 + jsy1Name: '李光明',
  211 + spy1Gh: '',
  212 + spy1Name: '',
  213 + ccsj2: '',
  214 + jsy2Gh: '',
  215 + jsy2Name: '',
  216 + spy2Gh: '',
  217 + spy2Name: '',
  218 + createUser: '',
  219 + createDate: '',
  220 + ttinfoName: '闵行11路时刻表0817'
  221 + });
  222 + },
  223 + function(result) {
  224 + alert("出错啦！");
  225 + }
  226 + );
  227 +
  228 + //$scope.$watch("ctrl.pageInfo.currentPage", function() {
  229 + // alert("dfdfdf");
  230 + //});
  231 +
  232 + // 翻页的时候调用
  233 + self.pageChanaged = function() {
  234 + schedulePlanReportManageService.setCurrentPageNo(self.pageInfo.currentPage);
  235 + schedulePlanReportManageService.getPage().then(
  236 + function(result) {
  237 + //self.pageInfo.totalItems = result.totalElements;
  238 + //self.pageInfo.currentPage = result.number + 1;
  239 + //self.pageInfo.infos = result.content;
  240 + //busLineInfoStatService.setCurrentPageNo(result.number + 1);
  241 + },
  242 + function(result) {
  243 + alert("出错啦！");
  244 + }
  245 + );
  246 + };
  247 + // 获取查询条件数据
  248 + self.searchCondition = function() {
  249 + return schedulePlanReportManageService.getSearchCondition();
  250 + };
  251 + // 重置查询条件
  252 + self.resetSearchCondition = function() {
  253 + return schedulePlanReportManageService.resetSearchCondition();
  254 + };
  255 +
  256 +}]);
  257 +
  258 +angular.module('ScheduleApp').controller('SchedulePlanReportManageFormCtrl', ['SchedulePlanReportManageService', '$stateParams', '$state', function(schedulePlanReportManageService, $stateParams, $state) {
  259 + // TODO：
  260 +}]);
  261 +
  262 +angular.module('ScheduleApp').controller('SchedulePlanReportManageDetailCtrl', ['SchedulePlanReportManageService', '$stateParams', function(schedulePlanReportManageService, $stateParams) {
  263 + // TODO：
  264 +}]);
  265 +
  266 +
  267 +