Commit ff9b823e3c90387519954ea56180521d7a7a2f59
1 parent
79a79489
PSM-12
Showing
3 changed files
with
29 additions
and
1 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
| @@ -686,6 +686,26 @@ ScheduleApp.config(['$stateProvider', '$urlRouterProvider', function($stateProvi | @@ -686,6 +686,26 @@ ScheduleApp.config(['$stateProvider', '$urlRouterProvider', function($stateProvi | ||
| 686 | }] | 686 | }] |
| 687 | } | 687 | } |
| 688 | }) | 688 | }) |
| 689 | + .state("ttInfoDetailManage_form2", { | ||
| 690 | + url: 'pages/base/timesmodel/index.html', | ||
| 691 | + views: { | ||
| 692 | + "": {templateUrl: 'pages/base/timesmodel/index.html'} | ||
| 693 | + }, | ||
| 694 | + resolve: { | ||
| 695 | + deps: ['$ocLazyLoad', function($ocLazyLoad) { | ||
| 696 | + return $ocLazyLoad.load({ | ||
| 697 | + name: 'ttInfoDetailManage_form2', | ||
| 698 | + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置 | ||
| 699 | + files: [ | ||
| 700 | + "assets/bower_components/angular-ui-select/dist/select.min.css", | ||
| 701 | + "assets/bower_components/angular-ui-select/dist/select.min.js", | ||
| 702 | + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js", | ||
| 703 | + "pages/scheduleApp/module/core/ttInfoDetailManage/main.js" | ||
| 704 | + ] | ||
| 705 | + }); | ||
| 706 | + }] | ||
| 707 | + } | ||
| 708 | + }) | ||
| 689 | .state("ttInfoDetailManage_edit", { | 709 | .state("ttInfoDetailManage_edit", { |
| 690 | url: '/ttInfoDetailManage_edit/:xlid/:ttid/:xlname/:ttname', | 710 | url: '/ttInfoDetailManage_edit/:xlid/:ttid/:xlname/:ttname', |
| 691 | views: { | 711 | views: { |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
| @@ -75,6 +75,8 @@ | @@ -75,6 +75,8 @@ | ||
| 75 | <td> | 75 | <td> |
| 76 | <a ui-sref="ttInfoDetailManage_edit({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})" | 76 | <a ui-sref="ttInfoDetailManage_edit({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})" |
| 77 | class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a> | 77 | class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a> |
| 78 | + <a ng-click="ctrl.toTtInfoDetailAuto()" | ||
| 79 | + class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a> | ||
| 78 | <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})" | 80 | <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})" |
| 79 | class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a> | 81 | class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a> |
| 80 | <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a> | 82 | <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a> |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/main.js
| @@ -85,7 +85,8 @@ angular.module('ScheduleApp').controller( | @@ -85,7 +85,8 @@ angular.module('ScheduleApp').controller( | ||
| 85 | [ | 85 | [ |
| 86 | 'TtInfoManageService', | 86 | 'TtInfoManageService', |
| 87 | 'FileDownload_g', | 87 | 'FileDownload_g', |
| 88 | - function(service, fileDownload) { | 88 | + '$state', |
| 89 | + function(service, fileDownload, $state) { | ||
| 89 | var self = this; | 90 | var self = this; |
| 90 | var TtInfo = service.getTtInfoQueryClass(); | 91 | var TtInfo = service.getTtInfoQueryClass(); |
| 91 | 92 | ||
| @@ -131,6 +132,11 @@ angular.module('ScheduleApp').controller( | @@ -131,6 +132,11 @@ angular.module('ScheduleApp').controller( | ||
| 131 | 132 | ||
| 132 | self.doPage(); | 133 | self.doPage(); |
| 133 | 134 | ||
| 135 | + // 自动生成时刻表 | ||
| 136 | + self.toTtInfoDetailAuto = function() { | ||
| 137 | + $state.go("ttInfoDetailManage_form2"); | ||
| 138 | + }; | ||
| 139 | + | ||
| 134 | // TODO: | 140 | // TODO: |
| 135 | } | 141 | } |
| 136 | ] | 142 | ] |