Merge branch 'master' of gitlab.cloudcross.net:ssp/ssp_web

src/main/java/com/cloudcross/ssp/web/back/main/ap/ApmacController.java

@@ -817,7 +817,7 @@ public class ApmacController extends SimpleController {
 		}
 	}
 	
-	@RequestMapping("wifisum")
+	@RequestMapping("/wifisum")
 	public String queryWifiSumList(Model model,String cn,String cnCity,Integer place,@RequestParam(defaultValue = "1") int page){
 		Map<String,Object>condition = new HashMap<String,Object>();
 		if(cn != null && !"".equals(cn)){

src/main/webapp/WEB-INF/pages/back/main/ap/apmac/wifiSum.ftl

@@ -0,0 +1,86 @@
+<@override name="head">
+<title>热点详情管理</title>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apApmacForDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/back/apApmac.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id= "pagecontent">
+		<div id="content">
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/back/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">热点分布查询</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/back/main/ap/apmac/wifisum" method="post">
+				<div id="content_choose">
+					<ul id="main_cnul">
+						<li class="select_box" id="cnul_box">
+							<span id="cnul_span">${cn!}</span>
+							<ul class="son_ul" id="cn_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="cn" id="cn" value="${cn!}"/>
+					<ul id="main_cnCityul">
+						<li class="select_box" id="cnCityul_box">
+							<span id="cnCityul_span">${cnCity!}</span>
+							<ul class="son_ul" id="cnCityul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="cnCity" id="cnCity" value="${cnCity!}"/>
+					<ul id="main_placeIdul">
+						<li class="select_box" id="placeIdul_box">
+							<span id="placeIdul_span">${placeName!}</span>
+							<ul class="son_ul" id="placeIdul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="placeId" id="placeId" value="${placeId!}"/>
+					<input type="hidden" name="placeName" id="placeName" value="${placeName!}"/>
+				  	<input id="btn_formSubmit" type="submit" value="查询"/>
+					<div id="searchValueDiv">
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
+						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
+						<input id="serachData_img" type="submit" value=""/>
+					</div>
+				</div>
+				<table border="1" class="tableApmacOther">
+				    <thead>
+				    	<tr class="theadTr">
+					    	<th class="theadTh" style="width:3%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:3%;">省</th>
+							<th class="theadTh" style="width:3%;">市</th>
+							<th class="theadTh" style="width:7%;">数聚场景</th>
+							<th class="theadTh" style="width:14%;">热点个数</th>
+				    	</tr>
+					</thead>
+					<tbody>
+						<#if wifiSumList ??>
+						<#list wifiSumList as wifiSum>
+						<tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd"></div></td>
+							<td class="tbodyTd">${wifiSum.cn!}</td>
+							<td class="tbodyTd">${wifiSum.cnCity!}</td>
+							<td class="tbodyTd">${wifiSum.placeName!}</td>
+							<td class="tbodyTd">${wifiSum.sum!}</td>
+						</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_wifiSum()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+	 		</form>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/client-account/create.ftl

@@ -40,15 +40,15 @@
 					<span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>联系人：</label>
+					<label class="input-label"><span class="lbl-no"></span>联系人：</label>
 					<input class="input-text" tabindex="4" id="linkMan" name="linkMan" type="text" value="" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>移动电话：</label>
+					<label class="input-label"><span class="lbl-no"></span>移动电话：</label>
 					<input class="input-text" tabindex="5" id="mobilePhone" name="mobilePhone" type="text" value="" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>固定电话：</label>
+					<label class="input-label"><span class="lbl-no"></span>固定电话：</label>
 					<input class="input-text" tabindex="6" id="tel" name="tel" type="text" value="" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
@@ -72,19 +72,19 @@
 					<input class="input-text" tabindex="11" id="email" name="email" type="text" value="" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group hideOperator">
-					<label class="input-label"><span class="lbl-yes">*</span>银行名称：</label>
+					<label class="input-label"><span class="lbl-no"></span>银行名称：</label>
 					<input class="input-text" tabindex="12" id="bank" name="bank" type="text" value="" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group hideOperator">
-					<label class="input-label"><span class="lbl-yes">*</span>开户人：</label>
+					<label class="input-label"><span class="lbl-no"></span>开户人：</label>
 					<input class="input-text" tabindex="13" id="bankAccountName" name="bankAccountName" type="text" value="" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group hideOperator">
-					<label class="input-label"><span class="lbl-yes">*</span>银行账户：</label>
+					<label class="input-label"><span class="lbl-no"></span>银行账户：</label>
 					<input class="input-text" tabindex="14" id="bankAccount" name="bankAccount" type="text" value="" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group hideAdverstier hideClientAccount">
-					<label class="input-label"><span class="lbl-yes">*</span>发票抬头：</label>
+					<label class="input-label"><span class="lbl-no"></span>发票抬头：</label>
 					<input class="input-text" tabindex="12" id="title" name="title" type="text" value="" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">

src/main/webapp/WEB-INF/pages/back/main/client-account/edit.ftl

@@ -44,15 +44,15 @@
 					<span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>联系人：</label>
+					<label class="input-label"><span class="lbl-no"></span>联系人：</label>
 					<input class="input-text" tabindex="4" id="linkMan" name="linkMan" type="text" value="${clientAccount.linkMan!}" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>移动电话：</label>
+					<label class="input-label"><span class="lbl-no"></span>移动电话：</label>
 					<input class="input-text" tabindex="5" id="mobilePhone" name="mobilePhone" type="text" value="${clientAccount.mobilePhone!}" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>固定电话：</label>
+					<label class="input-label"><span class="lbl-no"></span>固定电话：</label>
 					<input class="input-text" tabindex="6" id="tel" name="tel" type="text" value="${clientAccount.tel!}" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
@@ -77,21 +77,21 @@
 				</div>
 				<#if clientAccount.sysType==2>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>银行名称：</label>
+					<label class="input-label"><span class="lbl-no"></span>银行名称：</label>
 					<input class="input-text" tabindex="12" id="bank" name="bank" type="text" value="${clientAccount.bank!}" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>开户人：</label>
+					<label class="input-label"><span class="lbl-no"></span>开户人：</label>
 					<input class="input-text" tabindex="13" id="bankAccountName" name="bankAccountName" type="text" value="${clientAccount.bankAccountName!}" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>银行账户：</label>
+					<label class="input-label"><span class="lbl-no"></span>银行账户：</label>
 					<input class="input-text" tabindex="14" id="bankAccount" name="bankAccount" type="text" value="${clientAccount.bankAccount!}" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				</#if>
 				<#if clientAccount.sysType==3>
 				<div class="input-group">
-					<label class="input-label"><span class="lbl-yes">*</span>发票抬头：</label>
+					<label class="input-label"><span class="lbl-no"></span>发票抬头：</label>
 					<input class="input-text" tabindex="12" id="title" name="title" type="text" value="${clientAccount.title!}" verify="text/255/0/0"/><span class="spanVaildate"></span>
 				</div>
 				</#if>

src/main/webapp/WEB-INF/pages/back/main/public-head.ftl

@@ -30,7 +30,7 @@
 		</@sec.authorize>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_back_ap,ROLE_MANAGER')">
-		<li><a href="${ctx}/back/main/ap/apmac/list"><span>热点管理</span></a></li>
+		<li><a id="btn_menuApmac" href="${ctx}/back/main/ap/apmac/list"><span>热点管理</span></a></li>
 		</@sec.authorize>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_back_authority,ROLE_MANAGER')">
@@ -50,4 +50,5 @@
 		<input type="hidden" id="sessionagentId" value="${userSession.agentId!}"/>
 		<input type="hidden" id="sessionoperatorId" value="${userSession.operatorId!}"/>
 	</div>    		
-</div>	   	
+</div>	   	
+<a id="btn_otherMenuApmac" href="${ctx}/back/main/ap/apmac/wifisum">热点分布查询</a>

src/main/webapp/assets/css/common.css

@@ -59,7 +59,7 @@ li{
 #headDiv #menu li a{
 	display: block;
 	height:78px;
-	width: 79px;
+	width: 89px;
 	outline:none;
 	color:#ffffff;	
 }
@@ -1052,11 +1052,15 @@ table.tableApmac{
 	width:700px;
 }
 
-table.tableApmac,table.tableApmac th,table.tableApmac td{
+table.tableApmacOther{
+	width:700px;
+}
+
+table.tableApmac,table.tableApmac th,table.tableApmac td,table.tableApmacOther,table.tableApmacOther th,table.tableApmacOther td{
 	border:thin solid #b9c5d9;
 }
 
-table.tableApmac th{
+table.tableApmac th,table.tableApmacOther th{
 	height:60px;
 	border:none;
 	background-color: #f3f3f3;
@@ -1067,7 +1071,7 @@ img.audit_img{
 	border:none;
 }
 
-table.tableApmac td{
+table.tableApmac td,table.tableApmacOther td{
 	height:40px;
 	border:none;
 	border-top:thin solid #b9c5d9;
@@ -1135,4 +1139,18 @@ table.tableApmac td{
 
 #positionDiv,#placeChooseDiv,#operatorAdgroup_placeDiv,#adgroup_placeDiv,#LBSDiv{
 	clear:both;
+}
+
+#btn_otherMenuApmac{
+	position: absolute;
+	display: none;
+	height:78px;
+	width: 89px;
+	line-height:78px;
+	outline:none;
+	color:#ffffff;
+	text-align:center;
+	background-image:url(../images/tophover_bg.jpg);	
+	text-decoration: none;
+	z-index:9999;
 }

src/main/webapp/assets/js/back/apApmac.js

@@ -136,4 +136,14 @@ function exportExcel_relationship(){
 	var param = "?searchValue="+searchValue;
 	$("#exportExcel").attr("href",$("#ctx").val()+"/back/main/ap/apmac/exportRelationshipExcel"+param);
 	return false;
+}
+
+function exportExcel_wifiSum(){
+	var searchValue = $("#searchValue").val();
+	if(searchValue == "请输入关键字"){
+		searchValue = "";
+	}
+	var param = "?cn="+$("#cn").val()+"&cnCity="+$("#cnCity").val()+"&placeId="+$("#placeId").val()+"&searchValue="+searchValue;
+	$("#exportExcel").attr("href",$("#ctx").val()+"/back/main/ap/apmac/exportWifiSumExcel"+param);
+	return false;
 }

src/main/webapp/assets/js/back/public-head.js

@@ -25,5 +25,27 @@ $(function(){
 	if(path.indexOf("authority") != -1){
 		$("#menu a:eq(7)").addClass("menu_change");
 	};
+	
+	//鼠标划过
+	 $("#btn_menuApmac").mousemove(function(event){
+		 var left = 0; //存放left值  
+         var obj = document.getElementById("btn_menuApmac");  
+         while (obj) { //如果这个obj存在的话  
+             left = parseInt(left) + obj.offsetLeft;  
+             obj = obj.offsetParent; //obj变成自己的parent，一层一层向上循环累加left的值，直到obj不存在  
+         }
+        
+		$("#btn_otherMenuApmac").css("display","block");
+		$("#btn_otherMenuApmac").css("left", left - document.body.scrollLeft + "px");
+	});
+	$("#btn_otherMenuApmac").mouseout(function(event){
+		$("#btn_otherMenuApmac").css("display","none");
+	});
+	
+	document.body.onmouseout=function(event){
+		if(event.target.id != "btn_otherMenuApmac" && event.target.id != "btn_menuApmac"){
+			$("#btn_otherMenuApmac").css("display","none");
+		}
+	}
 		
 });