Merge branch 'PSM-12' into minhang

徐烜
2 parents 0798de27 3d3261e6
Showing 2 changed files with 3 additions and 23 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/main.js
@@ -686,26 +686,6 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
                 }]
             }
         })
-        .state("ttInfoDetailManage_form2", {
-            url: 'pages/base/timesmodel/index.html',
-            views: {
-                "": {templateUrl: 'pages/base/timesmodel/index.html'}
-            },
-            resolve: {
-                deps: ['$ocLazyLoad', function($ocLazyLoad) {
-                    return $ocLazyLoad.load({
-                        name: 'ttInfoDetailManage_form2',
-                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
-                        files: [
-                            "assets/bower_components/angular-ui-select/dist/select.min.css",
-                            "assets/bower_components/angular-ui-select/dist/select.min.js",
-                            "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
-                            "pages/scheduleApp/module/core/ttInfoDetailManage/main.js"
-                        ]
-                    });
-                }]
-            }
-        })
         .state("ttInfoDetailManage_edit", {
             url: '/ttInfoDetailManage_edit/:xlid/:ttid/:xlname/:ttname',
             views: {
@@ -85,8 +85,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     [
         'TtInfoManageService',
         'FileDownload_g',
-        '$state',
-        function(service, fileDownload, $state) {
+        function(service, fileDownload) {
             var self = this;
             var TtInfo = service.getTtInfoQueryClass();
  
@@ -134,7 +133,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
  
             // 自动生成时刻表
             self.toTtInfoDetailAuto = function() {
-                $state.go("ttInfoDetailManage_form2");
+                showPjax();
+                $.pjax({url: 'pages/base/timesmodel/index.html', container: pjaxContainer});
             };
  
             // TODO：