Signed-off-by: yrf123456 <463058651@qq.com>

游瑞烽
1 parent fc19cbfd
Showing 4 changed files with 93 additions and 16 deletions
src/main/resources/static/pages/base/line/css/bmap_base.css
src/main/resources/static/pages/base/line/editRoute.html
src/main/resources/static/pages/base/line/editsection.html
src/main/resources/static/pages/base/line/map.html
+#bmap_basic{
+	min-width: 100%;
+	width: calc(100% + 26px); 
+	margin-top: -28px;
+	border: 2px solid #fdfdfd;
+	min-height: 1200px;
+	height:100%;
+	overflow: hidden;
+}
+
+html,body{
+	overflow:hidden;
+}
+
+.caption {
+    color: #B7B7B7;
+    font-size: 18px;
+  
+    position: relative;
+    margin: 15px;
+   
+    font-family: 微软;
+}
+
+.cut-section{ position:absolute; right:40px; top:50px; background:#12527f; width:320px;max-height: 700px;min-height: 300px;} 
+
+.rm3_image {
+	width: 120px;
+    height: 26px;
+	
+}
+
+/* 隐藏百度地图logo */
+.anchorBL,
+.anchorBL,
+.amap-logo,
+.amap-copyright{
+	display: none;
+}
+
+
+.BMap_pop {
+	
+	box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33)!important;
+	
+}
@@ -248,7 +248,6 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 			// 关闭弹出层
 			layer.closeAll();
 			if(rd.status='SUCCESS') {
-				layer.msg('生成路线成功！');
 				var stationD = rd.stationData,isNullStr = '';
 				for(var t = 0 ;t<stationD.length;t++) {
 					if(stationD[t].potion.lat =='' || stationD[t].potion.lat ==null ||
@@ -268,10 +267,12 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 					// 在地图上画出线路走向
 					fun.linePanlThree(lineid,data,directionData);
 				});
-				$('#cutSection').removeClass('hidden');
-				$('#Undo').removeClass('hidden');
-				$('#uploadRoute').addClass('hidden');
-				layer.msg('请先编辑路段，然后放大地图切点，不然数据可能会有误差！！！');
+				$('#upload_show').removeClass('hidden');
+				//$('#Undo').removeClass('hidden');
+				//$('#cut_section').removeClass('hidden');
+				//$('#uploadRoute').addClass('hidden');
+				$('#upload').addClass('hidden');
+				layer.msg('请先编辑路段，并保存！！！');
 			}else {
 				layer.msg('生成路线失败！');
 			}
@@ -249,10 +249,10 @@ $(&#39;#edit_section_mobal_cache&#39;).on(&#39;editSectionMobalCache_show&#39;, function(e, map_
 			$post('/section/sectionCacheUpdate',params,function(resuntDate) {
 				if(resuntDate.status=='SUCCESS') {
 					// 弹出添加成功提示消息
-					layer.msg('修改成功...');
+					layer.msg('路段保存成功，将地图放到最大，用右击路段进行截取，确认截取完毕后提交！！！');
 				}else {
 					// 弹出添加失败提示消息
-					layer.msg('修改失败...');
+					layer.msg('路段保存失败，请重新编辑路段！！！');
 				}
 				$('#edit_section_mobal_cache').modal('hide');
 				closeMobleSetClean();
-< <link href="/pages/base/stationroute/css/bmap_base.css" rel="stylesheet" type="text/css" /> 
+< <link href="/pages/base/line/css/bmap_base.css" rel="stylesheet" type="text/css" /> 
 <div class="portlet-body">
 	<!-- 地图 -->
 	<div  id="bmap_basic" class="bmaps"></div>	
-	<!-- 右边添加栏 -->
-	<div class="portlet box protlet-box" style="top:20px;border-radius: 6px !important;box-shadow: 10px 10px 5px #888888;float:right;">
+	
+	<div class="cut-section">
+		<div class="portlet-title" >
+			<div class="caption" >
+				途径站点 
+			</div>
+		</div>	
+		 <div class="portlet-body">
+           	<div class="table-toolbar" style="text-align:center;" id="upload">
+				<button class="btn btn-circle blue" id="uploadRoute" ><i class="fa fa-plus"></i> 生成路线 </button>						
+           	</div>
+           	<div class="portlet-body hidden" id="upload_show">
+           		<div class="defeat-scroll" style="height: auto;max-height:600px;overflow-y:auto; border-left: 10px;">
+					<table class="table table-bordered table-hover table-checkable " id="section_table" style="color:#B7B7B7;">
+						<thead>
+							<tr role="row" class="heading">
+								<th >截取路段</th>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+				</div>
+	           	<div class="table-toolbar" style="text-align:center;">
+	           		<button class="btn btn-circle blue" id="cutSection">提交路段</button>
+					<button class="btn btn-circle blue" id="Undo">撤销切点</button>			
+	           	</div>
+           	</div>	           	
+		</div>
+	</div>
+	
+	<div class="portlet box protlet-box" style="top:20px;border-radius: 6px !important;box-shadow: 10px 10px 5px #888888;">
+		左边标题栏
 		<div class="portlet-title" style="background-color:#12527f;">
 			<div class="caption">
-				<!-- 途径站点  -->
+				途径站点 
 			</div>
 			<div class="tools">
 				<a href="javascript:;" class="collapse" data-original-title="" title=""> </a>
 			</div>
 		</div>
-		<!-- 左边栏 -->
+		左边栏
 		<div class="portlet-body" id="scrllmouseEvent"  style="border: 1px solid rgb(255, 255, 255); display: block;min-height: 300px">
 			<div class="row">
 	            <div class="portlet-body">
@@ -26,7 +56,7 @@
 							<table class="table table-striped table-bordered table-hover table-checkable " id="section_table">
 								<thead>
 									<tr role="row" class="heading">
-										<th >截取路段</th>
+										<th >已截取路段</th>
 									</tr>
 								</thead>
 								<tbody ></tbody>
@@ -35,7 +65,7 @@
 	            	</div>				
 				</div>
 			</div>
-		</div>		
+		</div>	
 	</div>
 </div>
 <script type="text/html" id="section_list">
@@ -47,7 +77,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan=13><h6 class="muted">你还没有对路段进行截取</h6></td>
+			<td colspan=13><h6 class="muted">沒有相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -138,7 +168,7 @@ $(function(){
 					}
 				});
 			} else {
-				layer.msg("请截取路段！！！");
+				layer.msg("请先截取路段！！！");
 			}
 		});		
 	});