Browse Source

新增数聚场景页面优化(back)

bao.zhang 9 years ago
parent
commit
3beffa6c01

+ 13 - 70
src/main/webapp/WEB-INF/pages/back/main/ap/place/create.ftl

@@ -8,71 +8,6 @@
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac.js"></script>
-	
-
-	<script type="text/javascript" >
-		$(function(){
-			
-			$("#wifiForm").autovalidate();
-			//保存按钮
-			$("#create-btn-save").unbind('click').click(function(){
-				if (!$("#wifiForm").validate()) {
-					return false;
-				}
-				if($("#cn").val() == ""){
-					$("#main_cnul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份");
-					$("#cnul_selectdiv").find('span.spanVaildate').html("请选择省份");
-					return false;
-				}
-				if($("#cnCity").val() == ""){
-					$("#main_cnCityul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份对应的城市");
-					$("#cnCityul_selectdiv").find('span.spanVaildate').html("请选择省份对应的城市");
-					return false;
-				}
-				if($("#place").val() == ""){
-					$("#main_placeul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择场景");
-					$("#placeul_selectdiv").find('span.spanVaildate').html("请选择场景");
-					return false;
-				}
-				$("#wifiForm").submit();
-			});
-				
-			//取消按钮
-			$("#create-btn-cancel").unbind('click').click(function(){
-				location.href = "${ctx}/operator/main/ap/apmac/list";
-			});
-				
-			$("#cnul_box").mouseleave(function(){
-		 		if($("#cn").val() == ""){
-					$("#main_cnul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份");
-					$("#cnul_selectdiv").find('span.spanVaildate').html("请选择省份");
-				}else{
-					$("#main_cnul").css("box-shadow","none").attr("title","");
-					$("#cnul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		 	$("#cnCityul_box").mouseleave(function(){
-		 		if($("#cnCity").val() == ""){
-					$("#main_cnCityul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份对应的城市");
-					$("#cnCityul_selectdiv").find('span.spanVaildate').html("请选择省份对应的城市");
-				}else{
-					$("#main_cnCityul").css("box-shadow","none").attr("title","");
-					$("#cnCityul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		 	$("#placeul_box").mouseleave(function(){
-		 		if($("#place").val() == ""){
-					$("#main_placeul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择场景");
-					$("#placeul_selectdiv").find('span.spanVaildate').html("请选择场景");
-				}else{
-					$("#main_placeul").css("box-shadow","none").attr("title","");
-					$("#placeul_selectdiv").find('span.spanVaildate').html("");
-				}
-		 	});
-		});
-		
-	</script>
 	
 </@override>
 
@@ -81,6 +16,7 @@
 <div id=content_bg>
 	<#include "/back/main/public-head.ftl">
     <div id="pagecontent">
+    
 		<div id="handler">
 			<ul>
 				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
@@ -90,6 +26,7 @@
 				<li class="size3">新增数聚场景</li>
 			</ul>  
 		</div>
+		
 		<div id="content">
 			<div id="placeclassify">		
 				<div id="place_fronttitle" style="width:97.4%;padding-left:20px;height:40px;line-height:40px;border:1px solid #d5dee8;color:#4c637b;">	
@@ -142,10 +79,16 @@
 	function cross(a){
 			var c = a.id;
 			var url = "${ctx}/back/main/ap/place/delete-place?id="+c;
-			$.getJSON(url, function(data) {
-				var data_1 = data;
-				$(".place_name").trigger("click");
-		})	
+			$.getJSON(url);
+			var h = $(".current_placename li").attr("id");
+			var url_current_placename = "${ctx}/back/main/ap/place/get-place?placeId="+h;
+			$(".current_definename").empty();
+			$.getJSON(url_current_placename, function(data) {
+					var data_1 = data;
+					$.each( data_1, function( key, val ) {
+		 				$(".current_definename").append('<li style="padding-left:20px;font-size:20px;font-weight:bold;color:#4c637b;margin-top:20px;" id='+val.id+'>'+val.name+'<image class="cross_delete" onclick="cross(this)" src="${ctx}/assets/images/cross.png" style="cursor:pointer;"  id='+val.id+'></li>');
+		 			});
+			})		
 	}
 $(function(){
 //点击左边场景,显示在右边js
@@ -163,7 +106,7 @@ $(function(){
 	 			});
 		})	
 	});
-///点击提交按钮
+//点击提交按钮
 	$("#newplace_submit").click(function(){	
 		var text = $("#newplace_submit_text").val();
 		var url_2 = "${ctx}/back/main/ap/place/add?placeName="+text;

+ 189 - 0
src/main/webapp/WEB-INF/pages/back/main/ap/place/place-sort.ftl

@@ -0,0 +1,189 @@
+<@override name="head">
+	<title>用户场景定义</title>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
+
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac.js"></script>
+	
+
+	<script type="text/javascript" >
+		$(function(){
+			
+			$("#wifiForm").autovalidate();
+			//保存按钮
+			$("#create-btn-save").unbind('click').click(function(){
+				if (!$("#wifiForm").validate()) {
+					return false;
+				}
+				if($("#cn").val() == ""){
+					$("#main_cnul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份");
+					$("#cnul_selectdiv").find('span.spanVaildate').html("请选择省份");
+					return false;
+				}
+				if($("#cnCity").val() == ""){
+					$("#main_cnCityul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份对应的城市");
+					$("#cnCityul_selectdiv").find('span.spanVaildate').html("请选择省份对应的城市");
+					return false;
+				}
+				if($("#place").val() == ""){
+					$("#main_placeul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择场景");
+					$("#placeul_selectdiv").find('span.spanVaildate').html("请选择场景");
+					return false;
+				}
+				$("#wifiForm").submit();
+			});
+				
+			//取消按钮
+			$("#create-btn-cancel").unbind('click').click(function(){
+				location.href = "${ctx}/operator/main/ap/apmac/list";
+			});
+				
+			$("#cnul_box").mouseleave(function(){
+		 		if($("#cn").val() == ""){
+					$("#main_cnul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份");
+					$("#cnul_selectdiv").find('span.spanVaildate').html("请选择省份");
+				}else{
+					$("#main_cnul").css("box-shadow","none").attr("title","");
+					$("#cnul_selectdiv").find('span.spanVaildate').html("");
+				}
+		 	});
+		 	$("#cnCityul_box").mouseleave(function(){
+		 		if($("#cnCity").val() == ""){
+					$("#main_cnCityul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择省份对应的城市");
+					$("#cnCityul_selectdiv").find('span.spanVaildate').html("请选择省份对应的城市");
+				}else{
+					$("#main_cnCityul").css("box-shadow","none").attr("title","");
+					$("#cnCityul_selectdiv").find('span.spanVaildate').html("");
+				}
+		 	});
+		 	$("#placeul_box").mouseleave(function(){
+		 		if($("#place").val() == ""){
+					$("#main_placeul").css({"box-shadow":"0 0 6px red","width":"150px"}).attr("title","请选择场景");
+					$("#placeul_selectdiv").find('span.spanVaildate').html("请选择场景");
+				}else{
+					$("#main_placeul").css("box-shadow","none").attr("title","");
+					$("#placeul_selectdiv").find('span.spanVaildate').html("");
+				}
+		 	});
+		});
+		
+	</script>
+	
+</@override>
+
+<@override name="body">
+<!-- PAGE CONTENT BEGINS HERE -->
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+		<div id="handler">
+			<ul>
+				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
+				<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				<li class="size2"><a href="${ctx}/operator/main/ap/apmac/list">热点详情</a></li>
+				<span class="divider2"><i class="icon-angle-right"></i></span>
+				<li class="size3">新增数聚场景</li>
+			</ul>  
+		</div>
+		<div id="content">
+			<div id="placeclassify">		
+				<div id="place_fronttitle" style="width:97.4%;padding-left:20px;height:40px;line-height:40px;border:1px solid #d5dee8;color:#4c637b;">	
+				数据场景分类
+				</div>
+				<div id="place_bottom" style="width:99%;">	
+				     <div id="place_bottom_left" style="float:left;width:50%;height:600px;border-left:1px solid #d5dee8;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
+					     	<div id="place_bottom_leftsubmit" style="float:left;width:50%;border:none;">	
+						     	<input type="text" id="newplace_submit_text" style="width:170px;height:20px;margin:20px 0px 0px 20px;border:1px solid #d5dee8;">
+						     	<button type="submit" id="newplace_submit" style="width:50px;height:30px;margin:20px 0px 0px 5px;border-radius:5px;color:#ffffff;border:1px solid #d5dee8;background-color:#36aeea;">提交</button>
+							</div>
+							
+							<div id="place_bottom_leftsearch" style="float:right;width:50%;border:none;">	
+						     	<input type="text" id="newplace_search_text" style="width:170px;height:20px;margin:20px 0px 0px 20px;border:1px solid #d5dee8;">
+						     	<button type="submit" id="newplace_search" style="width:50px;height:30px;margin:20px 0px 0px 5px;border-radius:5px;color:#ffffff;border:1px solid #d5dee8;background-color:#36aeea;">搜索</button>
+							</div>
+							
+							<div id="place_datalist" style="margin-top:75px;">	
+						     	<#if placeList ??>
+								<#list placeList as place>
+								<li id="${place.id!}" class="place_name" style="margin-top:20px;margin-left:20px;font-weight:bold;cursor:pointer;font-size:20px;color:#4c637b;">${place.name!}</li>
+								</#list>
+								</#if>
+							</div>
+							
+							<input id="page" type="hidden" name="page" value="${pager.page!}"/>
+							<div id="pageDiv" style="margin: -10px 38px 0 0;">
+				               	<#include "/common/pagination/simple.ftl"/>
+				            </div>
+					 
+					 </div>
+					 
+					<div id="place_bottom_right" style="float:right;width:49.7%;height:600px;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
+						   <div style="font-size:20px;color:#4c637b;padding-left:20px;padding-top:20px;">当前数聚场景名称:</div>
+						   <div class="current_placename" style="width:100%;height:40px;"> 
+						   </div>
+						   <br>
+						   <div style="font-size:20px;color:#4c637b;padding-left:20px;">当前用户场景名称:</div>
+						   <div class="current_definename" style="width:100%;"> 
+						   </div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+<!-- PAGE CONTENT ENDS HERE --/>
+</div><!--/row-->
+<script type="text/javascript" >
+//点击叉号
+	function cross(a){
+			var c = a.id;
+			var url = "${ctx}/back/main/ap/place/delete-place?id="+c;
+			$.getJSON(url, function(data) {
+				var data_1 = data;
+				$(".place_name").trigger("click");
+		})	
+	}
+$(function(){
+//点击左边场景,显示在右边js
+	$(".place_name").click(function(){
+		var a=$(this).html();
+		var b=$(this).attr("id");
+		$(".current_placename").empty();
+		$(".current_definename").empty();
+		$(".current_placename").append('<br><li style="padding-left:20px;font-size:20px;font-weight:bold;color:#4c637b;" id='+b+'>'+a+'</li>');
+		var url = "${ctx}/back/main/ap/place/get-place?placeId="+b;
+		$.getJSON(url, function(data) {
+				var data_1 = data;
+				$.each( data_1, function( key, val ) {
+	 				$(".current_definename").append('<li style="padding-left:20px;font-size:20px;font-weight:bold;color:#4c637b;margin-top:20px;" id='+val.id+'>'+val.name+'<image class="cross_delete" onclick="cross(this)" src="${ctx}/assets/images/cross.png" style="cursor:pointer;"  id='+val.id+'></li>');
+	 			});
+		})	
+	});
+//点击提交按钮
+	$("#newplace_submit").click(function(){	
+		var text = $("#newplace_submit_text").val();
+		var url_2 = "${ctx}/back/main/ap/place/add?placeName="+text;
+		location.href=url_2;
+	})
+//点击搜索按钮
+	$("#newplace_search").click(function(){	
+		var text = $("#newplace_search_text").val();
+		var url_3 = "${ctx}/back/main/ap/place/create?placeName="+text;
+		location.href=url_3;
+	})	
+//控制页码
+    $('#pageDiv .pagination ul li a[href]').click(function(){
+		var _page = $(this).attr('href').substr(1);//获取当前点击的页码
+		console.log(_page);
+		var url_4 = "${ctx}/back/main/ap/place/create?page="+_page;
+		location.href=url_4;
+	});
+})
+
+</script>
+</@override>
+<@extends name="/common/simple.ftl"/>