1.站点公司、分公司字段加入完善

王通
1 parent 81c42c3c
Showing 7 changed files with 147 additions and 18 deletions
src/main/java/com/bsth/entity/Station.java
src/main/resources/static/pages/base/section/js/section-operation.js
src/main/resources/static/pages/base/station/add.html
src/main/resources/static/pages/base/station/edit.html
src/main/resources/static/pages/base/station/js/add-form-wizard.js
src/main/resources/static/pages/base/station/js/add-vmap-world.js
src/main/resources/static/pages/base/station/list.html
 package com.bsth.entity;
+import com.bsth.data.BasicData;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.geolatte.geom.Point;
@@ -346,6 +347,9 @@ public class Station {
 	}
 	public String getCompanyName() {
+		if (company != null) {
+			return BasicData.businessCodeNameMap.get(company);
+		}
 		return companyName;
 	}
@@ -362,6 +366,9 @@ public class Station {
 	}
 	public String getBrancheCompanyName() {
+		if (company != null && brancheCompany != null) {
+			return BasicData.businessFgsCodeNameMap.get(String.format("%s_%s", brancheCompany, company));
+		}
 		return brancheCompanyName;
 	}
@@ -2,9 +2,9 @@ var SectionOperation = function () {
 	var map, type = 0, editSection;
 	var operation = {
 		initMap: function() {
-			var CENTER_POINT = {lng: 121.528733,lat: 31.237425};
+			//var CENTER_POINT = {lng: 121.528733,lat: 31.237425};
 			map = new BMap.Map('map_section');
-			map.centerAndZoom(new BMap.Point(CENTER_POINT.lng, CENTER_POINT.lat), 15);
+			map.centerAndZoom('成都', 15);
 			map.enableDragging();
 			map.enableScrollWheelZoom();
 			map.disableDoubleClickZoom();
@@ -122,6 +122,30 @@
 									</div>
 								</div>
 							</div>
+							<!-- 公司 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="control-label col-md-3">
+										<span class="required"> * </span> 公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+									</label>
+									<div class="col-md-7">
+										<select name="company" id="companySelect" class="form-control">
+										</select>
+									</div>
+								</div>
+							</div>
+							<!-- 分公司 -->
+							<div class="form-body">
+								<div class="form-group">
+									<label class="control-label col-md-3">
+										<span class="required"> * </span> 分公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+									</label>
+									<div class="col-md-7">
+										<select name="brancheCompany" id="brancheCompanySelect" class="form-control">
+										</select>
+									</div>
+								</div>
+							</div>
 							<!-- 站点名称 -->
 							<div class="form-body">
 								<div class="form-group">
@@ -28,6 +28,30 @@
 							</div>
 						</div>
 					</div>
+					<!-- 公司 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								<span class="required"> * </span> 公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+							</label>
+							<div class="col-md-7">
+								<select name="company" id="companySelect" class="form-control">
+								</select>
+							</div>
+						</div>
+					</div>
+					<!-- 分公司 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								<span class="required"> * </span> 分公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+							</label>
+							<div class="col-md-7">
+								<select name="brancheCompany" id="brancheCompanySelect" class="form-control">
+								</select>
+							</div>
+						</div>
+					</div>
 					<!-- 经纬度 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -138,6 +162,7 @@
 </div>
 <script type="text/javascript">
 $('#edit_station_modal').on('modal.show', function(e, map,fun,stat){
+	var code2company = {}, cgsbm = [];
 	layer.closeAll();
 	// 获取站点对象信息
 	var station = stat.getAddStation();
@@ -157,6 +182,42 @@ $(&#39;#edit_station_modal&#39;).on(&#39;modal.show&#39;, function(e, map,fun,stat){
 		map.clearMarkAndOverlays();
 		fun.initStationInfo(station.id);
 	}
+
+	function getComp(cb) {
+		$.get('/user/companyData',null,function(rs) {
+			return cb && cb(rs);
+		});
+	}
+
+	$.ajaxSettings.async = false;
+	getComp(function(rs) {
+		var html = new Array('');
+		for (var i = 0;i < rs.length;i++) {
+			var item = rs[i], children = item.children;
+			var company = {};
+			company.name = item.companyName;
+			company.children = children;
+			for (var j = 0;j < children.length;j++) {
+				cgsbm.push(item.companyCode + '_' + children[j].code);
+			}
+			code2company[item.companyCode] = company;
+			html.push('<option value="', item.companyCode, '">', item.companyName, '</option>');
+		}
+
+		$('#companySelect').html(html.join(''));
+		$('#companySelect').on('change', function() {
+			var companyCode = $(this).val(), html = [];
+			if (companyCode) {
+				for (var i = 0;i < code2company[companyCode].children.length;i++) {
+					var item = code2company[companyCode].children[i];
+					html.push('<option value="', item.code, '">', item.name, '</option>');
+				}
+			}
+			$('#brancheCompanySelect').html(html.join(''));
+		}).val(station.company).trigger('change');
+	})
+	$.ajaxSettings.async = true;
+
 	// 编辑表单元素
 	var form = $('#edit_station_form');
 	// 获取错误提示元素
@@ -168,21 +229,21 @@ $(&#39;#edit_station_modal&#39;).on(&#39;modal.show&#39;, function(e, map,fun,stat){
 	});
 	// 表单验证
 	form.validate({
-		errorElement : 'span', 
-		errorClass : 'help-block help-block-error', 
-		focusInvalid : false, 
+		errorElement : 'span',
+		errorClass : 'help-block help-block-error',
+		focusInvalid : false,
 		rules : {
 			'stationName' : {required : true}
 		},
-		invalidHandler : function(event, validator) {   
+		invalidHandler : function(event, validator) {
 			error.show();
 			App.scrollTo(error, -200);
 		},
-		highlight : function(element) { 
-			$(element).closest('.form-group').addClass('has-error'); 
+		highlight : function(element) {
+			$(element).closest('.form-group').addClass('has-error');
 		},
-		unhighlight : function(element) { 
-			$(element).closest('.form-group').removeClass('has-error'); 
+		unhighlight : function(element) {
+			$(element).closest('.form-group').removeClass('has-error');
 		},
 		success : function(label) {
 			label.closest('.form-group').removeClass('has-error');
@@ -5,6 +5,8 @@
  */
 var FormWizard = function() {
+	var code2company = {}, cgsbm = [];
+
 	return {
 		// 启动初始化向导导航
 		init : function() {
@@ -141,6 +143,13 @@ var FormWizard = function() {
                     }
                 });
             }
+
+			function getComp(cb) {
+				$.get('/user/companyData',null,function(rs) {
+					return cb && cb(rs);
+				});
+			}
+
 			/** 按钮点击时触发 */
 			var handleTitle = function(tab, navigation, index) {
 				// 定义导航条标签个数
@@ -179,6 +188,34 @@ var FormWizard = function() {
                     	$('html,body').animate({scrollTop: ($('#form-wizard-info').offset().top-5) + "px"},500);
                 	},300)
                 }else if(current==3) {
+					$.ajaxSettings.async = false;
+					getComp(function(rs) {
+						var html = new Array();
+						for (var i = 0;i < rs.length;i++) {
+							var item = rs[i], children = item.children;
+							var company = {};
+							company.name = item.companyName;
+							company.children = children;
+							for (var j = 0;j < children.length;j++) {
+								cgsbm.push(item.companyCode + '_' + children[j].code);
+							}
+							code2company[item.companyCode] = company;
+							html.push('<option value="', item.companyCode, '">', item.companyName, '</option>');
+						}
+
+						$('#companySelect').html(html.join(''));
+						$('#companySelect').on('change', function() {
+							var companyCode = $(this).val(), html = [];
+							if (companyCode) {
+								for (var i = 0;i < code2company[companyCode].children.length;i++) {
+									var item = code2company[companyCode].children[i];
+									html.push('<option value="', item.code, '">', item.name, '</option>');
+								}
+							}
+							$('#brancheCompanySelect').html(html.join(''));
+						}).trigger('change');
+					})
+					$.ajaxSettings.async = true;
                 	setTimeout(function(){
                 		$('html,body').animate({scrollTop: ($('#tab3').offset().top-70) + "px"});
                 	},500);
@@ -3,11 +3,11 @@ var StationPVmapWorlds = function() {
 	var Bmap = {
 			init : function() {
 				// 设置中心点,
-				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				//var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
 				// 初始化百度地图
 				mapB = new BMap.Map("stationbmap_basic");
 				//中心点和缩放级别
-				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
+				mapB.centerAndZoom('成都', 15);
 				//启用地图拖拽事件，默认启用(可不写)
 				mapB.enableDragging(); 
 				//启用地图滚轮放大缩小
@@ -119,6 +119,12 @@
 				{{obj.stationCode}}
 			</td>
 			<td>
+				{{obj.companyName}}
+			</td>
+			<td>
+				{{obj.brancheCompanyName}}
+			</td>
+			<td>
 				{{obj.passLines}}
 			</td>
 			<td>
@@ -139,12 +145,6 @@
 				{{/if}}
 			</td>
 			<td>
-				{{obj.roadCoding}}
-			</td>
-			<td>
-				{{obj.address}}
-			</td>
-			<td>
 				<a href="positions.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 定位 </a>
 			</td>
 		</tr>