Commit 3d3261e649a333296b21e69e051bdc44ac57e40a
1 parent
ff9b823e
PSM-12
Showing
2 changed files
with
3 additions
and
23 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
| @@ -686,26 +686,6 @@ ScheduleApp.config(['$stateProvider', '$urlRouterProvider', function($stateProvi | @@ -686,26 +686,6 @@ 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 | - }) | ||
| 709 | .state("ttInfoDetailManage_edit", { | 689 | .state("ttInfoDetailManage_edit", { |
| 710 | url: '/ttInfoDetailManage_edit/:xlid/:ttid/:xlname/:ttname', | 690 | url: '/ttInfoDetailManage_edit/:xlid/:ttid/:xlname/:ttname', |
| 711 | views: { | 691 | views: { |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/main.js
| @@ -85,8 +85,7 @@ angular.module('ScheduleApp').controller( | @@ -85,8 +85,7 @@ angular.module('ScheduleApp').controller( | ||
| 85 | [ | 85 | [ |
| 86 | 'TtInfoManageService', | 86 | 'TtInfoManageService', |
| 87 | 'FileDownload_g', | 87 | 'FileDownload_g', |
| 88 | - '$state', | ||
| 89 | - function(service, fileDownload, $state) { | 88 | + function(service, fileDownload) { |
| 90 | var self = this; | 89 | var self = this; |
| 91 | var TtInfo = service.getTtInfoQueryClass(); | 90 | var TtInfo = service.getTtInfoQueryClass(); |
| 92 | 91 | ||
| @@ -134,7 +133,8 @@ angular.module('ScheduleApp').controller( | @@ -134,7 +133,8 @@ angular.module('ScheduleApp').controller( | ||
| 134 | 133 | ||
| 135 | // 自动生成时刻表 | 134 | // 自动生成时刻表 |
| 136 | self.toTtInfoDetailAuto = function() { | 135 | self.toTtInfoDetailAuto = function() { |
| 137 | - $state.go("ttInfoDetailManage_form2"); | 136 | + showPjax(); |
| 137 | + $.pjax({url: 'pages/base/timesmodel/index.html', container: pjaxContainer}); | ||
| 138 | }; | 138 | }; |
| 139 | 139 | ||
| 140 | // TODO： | 140 | // TODO： |