潘钊 / bsth_control · Commits

Commit e7d523966d406bdc0363bfa76510d92457704416

Authored by 娄高锋
2 parents d3271fc3 cae18a65
build: skipped

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 4 changed files with 95 additions and 56 deletions
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
  View file @e7d5239
@@ -280,7 +280,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im @@ -280,7 +280,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im
280 FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb); 280 FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
281 281
282 if (StringUtils.isNotEmpty(fzdname)) 282 if (StringUtils.isNotEmpty(fzdname))
283 - headarrays[c + 1] = fzdname; 283 + headarrays[c] = fzdname;
284 fcInfos.add(fcInfo); 284 fcInfos.add(fcInfo);
285 285
286 286
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html
  View file @e7d5239
@@ -229,9 +229,12 @@ @@ -229,9 +229,12 @@
229 <input type="text" class="form-control" name="fcsj" 229 <input type="text" class="form-control" name="fcsj"
230 ng-model="ctrl.TimeTableDetailForSave.fcsj" 230 ng-model="ctrl.TimeTableDetailForSave.fcsj"
231 ng-pattern="ctrl.time_regex" 231 ng-pattern="ctrl.time_regex"
232 - /> 232 + required />
233 </div> 233 </div>
234 <!-- 隐藏块，显示验证信息 --> 234 <!-- 隐藏块，显示验证信息 -->
  235 + <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.required">
  236 + 发车时间必须填写
  237 + </div>
235 <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.pattern"> 238 <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.pattern">
236 时间格式错误，应该是格式hh:mm，如：06:39 239 时间格式错误，应该是格式hh:mm，如：06:39
237 </div> 240 </div>
@@ -289,7 +292,7 @@ @@ -289,7 +292,7 @@
289 dsparams="{{ {type: 'dic', param: 'ScheduleType' } | json }}" 292 dsparams="{{ {type: 'dic', param: 'ScheduleType' } | json }}"
290 iterobjname="item" 293 iterobjname="item"
291 iterobjexp="item.name" 294 iterobjexp="item.name"
292 - searchph="请选择营运状态..." 295 + searchph="请选择班次类型..."
293 searchexp="this.name" 296 searchexp="this.name"
294 required 297 required
295 > 298 >
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail2.html
  View file @e7d5239
@@ -39,106 +39,123 @@ @@ -39,106 +39,123 @@
39 <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm"> 39 <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
40 <div class="form-body"> 40 <div class="form-body">
41 41
42 - <div class="form-group has-success has-feedback"> 42 + <div class="form-group">
43 <label class="col-md-3 control-label">方向：</label> 43 <label class="col-md-3 control-label">方向：</label>
44 - <div class="col-md-7"> 44 + <div class="col-md-5">
45 <sa-Radiogroup model="ctrl.TimeTableDetailForSave.xlDir" dicgroup="LineTrend" name="xlDir"></sa-Radiogroup> 45 <sa-Radiogroup model="ctrl.TimeTableDetailForSave.xlDir" dicgroup="LineTrend" name="xlDir"></sa-Radiogroup>
46 </div> 46 </div>
47 47
48 </div> 48 </div>
49 <div class="form-group"> 49 <div class="form-group">
50 <label class="col-md-3 control-label">起点站：</label> 50 <label class="col-md-3 control-label">起点站：</label>
51 - <div class="col-md-7">  
52 - <sa-Select3 model="ctrl.TimeTableDetailForSave"  
53 - name="qdz"  
54 - placeholder="请输拼音..."  
55 - dcvalue="{{ctrl.TimeTableDetailForSave.qdz.id}}" 51 + <div class="col-md-5">
  52 + <sa-Select5 name="qdz"
  53 + model="ctrl.TimeTableDetailForSave"
  54 + cmaps="{'qdz.id' : 'stationid'}"
56 dcname="qdz.id" 55 dcname="qdz.id"
57 icname="stationid" 56 icname="stationid"
58 - icnames="stationname"  
59 - datatype="zd"  
60 - dataassociate="true"  
61 - dataparam="{{ {'xlid': ctrl.xlid, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}"  
62 - mlp="true"  
63 - >  
64 - </sa-Select3> 57 + dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd' } | json }}"
  58 + iterobjname="item"
  59 + iterobjexp="item.stationname"
  60 + searchph="请输拼音..."
  61 + searchexp="this.stationname"
  62 + required >
  63 + </sa-Select5>
65 </div> 64 </div>
66 </div> 65 </div>
67 <div class="form-group"> 66 <div class="form-group">
68 <label class="col-md-3 control-label">终点站：</label> 67 <label class="col-md-3 control-label">终点站：</label>
69 - <div class="col-md-7">  
70 - <sa-Select3 model="ctrl.TimeTableDetailForSave"  
71 - name="zdz"  
72 - placeholder="请输拼音..."  
73 - dcvalue="{{ctrl.TimeTableDetailForSave.zdz.id}}" 68 + <div class="col-md-5">
  69 + <sa-Select5 name="zdz"
  70 + model="ctrl.TimeTableDetailForSave"
  71 + cmaps="{'zdz.id' : 'stationid'}"
74 dcname="zdz.id" 72 dcname="zdz.id"
75 icname="stationid" 73 icname="stationid"
76 - icnames="stationname"  
77 - datatype="zd"  
78 - dataassociate="true"  
79 - dataparam="{{ {'xlid': ctrl.xlid, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}"  
80 - mlp="true"  
81 - >  
82 - </sa-Select3> 74 + dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd' } | json }}"
  75 + iterobjname="item"
  76 + iterobjexp="item.stationname"
  77 + searchph="请输拼音..."
  78 + searchexp="this.stationname"
  79 + required >
  80 + </sa-Select5>
83 </div> 81 </div>
84 </div> 82 </div>
85 <div class="form-group"> 83 <div class="form-group">
86 <label class="col-md-3 control-label">停车场：</label> 84 <label class="col-md-3 control-label">停车场：</label>
87 - <div class="col-md-7">  
88 - <sa-Select3 model="ctrl.TimeTableDetailForSave"  
89 - name="tcc"  
90 - placeholder="请输拼音..."  
91 - dcvalue="{{ctrl.TimeTableDetailForSave.tcc.id}}" 85 + <div class="col-md-5">
  86 + <sa-Select5 name="tcc"
  87 + model="ctrl.TimeTableDetailForSave"
  88 + cmaps="{'tcc.id': 'id'}"
92 dcname="tcc.id" 89 dcname="tcc.id"
93 icname="id" 90 icname="id"
94 - icnames="parkName"  
95 - datatype="tcc"  
96 - mlp="true"  
97 - >  
98 - </sa-Select3> 91 + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
  92 + iterobjname="item"
  93 + iterobjexp="item.parkName"
  94 + searchph="请输拼音..."
  95 + searchexp="this.parkName"
  96 + required >
  97 + </sa-Select5>
99 </div> 98 </div>
100 </div> 99 </div>
101 100
102 - <div class="form-group has-success has-feedback"> 101 + <div class="form-group">
103 <label class="col-md-3 control-label">发车时间：</label> 102 <label class="col-md-3 control-label">发车时间：</label>
104 - <div class="col-md-7">  
105 - <input type="text" class="form-control" 103 + <div class="col-md-5">
  104 + <input type="text" class="form-control" name="fcsj"
106 ng-model="ctrl.TimeTableDetailForSave.fcsj" 105 ng-model="ctrl.TimeTableDetailForSave.fcsj"
  106 + ng-pattern="ctrl.time_regex"
107 /> 107 />
108 </div> 108 </div>
  109 + <!-- 隐藏块，显示验证信息 -->
  110 + <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.pattern">
  111 + 时间格式错误，应该是格式hh:mm，如：06:39
  112 + </div>
109 113
110 </div> 114 </div>
111 <div class="form-group"> 115 <div class="form-group">
112 <label class="col-md-3 control-label">计划里程：</label> 116 <label class="col-md-3 control-label">计划里程：</label>
113 - <div class="col-md-7">  
114 - <input type="text" class="form-control" 117 + <div class="col-md-5">
  118 + <input type="text" class="form-control" name="jhlc"
115 ng-model="ctrl.TimeTableDetailForSave.jhlc" 119 ng-model="ctrl.TimeTableDetailForSave.jhlc"
  120 + ng-pattern="ctrl.float_regex"
116 /> 121 />
117 </div> 122 </div>
  123 + <!-- 隐藏块，显示验证信息 -->
  124 + <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.pattern">
  125 + 输入数字
  126 + </div>
118 127
119 </div> 128 </div>
120 <div class="form-group"> 129 <div class="form-group">
121 <label class="col-md-3 control-label">班次历时：</label> 130 <label class="col-md-3 control-label">班次历时：</label>
122 - <div class="col-md-7">  
123 - <input type="text" class="form-control" 131 + <div class="col-md-5">
  132 + <input type="text" class="form-control" name="bcsj"
124 ng-model="ctrl.TimeTableDetailForSave.bcsj" 133 ng-model="ctrl.TimeTableDetailForSave.bcsj"
  134 + ng-pattern="ctrl.number_regex"
125 /> 135 />
126 </div> 136 </div>
  137 + <!-- 隐藏块，显示验证信息 -->
  138 + <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.pattern">
  139 + 输入整数
  140 + </div>
127 141
128 </div> 142 </div>
129 - <div class="form-group has-success has-feedback"> 143 + <div class="form-group">
130 <label class="col-md-3 control-label">班次类型：</label> 144 <label class="col-md-3 control-label">班次类型：</label>
131 - <div class="col-md-7">  
132 - <sa-Select3 model="ctrl.TimeTableDetailForSave"  
133 - name="bcType"  
134 - placeholder="请选择班次类型..."  
135 - dcvalue="{{ctrl.TimeTableDetailForSave.bcType}}" 145 + <div class="col-md-5">
  146 + <sa-Select5 name="bcType"
  147 + model="ctrl.TimeTableDetailForSave"
  148 + cmaps="{'bcType': 'code'}"
136 dcname="bcType" 149 dcname="bcType"
137 icname="code" 150 icname="code"
138 - icnames="name"  
139 - datatype="ScheduleType"  
140 - >  
141 - </sa-Select3> 151 + dsparams="{{ {type: 'dic', param: 'ScheduleType' } | json }}"
  152 + iterobjname="item"
  153 + iterobjexp="item.name"
  154 + searchph="请选择班次类型..."
  155 + searchexp="this.name"
  156 + required
  157 + >
  158 + </sa-Select5>
142 </div> 159 </div>
143 160
144 </div> 161 </div>
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
  View file @e7d5239
@@ -283,6 +283,16 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -283,6 +283,16 @@ angular.module(&#39;ScheduleApp&#39;).controller(
283 if (id) { 283 if (id) {
284 TTInfoDetail.get({id: id}, function(value) { 284 TTInfoDetail.get({id: id}, function(value) {
285 self.TimeTableDetailForSave = value; 285 self.TimeTableDetailForSave = value;
  286 + if (!self.TimeTableDetailForSave.qdz) {
  287 + self.TimeTableDetailForSave.qdz = {};
  288 + }
  289 + if (!self.TimeTableDetailForSave.zdz) {
  290 + self.TimeTableDetailForSave.zdz = {};
  291 + }
  292 + if (!self.TimeTableDetailForSave.tcc) {
  293 + self.TimeTableDetailForSave.tcc = {};
  294 + }
  295 +
286 self.title2 = 296 self.title2 =
287 self.xlname + "（" + self.ttname + "）" + "时刻表明细信息" + 297 self.xlname + "（" + self.ttname + "）" + "时刻表明细信息" +
288 "->路牌" + self.TimeTableDetailForSave.lp.lpName + 298 "->路牌" + self.TimeTableDetailForSave.lp.lpName +
@@ -299,6 +309,8 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -299,6 +309,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
299 // delete $stateParams.id; 309 // delete $stateParams.id;
300 //} 310 //}
301 311
  312 + // TODO:
  313 +
302 if (self.TimeTableDetailForSave.tcc && !self.TimeTableDetailForSave.tcc.id) 314 if (self.TimeTableDetailForSave.tcc && !self.TimeTableDetailForSave.tcc.id)
303 delete self.TimeTableDetailForSave.tcc; 315 delete self.TimeTableDetailForSave.tcc;
304 if (self.TimeTableDetailForSave.qdz && !self.TimeTableDetailForSave.qdz.id) 316 if (self.TimeTableDetailForSave.qdz && !self.TimeTableDetailForSave.qdz.id)
@@ -344,6 +356,13 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -344,6 +356,13 @@ angular.module(&#39;ScheduleApp&#39;).controller(
344 var self = this; 356 var self = this;
345 var TTInfoDetail = service.getQueryClass(); 357 var TTInfoDetail = service.getQueryClass();
346 358
  359 + // 时间正则表达式（格式hh:mm，如：06:39）
  360 + self.time_regex = /^(([0-1]\d)|(2[0-4])):[0-5]\d$/;
  361 + // 整数
  362 + self.number_regex = /^-?\d+$/;
  363 + // 小数
  364 + self.float_regex = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/;
  365 +
347 // 欲保存的busInfo信息，绑定 366 // 欲保存的busInfo信息，绑定
348 self.TimeTableDetailForSave = new TTInfoDetail; 367 self.TimeTableDetailForSave = new TTInfoDetail;
349 self.TimeTableDetailForSave.tcc = {}; 368 self.TimeTableDetailForSave.tcc = {};