Merge branch 'master' of http://222.66.0.204:8090/panzhaov5/bsth_control

徐烜
2 parents a6aa90e0 d39a7c94
Showing 31 changed files with 264 additions and 146 deletions
src/main/java/com/bsth/controller/CarParkController.java
src/main/java/com/bsth/entity/LineInformation.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/CarParkRepository.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/impl/CarParkServiceImpl.java
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
src/main/resources/ftp.properties
src/main/resources/static/pages/base/carpark/add.html
src/main/resources/static/pages/base/carpark/edit.html
src/main/resources/static/pages/base/carpark/edit_select.html
src/main/resources/static/pages/base/carpark/js/add-form-reload.js
src/main/resources/static/pages/base/carpark/js/add-form-wizard.js
src/main/resources/static/pages/base/carpark/js/add-input-function.js
src/main/resources/static/pages/base/carpark/js/carpark-list-table.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-function.js
src/main/resources/static/pages/base/carpark/list.html
src/main/resources/static/pages/base/line/add.html
src/main/resources/static/pages/base/line/details.html
src/main/resources/static/pages/base/line/edit.html
 package com.bsth.controller;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,8 +25,13 @@ public class CarParkController extends BaseController&lt;CarPark, Integer&gt; {
 	 * @return int <carParkCode 停车场编码>
 	 */
 	@RequestMapping(value="getCarParkCode" , method = RequestMethod.GET)
-	public long getStationCode() {
-		return GetUIDAndCode.getCarParkId();
+	public Map<String, Object> getStationCode() {
+		
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		
+		resultMap.put("carParkCode", "FFFF" + GetUIDAndCode.getCarParkId());
+		
+		return resultMap;
 	}
@@ -321,7 +321,6 @@ public class LineInformation {
 	public void setTroughDownTime(Double troughDownTime) {
 		this.troughDownTime = troughDownTime;
 	}
-
 	public String getCarPark() {
 		return carPark;
 	}
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
 import java.util.Date;
@@ -20,16 +20,23 @@ public interface CarParkRepository extends BaseRepository&lt;CarPark, Integer&gt;{
 	@Transactional
     @Modifying
     @Query(value="INSERT INTO bsth_c_car_park (" +
-    			 "id , area , company , park_code , park_name , " +
-    			 "branche_company , create_by , create_date , descriptions , destroy," +
-    			 "update_by, update_date , versions , b_center_point , b_park_point , " +
-    			 "db_type, g_center_point, g_park_point, radius, shapes_type) " +
+    			 " area , company , park_code , park_name , branche_company , " +
+    		
+    			 "create_by , create_date , descriptions , destroy, update_by, " +
+    			 
+    			 "update_date , versions , b_center_point , b_park_point ,db_type, " +
+    			 
+    			 "g_center_point, g_park_point, radius, shapes_type) " +
+    			 
     			 " VALUES(" +
     			 "?1 , ?2 , ?3 , ?4 , ?5," +
-    			 "?6 , ?7 , str_to_date(?8,'%Y-%m-%d %H:%i:%s') , ?9 , ?10," +
-    			 "?11,str_to_date(?12,'%Y-%m-%d %H:%i:%s') ,?13, ?14, GeomFromText(?15), " +
-    			 "?16, ?17,GeomFromText(?18),?19,?20)", nativeQuery=true)
-	public void carParkSave(Integer id,Double area,String company,String parkCode,String parkName,
+    			 
+    			 "?6 ,  str_to_date(?7,'%Y-%m-%d %H:%i:%s') , ?8 , ?9 , ?10," +
+    			 
+    			 "str_to_date(?11,'%Y-%m-%d %H:%i:%s'), ?12 ,?13,GeomFromText(?14), ?15, " +
+    			 
+    			 "?16, GeomFromText(?17), ?18,?19)", nativeQuery=true)
+	public void carParkSave(Double area,String company,String parkCode,String parkName,
 							String brancheCompany,Integer createBy,String createDate,String descriptions,Integer destroy,
@@ -3,6 +3,7 @@ package com.bsth.repository.schedule;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.BaseRepository;
+import java.util.Date;
 import java.util.List;
 import org.springframework.data.domain.Page;
@@ -17,7 +18,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanInfo, Long> {
-	@Query(value = "select * from bsth_c_s_sp_info where DATE_FORMAT(schedule_date, '%Y-%m-%d')=?1", nativeQuery = true)
-	List<SchedulePlanInfo> findByDate(String dateformat);
+	@Query(value = "select s from SchedulePlanInfo s where scheduleDate=?1")
+	List<SchedulePlanInfo> findByDate(Date date);
 }
@@ -35,7 +35,7 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 			String parkCode = map.get("parkCode").equals("") ? null : map.get("parkCode").toString();
 			// 停车场id
-			Integer id = Integer.parseInt(parkCode);
+			// Integer id = Integer.parseInt(parkCode);
 			// 停车场名称
 			String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
@@ -113,13 +113,14 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 			Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
 			// 面积
-			double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
+			Double area = map.get("area").equals("") ? 0.0 : Double.parseDouble(map.get("area").toString());
 			// 公司
 			String company = map.get("company").equals("") ? "" : map.get("company").toString();
 			// 分公司
-			String brancheCompany = map.get("brancheCompany").equals("") ? "" : map.get("brancheCompany").toString();
+			/*String brancheCompany = map.get("brancheCompany").equals("") ? "" : map.get("brancheCompany").toString();*/
+			String brancheCompany="";
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
@@ -146,7 +147,7 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 			// 修改人
 			Integer updateBy = map.get("updateBy").equals("") ? null : Integer.parseInt(map.get("updateBy").toString());
-			carParkRepository.carParkSave(id, area, company, parkCode, parkName, 
+			carParkRepository.carParkSave(area, company, parkCode, parkName, 
 										  brancheCompany, createBy, createDate, descriptions, destroy, 
@@ -260,7 +261,7 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 			if(id!=null) {
 				// 面积
-				double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
+				Double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
 				// 中心点（百度坐标）
 				String bCenterPoint = map.get("bCenterPoint").equals("") ? "" : map.get("bCenterPoint").toString();
@@ -269,8 +270,9 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 				String bParkPoint = map.get("bParkPoint").equals("") ? "" : map.get("bParkPoint").toString();
 				// 分公司
-				String brancheCompany = map.get("brancheCompany").equals("")? "" :map.get("brancheCompany").toString();
-				
+				/*String brancheCompany = map.get("brancheCompany").equals("")? "" :map.get("brancheCompany").toString();*/
+				String brancheCompany = "";
+						
 				// 公司
 				String company = map.get("company").equals("") ? "" : map.get("company").toString();
@@ -16,6 +16,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.util.BatchSaveUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
 /**
  * 
@@ -36,6 +37,9 @@ public class GetSchedulePlanThread  extends Thread{
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
+	@Autowired
+	ObjectMapper objectMapper;
+	
 	SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 	@Override
@@ -53,7 +57,11 @@ public class GetSchedulePlanThread  extends Thread{
 				realList = scheduleRealInfoRepository.findByDate(cDate);
 			}
 			else{
-				List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(dateStr);
+				List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(cDate);
+				
+				for(SchedulePlanInfo sp : list){
+					sp.setSchedulePlan(null);
+				}
 				//实际排班计划
 				realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);
-#ftp.url=222.66.0.205
-#ftp.port=21
-#ftp.username=transport
-#ftp.password=transport123
-#ftp.path= down/
-
-ftp.url=192.168.168.101
+ftp.url=222.66.0.205
 ftp.port=21
-ftp.username=testftpservice
-ftp.password= 123
-ftp.path= ftptest/
 \ No newline at end of file
+ftp.username=transport
+ftp.password=transport123
+ftp.path= down/
+
+#ftp.url=192.168.168.101
+#ftp.port=21
+#ftp.username=testftpservice
+#ftp.password= 123
+#ftp.path= ftptest/
 \ No newline at end of file
@@ -235,7 +235,7 @@
 							<!-- 所属分公司 -->
-							<div class="form-body">
+							<!-- <div class="form-body">
 								<div class="form-group">
 									<label class="col-md-3 control-label">所属分公司：</label>
 									<div class="col-md-6">
@@ -243,7 +243,7 @@
 										</select>
 									</div>
 								</div>
-							</div>
+							</div> -->
 							<!-- 版本号 -->
@@ -344,12 +344,12 @@
                                </div>
                            </div>
-                           <div class="form-group">
+                         <!--   <div class="form-group">
                                <label class="control-label col-md-3">分公司:</label>
                                <div class="col-md-4">
                                    <p class="form-control-static" data-display="brancheCompany"> </p>
                                </div>
-                           </div>
+                           </div> -->
                            <div class="form-group">
                                <label class="control-label col-md-3">版本号:</label>
@@ -108,7 +108,7 @@
 					</div>
 					<!-- 所属分公司 -->
-					<div class="form-body">
+					<!-- <div class="form-body">
 						<div class="form-group">
 							<label class="col-md-3 control-label">所属分公司：</label>
 							<div class="col-md-6">
@@ -116,7 +116,7 @@
 								</select>
 							</div>
 						</div>
-					</div>
+					</div> -->
 					<!-- 版本号 -->
 					<div class="form-body">
@@ -181,17 +181,17 @@ $(&#39;#editPoitsions_carpark_mobal&#39;).on(&#39;editCarParkMobal_show&#39;, function(e, map,fu
 		$('#companySelect').val(businessCode);
 		/** 填充分公司下拉框 @param：<businessCode：公司代码> */
-		fun.getbrancheCompanyValues(businessCode,function() {
+		/* fun.getbrancheCompanyValues(businessCode,function() {
 			// 获取分公司元素并设值
 			$('#brancheCompanySelect').val(CarParkObj.carParkBrancheCompany);
-		});
+		}); */
 	});
 	// 公司值改变事件
-	$('#companySelect').on('change',companySelectChangeSetBrancheValue);
+	// $('#companySelect').on('change',companySelectChangeSetBrancheValue);
 	function companySelectChangeSetBrancheValue() {
@@ -102,12 +102,8 @@ $(&#39;#editPositions_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map,fun,
 			'carParkNamebox' : {
-				minlength : 2,
-				
 				required : true,
-				
-				maxlength : 10
-				
+				 
 			}
 		},
@@ -27,9 +27,9 @@
 		mapB = addCarParkVmapWorlds.init();
-		PublicFunctions.getCarParkCode(function(carParkCode) {
+		PublicFunctions.getCarParkCode(function(d) {
-			$('#parkCodeInput').val(carParkCode);
+			$('#parkCodeInput').val(d.carParkCode);
 		});
@@ -57,7 +57,7 @@
 		});
-		var htm = '<option value="">请选择...</option><optgroup label="公司">';
+		/*var htm = '<option value="">请选择...</option><optgroup label="公司">';
 		$('#brancheCompanySelect').html(htm).select2();
@@ -98,7 +98,7 @@
 			  }
 		});
-		
+		*/
 	}, 500);
@@ -80,11 +80,11 @@ var FormWizard = function() {
 					},
 					// 所属分公司
-					'brancheCompany' : {
+					/*'brancheCompany' : {
 						// 必填项
 						required : true,
-					}
+					}*/
 				},
@@ -27,9 +27,9 @@ var PublicFunctions = function () {
 			getBusinessAllInfo : function(cb) {
 				// 填充公司下拉框选择值
-				 $get('/business/all', {upCode_eq: '88'}, function(array){
+				 $get('/business/all', {upCode_eq: '77'}, function(array){
-					return cb && cb(array);
+					cb && cb(array);
 				});
@@ -37,9 +37,9 @@ var PublicFunctions = function () {
 			getCarParkCode : function(callback) {
-				$get('/carpark/getCarParkCode',null,function(carParkCode) {
+				$get('/carpark/getCarParkCode',null,function(d) {
-					callback && callback(carParkCode);
+					callback && callback(d);
 				});
@@ -48,6 +48,8 @@ var PublicFunctions = function () {
 			// 新增站点保存
 			carParkSave : function(carPark,callback) {
+				console.log(carPark);
+				
 				$post('/carpark/carParkSave',carPark,function(data) {
 					callback && callback(data);
@@ -13,7 +13,26 @@
  */
 (function(){
-	 
+	
+	/** 填充公司下拉框选择值 */
+	$get('/business/all', {upCode_eq: '77'}, function(array){
+		 
+		 // 公司下拉options属性值
+		 var options = '<option value="">请选择...</option>';
+		 
+		 // 遍历array
+		 $.each(array, function(i,d){
+			 
+			 options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
+			 
+		 });
+		 
+		 // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
+		 $('#companySelect').html(options)
+		 //$('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
+		 
+	 });
+	
 	/** page : 当前页  initPag : */
 	var page = 0,initPag;
@@ -170,6 +170,10 @@ var PublicFunctions = function () {
 							}
+						}else if( r[0].carParkCompany=='77'){
+							
+							companyV ='闵行公司'
+							
 						}
 						// 信息窗口类容
@@ -181,7 +185,7 @@ var PublicFunctions = function () {
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">范围类型：' +   shapesV + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' +   r[0].carParkRadius + '</span>' +
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">所属公司：' +   companyV + '</span>' +
-									'<span class="help-block" style="color:#DDD;font-size: 15px;">分　公司：' +    branchecomV+ '</span>' +
+									/*'<span class="help-block" style="color:#DDD;font-size: 15px;">分　公司：' +    branchecomV+ '</span>' +*/
 									'<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' +   r[0].carParkVersions + '</span>' +
 									'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD; overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ r[0].carParkDescriptions +'" >说明/描述：' + r[0].carParkDescriptions + '</span>' ;
@@ -255,7 +259,7 @@ var PublicFunctions = function () {
 			selectTemp : function(callback) {
 				// 填充公司下拉框选择值
-				$.get('/business/all', {upCode_eq: '88'}, function(array){
+				$.get('/business/all', {upCode_eq: '77'}, function(array){
 					 // 公司下拉options属性值
 					 var options = '<option value="">-- 请选择公司 --</option>';
@@ -34,7 +34,7 @@
 								<th width="8%">停车场编号</th>
 								<th width="8%">地理位置</th>
 								<th width="8%">面积</th>
-								<th width="8%">分公司</th>
+								<!-- <th width="8%">分公司</th> -->
 								<th width="8%">所属公司</th>
 								<th width="6%">版本号</th>
 								<th width="6%">是否撤销</th>
@@ -54,11 +54,11 @@
 								<td>
 									 <input type="text" class="form-control form-filter input-sm" name="area_eq">
 								</td>
-								<td>
+								<!-- <td>
 									 <input type="text" class="form-control form-filter input-sm" name="brancheCompany_eq">
-								</td>
+								</td> -->
 								<td>
-									<input type="text" class="form-control form-filter input-sm"  name="company_eq">
+									<select name="company_eq" class="form-control" id="companySelect"></select>
 								</td>
 								<td>
 									<input type="text" class="form-control form-filter input-sm"  name="versions_eq">
@@ -91,25 +91,9 @@
 		</div>
 	</div>
 </div>
-<script type="text/html" id="carpark_list_table_temp">
-	{{each list as obj i }}
-		<tr>
-			<td style="vertical-align: middle;">
-				 {{(list.page*10)+(i+1)}}
-			</td>
-			<td>
-				{{obj.parkName}}
-			</td>
-			<td>
-				{{obj.parkCode}}
-			</td>
-			<td>
-				{{obj.bCenterPoint}}
-			</td>
-			<td>
-				{{obj.area}}
-			</td>
-			<td>
+
+<!-- 
+
 				{{if obj.company == '55'}}
 					{{if obj.brancheCompany == '1'}}
@@ -163,6 +147,25 @@
 					{{/if}}
 				{{/if}}
+
+ -->
+<script type="text/html" id="carpark_list_table_temp">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				 {{(list.page*10)+(i+1)}}
+			</td>
+			<td>
+				{{obj.parkName}}
+			</td>
+			<td>
+				{{obj.parkCode}}
+			</td>
+			<td>
+				{{obj.bCenterPoint}}
+			</td>
+			<td>
+				{{obj.area}}
 			</td>
 			<td>
 				{{if obj.company == '55'}}
@@ -173,6 +176,8 @@
 					杨高公司
 				{{else if obj.company == '26'}}
 					南汇公司
+				{{else if obj.company == '77'}}
+					闵行公司
 				{{/if}}
 			</td>
 			<td>
@@ -82,12 +82,12 @@
                 </div>
                 <!-- 所属分公司 -->
-                <div class="form-group">
+               <!--  <div class="form-group">
                  	<label class="control-label col-md-3"> 所属分公司：</label>
                     <div class="col-md-4">
                      	<select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
                     </div>
-                </div>
+                </div> -->
                 <!-- 线路性质 -->
                 <div class="form-group">
@@ -72,12 +72,12 @@
                 </div>
                 <!-- 所属分公司 -->
-                <div class="form-group">
+               <!--  <div class="form-group">
                  	<label class="control-label col-md-3"> 所属分公司：</label>
                     <div class="col-md-4">
                      	<select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
                     </div>
-                </div>
+                </div> -->
                 <!-- 线路性质 -->
                 <div class="form-group">
@@ -80,12 +80,12 @@
                 </div>
                 <!-- 所属分公司 -->
-                <div class="form-group">
+                <!-- <div class="form-group">
                  	<label class="control-label col-md-3"> 所属分公司：</label>
                     <div class="col-md-4">
                      	<select name="brancheCompany" class="form-control" id="brancheCompanySelect"></select>
                     </div>
-                </div>
+                </div> -->
                 <!-- 线路性质 -->
                 <div class="form-group">
@@ -6,8 +6,6 @@ $(function(){
 		// 获取线路编码
 		$.get('/line/getLineCode',function(lineCode){
-			console.log(lineCode);
-			
 			return cb && cb(lineCode);
 		});
@@ -49,7 +47,7 @@ $(function(){
 	 });
 	 // 填充公司下拉框选择值
-	 $get('/business/all', {upCode_eq: '88'}, function(array){
+	 $get('/business/all', {upCode_eq: '77'}, function(array){
 		 // 公司下拉options属性值
 		 var options = '<option value="">-- 请选择公司 --</option>';
@@ -62,12 +60,13 @@ $(function(){
 		 });
 		 // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
-		 $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
+		 $('#companySelect').html(options)
+		 // $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
 	 });
 	 // 填充分公司下拉框
-	 setbrancheCompanySelectOptions();
+	 // setbrancheCompanySelectOptions();
 	 // 填充分公司下拉框选择值
 	 function setbrancheCompanySelectOptions(){
@@ -25,17 +25,17 @@ $(function(){
 					// 获取表单元素并设置Disabled属性
 					$('input,select,textarea','#line_details_form').attr('Disabled','Disabled');
-					
+					 
 					// 设置公司值
 					$('#companySelect').val(result.company);
 					// 填充分公司下拉框选择值
-					getbrancheCompanyValues(result.company,function(){
+					/*getbrancheCompanyValues(result.company,function(){
 						// 设置分公司
 						$('#brancheCompanySelect').val(result.brancheCompany);
-					});
+					});*/
 				}
@@ -61,7 +61,7 @@ $(function(){
 	function selectTemp(callback) {
 		// 填充公司下拉框选择值
-		$.get('/business/all', {upCode_eq: '88'}, function(array){
+		$.get('/business/all', {upCode_eq: '77'}, function(array){
 			 // 公司下拉options属性值
 			 var options = '<option value="">-- 请选择公司 --</option>';
@@ -76,7 +76,7 @@ $(function(){
 			 // 填充公司下拉框options
 			 $('#companySelect').html(options);
-			 return callback && callback();
+			 callback && callback();
 		 });
 	}
@@ -31,12 +31,12 @@
 					$('#companySelect').val(result.company);
 					// 填充分公司下拉框选择值
-					getbrancheCompanyValues(result.company,function(){
+				/*	getbrancheCompanyValues(result.company,function(){
 						// 设置分公司
 						$('#brancheCompanySelect').val(result.brancheCompany);
-					});
+					});*/
 				}
@@ -78,7 +78,7 @@
 	function selectTemp(callback) {
 		// 填充公司下拉框选择值
-		$.get('/business/all', {upCode_eq: '88'}, function(array){
+		$.get('/business/all', {upCode_eq: '77'}, function(array){
 			 // 公司下拉options属性值
 			 var options = '<option value="">-- 请选择公司 --</option>';
@@ -132,7 +132,7 @@
 	 }
 	// 公司值改变事件
-	$('#companySelect').on('change',companySelectChangeSetBrancheValue);
+	// $('#companySelect').on('change',companySelectChangeSetBrancheValue);
 	function companySelectChangeSetBrancheValue() {
@@ -15,7 +15,7 @@
 (function(){
 	/** 填充公司下拉框选择值 */
-	$get('/business/all', {upCode_eq: '88'}, function(array){
+	$get('/business/all', {upCode_eq: '77'}, function(array){
 		 // 公司下拉options属性值
 		 var options = '<option value="">请选择...</option>';
@@ -28,7 +28,8 @@
 		 });
 		 // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
-		 $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
+		 $('#companySelect').html(options)
+		 //$('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
 	 });
@@ -53,7 +53,7 @@
 								<th width="7%">线路编码</th>
 								<th width="8%">线路名称</th>
 								<th width="7%">所属公司</th>
-								<th width="8%">所属分公司</th>
+								<!-- <th width="8%">所属分公司</th> -->
 								<th width="6%">线路性质</th>
 								<th width="6%">线路等级</th>
 								<th width="7%">上海市线路编码</th>
@@ -74,9 +74,9 @@
 								<td>
 									 <select name="company_eq" class="form-control" id="companySelect"></select>
 								</td>
-								<td>
+								<!-- <td>
 									 <select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select>
-								</td>
+								</td> -->
 								<td>
 									<select name="nature_like" class="form-control" id="natureSelect">
 										<option value="">请选择...</option>
@@ -137,36 +137,10 @@
 </div>
 <!-- 
-<td style="vertical-align: middle;">
-	<input type="checkbox" class="group-checkable icheck" value="{{obj.name}}" id="{{obj.id}}" data-id="{{obj.id}}" data-lineName="{{obj.name}}">
-</td>
- -->
-<script type="text/html" id="line_list_temp">
-	{{each list as obj i }}
-		<tr>
 			<td style="vertical-align: middle;">
 				<input type="checkbox" class="group-checkable icheck" value="{{obj.name}}" id="{{obj.id}}" data-id="{{obj.id}}" data-lineName="{{obj.name}}">
 			</td>
-			<td style="vertical-align: middle;">
-				{{(list.page*10)+(i+1)}}
-			</td>
-			<td>
-				{{obj.lineCode}}
-			</td>
-			<td>
-				{{obj.name}}
-			</td>
-			<td>
-				{{if obj.company == '55'}}
-					上南公司
-				{{else if obj.company == '22'}}
-					金高公司
-				{{else if obj.company == '05'}}
-					杨高公司
-				{{else if obj.company == '26'}}
-					南汇公司
-				{{/if}}
-			</td>
+
 			<td>
 				{{if obj.company == '55'}}
@@ -222,6 +196,36 @@
 				{{/if}}
 			</td>
+ -->
+<script type="text/html" id="line_list_temp">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				<input type="checkbox" class="group-checkable icheck" value="{{obj.name}}" id="{{obj.id}}" data-id="{{obj.id}}" data-lineName="{{obj.name}}">
+			</td>
+			<td style="vertical-align: middle;">
+				{{(list.page*10)+(i+1)}}
+			</td>
+			<td>
+				{{obj.lineCode}}
+			</td>
+			<td>
+				{{obj.name}}
+			</td>
+			<td>
+				{{if obj.company == '55'}}
+					上南公司
+				{{else if obj.company == '22'}}
+					金高公司
+				{{else if obj.company == '05'}}
+					杨高公司
+				{{else if obj.company == '26'}}
+					南汇公司
+				{{else if obj.company == '77'}}
+					闵行公司
+				{{/if}}
+			</td>
+			
 			<td>
 				{{if obj.nature == 'lj'}}
 						路救
@@ -220,7 +220,8 @@
                 <div class="form-group">
                 	<label class="control-label col-md-3"> 停车场 ： </label>
                     <div class="col-md-4">
-                    	<input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场">
+                    	<select name="carPark" class="form-control" id="carParkSelect"></select>
+                    	<!-- <input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场"> -->
                     </div>
                 </div>
@@ -227,7 +227,8 @@
                 <div class="form-group">
                 	<label class="control-label col-md-3"> 停车场 ： </label>
                     <div class="col-md-4">
-                    	<input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场">
+                    	<select name="carPark" class="form-control" id="carParkSelect"></select>
+                    	<!-- <input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场"> -->
                     </div>
                 </div>
@@ -230,7 +230,8 @@
                 <div class="form-group">
                 	<label class="control-label col-md-3"> 停车场 ： </label>
                     <div class="col-md-4">
-                    	<input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场">
+                    	<select name="carPark" class="form-control" id="carParkSelect"></select>
+                    	<!-- <input type="text" class="form-control" name="carPark" id="carParkInput" placeholder="停车场"> -->
                     </div>
                 </div>
@@ -5,6 +5,22 @@ $(function(){
 	if(lineId) {
+		$get('/carpark/all',null, function(array){
+			 
+			 // 停车场下拉options属性值
+			 var options = '<option value="">-- 请选择停车场 --</option>';
+			 
+			 // 遍历array
+			 $.each(array, function(i,d){
+				 
+				 options += '<option value="'+d.parkCode+'">'+d.parkName+'</option>';
+				 
+			 });
+			 
+			 $('#carParkSelect').html(options)
+			 
+		 });
+		
 		$('.lineinformation_back').attr('href','/pages/base/lineinformation/list.html?no='+lineId);
 		$('#lineIdInput').val(lineId);
@@ -33,11 +33,38 @@ $(function() {
 			// 如果不为空
 			if(result) {
-				// 获取表单元素下的元素并设置值
+				$get('/carpark/all',null, function(array){
+					 
+					 // 停车场下拉options属性值
+					 var options = '<option value="">-- 请选择停车场 --</option>';
+					 
+					 // 遍历array
+					 $.each(array, function(i,d){
+						 
+						 options += '<option value="'+d.parkCode+'">'+d.parkName+'</option>';
+						 
+					 });
+					 
+					$('#carParkSelect').html(options)
+					 
+					// 获取线路标准类型并设值
+					$('#typeInput').val(result.type);
+					
+					// 获取表单元素下的元素并设值
+					putFormData(result, '#lineinformation_details_form');
+					
+					$('#carParkSelect').val(result.carPark);
+					
+					// 获取线路ID元素并设值
+					// $('#lineIdInput').val(lineId);
+					 
+				 });
+				
+			/*	// 获取表单元素下的元素并设置值
 				putFormData(result, '#lineinformation_details_form');
 				// 获取线路标注类型设置值
-				$('#typeInput').val(result.type);
+				$('#typeInput').val(result.type);*/
 			}
@@ -33,14 +33,32 @@ $(function() {
 			// 如果不为空
 			if(result) {
-				// 获取线路标准类型并设值
-				$('#typeInput').val(result.type);
-				
-				// 获取表单元素下的元素并设值
-				putFormData(result, '#lineinformation_edit_form');
-				
-				// 获取线路ID元素并设值
-				$('#lineIdInput').val(lineId);
+				$get('/carpark/all',null, function(array){
+					 
+					 // 停车场下拉options属性值
+					 var options = '<option value="">-- 请选择停车场 --</option>';
+					 
+					 // 遍历array
+					 $.each(array, function(i,d){
+						 
+						 options += '<option value="'+d.parkCode+'">'+d.parkName+'</option>';
+						 
+					 });
+					 
+					 $('#carParkSelect').html(options)
+					 
+					// 获取线路标准类型并设值
+					$('#typeInput').val(result.type);
+					
+					// 获取表单元素下的元素并设值
+					putFormData(result, '#lineinformation_edit_form');
+					
+					$('#carParkSelect').val(result.carPark);
+					
+					// 获取线路ID元素并设值
+					$('#lineIdInput').val(lineId);
+					 
+				 });
 			}