修改广告位管理页面问题

src/main/java/com/cloudcross/ssp/web/operator/main/ad/ZoneController.java

@@ -344,6 +344,7 @@ public  class ZoneController extends SimpleController {
 				zoneDomain.setZoneId(t.getId());
 				zoneDomain.setDomain(domainArr[i]);
 				zoneDomain.setStatus(0);//新增默认开启
+				zoneDomain.setSupdated(new Date().getTime() / 1000);
 				//在域名黑名单中插入黑名单信息
 				zoneDomainService.add(zoneDomain);
 			}

src/main/webapp/WEB-INF/pages/operator/main/ad/zone/create.ftl

@@ -21,100 +21,92 @@
 					<li><i class="icon-angle-right"></i></li>
 					<li><a href="${ctx}/operator/main/ad/zone">广告位管理</a></li>
 					<li><i class="icon-angle-right"></i></li>
-					<li class="navDiv_currentLiss">创建广告位</li>
+					<li class="navDiv_currentLi">创建广告位</li>
 				</ul>  
 	 		</div>
 			<form id="validateForm" action="${ctx}/operator/main/ad/zone/save" method="post" enctype="multipart/form-data">
-				<div id="created_ops">
-					<div class="choose_ops">
-						<span class="star">*</span><span>广告位名称</span>
-						<div class="opsdiv_control">
-							<input name="name" type="text" verify="unspecial/255/1/0"></span><span class="spanVaildate"></span>							
-						</div>
-					</div>
-					<div class="choose_ops">
-						<span class="star">*</span><span>类型</span>
-						<div class="opsdiv_control">
-							<input type="radio" name="device" class="input_control" id="Mobile Web" value="1" checked/>
-							<label class="label1" for="Mobile Web">网页</label>
-							<input type="radio" name="device" class="input_control" id="APP"  value="2"/>
-							<label class="label1" for="APP" class="first_control">APP</label>		
-						</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>广告位名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>类型：</label>
+					<div class="opsdiv_control">
+						<input type="radio" name="device" class="input_control" id="Mobile Web" value="1" checked/>
+						<label for="Mobile Web">网页</label>
+						<input type="radio" name="device" class="input_control" id="APP"  value="2"/>
+						<label for="APP">APP</label>		
 					</div>
-					<div class="choose_ops">
-						<span class="star">*</span><span>位置</span>
-						<div class="opsdiv_control">
-							<input id="authenpage" type="radio" name="position" class="input_control"  value="1" checked/>
-							<label class="label1" for="authenpage" class="first_control">认证页</label>
-							<input id="jump" type="radio" name="position" class="input_control" value="2" />
-							<label class="label1" for="jump">跳转页</label>
-							<input id="net" type="radio" name="position" class="input_control" value="3" />
-							<label class="label1" for="net">上网过程</label>
-						</div>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>位置：</label>
+					<div class="opsdiv_control">
+						<input id="authenpage" type="radio" name="position" class="input_control"  value="1" checked/>
+						<label for="authenpage" >认证页</label>
+						<input id="jump" type="radio" name="position" class="input_control" value="2" />
+						<label class="label1" for="jump">跳转页</label>
+						<input id="net" type="radio" name="position" class="input_control" value="3" />
+						<label for="net">上网过程</label>
 					</div>
-					<div class="choose_ops">
-						<span class="star">*</span><span>尺寸</span>  
-						<div class="opsdiv_control">
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>尺寸：</label>
+					<div class="opsdiv_control">
 						<#if sizeList ??>
 						<#list sizeList as size>
 						<#if size_index == 0>
-							<input  autocomplete="off"  type="radio" id="#{size.width}X#{size.height}"  class="input_control"  value="#{size.id}" name="sizeId" checked>
-							<label for="#{size.width}X#{size.height}" class="first_control label1">${size.width}X${size.height}</label>
+							<input  autocomplete="off"  type="radio" id="#{size.width}X#{size.height}" value="#{size.id}" name="sizeId" checked>
+							<label for="#{size.width}X#{size.height}">${size.width}X${size.height}</label>
 						<#else>
-							<input  autocomplete="off"  type="radio" id="#{size.width}X#{size.height}"  class="input_control"  value="#{size.id}" name="sizeId">
-							<label for="#{size.width}X#{size.height}" class="first_control label1">${size.width}X${size.height}</label>
+							<input  autocomplete="off"  type="radio" id="#{size.width}X#{size.height}" value="#{size.id}" name="sizeId">
+							<label for="#{size.width}X#{size.height}">${size.width}X${size.height}</label>
 						</#if>
 						</#list>
 						</#if>
-						</div>
 					</div>
-					<div class="choose_ops">
-						<div id="advertiser">
-							<span>垫底广告</span>
-							<div id="picture-divs" class="opsdiv_control">
-								<label class="label1" >上传素材</label>
-								<div id="filepicture_picture">
-									<input type="hidden" name="default_path" id="uploadfilehidden"/>
-							        <input type="file" name="file" id="uploadfile" class='videoSt0'/>
-							        <div id="pull">
-							        	<button id="uploadfilestr" type="button" href="${ctx}/operator/main/ad/zone/fileupload">上传</button>
-							            <div class="help_inline_text" id="style_A">jpg/gif&nbsp;&nbsp;2M以下</div>
-							        </div>
-							    </div>
-							    <div id="fileurl fileurl_a" class="controls radioC">
-							    	<label class="label_click" id="click">点击地址</label>
-									<input id="default_url" type="text" name="default_url" sverify="text/255/0/0"></span><span class="spanVaildate"></span>
-							    </div>
-						   	</div>
+				</div>
+				<div class="input-group" id="pathDiv">
+					<label class="input-label-other"><span class="lbl-no"></span>垫底广告：</label>
+					<div class="opsdiv_control">
+						<label class="lable1">上传素材</label>
+						<div id="filepicture_picture">
+							<input type="hidden" name="default_path" id="uploadfilehidden"/>
+							<input type="file" name="file" id="uploadfile"/>
+							<button id="uploadfilestr" type="button" href="${ctx}/operator/main/ad/zone/fileupload">上传</button>
+							<span class="help_inline_text">jpg/gif&nbsp;&nbsp;2M以下</span>
 						</div>
-					<div>
-					<div class="choose_ops">
-						<div class="opsdiv_control">
-							<label class="label1" id="imgspan_pic">缩略图</label>
-							<div id="enlarge_images"></div>
+						<div id="imgDivs">
+							<label id="imgspan_pic">缩略图</label>
+							<div id="son_imgDiv">
+								<img id="smallImg" src=""/>
+								<div id="enlarge_images"></div>
 								<input id="default_path_small" type="hidden" name="default_path_small" value=""/>
+								<input id="pictureName" type="hidden" name="pictureName" value=""/>
 							</div>
 						</div>
+						<div id="fileurl">
+							<label class="lable1">点击地址</label>
+							<input class="input-text" id="default_url" type="text" name="default_url" sverify="text/255/0/0"></span><span class="spanVaildate"></span>
+						</div>
 					</div>
 				</div>
-				<br>
-				<div class="choose_ops" id="choose_ops_check">
-					<span class="star">*</span><span>素材再次自审</span>
+				<div class="input-group" id="recheckDiv">
+					<label class="input-label-other"><span class="lbl-yes">*</span>素材再次自审：</label>
 					<div class="opsdiv_control">
 						<input type="radio" name="recheck" class="first_control" id="yes" value="1" checked/>
 						<label class="label1" for="yes">是</label>
 						<input type="radio" name="recheck" class="input_control" id="no" value="0"/>
-						<label class="label1" for="no" class="input_control">否</label><span class="help_inline">（云联已对广告素材做过审核）</span>
+						<label for="no" class="input_control">否</label><span class="help_inline">（云联已对广告素材做过审核）</span>
 					</div>
 				</div>
-				<div class="choose_ops">
-					<span>行业黑名单</span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>行业黑名单：</label>
 					<div class="opsdiv_control">
 						<input type="button" value="全部" class="add_all btn_hover" id="add_all">
 						<input type="button" value="清空" class="clear_all btn_hover" id="clear_all">
 					</div>
 				</div>
-				<div class="choose_ops">
+				<div class="input-group" id="industryDiv">
 					<ul id="all_industry">
 					<span class="ul_title">全部行业</span>
 					<#if industryList ??>
@@ -129,22 +121,22 @@
 						<input type="hidden" value="" id="industry_blacklist" name="industry" />
 					</ul>
 				</div>
-				<div class="choose_ops" id="ops_lastul">
-					<span>网站黑名单</span>
-					<div class="opsdiv_control" >
-						<input type="text" value="" id="blackname">
+				<div class="input-group" id="blackDiv">
+					<label class="input-label-other"><span class="lbl-no"></span>网站黑名单：</label>
+					<div class="opsdiv_control">
+						<input class="input-text" type="text" value="" id="blackname"/>
 						<input type="button" value="添加" class="add_all btn_hover" id="add_web"/>
 						<input type="button" value="清空" class="clear_all btn_hover" id="clear_allweb"/>
 					</div>
 				</div>
-				<div class="choose_ops">
+				<div class="input-group" id="web_blacklistDiv">
 					<ul id="web_blacklist">													
 						<input type="hidden" value="" id="web_blacklistvalue" name="domain" />
 					</ul>
 				</div>
-				<div id="creat_okbutton">
-					<button id="btn-save" class="btn-save">保存</button>
-					<button class="btn-cancel">取消</button>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
 				</div>
 			</form>		
 		</div>

src/main/webapp/WEB-INF/pages/operator/main/ad/zone/edit.ftl

@@ -21,97 +21,88 @@
 					<li><i class="icon-angle-right"></i></li>
 					<li><a href="${ctx}/operator/main/ad/zone">广告位管理</a></li>
 					<li><i class="icon-angle-right"></i></li>
-					<li class="navDiv_currentLiss">编辑广告位</li>
+					<li class="navDiv_currentLi">编辑广告位</li>
 				</ul>  
 	 		</div>
 			<form id="validateForm" action="${ctx}/operator/main/ad/zone/save" method="post" enctype="multipart/form-data">
 				<input  autocomplete="off"  type="hidden" name="id" value="${zone.id!}"/>
-				<div id="created_ops">
-					<div class="choose_ops">
-						<span class="star">*</span><span>广告位名称</span>
-						<div class="opsdiv_control">
-							<input name="name" type="text" verify="unspecial/255/1/0" value="${zone.name!}"></span><span class="spanVaildate"></span>							
-						</div>
-					</div>
-					<div class="choose_ops">
-						<span class="star">*</span><span>类型</span>
-						<div class="opsdiv_control">
-							<input type="radio" name="device" class="input_control" id="Mobile Web" value="1" <#if zone.device==1>checked</#if>/>
-							<label class="label1" for="Mobile Web">网页</label>
-							<input type="radio" name="device" class="input_control" id="APP"  value="2" <#if zone.device==2>checked</#if>/>
-							<label class="label1" for="APP" class="first_control">APP</label>		
-						</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>广告位名称：</label>
+					<input class="input-text" tabindex="1" id="name" name="name" type="text" value="${zone.name!}" verify="unspecial/255/1/0"/><span class="spanVaildate"></span>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>类型：</label>
+					<div class="opsdiv_control">
+						<input type="radio" name="device" class="input_control" id="Mobile Web" value="1" <#if zone.device==1>checked</#if>/>
+						<label for="Mobile Web">网页</label>
+						<input type="radio" name="device" class="input_control" id="APP"  value="2" <#if zone.device==2>checked</#if>/>
+						<label for="APP">APP</label>		
 					</div>
-					<div class="choose_ops">
-						<span class="star">*</span><span>位置</span>
-						<div class="opsdiv_control">
-							<input id="authenpage" type="radio" name="position" class="input_control"  value="1" <#if zone.position==1>checked</#if>/>
-							<label class="label1" for="authenpage" class="first_control">认证页</label>
-							<input id="jump" type="radio" name="position" class="input_control" value="2" <#if zone.position==2>checked</#if>/>
-							<label class="label1" for="jump">跳转页</label>
-							<input id="net" type="radio" name="position" class="input_control" value="3" <#if zone.position==3>checked</#if>/>
-							<label class="label1" for="net">上网过程</label>
-						</div>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>位置：</label>
+					<div class="opsdiv_control">
+						<input id="authenpage" type="radio" name="position" class="input_control"  value="1" <#if zone.position==1>checked</#if>/>
+						<label for="authenpage" >认证页</label>
+						<input id="jump" type="radio" name="position" class="input_control" value="2" <#if zone.position==2>checked</#if>/>
+						<label class="label1" for="jump">跳转页</label>
+						<input id="net" type="radio" name="position" class="input_control" value="3" <#if zone.position==3>checked</#if>/>
+						<label for="net">上网过程</label>
 					</div>
-					<div class="choose_ops">
-						<span class="star">*</span><span>尺寸</span>  
-							<div class="opsdiv_control">
-							<#if SizeList ??>
-							<#list SizeList as size>	
-								<input type="radio" id="#{size.width}X#{size.height}"  class="input_control" <#if zone.sizeId==size.id>checked</#if> value="${size.id}" name="sizeId">
-								<label for="#{size.width}X#{size.height}" class="first_control label1">${size.width}X${size.height}</label>
-							</#list>
-							</#if>
-						</div>
+				</div>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-yes">*</span>尺寸：</label>
+					<div class="opsdiv_control">
+						<#if SizeList ??>
+						<#list SizeList as size>	
+							<input type="radio" id="#{size.width}X#{size.height}"  class="input_control" <#if zone.sizeId==size.id>checked</#if> value="${size.id!}" name="sizeId">
+							<label for="#{size.width}X#{size.height}">${size.width}X${size.height}</label>
+						</#list>
+						</#if>
 					</div>
-					<div class="choose_ops">
-						<div id="advertiser">
-							<span>垫底广告</span>
-							<div id="picture-divs" class="opsdiv_control">
-								<label class="label1" >上传素材</label>
-								<div id="filepicture_picture">
-									<input type="hidden" name="default_path" id="uploadfilehidden" value="${zone.default_path!}"/>
-							        <input type="file" name="file" id="uploadfile" class='videoSt0'/>
-							        <div id="pull">
-							        	<button id="uploadfilestr" type="button" href="${ctx}/operator/main/ad/zone/fileupload">上传</button>
-							            <div class="help_inline_text" id="style_A">jpg/gif&nbsp;&nbsp;2M以下</div>
-							        </div>
-							    </div>
-							    <div id="fileurl fileurl_a" class="controls radioC">
-							    	<label class="label_click" id="click">点击地址</label>
-									<input id="default_url" type="text" name="default_url" verify="text/255/0/0" value="${zone.default_url!}"></span><span class="spanVaildate"></span>
-							    </div>
-						   	</div>
+				</div>
+				<div class="input-group" id="pathDiv">
+					<label class="input-label-other"><span class="lbl-no"></span>垫底广告：</label>
+					<div class="opsdiv_control">
+						<label class="lable1">上传素材</label>
+						<div id="filepicture_picture">
+							<input type="hidden" name="default_path" id="uploadfilehidden" value="${zone.default_path!}"/>
+							<input type="file" name="file" id="uploadfile"/>
+							<button id="uploadfilestr" type="button" href="${ctx}/operator/main/ad/zone/fileupload">上传</button>
+							<span class="help_inline_text">jpg/gif&nbsp;&nbsp;2M以下</span>
 						</div>
-					<div>
-					<div class="choose_ops">
-						<div class="opsdiv_control">
-							<label class="label1" id="imgspan_pic">缩略图</label>
-							<div id="enlarge_images"></div>
+						<div id="imgDivs">
+							<label id="imgspan_pic">缩略图</label>
+							<div id="son_imgDiv">
+								<img id="smallImg" src="${zone.default_path_small!}"/>
+								<div id="enlarge_images"></div>
 								<input id="default_path_small" type="hidden" name="default_path_small" value="${zone.default_path_small!}"/>
 								<input id="pictureName" type="hidden" name="pictureName" value="${pictureName!}"/>
 							</div>
 						</div>
+						<div id="fileurl">
+							<label class="lable1">点击地址</label>
+							<input class="input-text" id="default_url" type="text" name="default_url" verify="text/255/0/0" value="${zone.default_url!}"/></span><span class="spanVaildate"></span>
+						</div>
 					</div>
 				</div>
-				<br>
-				<div class="choose_ops" id="choose_ops_check">
-					<span class="star">*</span><span>素材再次自审</span>
+				<div class="input-group" id="recheckDiv">
+					<label class="input-label-other"><span class="lbl-yes">*</span>素材再次自审：</label>
 					<div class="opsdiv_control">
 						<input type="radio" name="recheck" class="first_control" id="yes" value="1" <#if zone.recheck==1>checked</#if>/>
 						<label class="label1" for="yes">是</label>
 						<input type="radio" name="recheck" class="input_control" id="no" value="0" <#if zone.recheck==0>checked</#if>/>
-						<label class="label1" for="no" class="input_control">否</label><span class="help_inline">（云联已对广告素材做过审核）</span>
+						<label for="no" class="input_control">否</label><span class="help_inline">（云联已对广告素材做过审核）</span>
 					</div>
 				</div>
-				<div class="choose_ops">
-					<span>行业黑名单</span>
+				<div class="input-group">
+					<label class="input-label-other"><span class="lbl-no"></span>行业黑名单：</label>
 					<div class="opsdiv_control">
 						<input type="button" value="全部" class="add_all btn_hover" id="add_all">
 						<input type="button" value="清空" class="clear_all btn_hover" id="clear_all">
 					</div>
 				</div>
-				<div class="choose_ops">
+				<div class="input-group" id="industryDiv">
 					<ul id="all_industry">
 					<span class="ul_title">全部行业</span>
 					<#if notzoneIndustryList ??>
@@ -130,7 +121,7 @@
 					</ul>
 					<ul id="blacklist">
 						<span class="ul_title" id="ul_title">黑名单行业</span>
-						<input type="hidden" value="" id="industry_blacklist" name="industry" />
+						<input type="hidden" value="${industryStr!}" id="industry_blacklist" name="industry" />
 						<#if industryList ??>
 						<#list industryList as industry>
 							<#list zoneIndustryList as z>
@@ -142,27 +133,27 @@
 						</#if>
 					</ul>
 				</div>
-				<div class="choose_ops" id="ops_lastul">
-					<span>网站黑名单</span>
-					<div class="opsdiv_control" >
-						<input type="text" value="" id="blackname">
+				<div class="input-group" id="blackDiv">
+					<label class="input-label-other"><span class="lbl-no"></span>网站黑名单：</label>
+					<div class="opsdiv_control">
+						<input class="input-text" type="text" value="" id="blackname"/>
 						<input type="button" value="添加" class="add_all btn_hover" id="add_web"/>
 						<input type="button" value="清空" class="clear_all btn_hover" id="clear_allweb"/>
 					</div>
 				</div>
-				<div class="choose_ops">
+				<div class="input-group" id="web_blacklistDiv">
 					<ul id="web_blacklist">													
 						<input type="hidden" value="${zoneDomainStr!}" id="web_blacklistvalue" name="domain" />
 						<#if zoneDomainList ??>
 						<#list zoneDomainList as zoneDomain>
 							<li>${zoneDomain.domain}<input type='button' class='movedel'/></li>
 						</#list>
-						</#if>												
+						</#if>
 					</ul>
 				</div>
-				<div id="creat_okbutton">
-					<button id="btn-save" class="btn-save">保存</button>
-					<button class="btn-cancel">取消</button>
+				<div id="footBtn">
+					<button class="btn-save" type="submit">保存</button>
+					<button class="btn-cancel" type="button">取消</button>
 				</div>
 			</form>		
 		</div>

src/main/webapp/assets/css/zone_operator.css

@@ -1,104 +1,94 @@
-
-.space{
-	height:5px;
-	padding:55px;
-	color:white
-	width:100%;
-	
-}
-.star{
-	color:#4bb4eb;
-}
-
-body{
-	color:#4C637B;
-}
-#created_ops .add_all, #created_ops .clear_all{
-	margin-left:9px;
-	width: 90px;
-	height: 35px;
-	color:#36AEEA!important;
-  	font-size:12px;
-  	border:1px solid #36AEEA;
-   	border-radius:5px!important;
-	cursor: pointer;
-	background-color: #ffffff;
-}
-#created_ops .choose_ops label.label1{	
-	width: 90px;
-	height: 35px;
-	line-height:35px;
-	text-align: center;
-	color:#4C637B;
-}
-
-#created_ops .opsdiv_control{
-	margin-top:-30px;
-	margin-left:100px;
+.opsdiv_control{
+	height:34px;
+	line-height:34px;
 }
-#created_ops .choose_ops label.invalid{
-	margin-left:5px;
-	color: red;
-}
-#created_ops .choose_ops input[type="radio"],input[type="checkbox"]{
+.opsdiv_control input[type="radio"],input[type="checkbox"]{
 	display: none;
 }
-
-#created_ops .choose_ops .scene_control input[type="checkbox"] + label{
-	margin-top:10px;
-	
-}
-#created_ops .choose_ops input[type="radio"] + label{
+.opsdiv_control input[type="radio"] + label{
+	width:90px;
+	height:34px;
+	line-height:34px;
 	display: inline-block;	
 	border:solid #d5dee8 1px;
-	margin-left:10px;
 	cursor: pointer;
+	margin-right:16px;
+	text-align: center;
 }
 
-#created_ops .choose_ops input[type="radio"]:checked + label{
+.opsdiv_control input[type="radio"]:checked + label{
 	background-color: #4C637B;
 	color: #fff;
 }
 
-#created_ops .choose_ops input[type="checkbox"] + label{
+.opsdiv_control input[type="checkbox"] + label{
 	display: inline-block;	
 	border:solid #d5dee8 1px;
-	margin-left:20px;
 	cursor: pointer;
 }
 
-#created_ops .choose_ops input[type="checkbox"]:checked + label{
+.opsdiv_control input[type="checkbox"]:checked + label{
 	background-color: #4C637B;
 	color: #fff;
 }
 
-.input_control{
-	margin-left: 20px;
-	width: 296px;
-	height: 41px;
-	margin-top:10px;
-	text-align: center;
-	color:#4C637B;
+#pathDiv{
+	margin-top:27px;
 }
 
-.invalid{
-	color:red;
-	margin-left:5px;
-	position:relative;
-	top:5px;		
+.opsdiv_control #filepicture_picture{
+	width:450px;
+	margin-left:25px;
 }
 
-span.help_inline{
-	height:30px;
-	line-height:30px;
-	margin-left:10px;
+.opsdiv_control #filepicture_picture,.opsdiv_control .lable1{
+	float:left;
+}
+
+.opsdiv_control #filepicture_picture #uploadfilestr{
+	float: left;
+    margin: -47px 0 0 233px;
+}
+
+.opsdiv_control #filepicture_picture .help_inline_text{
+	float: left;
+	margin: -50px 0 0 304px;
+}
+
+
+.opsdiv_control #fileurl{
+	clear:both;
+	margin: 46px 0 0 120px;
+    position: absolute;
+}
+
+.opsdiv_control #fileurl label{
+	margin-right:25px;
+}
+
+#recheckDiv{
+	margin-top:68px;
+	display:flex;
+}
+
+.opsdiv_control .add_all,.opsdiv_control .clear_all{
+	margin-right:9px;
+	width: 90px;
+	height: 35px;
+	color:#36AEEA!important;
+  	font-size:12px;
+  	border:1px solid #36AEEA;
+   	border-radius:5px!important;
+	cursor: pointer;
+	background-color: #ffffff;
 }
 
-.choose_ops ul{
+#industryDiv ul{
 	width:530px;
 	border-top: solid #d5dee8 1px;
 	border-left: solid #d5dee8 1px;
-	float:left;			
+	float:left;		
+	display:inline-block;	
 }
 
 #all_industry span,#all_industry li,#blacklist span,#blacklist li{
@@ -121,7 +111,7 @@ span.help_inline{
 }
 
 #all_industry{
-	margin-left:100px;
+	margin-left:122px;
 }
 
 #all_industry li{
@@ -141,33 +131,19 @@ span.help_inline{
 	cursor: pointer;	
 }
 
-#ops_lastul{
-	clear: both;
-	position: relative;
-	top:25px;
-}
-
-#ops_lastul input{
-	position: relative;
-    left:0px;
-    color:#4C637B; 
-   
-}
-#ops_lastul input.input_control{
-	height:41px;
-}
-
-
 #web_blacklist{
-	margin: 25px 20px 20px 110px;
+	margin-left:122px;
 	width: 88%;	
 	height:auto;
+	border-left: 1px solid #d5dee8;
+    border-top: 1px solid #d5dee8;
+    display:inline-block;
 }
 
 #web_blacklist li{
 	width:19.9%;
-	height: 35px;
-	line-height: 35px;
+	height: 34px;
+	line-height: 34px;
 	float: left;
 	text-align: center;
 	border-right:solid #d5dee8 1px;
@@ -175,102 +151,15 @@ span.help_inline{
 	
 }
 
-#creat_okbutton{
+#blackDiv{
 	clear:both;
-	height:80px;
-	vertical-align: bottom;
-	margin-left: 100px;
 	padding-top:20px;
 }
 
-#creat_okbutton button{
-	
-}
-
-#creat_okbutton .saveinfo{
-	width: 119px;
-	height: 38px;
-	border: none;
-	border-radius: 5px;
-	color: #fff;
-	background:#67ba2f;	
-	cursor: pointer;	
+#blackDiv input{
+	margin-right:9px;
 }
 
-#creat_okbutton .cancelinfo{
-	width: 119px;
-	height: 38px;
-	border: none;
-	border-radius: 5px;
-	color: #fff;
-	background: #36aeea;
-	margin-left: 18px;
-	cursor: pointer;
-}
-
-#handler{
-	margin:20px 0 20px 1px;
-	height:14px;
-	line-height:14px;
-}
-#handler ul .active1{
-	float:left;
-}
-#handler ul .size1{
-	float:left;
-}
-#handler ul .size2{
-	float:left;
-	margin:0px 10px 0px 10px;
-}
-#handler ul .divider2{
-	float:left;
-	margin:0px 10px 0px 10px;
-}
-
-#handler li a{
-	text-decoration: none;
-	color:#0088CC;
-	font-size:14px;
-}
-
-#created_ops .choose_ops{
-    line-height: 30px;
-    margin-bottom:20px;
-}
-
-#created_ops .choose_ops input[type="text"]{
-	border: 1px solid #d5dadf;
-    border-radius: 5px !important;
-    font-size: 12px;
-    height: 25px;
-    line-height: 25px;
-    padding-left: 20px;
-    width: 300px;
-    margin-left:10px;
-}
-.file {
-    position: relative;
-    display: inline-block;
-   	color:#36AEEA!important;
-   	font-size:12px;
- 	border:1px solid #36AEEA;
-   	border-radius:5px!important;
-    color: #36aeea;
-    text-decoration: none;
-    text-indent: 0;
-    line-height: 32px;
-    width:90px;
-    text-align: center;
-    top:-40px;
-    left:100px;
-    cursor: pointer;
-
- }
- .file:hover{
- 	text-decoration: none;
- }
-
 #uploadfilestr{
 	width:50px;
 	height:30px;
@@ -279,45 +168,20 @@ span.help_inline{
     color:#ffffff;
 }
 
-#enlarge_images{
-	position:absolute;
+#imgDivs{
 	display:none;
-	z-index:9999;
-	border:5px solid #f4f4f4;
-}
-#choose_ops_name{
-	clear: both; 
-	margin-left: 0px; 
-	padding-top: 15px;
+	float:left;
+	cursor: pointer;
+	margin-top:-15px;
 }
-#picture{
-	clear: both; 
-	float: left; 
-	margin-top: -35px; 
-	margin-left: 90px;
+
+#son_imgDiv{
+	width:150px;
+	height:60px;
+	border:1px solid #d5dee8;
+	position: relative;
 }
-#pull{
-	margin-left:230px;
-	margin-top:-50px;
+
+#enlarge_images{
 	position: absolute;
-}
-#style_A{
-	display:inline-block;
-	margin-left:13px;
-}
-#fileurl_a{
-	clear: both; 
-	margin-left: 15px;
-}
-#click{
-	display:inline-block;
-}
-#imgspan_pic{
-	position: absolute; 
-	margin-left: 500px; 
-	margin-top: -60px;
-}
-#filepicture_picture{
-	margin-left: 70px; 
-	margin-top: -35px;
-}
+}

src/main/webapp/assets/js/operator/zone.js

@@ -144,11 +144,14 @@ $(document).ready(function(){
 	
 	//初始化加载上传控件
 	if($("#filepicture_picture").html()){
-		initFile($("#uploadfile"),$("#default_path").val());
+		if($("#uploadfilehidden").val() !=""){
+			$("#imgDivs").css("display","block");
+		}else{
+		 	$("#imgDivs").css("display","none");
+		}
+		initFile($("#uploadfile"),$("#pictureName").val());
 		$('#uploadfilestr').unbind('click').click(function() {
-			if($(this).html() == "上传"){
-	 			getUploadFile1($(this),"uploadfile","filepicture","uploadfilehidden","default_path_small","imgspan","smallImg");
-	 		}
+	 		getUploadFile();
 		});
 	}
 	
@@ -316,16 +319,16 @@ $(document).ready(function(){
 	});
 	
 	//鼠标划过小图片显示大图片
-	 $("#smallImg").mousemove(function(event){
+	 $("#son_imgDiv").mousemove(function(event){
 		var event = event || window.event;
 		$("#enlarge_images").css("display","block");
-		var imgsrc = $(this).attr("src");
+		var imgsrc = $(this).find("img#smallImg").attr("src");
 		imgsrc = imgsrc.substring(0,imgsrc.lastIndexOf(".")-6)+imgsrc.substring(imgsrc.lastIndexOf("."),imgsrc.length);
-		$("#enlarge_images").html('<img src="'+imgsrc+'" />');
-		$("#enlarge_images").css("top",document.body.scrollTop + event.clientY + 10 + "px");
-		$("#enlarge_images").css("left",document.body.scrollLeft + event.clientX + 10 + "px");
+		$("#enlarge_images").html('<img src="'+imgsrc+'"/>');
+		$("#enlarge_images").css("top",document.body.scrollTop + event.clientY - 300 + "px");
+		$("#enlarge_images").css("left",document.body.scrollLeft + event.clientX - 660 + "px");
 	});
-	$("#smallImg").mouseout(function(event){
+	$("#son_imgDiv").mouseout(function(event){
 		$("#enlarge_images").html("");
 		$("#enlarge_images").css("display","none");
 	});
@@ -361,52 +364,42 @@ function initFile(obj,pictureName){
 }
 
 //文件上传ajax文件上传
-function getUploadFile1(obj,_elemId,_removeId,picPathId,smallpicPathId,imgSpanId,smallpicObj){
-	var _href = obj.attr('href');
+function getUploadFile(){
+	var _href = $("#uploadfilestr").attr('href');
 	$.ajaxFileUpload({
 		url:_href, 
 		secureuri:false,
-		fileElementId:_elemId,
+		fileElementId:"uploadfile",
 		dataType: 'json',
 		success: function (result, status) {
 			var path = result.data['url'];
-			removeFile1(_elemId,_removeId,picPathId,result);
+			removeFile("uploadfile","filepicture_picture","uploadfilehidden",result);
 			if (result.status == 'ok') {
 				var orgImg = path.substring(0,path.indexOf(","));
 				var smallImg = path.substring(path.indexOf(",")+1);
-				$("#"+picPathId).val(orgImg);
-				$("#"+smallpicPathId).val(smallImg);
-				$("#"+smallpicObj).attr("src",smallImg);
-				$("#"+smallpicObj).css("display","block");
-				$("#"+imgSpanId).css("display","block");
+				$("#uploadfilehidden").val(orgImg);
+				$("#smallImg").val(smallImg);
+				$("#default_path_small").val(smallImg);
+				$("#imgDivs").css("display","block");
 				var result = 0;
-				removeFile1(_elemId,_removeId,picPathId,result);
+				removeFile("uploadfile","filepicture_picture","uploadfilehidden",result);
 				bootbox.alert("上传成功！");
-				if(obj.hasClass("uploadOrView")){
-					obj.html("预览");
-				}
 			}else if (result.status == 'error') {
-				$("#"+picPathId).val("");
-				$("#"+smallpicPathId).val("");
-				$("#"+smallpicObj).css("display","none");
-				$("#"+imgSpanId).css("display","none");
+				$("#uploadfilehidden").val("");
+				$("#smallImg").val("");
+				$("#default_path_small").val("");
+				$("#imgDivs").css("display","none");
 			    bootbox.alert(result.msg);
-			    if(obj.hasClass("uploadOrView")){
-					obj.html("上传");
-				}
 			}
 		},
 		error: function (data, status, e)
 		{
-			$("#"+picPathId).val("");
-			$("#"+smallpicPathId).val("");
-			$("#"+smallpicObj).css("display","none");
-			$("#"+imgSpanId).css("display","none");
-			removeFile1(_elemId,_removeId,picPathId);
+			$("#uploadfilehidden").val("");
+			$("#smallImg").val("");
+			$("#default_path_small").val("");
+			$("#imgDivs").css("display","none");
+			removeFile("uploadfile","filepicture_picture","uploadfilehidden");
 			console.log(e);
-			if(obj.hasClass("uploadOrView")){
-				obj.html("上传");
-			}
 		}
 	});
 	return false;
@@ -414,7 +407,7 @@ function getUploadFile1(obj,_elemId,_removeId,picPathId,smallpicPathId,imgSpanId
 
 
 //上传文件时conle file 删除 file
-function removeFile1(_elemId,_removeId,picPathId,result){
+function removeFile(_elemId,_removeId,picPathId,result){
 	var filename = $('#'+_elemId).parent().find("span").attr("data-title");
 	var isChrome = navigator.userAgent.toLowerCase().match(/chrome/) != null;//判断是否是谷歌浏览器
 	if(filename==null || filename==''){