线路信息与线路标准信息页面修改

李强
1 parent 1106efac
Showing 9 changed files with 87 additions and 60 deletions
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/LineInformation.java
src/main/resources/static/pages/base/line/details.html
src/main/resources/static/pages/base/line/js/line-list-table.js
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/pages/base/line/lineinformation/lineinformation_add.html → src/main/resources/static/pages/base/lineinformation/add.html
src/main/resources/static/pages/base/line/js/lineinformation-add-form.js → src/main/resources/static/pages/base/lineinformation/js/lineinformation-add-form.js
src/main/resources/static/pages/base/line/js/lineinformation-list-table.js → src/main/resources/static/pages/base/lineinformation/js/lineinformation-list-table.js
src/main/resources/static/pages/base/line/lineinformation/lineinformation.html → src/main/resources/static/pages/base/lineinformation/list.html
@@ -7,6 +7,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
@@ -140,10 +141,6 @@ public class Line {
 	// 修改日期
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
-	
-	// 线路标准信息
-	@OneToOne
-	private LineInformation lineInformation;
 	public Integer getId() {
 		return id;
@@ -424,12 +421,4 @@ public class Line {
 	public void setUpdateDate(Date updateDate) {
 		this.updateDate = updateDate;
 	}
-
-	public LineInformation getLineInformation() {
-		return lineInformation;
-	}
-
-	public void setLineInformation(LineInformation lineInformation) {
-		this.lineInformation = lineInformation;
-	}
 }
@@ -7,6 +7,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 /**
@@ -158,6 +159,9 @@ public class LineInformation {
 	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
+	@ManyToOne
+	private Line line;
+	
 	public Integer getId() {
 		return id;
 	}
@@ -500,5 +504,13 @@ public class LineInformation {
 	public void setUpdateDate(Date updateDate) {
 		this.updateDate = updateDate;
-	} 
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
 }
@@ -19,6 +19,11 @@
 					 <i class="fa fa-info-circle font-dark"></i> 
 					 <span class="caption-subject font-dark sbold uppercase">线路详情</span>
 				</div>
+				<div class="actions">
+					<div class="btn-group btn-group-devided" data-toggle="buttons">
+						<a class="btn btn-circle blue" href="list.html" data-pjax><i class="fa fa-reply"></i> 返回</a>
+					</div>
+				</div>
 			</div>
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px">
@@ -122,6 +122,8 @@
 			}
 		});
 		page = 0;
+		
+		console.log(params);
 		loadTableDate(params,true);
 	});
@@ -44,19 +44,19 @@
 							<tr role="row" class="filter">
 								<td></td>
 								<td>
-									<input type="text"  class="form-control form-filter input-sm" name="lineCode">
+									<input type="text"  class="form-control form-filter input-sm" name="lineCode_eq">
 								</td>
 								<td>
-									<input type="text"  class="form-control form-filter input-sm" name="name">
+									<input type="text"  class="form-control form-filter input-sm" name="name_like">
 								</td>
 								<td>
-									 <select name="company" class="form-control" id="companySelect"></select>
+									 <select name="company_eq" class="form-control" id="companySelect"></select>
 								</td>
 								<td>
-									 <select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
+									 <select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select>
 								</td>
 								<td>
-									<select name="nature" class="form-control" id="natureSelect">
+									<select name="nature_like" class="form-control" id="natureSelect">
 										<option value="">请选择...</option>
 										<option value="lj">路救</option>
 										<option value="bc">备车</option>
@@ -71,7 +71,7 @@
 									</select>
 								</td>
 								<td>
-									<select name="level" class="form-control" id="levelSelect">
+									<select name="level_eq" class="form-control" id="levelSelect">
 										<option value="">请选择...</option>
 										<option value="1">一级线路</option>
 										<option value="2">二级线路</option>
@@ -79,10 +79,10 @@
 									</select>
 								</td>
 								<td>
-									 <input type="text" class="form-control form-filter input-sm" name="shanghaiLinecode">
+									 <input type="text" class="form-control form-filter input-sm" name="shanghaiLinecode_eq">
 								</td>
 								<td>
-									<select class="form-control form-filter " name="destroy">
+									<select class="form-control form-filter " name="destroy_eq">
                                          <option value="">请选择...</option>
                                          <option value="1">运营</option>
                                          <option value="0">撤销</option>
@@ -142,7 +142,7 @@
 				{{obj.destroy}}
 			</td>
 			<td>
-				<a href="lineinformation/lineinformation.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
+				<a href="/pages/base/lineinformation/list.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
 				<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
@@ -156,4 +156,4 @@
 		</tr>
 	{{/if}}
 </script>
-<script src="/pages/base/line/js/line-list-table.js"></script>
 \ No newline at end of file
+<script src="/pages/base/line/js/line-list-table.js"></script>
@@ -50,7 +50,7 @@
 							<option value="zc">正常</option>
 							<option value="qj">区间</option>
 							<option value="fk">放空</option>
-						</select>
+						 </select>
                      </div>
                 </div>
@@ -389,4 +389,4 @@
 		</form>
 	</div>
 </div>
-<script src="/pages/base/line/js/lineinformation-add-form.js"></script>
 \ No newline at end of file
+<script src="/pages/base/lineinformation/js/lineinformation-add-form.js"></script>
 \ No newline at end of file
@@ -5,10 +5,22 @@ $(function(){
 	if(lineId) {
-		$('.lineinformation_back').attr('href','/pages/base/line/lineinformation/lineinformation.html?lineId='+lineId);
+		$('.lineinformation_back').attr('href','/pages/base/lineinformation/list.html?lineId='+lineId);
 		$('#lineIdInput').val(lineId);
+		// 早高峰开始时间
+		$('#earlyStartTimeInput').val('06:31');
+		
+		// 早高峰结束时间
+		$('#earlyEndTimeInput').val('08:30');
+		
+		// 晚高峰开始时间
+		$('#lateStartTimeInput').val('16:01');
+		
+		// 晚高峰结束时间
+		$('#lateEndTimeInput').val('18:30');
+		
 		// 日期控件
 		$('#earlyStartTimeInput').datetimepicker({
@@ -443,7 +455,7 @@ $(function(){
 			btn : [ '返回' ],icon: 3, title:'提示'
 		}, function(index){
 			layer.close(index);
-			loadPage('lineinformation.html');
+			loadPage('/pages/base/lineinformation/list.html?lineId='+lineId);
 		});
 	}
@@ -3,30 +3,31 @@ $(function(){
 	// 获取参数ID
 	var lineId = $.url().param('lineId');
+	// 如果不为空
 	if(lineId) {
-		$('#lineinformation_add').attr('href','lineinformation_add.html?lineId='+lineId);
+		$('#lineinformation_add').attr('href','add.html?lineId='+lineId);
-		$.get('/line',{id_eq:lineId},function(result){
+		$get('/lineInformation',{'line.id_eq':lineId},function(result) {
-			if(result) {
+			var len = result.content.length;
+			
+			var tbodyHtml;
+			
+			if(len>0) {
-				var tbodyHtml;
+				//  先一个线路对应一个线路标准
+				$('#lineinformation_add').hide();
-				if(result.lineInformation) {
-					
-					tbodyHtml = template('lineinformation_table_temp',{list:result.content});
-					
-				} else {
-
-					tbodyHtml = '<tr><td colspan=9><h6 class="muted">没有找到相关数据</h6></td></tr>'
-						
-				}
+				tbodyHtml = template('lineinformation_table_temp',{list : result.content});
-				$('#datatable_lineinformation tbody').html(tbodyHtml);
+			} else {
+				tbodyHtml = '<tr><td colspan=9><h6 class="muted">没有找到相关数据</h6></td></tr>'
 			}
-			
+				
+			$('#datatable_lineinformation tbody').html(tbodyHtml);
+				
 		});
@@ -37,7 +38,7 @@ $(function(){
 			btn : [ '返回' ],icon: 3, title:'提示'
 		}, function(index){
 			layer.close(index);
-			loadPage('list.html');
+			loadPage('/pages/base/line/list.html');
 		});
 	}
@@ -21,7 +21,10 @@
 				</div>
 				<div class="actions">
 					<div class="btn-group btn-group-devided" data-toggle="buttons">
-						<a class="btn btn-circle blue" href="lineinformation_add.html" id="lineinformation_add" data-pjax><i class="fa fa-plus"></i> 添加线路标准信息</a>
+						<a class="btn btn-circle blue" href="add.html" id="lineinformation_add" data-pjax><i class="fa fa-plus"></i> 添加线路标准信息</a>
+					</div>
+					<div class="btn-group btn-group-devided" data-toggle="buttons">
+						<a class="btn btn-circle blue" href="/pages/base/line/list.html" data-pjax><i class="fa fa-reply"></i> 返回</a>
 					</div>
 				</div>
 			</div>
@@ -40,6 +43,7 @@
 								<th width="10%">下行行驶时间</th>
 								<th width="15%">操作</th>
 							</tr>
+							<!--  
 							<tr role="row" class="filter">
 								<td></td>
 								<td>
@@ -49,11 +53,12 @@
 									<input type="text"  class="form-control form-filter input-sm" name="name">
 								</td>
 								<td>
-									 <select class="form-control form-filter " name="destroy">
-                                         <option value="">请选择...</option>
-                                         <option value="1">运营</option>
-                                         <option value="0">撤销</option>
-                                     </select>
+									<select name="type" class="form-control" id="typeInput">
+										<option value="">请选择...</option>
+										<option value="zc">正常</option>
+										<option value="qj">区间</option>
+										<option value="fk">放空</option>
+							 		</select>
 								</td>
 								<td>
 									 <input type="text"  class="form-control form-filter input-sm" name="name">
@@ -77,6 +82,7 @@
 									</button>
 								</td>
 							</tr>
+							-->
 						</thead>
 						<tbody></tbody>
 					</table>
@@ -92,34 +98,34 @@
 	{{each list as obj i }}
 		<tr>
 			<td style="vertical-align: middle;">
-				<input type="checkbox" class="group-checkable icheck" data-id="{{obj.lineInformation.id}}">
+				<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
 			</td>
 			<td>
-				{{obj.lineCode}}
+				{{obj.line.lineCode}}
 			</td>
 			<td>
-				{{obj.name}}
+				{{obj.line.name}}
 			</td>
 			<td>
-				{{obj.lineInformation.type}}
+				{{obj.type}}
 			</td>
 			<td>
-				{{obj.lineInformation.upMileage}}
+				{{obj.upMileage}}
 			</td>
 			<td>
-				{{obj.lineInformation.downMileage}}
+				{{obj.downMileage}}
 			</td>
 			<td>
-				{{obj.lineInformation.upTravelTime}}
+				{{obj.upTravelTime}}
 			</td>
 			<td>
-				{{obj.lineInformation.downTravelTime}}
+				{{obj.downTravelTime}}
 			</td>
 			<td>
-				<a href="details.html?lineId={{obj.lineInformation.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
-				<a href="edit.html?lineId={{obj.lineInformation.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+				<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
+				<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
 			</td>
 		</tr>
 	{{/each}}
 </script>
-<script src="/pages/base/line/js/lineinformation-list-table.js"></script>
 \ No newline at end of file
+<script src="/pages/base/lineinformation/js/lineinformation-list-table.js"></script>
 \ No newline at end of file