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

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents cab5a240 9d2b8f73
Showing 6 changed files with 10 additions and 11 deletions
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/pages/base/roadspeed/add.html
src/main/resources/static/pages/base/roadspeed/editroadspeed.html
src/main/resources/static/pages/base/roadspeed/js/add-form-wizard.js
src/main/resources/static/pages/base/roadspeed/js/add-vmap-world.js
src/main/resources/static/real_control_v2/main.html
@@ -347,7 +347,7 @@
 				<a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
-				<a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
+				<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
 				<a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
@@ -102,10 +102,10 @@
 								<div class="col-md-9">
 									<div class="icheck-list">
 										<label>
-											<input type="radio" class="icheck" name="baseRes" value=0 > 系统生成
+											<input type="radio" class="icheck" name="baseRes" value=0 checked> 系统生成
 										</label>
 										<label >
-											<input type="radio" class="icheck" name="baseRes" value=1 checked> 手动添加
+											<input type="radio" class="icheck" name="baseRes" value=1 > 手动添加
 										</label>
 									</div>
 								</div>
@@ -155,7 +155,7 @@ $(&#39;#edit_roadspeed_mobal&#39;).on(&#39;editRoadspeedMobal_show&#39;, function(e, map_,ajaxd,
 		},
 		submitHandler : function(f) {
 			var params = form.serializeJSON();
-			params.bRoadVector = EditRoadspeedObj.getEitdRoadspeed().bRoadVector;
+			params.bRoadVector = Roadspeed.bRoadVector;
 			error.hide();
 			ajaxd.roadspeedUpdate(params,function(resuntDate) {
 				if(resuntDate.status=='SUCCESS') {
@@ -164,7 +164,6 @@ $(&#39;#edit_roadspeed_mobal&#39;).on(&#39;editRoadspeedMobal_show&#39;, function(e, map_,ajaxd,
 				}else {
 					// 弹出添加失败提示消息
 					layer.msg('修改失败...');
-					
 				}
 				$('#edit_roadspeed_mobal').modal('hide');
 				closeMobleSetClean();
@@ -146,8 +146,8 @@ var FormWizard = function() {
                     	var stationStartValue = $('#stationStartInput').val();
                     	var stationEndValue = $('#stationEndInput').val();
                     	var paramsStationsArray = [];
-                    	paramsStationsArray[0] = stationStartValue+'公交车站';
-                    	paramsStationsArray[1]= stationEndValue+'公交车站';
+                    	paramsStationsArray[0] = stationStartValue;
+                    	paramsStationsArray[1]= stationEndValue;
                     	$('#nameInput').val(stationStartValue + '至' + stationEndValue );
                     	if(baseResValue == 0) {
                     		$('.leftUtils').hide();
@@ -161,8 +161,8 @@ var FormWizard = function() {
                 				});
                 			});
                     	}else if(baseResValue ==1) {
-                    		SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue+'公交车站');
-                        	SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue+'公交车站');
+                    		SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue);
+                        	SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue);
 //                    		SectionVmapWorlds.drawingManagerOpen();
                     	}
                     	$('html,body').animate({scrollTop: ($('#form-wizard-info').offset().top-5) + "px"},500);
@@ -174,7 +174,7 @@ var SectionVmapWorlds = function() {
 					 var f = arguments.callee;
 					 var poiOne =  new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat);
 					 var poiTwo =  new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat);
-					 var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB},onPolylinesSet: searchPolylinesSet});
+					 var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB,enableDragging : true},onPolylinesSet: searchPolylinesSet});
 					 function searchPolylinesSet(results){
 						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
 						 }else {
@@ -117,7 +117,7 @@
 <!-- 高德  -->
 <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
 <!-- jquery -->
-<script src="http://180.168.57.114:4244/Scripts/jquery-3.2.1.min.js"></script>
+<script src="/real_control_v2/assets/js/jquery.min.js"></script>
 <!-- jquery actual -->
 <script src="/real_control_v2/assets/js/jquery.actual.min.js" merge="plugins"></script>
 <!-- jquery.serializejson JSON序列化插件 -->