潘钊 / bsth_control · Commits

Commit df10f672aa5d422a68eb22fbc34365566ad1c847

Authored by 徐烜
1 parent cf0771db

PSM-26

Inline Side-by-side
Showing 6 changed files with 763 additions and 748 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @df10f67
@@ -219,73 +219,73 @@ angular.module('ScheduleApp').directive('remoteValidationt2', [ @@ -219,73 +219,73 @@ angular.module('ScheduleApp').directive('remoteValidationt2', [
219 } 219 }
220 ]); 220 ]);
221 221
222 -/**  
223 - * remoteValidationt3 远程验证指令（监控依赖的model变化）  
224 - * 属性如下：  
225 - * remotevtype（必须）：验证类型（在service中有对应映射），如rvtype="xl"  
226 - * remotemodel（必须）：关联的model  
227 - * remotemodelcol（必须）：关联的model属性  
228 - */  
229 -angular.module('ScheduleApp').directive(  
230 - 'remoteValidation3',  
231 - [  
232 - '$$SearchInfoService_g',  
233 - '$q',  
234 - function($$SearchInfoService_g, $q) {  
235 - return {  
236 - restrict: 'A', // 属性  
237 - require: '^ngModel', // 依赖所属指令的ngModel  
238 - compile: function(tElem, tAttrs) {  
239 - var remotevtype_attr = tAttrs['remotevtype'];  
240 - var remotemodel_attr = tAttrs['remotemodel'];  
241 - var remotemodelcol_attr = tAttrs['remotemodelcol'];  
242 - if (!remotevtype_attr) {  
243 - throw new Error("remotevtype属性必须填写");  
244 - }  
245 - if (!remotemodel_attr) {  
246 - throw new Error("remotemodel属性必须填写");  
247 - }  
248 - if (!remotemodelcol_attr) {  
249 - throw new Error("remotemodelcol属性必须填写");  
250 - }  
251 -  
252 - return {  
253 - pre: function(scope, element, attr) {  
254 -  
255 - },  
256 -  
257 - post: function(scope, element, attr, ngModelCtrl) {  
258 - ngModelCtrl.$asyncValidators.remote =  
259 - function(modelValue, viewValue) {  
260 - var deferred = $q.defer();  
261 -  
262 - // 远端验证service  
263 - var param = JSON.parse(attr['remotemodel']);  
264 - console.log(param);  
265 - param[remotemodelcol_attr] = modelValue;  
266 - $$SearchInfoService_g.validate[remotevtype_attr].remote.do(  
267 - param,  
268 - function(result) {  
269 - if (result.status == "SUCCESS") {  
270 - deferred.resolve();  
271 - } else {  
272 - scope.$remote_msg = result.msg;  
273 - deferred.reject();  
274 - }  
275 - },  
276 - function(result) {  
277 - deferred.reject();  
278 - }  
279 - );  
280 -  
281 - return deferred.promise;  
282 - };  
283 - }  
284 - };  
285 - }  
286 - }  
287 - }  
288 - ] 222 +/**
  223 + * remoteValidationt3 远程验证指令（监控依赖的model变化）
  224 + * 属性如下：
  225 + * remotevtype（必须）：验证类型（在service中有对应映射），如rvtype="xl"
  226 + * remotemodel（必须）：关联的model
  227 + * remotemodelcol（必须）：关联的model属性
  228 + */
  229 +angular.module('ScheduleApp').directive(
  230 + 'remoteValidation3',
  231 + [
  232 + '$$SearchInfoService_g',
  233 + '$q',
  234 + function($$SearchInfoService_g, $q) {
  235 + return {
  236 + restrict: 'A', // 属性
  237 + require: '^ngModel', // 依赖所属指令的ngModel
  238 + compile: function(tElem, tAttrs) {
  239 + var remotevtype_attr = tAttrs['remotevtype'];
  240 + var remotemodel_attr = tAttrs['remotemodel'];
  241 + var remotemodelcol_attr = tAttrs['remotemodelcol'];
  242 + if (!remotevtype_attr) {
  243 + throw new Error("remotevtype属性必须填写");
  244 + }
  245 + if (!remotemodel_attr) {
  246 + throw new Error("remotemodel属性必须填写");
  247 + }
  248 + if (!remotemodelcol_attr) {
  249 + throw new Error("remotemodelcol属性必须填写");
  250 + }
  251 +
  252 + return {
  253 + pre: function(scope, element, attr) {
  254 +
  255 + },
  256 +
  257 + post: function(scope, element, attr, ngModelCtrl) {
  258 + ngModelCtrl.$asyncValidators.remote =
  259 + function(modelValue, viewValue) {
  260 + var deferred = $q.defer();
  261 +
  262 + // 远端验证service
  263 + var param = JSON.parse(attr['remotemodel']);
  264 + console.log(param);
  265 + param[remotemodelcol_attr] = modelValue;
  266 + $$SearchInfoService_g.validate[remotevtype_attr].remote.do(
  267 + param,
  268 + function(result) {
  269 + if (result.status == "SUCCESS") {
  270 + deferred.resolve();
  271 + } else {
  272 + scope.$remote_msg = result.msg;
  273 + deferred.reject();
  274 + }
  275 + },
  276 + function(result) {
  277 + deferred.reject();
  278 + }
  279 + );
  280 +
  281 + return deferred.promise;
  282 + };
  283 + }
  284 + };
  285 + }
  286 + }
  287 + }
  288 + ]
289 ); 289 );
290 290
291 angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) { 291 angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) {
@@ -1698,49 +1698,49 @@ angular.module('ScheduleApp').directive('saSelect5', [ @@ -1698,49 +1698,49 @@ angular.module('ScheduleApp').directive('saSelect5', [
1698 }; 1698 };
1699 } 1699 }
1700 ]); 1700 ]);
1701 -/**  
1702 - * mySelect指令，封装uiselect指令，封装内部数据获取，只支持单选  
1703 - * cm（必须）：绑定外部对象，因为关联的字段不只一个，单独使用ngModel不够  
1704 - * cmoptions（必须）：描述绑定的逻辑配置对象，格式如下：  
1705 - *  
1706 - * // TODO：  
1707 - */  
1708 -angular.module('ScheduleApp').directive('mySelect', [  
1709 - function() {  
1710 - return {  
1711 - restrict: 'E',  
1712 - template: '<div>bioxuxuan</div>',  
1713 - require: 'ngModel',  
1714 - compile: function(tElem, tAttrs) {  
1715 - return {  
1716 - pre: function(scope, element, attr) {  
1717 -  
1718 - },  
1719 - post: function(scope, element, attr, ngModelCtr) {  
1720 - // model -> view  
1721 - ngModelCtr.$formatters.push(function(modelValue) {  
1722 - // 监控model的变化  
1723 - if (typeof modelValue != "undefined") {  
1724 - console.log(modelValue);  
1725 -  
1726 - return modelValue;  
1727 - }  
1728 - });  
1729 -  
1730 - ngModelCtr.$render = function() {  
1731 - if (typeof scope.ctrl.say != "undefined") {  
1732 - element.find('div').css('color', 'red');  
1733 - }  
1734 - };  
1735 -  
1736 - ngModelCtr.$setViewValue("init value");  
1737 -  
1738 -  
1739 - }  
1740 - }  
1741 - }  
1742 - }  
1743 - } 1701 +/**
  1702 + * mySelect指令，封装uiselect指令，封装内部数据获取，只支持单选
  1703 + * cm（必须）：绑定外部对象，因为关联的字段不只一个，单独使用ngModel不够
  1704 + * cmoptions（必须）：描述绑定的逻辑配置对象，格式如下：
  1705 + *
  1706 + * // TODO：
  1707 + */
  1708 +angular.module('ScheduleApp').directive('mySelect', [
  1709 + function() {
  1710 + return {
  1711 + restrict: 'E',
  1712 + template: '<div>bioxuxuan</div>',
  1713 + require: 'ngModel',
  1714 + compile: function(tElem, tAttrs) {
  1715 + return {
  1716 + pre: function(scope, element, attr) {
  1717 +
  1718 + },
  1719 + post: function(scope, element, attr, ngModelCtr) {
  1720 + // model -> view
  1721 + ngModelCtr.$formatters.push(function(modelValue) {
  1722 + // 监控model的变化
  1723 + if (typeof modelValue != "undefined") {
  1724 + console.log(modelValue);
  1725 +
  1726 + return modelValue;
  1727 + }
  1728 + });
  1729 +
  1730 + ngModelCtr.$render = function() {
  1731 + if (typeof scope.ctrl.say != "undefined") {
  1732 + element.find('div').css('color', 'red');
  1733 + }
  1734 + };
  1735 +
  1736 + ngModelCtr.$setViewValue("init value");
  1737 +
  1738 +
  1739 + }
  1740 + }
  1741 + }
  1742 + }
  1743 + }
1744 ]); 1744 ]);
1745 1745
1746 /** 1746 /**
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice-legacy.js
  View file @df10f67
@@ -204,7 +204,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun @@ -204,7 +204,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
204 { 204 {
205 list: { 205 list: {
206 method: 'GET', 206 method: 'GET',
207 - isArray: true 207 + isArray: true,
  208 + transformResponse: function(rs) {
  209 + var dst = angular.fromJson(rs);
  210 + if (dst.status == 'SUCCESS') {
  211 + return dst.data;
  212 + } else {
  213 + return dst; // 业务错误留给控制器处理
  214 + }
  215 + }
208 } 216 }
209 } 217 }
210 ), 218 ),
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
  View file @df10f67
1 //所有模块service配置 1 //所有模块service配置
2 -// 车辆信息service  
3 -angular.module('ScheduleApp').factory('BusInfoManageService_g', ['$resource', function($resource) {  
4 - return {  
5 - rest: $resource(  
6 - '/cars_sc/:id',  
7 - {order: 'carCode', direction: 'ASC', id: '@id_route'},  
8 - {  
9 - list: {  
10 - method: 'GET',  
11 - params: {  
12 - page: 0  
13 - },  
14 - transformResponse: function(rs) {  
15 - var dst = angular.fromJson(rs);  
16 - if (dst.status == 'SUCCESS') {  
17 - return dst.data;  
18 - } else {  
19 - return dst; // 业务错误留给控制器处理  
20 - }  
21 - }  
22 - },  
23 - get: {  
24 - method: 'GET',  
25 - transformResponse: function(rs) {  
26 - var dst = angular.fromJson(rs);  
27 - if (dst.status == 'SUCCESS') {  
28 - return dst.data;  
29 - } else {  
30 - return dst;  
31 - }  
32 - }  
33 - },  
34 - save: {  
35 - method: 'POST'  
36 - }  
37 - }  
38 - ),  
39 - import: $resource(  
40 - '/cars/importfile',  
41 - {},  
42 - {  
43 - do: {  
44 - method: 'POST',  
45 - headers: {  
46 - 'Content-Type': 'application/x-www-form-urlencoded'  
47 - },  
48 - transformRequest: function(obj) {  
49 - var str = [];  
50 - for (var p in obj) {  
51 - str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));  
52 - }  
53 - return str.join("&");  
54 - }  
55 - }  
56 - }  
57 - ),  
58 - validate: $resource(  
59 - '/cars/validate/:type',  
60 - {},  
61 - {  
62 - insideCode: {  
63 - method: 'GET'  
64 - }  
65 - }  
66 - ),  
67 - dataTools: $resource(  
68 - '/cars/:type',  
69 - {},  
70 - {  
71 - dataExport: {  
72 - method: 'GET',  
73 - responseType: "arraybuffer",  
74 - params: {  
75 - type: "dataExport"  
76 - },  
77 - transformResponse: function(data, headers){  
78 - return {data : data};  
79 - }  
80 - }  
81 - }  
82 - )  
83 - };  
84 -}]);  
85 -// 车辆设备信息service  
86 -angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {  
87 - return $resource(  
88 - '/cde/:id',  
89 - {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id_route'},  
90 - {  
91 - list: {  
92 - method: 'GET',  
93 - params: {  
94 - page: 0  
95 - }  
96 - },  
97 - get: {  
98 - method: 'GET'  
99 - },  
100 - save: {  
101 - method: 'POST'  
102 - },  
103 - delete: {  
104 - method: 'DELETE'  
105 - }  
106 - }  
107 - ); 2 +// 车辆信息service
  3 +angular.module('ScheduleApp').factory('BusInfoManageService_g', ['$resource', function($resource) {
  4 + return {
  5 + rest: $resource(
  6 + '/cars_sc/:id',
  7 + {order: 'carCode', direction: 'ASC', id: '@id_route'},
  8 + {
  9 + list: {
  10 + method: 'GET',
  11 + params: {
  12 + page: 0
  13 + },
  14 + transformResponse: function(rs) {
  15 + var dst = angular.fromJson(rs);
  16 + if (dst.status == 'SUCCESS') {
  17 + return dst.data;
  18 + } else {
  19 + return dst; // 业务错误留给控制器处理
  20 + }
  21 + }
  22 + },
  23 + get: {
  24 + method: 'GET',
  25 + transformResponse: function(rs) {
  26 + var dst = angular.fromJson(rs);
  27 + if (dst.status == 'SUCCESS') {
  28 + return dst.data;
  29 + } else {
  30 + return dst;
  31 + }
  32 + }
  33 + },
  34 + save: {
  35 + method: 'POST'
  36 + }
  37 + }
  38 + ),
  39 + import: $resource(
  40 + '/cars/importfile',
  41 + {},
  42 + {
  43 + do: {
  44 + method: 'POST',
  45 + headers: {
  46 + 'Content-Type': 'application/x-www-form-urlencoded'
  47 + },
  48 + transformRequest: function(obj) {
  49 + var str = [];
  50 + for (var p in obj) {
  51 + str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
  52 + }
  53 + return str.join("&");
  54 + }
  55 + }
  56 + }
  57 + ),
  58 + validate: $resource(
  59 + '/cars/validate/:type',
  60 + {},
  61 + {
  62 + insideCode: {
  63 + method: 'GET'
  64 + }
  65 + }
  66 + ),
  67 + dataTools: $resource(
  68 + '/cars/:type',
  69 + {},
  70 + {
  71 + dataExport: {
  72 + method: 'GET',
  73 + responseType: "arraybuffer",
  74 + params: {
  75 + type: "dataExport"
  76 + },
  77 + transformResponse: function(data, headers){
  78 + return {data : data};
  79 + }
  80 + }
  81 + }
  82 + )
  83 + };
108 }]); 84 }]);
109 -// 人员信息service  
110 -angular.module('ScheduleApp').factory('EmployeeInfoManageService_g', ['$resource', function($resource) {  
111 - return {  
112 - rest : $resource(  
113 - '/personnel/:id',  
114 - {order: 'jobCode', direction: 'ASC', id: '@id_route'},  
115 - {  
116 - list: {  
117 - method: 'GET',  
118 - params: {  
119 - page: 0  
120 - }  
121 - },  
122 - get: {  
123 - method: 'GET'  
124 - },  
125 - save: {  
126 - method: 'POST'  
127 - }  
128 - }  
129 - ),  
130 - validate: $resource(  
131 - '/personnel/validate/:type',  
132 - {},  
133 - {  
134 - jobCode: {  
135 - method: 'GET'  
136 - }  
137 - }  
138 - ),  
139 - dataTools: $resource(  
140 - '/personnel/:type',  
141 - {},  
142 - {  
143 - dataExport: {  
144 - method: 'GET',  
145 - responseType: "arraybuffer",  
146 - params: {  
147 - type: "dataExport"  
148 - },  
149 - transformResponse: function(data, headers){  
150 - return {data : data};  
151 - }  
152 - }  
153 - }  
154 - )  
155 - }; 85 +// 车辆设备信息service
  86 +angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
  87 + return $resource(
  88 + '/cde/:id',
  89 + {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id_route'},
  90 + {
  91 + list: {
  92 + method: 'GET',
  93 + params: {
  94 + page: 0
  95 + }
  96 + },
  97 + get: {
  98 + method: 'GET'
  99 + },
  100 + save: {
  101 + method: 'POST'
  102 + },
  103 + delete: {
  104 + method: 'DELETE'
  105 + }
  106 + }
  107 + );
156 }]); 108 }]);
  109 +// 人员信息service
  110 +angular.module('ScheduleApp').factory('EmployeeInfoManageService_g', ['$resource', function($resource) {
  111 + return {
  112 + rest : $resource(
  113 + '/personnel/:id',
  114 + {order: 'jobCode', direction: 'ASC', id: '@id_route'},
  115 + {
  116 + list: {
  117 + method: 'GET',
  118 + params: {
  119 + page: 0
  120 + }
  121 + },
  122 + get: {
  123 + method: 'GET'
  124 + },
  125 + save: {
  126 + method: 'POST'
  127 + }
  128 + }
  129 + ),
  130 + validate: $resource(
  131 + '/personnel/validate/:type',
  132 + {},
  133 + {
  134 + jobCode: {
  135 + method: 'GET'
  136 + }
  137 + }
  138 + ),
  139 + dataTools: $resource(
  140 + '/personnel/:type',
  141 + {},
  142 + {
  143 + dataExport: {
  144 + method: 'GET',
  145 + responseType: "arraybuffer",
  146 + params: {
  147 + type: "dataExport"
  148 + },
  149 + transformResponse: function(data, headers){
  150 + return {data : data};
  151 + }
  152 + }
  153 + }
  154 + )
  155 + };
  156 +}]);
157 157
158 // 车辆配置service 158 // 车辆配置service
159 angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', function($resource) { 159 angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', function($resource) {
@@ -194,21 +194,21 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, functi @@ -194,21 +194,21 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, functi
194 ) 194 )
195 }; 195 };
196 }]); 196 }]);
197 -// 线路运营统计service  
198 -angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {  
199 - return $resource(  
200 - '/bic/:id',  
201 - {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询  
202 - {  
203 - list: {  
204 - method: 'GET',  
205 - params: {  
206 - page: 0  
207 - }  
208 - }  
209 - }  
210 - );  
211 -}]); 197 +// 线路运营统计service
  198 +angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {
  199 + return $resource(
  200 + '/bic/:id',
  201 + {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
  202 + {
  203 + list: {
  204 + method: 'GET',
  205 + params: {
  206 + page: 0
  207 + }
  208 + }
  209 + }
  210 + );
  211 +}]);
212 212
213 // 人员配置service 213 // 人员配置service
214 angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) { 214 angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) {
@@ -261,267 +261,267 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f @@ -261,267 +261,267 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
261 ) 261 )
262 }; 262 };
263 }]); 263 }]);
264 -// 路牌管理service  
265 -angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) {  
266 - return {  
267 - rest: $resource(  
268 - '/gic/:id',  
269 - {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id_route'},  
270 - {  
271 - list: {  
272 - method: 'GET',  
273 - params: {  
274 - page: 0  
275 - },  
276 - transformResponse: function(rs) {  
277 - var dst = angular.fromJson(rs);  
278 - if (dst.status == 'SUCCESS') {  
279 - return dst.data;  
280 - } else {  
281 - return dst;  
282 - }  
283 - }  
284 - },  
285 - get: {  
286 - method: 'GET',  
287 - transformResponse: function(rs) {  
288 - var dst = angular.fromJson(rs);  
289 - if (dst.status == 'SUCCESS') {  
290 - return dst.data;  
291 - } else {  
292 - return dst;  
293 - }  
294 - }  
295 - },  
296 - save: {  
297 - method: 'POST'  
298 - }  
299 - // 内部还有默认的方法delete  
300 - }  
301 - )  
302 - }; 264 +// 路牌管理service
  265 +angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) {
  266 + return {
  267 + rest: $resource(
  268 + '/gic/:id',
  269 + {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id_route'},
  270 + {
  271 + list: {
  272 + method: 'GET',
  273 + params: {
  274 + page: 0
  275 + },
  276 + transformResponse: function(rs) {
  277 + var dst = angular.fromJson(rs);
  278 + if (dst.status == 'SUCCESS') {
  279 + return dst.data;
  280 + } else {
  281 + return dst;
  282 + }
  283 + }
  284 + },
  285 + get: {
  286 + method: 'GET',
  287 + transformResponse: function(rs) {
  288 + var dst = angular.fromJson(rs);
  289 + if (dst.status == 'SUCCESS') {
  290 + return dst.data;
  291 + } else {
  292 + return dst;
  293 + }
  294 + }
  295 + },
  296 + save: {
  297 + method: 'POST'
  298 + }
  299 + // 内部还有默认的方法delete
  300 + }
  301 + )
  302 + };
303 }]); 303 }]);
304 -// 套跑管理service  
305 -angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', function($resource) {  
306 - return {  
307 - rest: $resource(  
308 - 'rms/:id',  
309 - {order: 'rerunXl.id,isCancel', direction: 'ASC', id: '@id_route'},  
310 - {  
311 - list: {  
312 - method: 'GET',  
313 - params: {  
314 - page: 0  
315 - }  
316 - },  
317 - get: {  
318 - method: 'GET'  
319 - },  
320 - save: {  
321 - method: 'POST'  
322 - },  
323 - delete: {  
324 - method: 'DELETE'  
325 - }  
326 - }  
327 - )  
328 - }; 304 +// 套跑管理service
  305 +angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', function($resource) {
  306 + return {
  307 + rest: $resource(
  308 + 'rms/:id',
  309 + {order: 'rerunXl.id,isCancel', direction: 'ASC', id: '@id_route'},
  310 + {
  311 + list: {
  312 + method: 'GET',
  313 + params: {
  314 + page: 0
  315 + }
  316 + },
  317 + get: {
  318 + method: 'GET'
  319 + },
  320 + save: {
  321 + method: 'POST'
  322 + },
  323 + delete: {
  324 + method: 'DELETE'
  325 + }
  326 + }
  327 + )
  328 + };
329 }]); 329 }]);
330 -// 排班计划管理service  
331 -angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) {  
332 - return {  
333 - rest : $resource(  
334 - '/spc/:id',  
335 - {order: 'xl.id,createDate', direction: 'DESC,DESC', id: '@id_route'},  
336 - {  
337 - list: {  
338 - method: 'GET',  
339 - params: {  
340 - page: 0  
341 - }  
342 - },  
343 - get: {  
344 - method: 'GET'  
345 - },  
346 - save: {  
347 - method: 'POST'  
348 - },  
349 - delete: {  
350 - method: 'DELETE'  
351 - }  
352 - }  
353 - ),  
354 - tommorw: $resource(  
355 - '/spc/tommorw',  
356 - {},  
357 - {  
358 - list: {  
359 - method: 'GET'  
360 - }  
361 - }  
362 - )  
363 - }; 330 +// 排班计划管理service
  331 +angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) {
  332 + return {
  333 + rest : $resource(
  334 + '/spc/:id',
  335 + {order: 'xl.id,createDate', direction: 'DESC,DESC', id: '@id_route'},
  336 + {
  337 + list: {
  338 + method: 'GET',
  339 + params: {
  340 + page: 0
  341 + }
  342 + },
  343 + get: {
  344 + method: 'GET'
  345 + },
  346 + save: {
  347 + method: 'POST'
  348 + },
  349 + delete: {
  350 + method: 'DELETE'
  351 + }
  352 + }
  353 + ),
  354 + tommorw: $resource(
  355 + '/spc/tommorw',
  356 + {},
  357 + {
  358 + list: {
  359 + method: 'GET'
  360 + }
  361 + }
  362 + )
  363 + };
  364 +}]);
  365 +
  366 +// 排班计划明细管理service
  367 +angular.module('ScheduleApp').factory('SchedulePlanInfoManageService_g', ['$resource', function($resource) {
  368 + return {
  369 + rest : $resource(
  370 + '/spic/:id',
  371 + {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id_route'},
  372 + {
  373 + list: {
  374 + method: 'GET',
  375 + params: {
  376 + page: 0
  377 + }
  378 + },
  379 + get: {
  380 + method: 'GET'
  381 + },
  382 + save: {
  383 + method: 'POST'
  384 + }
  385 + }
  386 + ),
  387 + groupinfo : $resource(
  388 + '/spic/groupinfos/:xlid/:sdate',
  389 + {},
  390 + {
  391 + list: {
  392 + method: 'GET',
  393 + isArray: true
  394 + }
  395 + }
  396 + ),
  397 + updateGroupInfo : $resource(
  398 + '/spic/groupinfos/update',
  399 + {},
  400 + {
  401 + update: {
  402 + method: 'POST'
  403 + }
  404 + }
  405 + )
  406 + };
364 }]); 407 }]);
  408 +// 排班管理service
  409 +angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource', function($resource) {
  410 + return {
  411 + rest: $resource(
  412 + '/sr1fc/:id',
  413 + {order: 'createDate', direction: 'DESC', id: '@id_route'},
  414 + {
  415 + list: {
  416 + method: 'GET',
  417 + params: {
  418 + page: 0
  419 + }
  420 + },
  421 + get: {
  422 + method: 'GET'
  423 + },
  424 + save: {
  425 + method: 'POST'
  426 + },
  427 + delete: {
  428 + method: 'DELETE'
  429 + }
  430 + }
  431 + )
  432 + };
  433 +}]);
365 434
366 -// 排班计划明细管理service  
367 -angular.module('ScheduleApp').factory('SchedulePlanInfoManageService_g', ['$resource', function($resource) {  
368 - return {  
369 - rest : $resource(  
370 - '/spic/:id',  
371 - {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id_route'},  
372 - {  
373 - list: {  
374 - method: 'GET',  
375 - params: {  
376 - page: 0  
377 - }  
378 - },  
379 - get: {  
380 - method: 'GET'  
381 - },  
382 - save: {  
383 - method: 'POST'  
384 - }  
385 - }  
386 - ),  
387 - groupinfo : $resource(  
388 - '/spic/groupinfos/:xlid/:sdate',  
389 - {},  
390 - {  
391 - list: {  
392 - method: 'GET',  
393 - isArray: true  
394 - }  
395 - }  
396 - ),  
397 - updateGroupInfo : $resource(  
398 - '/spic/groupinfos/update',  
399 - {},  
400 - {  
401 - update: {  
402 - method: 'POST'  
403 - }  
404 - }  
405 - )  
406 - };  
407 -}]);  
408 -// 排班管理service  
409 -angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource', function($resource) {  
410 - return {  
411 - rest: $resource(  
412 - '/sr1fc/:id',  
413 - {order: 'createDate', direction: 'DESC', id: '@id_route'},  
414 - {  
415 - list: {  
416 - method: 'GET',  
417 - params: {  
418 - page: 0  
419 - }  
420 - },  
421 - get: {  
422 - method: 'GET'  
423 - },  
424 - save: {  
425 - method: 'POST'  
426 - },  
427 - delete: {  
428 - method: 'DELETE'  
429 - }  
430 - }  
431 - )  
432 - };  
433 -}]);  
434 -  
435 -// 时刻表管理service  
436 -angular.module('ScheduleApp').factory('TimeTableManageService_g', ['$resource', function($resource) {  
437 - return {  
438 - rest: $resource(  
439 - '/tic/:id',  
440 - {order: 'xl,isCancel,isEnableDisTemplate,qyrq', direction: 'DESC,ASC,DESC,DESC', id: '@id'},  
441 - {  
442 - list: {  
443 - method: 'GET',  
444 - params: {  
445 - page: 0  
446 - }  
447 - }  
448 - }  
449 - )  
450 - };  
451 -}]);  
452 -  
453 -// 时刻表明细管理service  
454 -angular.module('ScheduleApp').factory('TimeTableDetailManageService_g', ['$resource', function($resource) {  
455 - return {  
456 - rest: $resource(  
457 - '/tidc/:id',  
458 - {order: 'createDate', direction: 'DESC', id: '@id_route'},  
459 - {  
460 - get: {  
461 - method: 'GET'  
462 - },  
463 - save: {  
464 - method: 'POST'  
465 - }  
466 - }  
467 - ),  
468 - import: $resource(  
469 - '/tidc/importfile',  
470 - {},  
471 - {  
472 - do: {  
473 - method: 'POST',  
474 - headers: {  
475 - 'Content-Type': 'application/x-www-form-urlencoded'  
476 - },  
477 - transformRequest: function(obj) {  
478 - var str = [];  
479 - for (var p in obj) {  
480 - str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));  
481 - }  
482 - return str.join("&");  
483 - }  
484 - }  
485 - }  
486 - ),  
487 - edit: $resource(  
488 - '/tidc/edit/:xlid/:ttid',  
489 - {},  
490 - {  
491 - list: {  
492 - method: 'GET'  
493 - }  
494 - }  
495 - ),  
496 - bcdetails: $resource(  
497 - '/tidc/bcdetail',  
498 - {},  
499 - {  
500 - list: {  
501 - method: 'GET',  
502 - isArray: true  
503 - }  
504 - }  
505 - ),  
506 - dataTools: $resource(  
507 - '/tidc/:type',  
508 - {},  
509 - {  
510 - dataExport: {  
511 - method: 'GET',  
512 - responseType: "arraybuffer",  
513 - params: {  
514 - type: "dataExportExt"  
515 - },  
516 - transformResponse: function(data, headers){  
517 - return {data : data};  
518 - }  
519 - }  
520 - }  
521 - )  
522 -  
523 - // TODO：导入数据  
524 - }; 435 +// 时刻表管理service
  436 +angular.module('ScheduleApp').factory('TimeTableManageService_g', ['$resource', function($resource) {
  437 + return {
  438 + rest: $resource(
  439 + '/tic/:id',
  440 + {order: 'xl,isCancel,isEnableDisTemplate,qyrq', direction: 'DESC,ASC,DESC,DESC', id: '@id'},
  441 + {
  442 + list: {
  443 + method: 'GET',
  444 + params: {
  445 + page: 0
  446 + }
  447 + }
  448 + }
  449 + )
  450 + };
  451 +}]);
  452 +
  453 +// 时刻表明细管理service
  454 +angular.module('ScheduleApp').factory('TimeTableDetailManageService_g', ['$resource', function($resource) {
  455 + return {
  456 + rest: $resource(
  457 + '/tidc/:id',
  458 + {order: 'createDate', direction: 'DESC', id: '@id_route'},
  459 + {
  460 + get: {
  461 + method: 'GET'
  462 + },
  463 + save: {
  464 + method: 'POST'
  465 + }
  466 + }
  467 + ),
  468 + import: $resource(
  469 + '/tidc/importfile',
  470 + {},
  471 + {
  472 + do: {
  473 + method: 'POST',
  474 + headers: {
  475 + 'Content-Type': 'application/x-www-form-urlencoded'
  476 + },
  477 + transformRequest: function(obj) {
  478 + var str = [];
  479 + for (var p in obj) {
  480 + str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
  481 + }
  482 + return str.join("&");
  483 + }
  484 + }
  485 + }
  486 + ),
  487 + edit: $resource(
  488 + '/tidc/edit/:xlid/:ttid',
  489 + {},
  490 + {
  491 + list: {
  492 + method: 'GET'
  493 + }
  494 + }
  495 + ),
  496 + bcdetails: $resource(
  497 + '/tidc/bcdetail',
  498 + {},
  499 + {
  500 + list: {
  501 + method: 'GET',
  502 + isArray: true
  503 + }
  504 + }
  505 + ),
  506 + dataTools: $resource(
  507 + '/tidc/:type',
  508 + {},
  509 + {
  510 + dataExport: {
  511 + method: 'GET',
  512 + responseType: "arraybuffer",
  513 + params: {
  514 + type: "dataExportExt"
  515 + },
  516 + transformResponse: function(data, headers){
  517 + return {data : data};
  518 + }
  519 + }
  520 + }
  521 + )
  522 +
  523 + // TODO：导入数据
  524 + };
525 }]); 525 }]);
526 // 项目通用的全局service服务，供不同的controller使用，自定义指令不使用 526 // 项目通用的全局service服务，供不同的controller使用，自定义指令不使用
527 527
@@ -729,7 +729,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun @@ -729,7 +729,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
729 { 729 {
730 list: { 730 list: {
731 method: 'GET', 731 method: 'GET',
732 - isArray: true 732 + isArray: true,
  733 + transformResponse: function(rs) {
  734 + var dst = angular.fromJson(rs);
  735 + if (dst.status == 'SUCCESS') {
  736 + return dst.data;
  737 + } else {
  738 + return dst; // 业务错误留给控制器处理
  739 + }
  740 + }
733 } 741 }
734 } 742 }
735 ), 743 ),
@@ -966,4 +974,3 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun @@ -966,4 +974,3 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
966 }]); 974 }]);
967 975
968 976
969 -  
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
  View file @df10f67
@@ -509,100 +509,100 @@ ScheduleApp.config([ @@ -509,100 +509,100 @@ ScheduleApp.config([
509 509
510 } 510 }
511 ]); 511 ]);
512 -// ui route 配置  
513 -  
514 -/** 路牌管理配置所有模块页面route */  
515 -ScheduleApp.config([  
516 - '$stateProvider',  
517 - '$urlRouterProvider',  
518 - function($stateProvider, $urlRouterProvider) {  
519 - // 默认路由  
520 - //$urlRouterProvider.otherwise('/busConfig.html');  
521 -  
522 - $stateProvider  
523 - .state("guideboardManage", { // index页面  
524 - url: '/guideboardManage',  
525 - views: {  
526 - "": {  
527 - templateUrl: 'pages/scheduleApp/module/core/guideboardManage/index.html'  
528 - },  
529 - "guideboardManage_list@guideboardManage": {  
530 - templateUrl: 'pages/scheduleApp/module/core/guideboardManage/list.html'  
531 - }  
532 - },  
533 -  
534 - resolve: {  
535 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
536 - return $ocLazyLoad.load({  
537 - name: 'guideboardManage_module',  
538 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
539 - files: [  
540 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
541 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
542 - "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",  
543 - "pages/scheduleApp/module/core/guideboardManage/module.js"  
544 - ]  
545 - });  
546 - }]  
547 - }  
548 - })  
549 - .state('guideboardManage_form', { // 添加路牌form  
550 - url: '/guideboardManage_form',  
551 - views: {  
552 - '': {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/form.html'}  
553 - },  
554 - resolve: {  
555 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
556 - return $ocLazyLoad.load({  
557 - name: 'guideboardManage_form_module',  
558 - insertBefore: '#ng_load_plugins_before',  
559 - files: [  
560 - 'assets/bower_components/angular-ui-select/dist/select.min.css',  
561 - 'assets/bower_components/angular-ui-select/dist/select.min.js',  
562 - 'pages/scheduleApp/module/core/guideboardManage/module.js'  
563 - ]  
564 - });  
565 - }]  
566 - }  
567 - })  
568 - .state('guideboardManage_edit', { // 修改路牌form  
569 - url: '/guideboardManage_edit/:id',  
570 - views: {  
571 - '': {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/edit.html'}  
572 - },  
573 - resolve: {  
574 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
575 - return $ocLazyLoad.load({  
576 - name: 'guideboardManage_edit_module',  
577 - insertBefore: '#ng_load_plugins_before',  
578 - files: [  
579 - 'assets/bower_components/angular-ui-select/dist/select.min.css',  
580 - 'assets/bower_components/angular-ui-select/dist/select.min.js',  
581 - 'pages/scheduleApp/module/core/guideboardManage/module.js'  
582 - ]  
583 - });  
584 - }]  
585 - }  
586 - })  
587 - .state("guideboardManage_detail", { // 详细信息页面  
588 - url: '/guideboardManage_detail/:id',  
589 - views: {  
590 - "": {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/detail.html'}  
591 - },  
592 - resolve: {  
593 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
594 - return $ocLazyLoad.load({  
595 - name: 'guideboardManage_detail_module',  
596 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
597 - files: [  
598 - "pages/scheduleApp/module/core/guideboardManage/module.js"  
599 - ]  
600 - });  
601 - }]  
602 - }  
603 - })  
604 -  
605 - 512 +// ui route 配置
  513 +
  514 +/** 路牌管理配置所有模块页面route */
  515 +ScheduleApp.config([
  516 + '$stateProvider',
  517 + '$urlRouterProvider',
  518 + function($stateProvider, $urlRouterProvider) {
  519 + // 默认路由
  520 + //$urlRouterProvider.otherwise('/busConfig.html');
  521 +
  522 + $stateProvider
  523 + .state("guideboardManage", { // index页面
  524 + url: '/guideboardManage',
  525 + views: {
  526 + "": {
  527 + templateUrl: 'pages/scheduleApp/module/core/guideboardManage/index.html'
  528 + },
  529 + "guideboardManage_list@guideboardManage": {
  530 + templateUrl: 'pages/scheduleApp/module/core/guideboardManage/list.html'
  531 + }
  532 + },
  533 +
  534 + resolve: {
  535 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  536 + return $ocLazyLoad.load({
  537 + name: 'guideboardManage_module',
  538 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  539 + files: [
  540 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  541 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  542 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  543 + "pages/scheduleApp/module/core/guideboardManage/module.js"
  544 + ]
  545 + });
  546 + }]
  547 + }
  548 + })
  549 + .state('guideboardManage_form', { // 添加路牌form
  550 + url: '/guideboardManage_form',
  551 + views: {
  552 + '': {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/form.html'}
  553 + },
  554 + resolve: {
  555 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  556 + return $ocLazyLoad.load({
  557 + name: 'guideboardManage_form_module',
  558 + insertBefore: '#ng_load_plugins_before',
  559 + files: [
  560 + 'assets/bower_components/angular-ui-select/dist/select.min.css',
  561 + 'assets/bower_components/angular-ui-select/dist/select.min.js',
  562 + 'pages/scheduleApp/module/core/guideboardManage/module.js'
  563 + ]
  564 + });
  565 + }]
  566 + }
  567 + })
  568 + .state('guideboardManage_edit', { // 修改路牌form
  569 + url: '/guideboardManage_edit/:id',
  570 + views: {
  571 + '': {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/edit.html'}
  572 + },
  573 + resolve: {
  574 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  575 + return $ocLazyLoad.load({
  576 + name: 'guideboardManage_edit_module',
  577 + insertBefore: '#ng_load_plugins_before',
  578 + files: [
  579 + 'assets/bower_components/angular-ui-select/dist/select.min.css',
  580 + 'assets/bower_components/angular-ui-select/dist/select.min.js',
  581 + 'pages/scheduleApp/module/core/guideboardManage/module.js'
  582 + ]
  583 + });
  584 + }]
  585 + }
  586 + })
  587 + .state("guideboardManage_detail", { // 详细信息页面
  588 + url: '/guideboardManage_detail/:id',
  589 + views: {
  590 + "": {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/detail.html'}
  591 + },
  592 + resolve: {
  593 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  594 + return $ocLazyLoad.load({
  595 + name: 'guideboardManage_detail_module',
  596 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  597 + files: [
  598 + "pages/scheduleApp/module/core/guideboardManage/module.js"
  599 + ]
  600 + });
  601 + }]
  602 + }
  603 + })
  604 +
  605 +
606 }]); 606 }]);
607 // ui route 配置 607 // ui route 配置
608 608
@@ -952,117 +952,117 @@ ScheduleApp.config([ @@ -952,117 +952,117 @@ ScheduleApp.config([
952 }) 952 })
953 } 953 }
954 ]); 954 ]);
955 -// ui route 配置  
956 -  
957 -/** 时刻表管理配置route */  
958 -ScheduleApp.config([  
959 - '$stateProvider',  
960 - '$urlRouterProvider',  
961 - function($stateProvider, $urlRouterProvider) {  
962 - // 默认路由  
963 - //$urlRouterProvider.otherwise('/busConfig.html');  
964 -  
965 - $stateProvider  
966 - .state("ttInfoManage", { // index页面  
967 - url: '/ttInfoManage',  
968 - views: {  
969 - "": {  
970 - templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/index.html'  
971 - },  
972 - "ttInfoManage_list@ttInfoManage": {  
973 - templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/list.html'  
974 - }  
975 - },  
976 -  
977 - resolve: {  
978 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
979 - return $ocLazyLoad.load({  
980 - name: 'ttInfoManage_module',  
981 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
982 - files: [  
983 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
984 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
985 - "pages/scheduleApp/module/core/ttInfoManage/module.js"  
986 - ]  
987 - });  
988 - }]  
989 - }  
990 - })  
991 - .state("ttInfoManage_form", { // 添加时刻表信息form  
992 - url: '/ttInfoManage_form',  
993 - views: {  
994 - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/form.html'}  
995 - },  
996 - resolve: {  
997 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
998 - return $ocLazyLoad.load({  
999 - name: 'ttInfoManage_form_module',  
1000 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
1001 - files: [  
1002 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
1003 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
1004 - "pages/scheduleApp/module/core/ttInfoManage/module.js"  
1005 - ]  
1006 - });  
1007 - }]  
1008 - }  
1009 - })  
1010 - .state("ttInfoManage_edit", { // 修改时刻表信息form  
1011 - url: '/ttInfoManage_edit/:id',  
1012 - views: {  
1013 - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/edit.html'}  
1014 - },  
1015 - resolve: {  
1016 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
1017 - return $ocLazyLoad.load({  
1018 - name: 'ttInfoManage_edit_module',  
1019 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
1020 - files: [  
1021 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
1022 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
1023 - "pages/scheduleApp/module/core/ttInfoManage/module.js"  
1024 - ]  
1025 - });  
1026 - }]  
1027 - }  
1028 - })  
1029 - .state("ttInfoManage_detail", { // 时刻表详细信息  
1030 - url: '/ttInfoManage_detail/:id',  
1031 - views: {  
1032 - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detail.html'}  
1033 - },  
1034 - resolve: {  
1035 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
1036 - return $ocLazyLoad.load({  
1037 - name: 'ttInfoManage_detail_module',  
1038 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
1039 - files: [  
1040 - "pages/scheduleApp/module/core/ttInfoManage/module.js"  
1041 - ]  
1042 - });  
1043 - }]  
1044 - }  
1045 - })  
1046 - .state('ttInfoManage_test', { // TODO：测试页面  
1047 - url: '/ttInfoManage_test',  
1048 - views: {  
1049 - '': {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/test.html'}  
1050 - },  
1051 - resolve: {  
1052 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
1053 - return $ocLazyLoad.load({  
1054 - name: 'ttInfoManage_test_module',  
1055 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
1056 - files: [  
1057 - 'pages/scheduleApp/module/core/ttInfoManage/test.js'  
1058 - ]  
1059 - });  
1060 - }]  
1061 - }  
1062 - })  
1063 -  
1064 -  
1065 - } 955 +// ui route 配置
  956 +
  957 +/** 时刻表管理配置route */
  958 +ScheduleApp.config([
  959 + '$stateProvider',
  960 + '$urlRouterProvider',
  961 + function($stateProvider, $urlRouterProvider) {
  962 + // 默认路由
  963 + //$urlRouterProvider.otherwise('/busConfig.html');
  964 +
  965 + $stateProvider
  966 + .state("ttInfoManage", { // index页面
  967 + url: '/ttInfoManage',
  968 + views: {
  969 + "": {
  970 + templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/index.html'
  971 + },
  972 + "ttInfoManage_list@ttInfoManage": {
  973 + templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/list.html'
  974 + }
  975 + },
  976 +
  977 + resolve: {
  978 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  979 + return $ocLazyLoad.load({
  980 + name: 'ttInfoManage_module',
  981 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  982 + files: [
  983 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  984 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  985 + "pages/scheduleApp/module/core/ttInfoManage/module.js"
  986 + ]
  987 + });
  988 + }]
  989 + }
  990 + })
  991 + .state("ttInfoManage_form", { // 添加时刻表信息form
  992 + url: '/ttInfoManage_form',
  993 + views: {
  994 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/form.html'}
  995 + },
  996 + resolve: {
  997 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  998 + return $ocLazyLoad.load({
  999 + name: 'ttInfoManage_form_module',
  1000 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1001 + files: [
  1002 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  1003 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  1004 + "pages/scheduleApp/module/core/ttInfoManage/module.js"
  1005 + ]
  1006 + });
  1007 + }]
  1008 + }
  1009 + })
  1010 + .state("ttInfoManage_edit", { // 修改时刻表信息form
  1011 + url: '/ttInfoManage_edit/:id',
  1012 + views: {
  1013 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/edit.html'}
  1014 + },
  1015 + resolve: {
  1016 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1017 + return $ocLazyLoad.load({
  1018 + name: 'ttInfoManage_edit_module',
  1019 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1020 + files: [
  1021 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  1022 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  1023 + "pages/scheduleApp/module/core/ttInfoManage/module.js"
  1024 + ]
  1025 + });
  1026 + }]
  1027 + }
  1028 + })
  1029 + .state("ttInfoManage_detail", { // 时刻表详细信息
  1030 + url: '/ttInfoManage_detail/:id',
  1031 + views: {
  1032 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detail.html'}
  1033 + },
  1034 + resolve: {
  1035 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1036 + return $ocLazyLoad.load({
  1037 + name: 'ttInfoManage_detail_module',
  1038 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1039 + files: [
  1040 + "pages/scheduleApp/module/core/ttInfoManage/module.js"
  1041 + ]
  1042 + });
  1043 + }]
  1044 + }
  1045 + })
  1046 + .state('ttInfoManage_test', { // TODO：测试页面
  1047 + url: '/ttInfoManage_test',
  1048 + views: {
  1049 + '': {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/test.html'}
  1050 + },
  1051 + resolve: {
  1052 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1053 + return $ocLazyLoad.load({
  1054 + name: 'ttInfoManage_test_module',
  1055 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1056 + files: [
  1057 + 'pages/scheduleApp/module/core/ttInfoManage/test.js'
  1058 + ]
  1059 + });
  1060 + }]
  1061 + }
  1062 + })
  1063 +
  1064 +
  1065 + }
1066 ]); 1066 ]);
1067 // ui route 配置 1067 // ui route 配置
1068 1068
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/index.html
  View file @df10f67
@@ -27,10 +27,10 @@ @@ -27,10 +27,10 @@
27 <span class="caption-subject bold uppercase">时刻表</span> 27 <span class="caption-subject bold uppercase">时刻表</span>
28 </div> 28 </div>
29 <div class="actions"> 29 <div class="actions">
30 - <a ui-sref="ttInfoManage_test" class="btn btn-circle blue">  
31 - <i class="fa fa-plus"></i>  
32 - 测试  
33 - </a> 30 + <!--<a ui-sref="ttInfoManage_test" class="btn btn-circle blue">-->
  31 + <!--<i class="fa fa-plus"></i>-->
  32 + <!--测试-->
  33 + <!--</a>-->
34 <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.toTtInfoManageForm()"> 34 <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.toTtInfoManageForm()">
35 <i class="fa fa-plus"></i> 35 <i class="fa fa-plus"></i>
36 添加时刻表 36 添加时刻表
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
  View file @df10f67
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <td></td> 37 <td></td>
38 <td> 38 <td>
39 <label class="checkbox-inline"> 39 <label class="checkbox-inline">
40 - <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>作废 40 + <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>已作废
41 </label> 41 </label>
42 </td> 42 </td>
43 <td></td> 43 <td></td>