投放，媒体自投更改操作系统为多选，修改编辑自投页面的问题

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/create.ftl

@@ -143,6 +143,7 @@
 					<input id="perImpressionType" name="perImpressionType" type="hidden" value="" />
 					<input class="input-text-small" tabindex="13" id="perImpression" name="perImpression" type="text" value="" verify="number/11/0/0"/><span class="input-span">次</span><span class="spanVaildate"></span>
 				</div>
+				<div style="display:none;">
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-no"></span>点击找回：</label>
 					<input class="input-radio" name="retarget" type="radio" value="1" checked="checked"><span class="input-radio-span otherspan">未设置</span>
@@ -160,6 +161,7 @@
 					<label class="input-label-other"><span class="lbl-no"></span>访客分类：</label>
 					<input class="input-checkbox" name="site" type="checkbox" value="1"><span class="input-checkbox-span otherspan">全站访客</span>
 				</div>
+				</div>
 				<div class="input-group" id="areasDiv">
 					<label class="input-label-other"><span class="lbl-no"></span>地域定向：</label>
 					<input class="ignore" type="hidden" id="areas" name="areas" value=""/>
@@ -180,6 +182,17 @@
 					    <div class="time_add"><p id="setting_list" class="dateRangePicker" href="">新增时间段</p></div>
 				    </div>
 			  	</div>
+			  	<div class="input-group" id="osDiv">
+					<label class="input-label-other"><span class="lbl-yes">*</span>操作系统：</label>
+					<input type="hidden" id="os" name="os" value=""/>
+					<input class="input-checkbox" type="checkbox" value="1"><span class="input-checkbox-span otherspan">iOS</span>
+					<input class="input-checkbox" type="checkbox" value="2"><span class="input-checkbox-span otherspan">Android</span>
+					<input class="input-checkbox" type="checkbox" value="3"><span class="input-checkbox-span otherspan">WP</span>
+					<input class="input-checkbox" type="checkbox" value="4"><span class="input-checkbox-span otherspan">Symbian</span>
+					<input class="input-checkbox" type="checkbox" value="5"><span class="input-checkbox-span otherspan">MAC OS</span>
+					<input class="input-checkbox" type="checkbox" value="6"><span class="input-checkbox-span otherspan">Windows</span>
+					<input class="input-checkbox" type="checkbox" value="7"><span class="input-checkbox-span otherspan">其他</span>
+				</div>
 			  	<div class="input-group" id="adgroup_placeDiv">
 					<label class="input-label-other"><span class="lbl-yes">*</span>场景：</label>
 					<div class="input-checkboxsDiv">
@@ -193,7 +206,7 @@
 					</div>
 				</div>
 				<div class="input-group" id="positionDiv">
-					<label class="input-label-other"><span class="lbl-no"></span>访客分类：</label>
+					<label class="input-label-other"><span class="lbl-yes">*</span>广告位置：</label>
 					<input class="input-checkbox" name="position" type="checkbox" value=""><span class="input-checkbox-span otherspan">全部</span>
 					<input class="input-checkbox" name="position" type="checkbox" value="1"><span class="input-checkbox-span otherspan">认证页</span>
 					<input class="input-checkbox" name="position" type="checkbox" value="2"><span class="input-checkbox-span otherspan">认证页后</span>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/edit.ftl

@@ -143,6 +143,7 @@
 					<input id="perImpressionType" name="perImpressionType" type="hidden" value="${adGroup.perImpressionType!}"/>
 					<input class="input-text-small" tabindex="13" id="perImpression" name="perImpression" type="text" value="${adGroup.perImpression!}" verify="number/11/0/0"/><span class="input-span">次</span><span class="spanVaildate"></span>
 				</div>
+				<div style="display:none;">
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-no"></span>点击找回：</label>
 					<input class="input-radio" name="retarget" type="radio" value="1" <#if adGroup.retarget==1>checked</#if> ><span class="input-radio-span otherspan">未设置</span>
@@ -160,6 +161,7 @@
 					<label class="input-label-other"><span class="lbl-no"></span>访客分类：</label>
 					<input class="input-checkbox" name="site" type="checkbox" value="1" <#if adGroup.site==1>checked</#if> ><span class="input-checkbox-span otherspan">全站访客</span>
 				</div>
+				</div>
 				<div class="input-group" id="areasDiv">
 					<label class="input-label-other"><span class="lbl-no"></span>地域定向：</label>
 					<input class="ignore" type="hidden" id="areas" name="areas" value="${areas!}"/>
@@ -180,6 +182,17 @@
 					    <div class="time_add"><p id="setting_list" class="dateRangePicker" href="">新增时间段</p></div>
 				    </div>
 			  	</div>
+			  	<div class="input-group edit_osDiv" id="osDiv">
+					<label class="input-label-other"><span class="lbl-yes">*</span>操作系统：</label>
+					<input type="hidden" id="os" name="os" value="${os!}"/>
+					<input class="input-checkbox" type="checkbox" value="1"><span class="input-checkbox-span otherspan">iOS</span>
+					<input class="input-checkbox" type="checkbox" value="2"><span class="input-checkbox-span otherspan">Android</span>
+					<input class="input-checkbox" type="checkbox" value="3"><span class="input-checkbox-span otherspan">WP</span>
+					<input class="input-checkbox" type="checkbox" value="4"><span class="input-checkbox-span otherspan">Symbian</span>
+					<input class="input-checkbox" type="checkbox" value="5"><span class="input-checkbox-span otherspan">MAC OS</span>
+					<input class="input-checkbox" type="checkbox" value="6"><span class="input-checkbox-span otherspan">Windows</span>
+					<input class="input-checkbox" type="checkbox" value="7"><span class="input-checkbox-span otherspan">其他</span>
+				</div>
 			  	<div class="input-group place-edit" id="adgroup_placeDiv">
 			  		<input type="hidden" id="edit-place" value="${place!}"/>
 					<label class="input-label-other"><span class="lbl-yes">*</span>场景：</label>
@@ -194,7 +207,7 @@
 					</div>
 				</div>
 				<div class="input-group position-edit" id="positionDiv">
-					<label class="input-label-other"><span class="lbl-no"></span>访客分类：</label>
+					<label class="input-label-other"><span class="lbl-yes">*</span>广告位置：</label>
 					<input type="hidden" id="edit-position" value="${adGroup.position!}"/>
 					<input class="input-checkbox" name="position" type="checkbox" value=""><span class="input-checkbox-span otherspan">全部</span>
 					<input class="input-checkbox" name="position" type="checkbox" value="1"><span class="input-checkbox-span otherspan">认证页</span>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/operator-ad-group/create.ftl

@@ -39,7 +39,7 @@
 					<li><i class="icon-angle-right"></i></li>
 					<li><a href="${ctx}/advertiser/main/ad/target/campaign/list?orderId=${orderId!}&advertiserId=${advertiserId!}">活动管理</a></li>
 					<li><i class="icon-angle-right"></i></li>
-					<li><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
+					<li><a href="${ctx}/advertiser/main/ad/target/operator-ad-group/list?campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}">投放管理</a></li>
 					<li><i class="icon-angle-right"></i></li>
 					<li class="navDiv_currentLi">媒体自投</li>
 				</ul>  
@@ -160,22 +160,22 @@
 					    <div class="time_add"><p id="setting_list" class="dateRangePicker" href="">新增时间段</p></div>
 				    </div>
 			  	</div>
-				<div class="input-group">
+				<div class="input-group" id="osDiv">
 					<label class="input-label-other"><span class="lbl-yes">*</span>操作系统：</label>
-					<input class="input-radio" name="os" type="radio" value="1" checked="checked"><span class="input-radio-span otherspan">iOS</span>
-					<input class="input-radio" name="os" type="radio" value="2"><span class="input-radio-span otherspan">Android</span>
-					<input class="input-radio" name="os" type="radio" value="3"><span class="input-radio-span otherspan">WP</span>
-					<input class="input-radio" name="os" type="radio" value="4"><span class="input-radio-span otherspan">Symbian</span>
-					<input class="input-radio" name="os" type="radio" value="5"><span class="input-radio-span otherspan">MAC OS</span>
-					<input class="input-radio" name="os" type="radio" value="6"><span class="input-radio-span otherspan">Windows</span>
-					<input class="input-radio" name="os" type="radio" value="7"><span class="input-radio-span otherspan">其他</span>
+					<input type="hidden" id="os" name="os" value=""/>
+					<input class="input-checkbox" type="checkbox" value="1"><span class="input-checkbox-span otherspan">iOS</span>
+					<input class="input-checkbox" type="checkbox" value="2"><span class="input-checkbox-span otherspan">Android</span>
+					<input class="input-checkbox" type="checkbox" value="3"><span class="input-checkbox-span otherspan">WP</span>
+					<input class="input-checkbox" type="checkbox" value="4"><span class="input-checkbox-span otherspan">Symbian</span>
+					<input class="input-checkbox" type="checkbox" value="5"><span class="input-checkbox-span otherspan">MAC OS</span>
+					<input class="input-checkbox" type="checkbox" value="6"><span class="input-checkbox-span otherspan">Windows</span>
+					<input class="input-checkbox" type="checkbox" value="7"><span class="input-checkbox-span otherspan">其他</span>
 				</div>
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-no"></span>广告位：</label>
 					<input class="input-checkbox" name="position" checked="checked" type="checkbox" value="1"><span class="input-checkbox-span otherspan">认证页</span>
 					<input class="input-checkbox" name="position" type="checkbox" value="2"><span class="input-checkbox-span otherspan">认证页后</span>
 					<input class="input-checkbox" name="position" type="checkbox" value="3"><span class="input-checkbox-span otherspan">上网过程</span>
-					<input type="hidden" name="pager" value="1"/>
 				</div>
 				<div class="input-group" id="zonechooseDiv">
 					<div id="zone-chooseing" class="zonechoose">

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/operator-ad-group/edit.ftl

@@ -46,15 +46,15 @@
 				</ul>  
 	 		</div>
 	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/operator-ad-group/save" method="post">
-	 			<input type="hidden" id="adGroupId" name="id" value=""/>
+	 			<input type="hidden" id="adGroupId" name="id" value="${adGroupId!}"/>
 	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}"/>
 	 			<input type="hidden" id="orderId" name="orderId" value="${orderId!}"/>
 	 			<input type="hidden" id="campaignId" name="campaignId" value="${campaignId!}"/>
 	 			<input type="hidden" name="agentId" value="${agentId!}"/>
-				<input type="hidden" name="zoneIdString" value="1,12"/>
+				<input type="hidden" id="zoneId" name="zoneId" value="${zoneId!}"/>
 				<input type="hidden" name="selectedwifi" id="selectedwifi" value=""/>
-				<div id="hidden_class">
-				</div>
+				<input type="hidden" id="placeId" name="place" value="${placeIdStr!}"/>
+				<input type="hidden" id="placeName" name="placeName" value="${placeNameStr!}"/>
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-yes">*</span>投放名称：</label>
 					<input class="input-text" tabindex="1" disabled="true"   id="adGroupName" name="adGroupName" type="text" value="${adGroup.adGroupName!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
@@ -155,97 +155,81 @@
 					    	<p>开始时间</p>
 					        <p>结束时间</p>
 					    </div>
-					    <input type="hidden" name="sdayParting" id="sdayParting" value="${time!}"/>
+					    <input type="hidden" name="sdayParting" id="sdayParting" value='${time!}'/>
 					    <div class="clear"></div>
 					    <div class="time_box"></div>
 					    <div class="time_add"><p id="setting_list" class="dateRangePicker" href="">新增时间段</p></div>
 				    </div>
 			  	</div>
-				<div class="input-group">
+				<div class="input-group edit_osDiv" id="osDiv">
 					<label class="input-label-other"><span class="lbl-yes">*</span>操作系统：</label>
-					<input class="input-radio" name="os" type="radio" value="1" <#if adGroup.os==1>checked</#if> ><span class="input-radio-span otherspan">iOS</span>
-					<input class="input-radio" name="os" type="radio" value="2" <#if adGroup.os==2>checked</#if> ><span class="input-radio-span otherspan">Android</span>
-					<input class="input-radio" name="os" type="radio" value="3" <#if adGroup.os==3>checked</#if> ><span class="input-radio-span otherspan">WP</span>
-					<input class="input-radio" name="os" type="radio" value="4" <#if adGroup.os==4>checked</#if> ><span class="input-radio-span otherspan">Symbian</span>
-					<input class="input-radio" name="os" type="radio" value="5" <#if adGroup.os==5>checked</#if> ><span class="input-radio-span otherspan">MAC OS</span>
-					<input class="input-radio" name="os" type="radio" value="6" <#if adGroup.os==6>checked</#if> ><span class="input-radio-span otherspan">Windows</span>
-					<input class="input-radio" name="os" type="radio" value="7" <#if adGroup.os==7>checked</#if> ><span class="input-radio-span otherspan">其他</span>
+					<input type="hidden" id="os" name="os" value="${os!}"/>
+					<input class="input-checkbox" type="checkbox" value="1"><span class="input-checkbox-span otherspan">iOS</span>
+					<input class="input-checkbox" type="checkbox" value="2"><span class="input-checkbox-span otherspan">Android</span>
+					<input class="input-checkbox" type="checkbox" value="3"><span class="input-checkbox-span otherspan">WP</span>
+					<input class="input-checkbox" type="checkbox" value="4"><span class="input-checkbox-span otherspan">Symbian</span>
+					<input class="input-checkbox" type="checkbox" value="5"><span class="input-checkbox-span otherspan">MAC OS</span>
+					<input class="input-checkbox" type="checkbox" value="6"><span class="input-checkbox-span otherspan">Windows</span>
+					<input class="input-checkbox" type="checkbox" value="7"><span class="input-checkbox-span otherspan">其他</span>
 				</div>
 				<div class="input-group">
 					<label class="input-label-other"><span class="lbl-no"></span>广告位：</label>
-					<input class="input-checkbox" name="position" type="checkbox" value="2"><span class="input-checkbox-span otherspan">认证页</span>
-					<input class="input-checkbox" name="position" type="checkbox" value="3"><span class="input-checkbox-span otherspan">认证页后</span>
-					<input class="input-checkbox" name="position" type="checkbox" value="4"><span class="input-checkbox-span otherspan">上网过程</span>
-					<input type="hidden" name="pager" value="1"/>
-				<form  id="myform" method="post"  action="${ctx}/advertiser/main/ad/target/operator-ad-group/zonelist?position=1">
-				<div style="width:100%;height:500px;">	
-					<div style="width:20%;float:left;height:337px;border:thin solid #b9c5d9;border-bottom:2px solid #b9c5d9;margin-left:100px !important;">	
-						<table border="1" id="uploadTable" class="uploadTable" style="margin-left:0px !important;">
-							<thead>
-								<tr>
-									 <th style="width:20%;">全部app广告位</th>
-									 
-								</tr>
-							</thead>
-							<tbody>
-								<#if unselectZoneList ??>
-								<#list unselectZoneList as zone>
-								<tr>
-									<td class="all-app-advertiser"  value=${zone.id!}|${zone.name!} onclick="td_click(${zone.id!})"  id=td_${zone.id!}>${zone.name!}</td>
-								<tr>
-								</#list>
-								</#if>
-								
-							</tbody>
-						</table>
-						<ul style="border-bottom:thin solid #b9c5d9;text-align:center;height:50px;line-height:50px;font-weight:bold;">分页
+					<input class="input-checkbox" name="position" type="checkbox" value="1" checked><span class="input-checkbox-span otherspan">认证页</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="2" checked><span class="input-checkbox-span otherspan">认证页后</span>
+					<input class="input-checkbox" name="position" type="checkbox" value="3" checked><span class="input-checkbox-span otherspan">上网过程</span>
+				</div>
+				<div class="input-group edit_zonechooseDiv" id="zonechooseDiv">
+					<div id="zone-chooseing" class="zonechoose">
+						<span class="span_title">全部app广告位</span>
+						<ul id="zone-chooseingUl">
+						<#if unselectZoneList ??>
+						<#list unselectZoneList as zone>
+							<li value="${zone.id!}" title="${zone.name!}"><label>${zone.name!}</label></li>
+						</#list>
+						</#if>
 						</ul>
 					</div>
-					
-					<div id="choosed_ad" style="width:20%;height:337px;float:left;border:2px solid #b9c5d9;border-left:none;">
-						<ul style="border-bottom:thin solid #b9c5d9;text-align:center;height:50px;line-height:50px;font-weight:bold;">已选广告位
+					<div id="zone-selected" class="zonechoose edit_zonechoose">
+						<span class="span_title">已选广告位</span>
+						<ul id="zone-selectedUl">
+						<#if selectZoneList ??>
+						<#list selectZoneList as zone>
+							<li value="${zone.id!}" title="${zone.name!}"><label>${zone.name!}</label><input type='button' class='movedel'/></li>
+						</#list>
+						</#if>
 						</ul>
-							<#if selectZoneList ??>
-								<#list selectZoneList as zone>
-								<tr>
-									<ul style="border-bottom:thin solid #b9c5d9;text-align:center;" id="ul${zone.id!}">${zone.name!}
-									<image src="${ctx}/assets/images/cross.png"  style="float:right;" id="images${zone.id!}" onclick="cross(${zone.id!})" >
-									<input type="hidden" name="" id="${zone.id!}">
-									</ul>
-								<tr>
-								</#list>
-								</#if>
 					</div>
+					<div id="edit_zonechoose"></div>
 				</div>
-				<div class="input-group">
+				<div class="input-group" id="placeChooseDiv">
 					<label class="input-label-other"><span class="lbl-yes">*</span>定向：</label>
-					<#if place1 ??><input class="input-radio" name="aa" type="radio" value="1" checked="checked"><span class="input-radio-span otherspan">数据场景</span></#if>
-					<#if selectWifiGroupInfoList ??><input class="input-radio" name="aa" type="radio" checked="checked" value="2"><span class="input-radio-span otherspan">分组</span></#if>
+					<#if placeStatus == 1><input class="input-radio" name="aa" type="radio" value="1" checked="checked"><span class="input-radio-span otherspan">数据场景</span></#if>
+					<#if placeStatus == 2><input class="input-radio" name="aa" type="radio" checked="checked" value="2"><span class="input-radio-span otherspan">分组</span></#if>
 				</div>
-				<div class="input-group" id="placeDiv">
+				<div class="input-group place-edit" id="operatorAdgroup_placeDiv">
 					<label class="input-label-other"><span class="lbl-yes">*</span>场景：</label>
 					<div class="input-checkboxsDiv">
-					<#if place1 ??>
+					<#if placeStatus == 1>
 						<#if placeList ??>
 						<#list placeList as place>
 						<div class="single_div">
-							<input class="single_div_checkbox" name="place" id="${place.id!}-${place.name!}" type="checkbox" value="${place.id!}" onclick="place_fun()"><span class="single_div_span">${place.name!}</span>
+							<input class="single_div_checkbox" name="place" type="checkbox" value="${place.id!}" title="${place.name!}"><span class="single_div_span" title="${place.name!}">${place.name!}</span>
 						</div>
 						</#list>
 						</#if>
 					</#if> 
-					<#if selectWifiGroupInfoList ??>
+					<#if placeStatus == 2>
 						<#if allWifiGroupInfoList ??>
 						<#list allWifiGroupInfoList as place>
 						<div class="single_div">
-							<input class="single_div_checkbox" name="place" id="${place.id!}-${place.name!}" type="checkbox" value="${place.id!}" onclick="place_fun()"><span class="single_div_span">${place.name!}</span>
+							<input class="single_div_checkbox" name="ad_group_ed" type="checkbox" value="${place.id!}" title="${place.name!}"><span class="single_div_span" title="${place.name!}">${place.name!}</span>
 						</div>
 						</#list>
 						</#if>
 					</#if> 
 					</div>
 				</div>
-				<div class="input-group">
+				<div class="input-group" id="LBSDiv">
 					<label class="input-label-other"><span class="lbl-no"></span>LBS定向：</label>
 					<a id="btn-toggle" class="btn2">LBS定向</a>
 					<span id="spanselectedhint"></span>
@@ -253,7 +237,7 @@
 				<div id="divLBS">
 					<div class="wifi-modal-dialog">
 						<div class="wifi-modal-head">
-							<lable>LBS 设定</label>
+							<label>LBS 设定</label>
 							<span id="wifi-headclose" class="close-tag"></span>
 						</div>
 						<div class="wifi-modal-content">

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/operator-ad-group/locations.ftl

@@ -0,0 +1 @@
+[<#list hashMap?keys as key><#assign values = hashMap[key]>{"id":"${hashCode[key]}","name":"${key}","children":[<#list values as locate  >{"id":"${locate.location1}${locate.location2}${locate.location3}","name":"${locate.cnCity}","pyname":"${locate.location3}","children":[]}<#if locate_has_next>,</#if></#list>]}<#if key_has_next>,</#if></#list>]

src/main/webapp/assets/js/advertiser/adGroup.js

@@ -347,12 +347,24 @@ $(document).ready(function(){
 		if(falg == false){
 			return false;
 		}
+		//提示操作系统选择
+		var oslist = $("#osDiv input[type='checkbox']:checked");
+		if(oslist.length == 0){
+			bootbox.alert("操作系统为必填项，请选择！");
+			return false;
+		}
 		//提示场景选择
 		var placelist = $("#adgroup_placeDiv input[type='checkbox']:checked");
 		if(placelist.length == 0){
 			bootbox.alert("场景为必填项，请选择！");
 			return false;
 		}
+		//提示广告位置选择
+		var positionlist = $("#positionDiv input[type='checkbox']:checked");
+		if(positionlist.length == 0){
+			bootbox.alert("广告位置为必填项，请选择！");
+			return false;
+		}
 		$("#validateForm").submit();
 		return false;
 	});
@@ -394,6 +406,20 @@ $(document).ready(function(){
 			}
 		});
 	}
+	
+	//操作系统
+	if($(".edit_osDiv").html()){
+		var osId = $("#os").val();
+		var authArr = osId.split(",");
+		var checkboxs = $("#osDiv input[type='checkbox']");
+		checkboxs.each(function(i){
+			for(var i = 0;i<authArr.length;i++){
+				if($(this).val() == authArr[i]){
+					$(this).attr("checked","true");
+				}
+			}
+		});
+	}
 });
 		
 function exportExcel_list(){

src/main/webapp/assets/js/advertiser/operatoradGroup.js

@@ -347,6 +347,21 @@ $(document).ready(function(){
 		if(falg == false){
 			return false;
 		}
+		//提示操作系统选择
+		var oslist = $("#osDiv input[type='checkbox']:checked");
+		var osId = "";
+		if(oslist.length == 0){
+			bootbox.alert("操作系统为必填项，请选择！");
+			return false;
+		}else{
+			oslist.each(function(){
+				osId += $(this).val()+",";
+			});
+			if(osId!=""){
+				osId = osId.substring(0, osId.length-1);
+				$("#os").val(osId);
+			}
+		}
 		//提示场景选择
 		var placelist = $("#operatorAdgroup_placeDiv input[type='checkbox']:checked");
 		var placeId = "";
@@ -362,7 +377,12 @@ $(document).ready(function(){
 			if(placeId!=""){
 				placeId = placeId.substring(0, placeId.length-1);
 				placeName = placeName.substring(0, placeName.length-1);
-				$("#placeId").val(placeId);
+				var checked_id =$(".input-group input[name=aa]:checked").val();
+				if(checked_id==1){
+					$("#placeId").val("a,"+placeId);
+				}else if(checked_id==2){
+					$("#placeId").val("b,"+placeId);
+				}
 				$("#placeName").val(placeName);
 			}
 		}
@@ -394,6 +414,20 @@ $(document).ready(function(){
 		});
 	}
 	
+	//操作系统
+	if($(".edit_osDiv").html()){
+		var osId = $("#os").val();
+		var authArr = osId.split(",");
+		var checkboxs = $("#osDiv input[type='checkbox']");
+		checkboxs.each(function(i){
+			for(var i = 0;i<authArr.length;i++){
+				if($(this).val() == authArr[i]){
+					$(this).attr("checked","true");
+				}
+			}
+		});
+	}
+	
 	/******  广告位  *****/
 	//选中右移
     var $chooseing_li = $("#zone-chooseingUl li");
@@ -436,6 +470,12 @@ $(document).ready(function(){
 		}
 	});
 	
+	//编辑时保存选中的广告位
+	if($(".edit_zonechooseDiv").html()){
+		$("#edit_zonechoose").hide();
+		$("#edit_zonechoose").html($("#zone-selectedUl").html());
+	}
+	
 	//选择广告位
 	$(".input-group input[name=position]").click(function(){
 		$("#zone-chooseingUl").empty();//清空ul
@@ -456,11 +496,13 @@ $(document).ready(function(){
 	 			$("#zone-chooseingUl").append("<li value="+val.id+" title="+val.name+"><label>"+val.name+"</label></li>");
 			});
 	 	});
+		if($(".edit_zonechooseDiv").html()){
+	 		$("#zone-selectedUl").append($("#edit_zonechoose").html());
+		}
 	})
 	
 	/******  数据场景或分组  *****/
 	//数据场景或分组
-	//数据场景或分组
 	$(".input-group input[name=aa]").click(function(){	
 		$("#input-checkboxsDiv").empty();
 		var checked_id =$(".input-group input[name=aa]:checked").val();
@@ -485,74 +527,7 @@ $(document).ready(function(){
 	
 	
 });
-function place_fun(){
-	var input_length = $(".input-checkboxsDiv input[name=place]").length;
-	var get_place =  $(".input-checkboxsDiv input[name=place]");
-	var ad_group_id = "a"
-	var ad_group_name= "" ;
-	$("#hidden_class").html("");
-	for(i=0;i<input_length;i++){
-		console.log(get_place[i]);
-		var p = get_place[i].id;
-		//alert("p"+p);
-		var m = p.split('-');
-		if(get_place[i].checked==true){
-			ad_group_id = ad_group_id+","+m[0];
-			ad_group_name = m[1]+","+ad_group_name;
-			//alert(ad_group_name);
-		}
-	}
-	$("#hidden_class").append('<input type=hidden id="place" name="place"  value='+ad_group_id+'>');
-	$("#hidden_class").append('<input type=hidden id="placeName" name="placeName"  value='+ad_group_name+'>');
-}
-function ad_group_fun(){
-	var input_length = $(".input-checkboxsDiv input[name=ad_group_ed]").length;
-	//alert(input_length);
-	var get_place =  $(".input-checkboxsDiv input[name=ad_group_ed]");
-	var place_id = "b";
-	var place_name = "";
-	$("#hidden_class").html("");
-	for(i=0;i<input_length;i++){
-		console.log(get_place[i]);
-		var q = get_place[i].id;
-		var n = q.split("-")
-		if(get_place[i].checked==true){
-			place_id = place_id+","+n[0];
-			place_name = n[1]+","+place_name;
-			//alert(place_id);
-		}
-	}
-	$("#hidden_class").append('<input type=hidden id="place" name="place" value='+place_id+'>');	
-	$("#hidden_class").append('<input type=hidden id="placeName" name="placeName" value='+place_name+'>');	
-}
-function td_click(a){
-	var ii = "#td_"+a;
-	//alert("ii"+ii);
-	var ch = $(ii).attr("value");
-	//alert("ch"+ch);
-	var ch_ad =[];
-	ch_ad = ch.split("|");
-	//alert(ch_ad[1]);
-	var check_have = document.getElementById("choosed_ad").innerHTML;
-	var get_check_num = check_have.indexOf(ch_ad[0]);
-	//alert(get_check_num);
-	if(get_check_num == -1){
-	 $("#choosed_ad").append('<ul style="border-bottom:thin solid #b9c5d9;text-align:center;" id="ul'+ch_ad[0]+'">'+ch_ad[1]+'<image src="'+$("#ctx").val()+'/assets/images/cross.png"  style="float:right;" id="images'+ch_ad[0]+'" onclick="cross('+ch_ad[0]+')" ><input type="hidden" name="zoneId_single" value="'+ch_ad[0]+'"  id="'+ch_ad[0]+'"></ul>');
-	}
-	var get_zone_array = $("#choosed_ad input[name=zoneId_single]");
-	var get_zonearray_length = get_zone_array.length;
-	var get_zone_id = "";
-	for(i=0;i<get_zonearray_length;i++){
-		//alert(get_zone_array[i].id);
-		get_zone_id = get_zone_array[i].id+","+get_zone_id;
-	}
-	$("#validateForm input[name=zoneId]").val(get_zone_id);
-}
-function cross(ss){
-	var ul_id = "#ul"+ss;
-	console.log($(ul_id).attr("id"));
-	$(ul_id).remove();
-}		
+	
 function exportExcel_list(){
 	var searchValue = $("#searchValue").val();
 	if(searchValue == "请输入关键字"){