潘钊 / bsth_control · Commits

Commit 084d9bda7b3ab59c2e2cfc8541e230da01e53e3e

Authored by 徐烜
1 parent 65c5494c

update

Inline Side-by-side
Showing 10 changed files with 216 additions and 66 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice-legacy.js
  View file @084d9bd
@@ -158,12 +158,20 @@ angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', fun @@ -158,12 +158,20 @@ angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', fun
158 } 158 }
159 ), 159 ),
160 ttInfo: $resource( 160 ttInfo: $resource(
161 - '/tic/:type', 161 + '/tic_ec/:type',
162 {order: "name", direction: 'ASC'}, 162 {order: "name", direction: 'ASC'},
163 { 163 {
164 list: { 164 list: {
165 method: 'GET', 165 method: 'GET',
166 - isArray: true 166 + isArray: true,
  167 + transformResponse: function(rs) {
  168 + var dst = angular.fromJson(rs);
  169 + if (dst.status == 'SUCCESS') {
  170 + return dst.data;
  171 + } else {
  172 + return dst; // 业务错误留给控制器处理
  173 + }
  174 + }
167 } 175 }
168 } 176 }
169 ), 177 ),
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
  View file @084d9bd
@@ -754,12 +754,20 @@ angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', fun @@ -754,12 +754,20 @@ angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', fun
754 } 754 }
755 ), 755 ),
756 ttInfo: $resource( 756 ttInfo: $resource(
757 - '/tic/:type', 757 + '/tic_ec/:type',
758 {order: "name", direction: 'ASC'}, 758 {order: "name", direction: 'ASC'},
759 { 759 {
760 list: { 760 list: {
761 method: 'GET', 761 method: 'GET',
762 - isArray: true 762 + isArray: true,
  763 + transformResponse: function(rs) {
  764 + var dst = angular.fromJson(rs);
  765 + if (dst.status == 'SUCCESS') {
  766 + return dst.data;
  767 + } else {
  768 + return dst; // 业务错误留给控制器处理
  769 + }
  770 + }
763 } 771 }
764 } 772 }
765 ), 773 ),
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
  View file @084d9bd
@@ -1123,7 +1123,7 @@ ScheduleApp.config([ @@ -1123,7 +1123,7 @@ ScheduleApp.config([
1123 name: 'ttInfoDetailManage_edit_module', 1123 name: 'ttInfoDetailManage_edit_module',
1124 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置 1124 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
1125 files: [ 1125 files: [
1126 - "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js" 1126 + "pages/scheduleApp/module/core/ttInfoManage/detailedit/module2.js"
1127 ] 1127 ]
1128 }); 1128 });
1129 }] 1129 }]
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/edit.html
  View file @084d9bd
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 cmaps="{'rerunTtinfo.id' : 'id'}" 69 cmaps="{'rerunTtinfo.id' : 'id'}"
70 dcname="rerunTtinfo.id" 70 dcname="rerunTtinfo.id"
71 icname="id" 71 icname="id"
72 - dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.rerunXl.id, 'isCancel_eq': false}, atype:'ttInfo' } | json }}" 72 + dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.rerunXl.id, 'isCancel_eq': false, 'isEnableDisTemplate_eq': true}, atype:'ttInfo' } | json }}"
73 dsparamsextra="{'type':'all'}" 73 dsparamsextra="{'type':'all'}"
74 iterobjname="item" 74 iterobjname="item"
75 iterobjexp="item.name + '-' + item.xl.name" 75 iterobjexp="item.name + '-' + item.xl.name"
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/form.html
  View file @084d9bd
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 cmaps="{'rerunTtinfo.id' : 'id'}" 69 cmaps="{'rerunTtinfo.id' : 'id'}"
70 dcname="rerunTtinfo.id" 70 dcname="rerunTtinfo.id"
71 icname="id" 71 icname="id"
72 - dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.rerunXl.id, 'isCancel_eq': false}, atype:'ttInfo' } | json }}" 72 + dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.rerunXl.id, 'isCancel_eq': false, 'isEnableDisTemplate_eq': true}, atype:'ttInfo' } | json }}"
73 dsparamsextra="{'type':'all'}" 73 dsparamsextra="{'type':'all'}"
74 iterobjname="item" 74 iterobjname="item"
75 iterobjexp="item.name + '-' + item.xl.name" 75 iterobjexp="item.name + '-' + item.xl.name"
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
  View file @084d9bd
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 <span ng-bind="info.fcsj"></span> 77 <span ng-bind="info.fcsj"></span>
78 </td> 78 </td>
79 <td> 79 <td>
80 - <abbr title="info.ttInfoName">{{info.ttInfoName}}</abbr> 80 + <abbr title="{{info.ttInfoName}}"><span>{{info.ttInfoName}}</span></abbr>
81 </td> 81 </td>
82 82
83 </tr> 83 </tr>
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit2.html
  View file @084d9bd
1 -<h1>测试handsontable</h1> 1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>时刻表管理</h1>
  4 + </div>
  5 +</div>
2 6
3 -<div ng-controller="tt_edit2 as ctrl">  
4 - <hot-table col-headers="ctrl.colHeaders" datarows="ctrl.data">  
5 - <hot-column ng-repeat="column in ctrl.columns" data="{{column.data}}"  
6 - title="column.title" read-only="column.readOnly"></hot-column>  
7 - </hot-table> 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 + <a ui-sref="ttInfoManage">时刻表管理</a>
  18 + <i class="fa fa-circle"></i>
  19 + </li>
  20 + <li>
  21 + <span class="active">编辑时刻表明细信息</span>
  22 + </li>
  23 +</ul>
  24 +
  25 +<div class="row" id="timeTableDetail" ng-controller="TTInfoDetailManageCtrl as ctrl">
  26 + <div class="col-md-12">
  27 + <div class="portlet light bordered">
  28 + <div class="portlet-title">
  29 + <div class="caption font-dark">
  30 + <i class="fa fa-database font-dark"></i>
  31 + <span class="caption-subject bold uppercase" ng-bind="ctrl.title"></span>
  32 + </div>
  33 + <div class="actions">
  34 + <i class="fa fa-arrow-up" aria-hidden="true"></i>
  35 + <span style="padding-right: 10px;">上行班次</span>
  36 + <i class="fa fa-arrow-down" aria-hidden="true"></i>
  37 + <span style="padding-right: 10px;">下行班次</span>
  38 + <i class="fa fa-circle-o-notch" aria-hidden="true"></i>
  39 + <span style="padding-right: 10px;">区间班次</span>
  40 + <i class="fa fa-adjust" aria-hidden="true"></i>
  41 + <span style="padding-right: 10px;">分班班次</span>
  42 +
  43 + <div class="btn-group">
  44 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  45 + <i class="fa fa-share"></i>
  46 + <span>数据工具</span>
  47 + <i class="fa fa-angle-down"></i>
  48 + </a>
  49 + <ul class="dropdown-menu pull-right">
  50 + <li>
  51 + <a href="javascript:" class="tool-action">
  52 + <i class="fa fa-file-excel-o"></i>
  53 + 导出excel
  54 + </a>
  55 + </li>
  56 + <li class="divider"></li>
  57 + <li>
  58 + <a href="javascript:" class="tool-action" ng-click="ctrl.refresh()">
  59 + <i class="fa fa-refresh"></i>
  60 + 刷行数据
  61 + </a>
  62 + </li>
  63 + </ul>
  64 + </div>
  65 +
  66 + </div>
  67 + </div>
  68 +
  69 + <div class="portlet-body">
  70 + <!--<div ng-view></div>-->
  71 + <div class="fixDiv">
  72 +
  73 + <hot-table col-headers="ctrl.getColHeaders()" datarows="ctrl.getData()">
  74 + <hot-column ng-repeat="column in ctrl.columns" data="{{column.data}}"
  75 + title="column.title" read-only="column.readOnly"></hot-column>
  76 + </hot-table>
  77 +
  78 + </div>
  79 +
  80 +
  81 + </div>
  82 + </div>
  83 + </div>
8 </div> 84 </div>
9 \ No newline at end of file 85 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/module2.js 0 → 100644
  View file @084d9bd
  1 +// 保存时刻表明细编辑信息
  2 +angular.module('ScheduleApp').factory(
  3 + '$$TTInfoDetail_edit2_info',
  4 + [
  5 + 'TimeTableDetailManageService_g',
  6 + function(service) {
  7 + var editInfo = {}; // 转换好的内部明细数据
  8 + editInfo.colHeaders = [ // 这个要动态生成的
  9 + {
  10 + data: 'fcsj',
  11 + title: '路牌',
  12 + type: 'text',
  13 + readOnly: true
  14 + },
  15 + {
  16 + data: ''
  17 + },
  18 + {},
  19 +
  20 +
  21 +
  22 +
  23 + '路牌',
  24 + '出场',
  25 + '和静路安亭老街',
  26 + '福泉路天山西路',
  27 + '和静路安亭老街',
  28 + '福泉路天山西路',
  29 + '和静路安亭老街',
  30 + '福泉路天山西路',
  31 + '和静路安亭老街',
  32 + '福泉路天山西路',
  33 + '和静路安亭老街',
  34 + '福泉路天山西路',
  35 + '和静路安亭老街',
  36 + '福泉路天山西路',
  37 + '和静路安亭老街',
  38 + '进场'
  39 + ];
  40 + editInfo.items = [
  41 + ['1', '0615', '2', '', '0630', '0755', '0935', '1055', '1305', '1425', '1640', '1805', '', '', '1915', '1925'],
  42 + ['1', '0615', '', '2', '0630', '0755', '0935', '1055', '1305', '1425', '1640', '1805', '2', '', '1915', '1925'],
  43 + ['1', '0615', '', '', '0630', '0755', '0935', '1055', '1305', '1425', '1640', '1805', '2', '', '1915', '1925'],
  44 + ['1', '0615', '', '2', '0630', '0755', '0935', '1055', '1305', '1425', '1640', '1805', '', '2', '1915', '1925'],
  45 + ['1', '0615', '2', '', '0630', '0755', '0935', '1055', '1305', '1425', '1640', '1805', '', '2', '1915', '1925'],
  46 + ['1', '0615', '', '2', '0630', '0755', '0935', '1055', '1305', '1425', '1640', '1805', '', '', '1915', '1925']
  47 + ];
  48 +
  49 + //this.columns = [
  50 + // {
  51 + // data: 'id',
  52 + // title: 'ID',
  53 + // readOnly: true
  54 + // },
  55 + // {
  56 + // data: 'price',
  57 + // title: 'Price',
  58 + // readOnly: false
  59 + // }
  60 + //];
  61 +
  62 + // demo data
  63 +
  64 +
  65 + return {
  66 + getEditDetailInfo: function() {
  67 + return editInfo;
  68 + },
  69 + refreshEditDetail: function() {
  70 + // TODO：
  71 +
  72 + return editInfo;
  73 + }
  74 + }
  75 + }
  76 + ]
  77 +);
  78 +
  79 +// edit2.html 页面
  80 +angular.module('ScheduleApp').controller(
  81 + 'TTInfoDetailManageCtrl',
  82 + [
  83 + 'TimeTableDetailManageService_g',
  84 + '$stateParams',
  85 + '$$TTInfoDetail_edit2_info',
  86 + function(service, $stateParams, detailService) {
  87 + var self = this;
  88 + self.xlid = $stateParams.xlid; // 获取传过来的线路id
  89 + self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
  90 + self.xlname = $stateParams.xlname; // 获取传过来的线路名字
  91 + self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
  92 +
  93 + self.title = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
  94 +
  95 + self.getColHeaders = function() {
  96 + return detailService.getEditDetailInfo().colHeaders;
  97 + };
  98 + self.getData = function() {
  99 + return detailService.getEditDetailInfo().items;
  100 + };
  101 +
  102 + // TODO：判定是否刷新数据
  103 + detailService.refreshEditDetail();
  104 +
  105 +
  106 +
  107 + }
  108 + ]
  109 +);
0 \ No newline at end of file 110 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/route.js
  View file @084d9bd
@@ -57,7 +57,7 @@ ScheduleApp.config([ @@ -57,7 +57,7 @@ ScheduleApp.config([
57 name: 'ttInfoDetailManage_edit_module', 57 name: 'ttInfoDetailManage_edit_module',
58 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置 58 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
59 files: [ 59 files: [
60 - "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js" 60 + "pages/scheduleApp/module/core/ttInfoManage/detailedit/module2.js"
61 ] 61 ]
62 }); 62 });
63 }] 63 }]
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
  View file @084d9bd
@@ -206,54 +206,3 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableDetailManageFormCtrl_old&#39;, [&#39; @@ -206,54 +206,3 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableDetailManageFormCtrl_old&#39;, [&#39;
206 206
207 }]); 207 }]);
208 208
209 -// 测试edit2功能  
210 -angular.module("ScheduleApp").controller(  
211 - 'tt_edit2',  
212 - [  
213 - function() {  
214 - this.colHeaders = [  
215 - '路牌',  
216 - '出场',  
217 - '和静路安亭老街',  
218 - '福泉路天山西路',  
219 - '和静路安亭老街',  
220 - '福泉路天山西路',  
221 - '和静路安亭老街',  
222 - '福泉路天山西路',  
223 - '和静路安亭老街',  
224 - '福泉路天山西路',  
225 - '和静路安亭老街',  
226 - '福泉路天山西路',  
227 - '和静路安亭老街',  
228 - '福泉路天山西路',  
229 - '和静路安亭老街',  
230 - '进场'  
231 - ];  
232 -  
233 -  
234 -  
235 -  
236 -  
237 -  
238 -  
239 - var items = [  
240 - ['1', '0615', '', '', '0630', '0755', '0935', '1055', '1305', '1425', '1640', '1805', '', '', '1915', '1925']  
241 - ];  
242 -  
243 - this.data = items;  
244 - //this.columns = [  
245 - // {  
246 - // data: 'id',  
247 - // title: 'ID',  
248 - // readOnly: true  
249 - // },  
250 - // {  
251 - // data: 'price',  
252 - // title: 'Price',  
253 - // readOnly: false  
254 - // }  
255 - //];  
256 - }  
257 -  
258 - ]  
259 -);  
260 \ No newline at end of file 209 \ No newline at end of file