Home Explore Project
Register Sign In
linkmedia
/
ssp_web
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修改广告主，后台页面问题

ying.rong 9 years ago
parent
7e627fadf1
commit
d785792204
15 changed files with 79 additions and 97 deletions
Split View Show Diff Stats
  1. 1 1
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report.ftl
  2. 14 23
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/create.ftl
  3. 11 20
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/createbyoperator.ftl
  4. 13 21
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/edit.ftl
  5. 0 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/edit.ftl
  6. 2 3
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/create-banner/list.ftl
  7. 5 2
      src/main/webapp/WEB-INF/pages/advertiser/main/authority/create.ftl
  8. 1 1
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl
  9. 3 2
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/type.ftl
  10. 1 1
      src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/banner-audit.ftl
  11. 1 1
      src/main/webapp/WEB-INF/pages/back/main/dashboard.ftl
  12. 0 3
      src/main/webapp/assets/css/audit.css
  13. 5 2
      src/main/webapp/assets/css/authority.css
  14. 16 15
      src/main/webapp/assets/css/regionReport.css
  15. 6 0
      src/main/webapp/assets/js/dropDownList.js

+ 1 - 1
src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report.ftl
View File 

@@ -54,7 +54,7 @@
 
 				<ul id="main_dimensionul" style="float:left; margin-right:10px;">

 					<li class="select_box" id="dimensionul_box">

 						<span id="dimensionul_span">${selecteddimensionName!}</span>

-						<ul class="son_ul" id="dimension_son_ul" style="margin-left:10px;"></ul>

+						<ul class="son_ul" id="dimension_son_ul" style="margin-left:20px;"></ul>

 					</li>

 				</ul>

 				<input type="hidden" name="selecteddimensionId" id="dimensionId" value="${dimensionId!}">

+ 14 - 23
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/create.ftl
View File 

@@ -1,6 +1,4 @@
 
- 

-<!DOCTYPE html>

-<head>

+<@override name="head">	

 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/public-head.css"/>

 	<link rel="stylesheet" href="${ctx}/assets/css/create.css"/>

 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />

@@ -28,9 +26,7 @@
 
 	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>

 	

 	<style>

-		#pagecontent{height:1660px;}

-		

-		.ui-widget-overlay { background: #aeaeae 50% 50% repeat-y; opacity: .90;filter:Alpha(Opacity=90); position: absolute; top: 0; left: 0; width: 100%; height:460%;;}

+		.ui-widget-overlay { background: #aeaeae 50% 50% repeat-y; opacity: .90;filter:Alpha(Opacity=90); position: absolute; top: 0; left: 0; width: 100%; height:560%;;}

 		.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }

 		.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }

 		.modal-foot{text-algin:center;width:560px;height:40px;}

@@ -66,9 +62,6 @@
 
 		.pagination-wifi{float:left;margin-left:10px;width:320px;padding-top:10px;}

 		.pagination-mini-wifi{margin:0; padding:0; list-style:none; overflow:hidden; float:left;  border:solid 1px #E9E9E9;border-radius: 5px;}

 		.pagination-mini-wifi li{margin:0px; padding:3px; list-style:none; overflow:hidden; float:left; width:20px;height:20px;border:solid 1px #E9E9E9;text-align:center; }

-		#pagecontent{

-		 margin-top:42px;

-		}

 		#third{

 		margin-left:-60px;

 		margin-top:-16px;

@@ -364,16 +357,14 @@ var datefalg = true;
 
 

 });

 </script> 

-</head>

-<body>

-<#include "/advertiser/main/public-head.ftl">                                                           

-<@override name="page">

-

+</@override>	

+	

+<@override name="body">

 <!-- PAGE CONTENT BEGINS HERE -->

 <div id=content_bg>

-		

+	<#include "/advertiser/main/public-head.ftl"> 	

 <div id= "pagecontent">

-	<div id="content" style="width:97%;height:94%;">

+	<div id="content">

 		<div id="third">

 			<ul style="">

 					<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="${ctx}/advertiser/main/dashboard">首页</a>

@@ -620,14 +611,14 @@ var datefalg = true;
 
   	</div>

 		

 		<br>

-		<div class="control-group" id="placediv">

+		<div class="control-group" id="placediv" style="clear:both;">

 			<sup style="color:red">*</sup>场景：

 			<div class="controls6" style="margin-left: 25px;margin-top: -18px;width:auto;">

 				<#if placeList ??>

 				<#list placeList as place>

-				<div style="display:inline-block; margin-left:180px;margin-bottom:20px;">

-					<input  autocomplete="off" style="display:inline-block;margin-left:-155px;"  type="checkbox" name="place" id ="#{place.id}place" value="#{place.id}">

-					<li style="float:left;margin-left:-50px;margin-top:3px;width:120px;" >${place.name}</li>

+				<div style="display:inline-block; margin-left:100px;margin-bottom:20px;">

+					<input  autocomplete="off" style="float:left;display:inline-block;"  type="checkbox" name="place" id ="#{place.id}place" value="#{place.id}">

+					<li style="float:left;width:120px;position: relative;top:-3px;left:10px;" >${place.name}</li>

 					</div>

 				</#list>

 				</#if>

@@ -729,6 +720,7 @@ var datefalg = true;
 
 </div>

 <div id="areas_layout"></div>

 <div id="schedule_layout"></div>

+

 <script type="text/javascript">

                 

             	var areasgeoPopup = $("#areas_popup")[0];

@@ -1080,7 +1072,7 @@ function genwifinav(pcount,pno,fun){
 
 					        }else{

 					           	var timeData = -1;

 					        }

-					   		var html = '<div class="time_item"><p class="tr_data"><span class="inp"><input type="text" class="start_date edit_time" readonly="readonly" value="'+startDate+'"></span><span class="inp"><input type="text" class="end_date edit_time" readonly="readonly" value = "'+endDate+'"></span></p><button class="btn_del">删除</button><input class="json_date" type="hidden" value = "'+timeData+'"></div>';

+					   		var html = '<div class="time_item"><p class="tr_data"><span class="inp"><input type="" class="start_date edit_time" readonly="readonly" value="'+startDate+'"></span><span class="inp"><input type="" class="end_date edit_time" readonly="readonly" value = "'+endDate+'"></span></p><button class="btn_del">删除</button><input class="json_date" type="hidden" value = "'+timeData+'"></div>';

 					   		$(".setting .time_box").append(html);

 					   		$(".time_box .time_item .btn_del").bind("click",function(e){

 					   			$(this).parents(".time_item").remove();

@@ -1222,5 +1214,4 @@ function genwifinav(pcount,pno,fun){
 
 

 </script>

 </@override>

-<@extends name="/common/page.ftl"/>

-

+<@extends name="/common/simple.ftl"/>

+ 11 - 20
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/createbyoperator.ftl
View File 

@@ -1,6 +1,4 @@
 
- 
-<!DOCTYPE html>
 
-<head>
 
+<@override name="head">	
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/public-head.css"/>
 
 	<link rel="stylesheet" href="${ctx}/assets/css/create.css"/>
 
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 
@@ -11,6 +9,7 @@
 
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
 
 	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
 
 	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
 
+	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.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>
 
@@ -27,9 +26,7 @@
 
 	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 
 	
 	<style>
 
-		#pagecontent{height:1660px;}
 
-		
-		.ui-widget-overlay { background: #aeaeae 50% 50% repeat-y; opacity: .90;filter:Alpha(Opacity=90); position: absolute; top: 0; left: 0; width: 100%; height:460%;;}
 
+		.ui-widget-overlay { background: #aeaeae 50% 50% repeat-y; opacity: .90;filter:Alpha(Opacity=90); position: absolute; top: 0; left: 0; width: 100%; height:560%;;}
 
 		.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 
 		.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
 
 		.modal-foot{text-algin:center;width:560px;height:40px;}
 
@@ -65,9 +62,6 @@
 
 		.pagination-wifi{float:left;margin-left:10px;width:320px;padding-top:10px;}
 
 		.pagination-mini-wifi{margin:0; padding:0; list-style:none; overflow:hidden; float:left;  border:solid 1px #E9E9E9;border-radius: 5px;}
 
 		.pagination-mini-wifi li{margin:0px; padding:3px; list-style:none; overflow:hidden; float:left; width:20px;height:20px;border:solid 1px #E9E9E9;text-align:center; }
 
-		#pagecontent{
 
-		 margin-top:42px;
 
-		}
 
 		#third{
 
 		margin-left:-60px;
 
 		margin-top:-16px;
 
@@ -363,14 +357,12 @@ var datefalg = true;
 
 
 });
 
 </script> 
-</head>
 
-<body>
 
-<#include "/advertiser/main/public-head.ftl">                                                           
-<@override name="page">
 
-
 
+</@override>	
+	
+<@override name="body">
 
 <!-- PAGE CONTENT BEGINS HERE -->
 
 <div id=content_bg>
 
-		
+	<#include "/advertiser/main/public-head.ftl">  	
 <div id= "pagecontent">
 
 	<div id="content" style="width:97%;height:94%;">
 
 		<div id="third">
 
@@ -394,7 +386,7 @@ var datefalg = true;
 
 					<span class="divider2"><i class="icon-angle-right"></i></span></li>
 
 					<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">投放管理</a></li>
 
 					<span class="divider2"><i class="icon-angle-right"></i></span></li>
 
-					<li class="size3">创建投放</li>
 
+					<li class="size3">媒体自投</li>
 
 					</#if>
 
 				</ul> 
 			</div> 
@@ -614,8 +606,8 @@ var datefalg = true;
 
 				<#if placeList ??>
 
 				<#list placeList as place>
 
 				<div style="display:inline-block; margin-left:180px;margin-bottom:20px;">
 
-					<input  autocomplete="off" style="display:inline-block;margin-left:-155px;"  type="checkbox" name="place" id ="#{place.id}place" value="#{place.id}">
 
-					<li style="float:left;margin-left:-50px;margin-top:3px;width:120px;" >${place.name}</li>
 
+					<input  autocomplete="off" style="float:left;display:inline-block;"  type="checkbox" name="place" id ="#{place.id}place" value="#{place.id}">
 
+					<li style="float:left;width:120px;position: relative;top:-3px;left:10px;" >${place.name}</li>
 
 					</div>
 
 				</#list>
 
 				</#if>
 
@@ -1188,5 +1180,4 @@ function genwifinav(pcount,pno,fun){
 
 
 </script>
 
 </@override>
 
-<@extends name="/common/page.ftl"/>
 
-
 
+<@extends name="/common/simple.ftl"/>

+ 13 - 21
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/edit.ftl
View File 

@@ -1,6 +1,4 @@
 
- 

-<!DOCTYPE html>

-<head>

+<@override name="head">	

 <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/public-head.css"/>

  <link rel="stylesheet" href="${ctx}/assets/css/create.css"/>

 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />

@@ -32,9 +30,7 @@
 
 		#btnmapSearch:hover {background:#344c67;}

 		/**点击找回**/

 		#line{margin-left:80px;}

-		

-		#pagecontent{height:1660px;}

-		.ui-widget-overlay { background: #aeaeae 50% 50% repeat-y; opacity: .90;filter:Alpha(Opacity=90); position: absolute; top: 0; left: 0; width: 100%; height:460%;}

+		.ui-widget-overlay { background: #aeaeae 50% 50% repeat-y; opacity: .90;filter:Alpha(Opacity=90); position: absolute; top: 0; left: 0; width: 100%; height:560%;}

 		.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }

 		.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }

 		.modal-foot{text-algin:center;width:560px;}

@@ -72,9 +68,6 @@
 
 		.pagination-wifi{float:left;margin-left:10px;width:320px;padding-top:10px;}

 		.pagination-mini-wifi{margin:0; padding:0; list-style:none; overflow:hidden; float:left;  border:solid 1px #E9E9E9;border-radius: 5px;}

 		.pagination-mini-wifi li{margin:0px; padding:3px; list-style:none; overflow:hidden; float:left; width:20px;height:20px;border:solid 1px #E9E9E9;text-align:center; }

-		#pagecontent{

-		 margin-top:42px;

-		}

 		#third{

 		margin-left:-60px;

 		margin-top:-10px;

@@ -248,7 +241,7 @@
 
 		  }

 		  .pitchon{

 		    background-color:red;

-		    background:url(/ssp_advertiser/assets/advertiser/images/duihao.png) no-repeat right bottom;

+		    background:url(/ssp_web/assets/advertiser/images/duihao.png) no-repeat right bottom;

 		    background-size:16%;

 		  }

 		  

@@ -449,13 +442,12 @@ var datefalg = true;
 
 	

 });

         </script> 

-        </head><body>

-<#include "/advertiser/main/public-head.ftl">                                                           

-<@override name="page">

-

+</@override>	

+	

+<@override name="body">

 <!-- PAGE CONTENT BEGINS HERE -->

 <div id=content_bg>

-		

+		<#include "/advertiser/main/public-head.ftl">    

 		<div id= "pagecontent">

 			<div id="content" style="width:97%;height:94%;">

 				<div id="third">

@@ -699,14 +691,14 @@ var datefalg = true;
 
 		    </div>

 		</div>

 

-		<div class="control-group" id="placediv">

+		<div class="control-group" id="placediv" style="clear:both;">

 			<sup style="color:red">*</sup>场景：

 			<div class="controls6" style="margin-bottom: 37px;margin-left: 25px;margin-top: -18px;width:auto;">

 				<#if placeList ??>

 				<#list placeList as place>

 				<div style="display:inline-block; margin-left:180px;margin-bottom:20px;">

-					<input  autocomplete="off" style="display:inline-block;margin-left:-155px;"  type="checkbox" name="place" id ="#{place.id}place" value="#{place.id}">

-					<li style="float:left;margin-left:-50px;margin-top:3px;width:120px;" >${place.name}</li>

+					<input  autocomplete="off" style="float:left;display:inline-block;"  type="checkbox" name="place" id ="#{place.id}place" value="#{place.id}">

+					<li style="float:left;width:120px;position: relative;top:-3px;left:10px;" >${place.name}</li>

 					</div>

 				</#list>

 				</#if>

@@ -841,8 +833,6 @@ var datefalg = true;
 
 </div><!--/row-->

 <div id="areas_layout"></div>

 <div id="schedule_layout"></div>

-</@override>

-<@extends name="/common/page.ftl"/>

 

 <script type="text/javascript">

                     

@@ -1414,4 +1404,6 @@ function genwifinav(pcount,pno,fun){
 
 		}

 	}

   

-</script>
 
+</script>

+</@override>

+<@extends name="/common/simple.ftl"/>

+ 0 - 2
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/edit.ftl
View File 

@@ -37,12 +37,10 @@
 
 					var path = data.result;

 					if(path.indexOf("不支持") < 0){

 					var file_name = path.split("\\")[path.split("\\").length-1];

-					alert(file_name);

 					$("#bannerTemplateName").val(file_name);

 		              $("#bannerTemplateName1").val(file_name); 

 					 $("#upload-path").val(data.result);

 			     }

-					 alert(path); 

 				}

 			})

+ 2 - 3
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/create-banner/list.ftl
View File 

@@ -59,13 +59,13 @@
 
 							<span class="divider2"><i class="icon-angle-right"></i></span>

 							<li class="size2"><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId}&campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}">创意管理</a>

 							<span class="divider2"><i class="icon-angle-right"></i></span>

-							<li class="size3">创建创意

+							<li class="size3">创建创意</li>

 							</#if>

 						</ul>  

 					</div>

 					<div class="btns">

 					

-						<div class="btn1">

+						<div>

 							<div class="btn-content">

 								<button class="banner-select" href="${ctx}/advertiser/main/ad/target/clone-banner?adGroupId=${adGroupId}" onMouseOver="this.style.cssText='background-color:#36aeea;color:#fff;'" onMouseOut="this.style.cssText='background-color:#ffffff;color:#36aeea;'">从创意中心选择</button>

 							</div>

@@ -173,7 +173,6 @@ $(function(){
 
 		autoUpload: true,

 		url: '${ctx}/advertiser/main/ad/target/create-banner/upload?adGroupId=${adGroupId}',		

 		done:function(e,data){

-			alert(data.result);

 			window.location.reload();

 		}				

 	});

+ 5 - 2
src/main/webapp/WEB-INF/pages/advertiser/main/authority/create.ftl
View File 

@@ -1,7 +1,10 @@
 
 <@override name="head">

 	<title>创建账号</title>

 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>

+	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>

+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>

 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>

+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.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>

@@ -232,8 +235,8 @@
 
 					

 					<div class="control-group" style="margin-bottom:10px;">

 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态：</label>

-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" value="1" checked="checked"><span style="margin-top:3px;">开启</span></label> 

-						<label class="form-align-radio" ><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span >暂停</span></label>

+						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" value="1" checked="checked"><span>开启</span></label> 

+						<label class="form-align-radio" style="margin:-40px 0 0 140px;"><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span>暂停</span></label>

 					</div>

 					

 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">

+ 1 - 1
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl
View File 

@@ -53,7 +53,7 @@
 
 					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 
 					<ul id="main_zoneListUl">
 
 						<li class="select_box" id="zoneListUl_box">
 
-							<span id="zoneListUl_span">${selecteddimensionName!}</span>
 
+							<span id="zoneListUl_span">${selectedZoneName!}</span>
 
 							<ul class="son_ul" id="son_zoneListUl"></ul>
 
 						</li>
 
 					</ul>

+ 3 - 2
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/type.ftl
View File 

@@ -26,10 +26,11 @@
 
 				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
 
 				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
 
 				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
 
-				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
 
-				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
 
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
 
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
 
 				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
 
 				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
 
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
 
 		    </div>
 
  			<div id="navDiv">
 
 				<ul id="navDiv_ul">

+ 1 - 1
src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/banner-audit.ftl
View File 

@@ -52,7 +52,7 @@
 
 
 <div id="footBar">
 
 	<button class='exportExcel' href="${ctx}/back/main/audit/audit-banner/auditBannerExcel">导出Excel</button>
 
-	<div id="paged">
 
+	<div id="paged1" style="float:right;margin:-35px -30px 0 0;">
 
        <#include "/common/pagination/simple.ftl"/>
 
     </div>
 
 </div>

+ 1 - 1
src/main/webapp/WEB-INF/pages/back/main/dashboard.ftl
View File 

@@ -111,7 +111,7 @@ $(function () {
 
 <!-- PAGE CONTENT BEGINS HERE -->
 
 <#include "public-head.ftl">
 
 	<div id="pagecontent">
 
-		<div id="quickJump">
 
+		<div id="quickJump" style="padding:20px 0 0 20px;">
 
 			<span><i class="icon-home">&nbsp;</i><a src="${ctx}/back/main/dashboard">首页</a></span>
 
 		</div>

+ 0 - 3
src/main/webapp/assets/css/audit.css
View File 

@@ -24,9 +24,6 @@
 
 	border-bottom:2px solid #36aeea;
 
 }
 
 /*设置快速跳转div中ul的左margin*/
 
-#shortcutBar{
 
-	margin-top:-10px;
 
-}
 
 #shortcutBar ul{
 
 	margin-left:0px;
 
 }

+ 5 - 2
src/main/webapp/assets/css/authority.css
View File 

@@ -10,7 +10,6 @@
 
 	margin-top:20px;
 
 }
 
 #content{
 
-	margin:0 20px;
 
 	padding-top:1px;
 
 }
 
 
@@ -502,4 +501,8 @@ span.input-checkbox-span{
 
 #selectConditionBar a:hover{
 
 	border-bottom-color: #36aeea;
 
 }
 
-/*webback閲岄潰鐨別nd*/
 
+/*webback閲岄潰鐨別nd*/
 
+
 
+#uploadTable .ace-file-input label span{
 
+	height:27px;
 
+}

+ 16 - 15
src/main/webapp/assets/css/regionReport.css
View File 

@@ -50,9 +50,9 @@
 
 		}
 
 		#third{
 
 			margin:20px 10px 7px 10px;
 
-			/*webback里面的start
 
+			/*webback锟斤拷锟斤拷锟絪tart
 
 	margin:20px 0 20px 10px;
 
-webback里面的end*/
 
+webback锟斤拷锟斤拷锟絜nd*/
 
 		}
 
 		#third ul .active1{
 
 		   float:left;
 
@@ -64,9 +64,9 @@ webback
 
 	    #third ul .size2{
 
 		   float:left;
 
 		   margin:0px -7px 0px -7px;
 
-		   			/*webback里面的start
 
+		   			/*webback锟斤拷锟斤拷锟絪tart
 
  margin:0px 10px 0px 10px;
 
-webback里面的end*/
 
+webback锟斤拷锟斤拷锟絜nd*/
 
 		}
 
 		#third ul .divider2{
 
 		   float:left;
 
@@ -77,7 +77,7 @@ webback
 
 		margin-top:10px;
 
 		}
 
 		
-		/*advertiser里面的start
 
+		/*advertiser锟斤拷锟斤拷锟絪tart
 
 		#third{
 
 			margin:20px 0 20px 10px;
 
 		}
 
@@ -105,22 +105,22 @@ webback
 
 			float:left;
 
 			clear:both;
 
 			margin-bottom:20px;
 
-			/*advertiser里面的start
 
+			/*advertiser锟斤拷锟斤拷锟絪tart
 
 			
 			margin:0 0 20px 10px;
 
 			
 			
-			advertiser里面的end*/
 
+			advertiser锟斤拷锟斤拷锟絜nd*/
 
 		}
 
 		#selectuls ul{
 
 			float:left;
 
 			cursor: pointer;
 
 			margin-left:20px;
 
-			/*advertiser里面的start
 
+			/*advertiser锟斤拷锟斤拷锟絪tart
 
 			
 			margin-left:10px;
 
 			
-			advertiser里面的end*/
 
+			advertiser锟斤拷锟斤拷锟絜nd*/
 
 		}
 
 		.select_box{
 
 			width:150px;
 
@@ -146,6 +146,7 @@ webback
 
 			border-radius:5px!important;
 
 			position: relative;
 
 			left:-20px;
 
+			z-index: 9999;
 
 		}
 
 		.son_ul li {
 
 			padding-left:20px; 
@@ -160,7 +161,7 @@ webback
 
 		#date{
 
 			margin-bottom:10px;
 
 		}
 
-		/*advertiser里面的start*/
 
+		/*advertiser锟斤拷锟斤拷锟絪tart*/
 
 		#date{
 
 			margin:0 20px;
 
 		}
 
@@ -192,9 +193,9 @@ webback
 
 		#date-radio span{
 
 			font-size:12px; 
 			margin-right:20px;
 
-			/*webback里面的start
 
+			/*webback锟斤拷锟斤拷锟絪tart
 
 	margin-right:13px;
 
-webback里面的end*/
 
+webback锟斤拷锟斤拷锟絜nd*/
 
 			position: relative;
 
 			top: 3px;
 
 		}
 
@@ -202,7 +203,7 @@ webback
 
 			margin-right:5px;
 
 		}
 
 		
-/*advertiser里面的end*/
 
+/*advertiser锟斤拷锟斤拷锟絜nd*/
 
 		#table{
 
 			width:100%;
 
 			height:auto;
 
@@ -216,7 +217,7 @@ webback
 
 		#pageDiv{
 
 			margin-top:20px;
 
 		}
 
-/*advertiser里面的start*/
 
+/*advertiser锟斤拷锟斤拷锟絪tart*/
 
 	#sign {
 
 			font-size:12px; 
 		    background:#36aeea none repeat scroll 0 0;
 
@@ -277,4 +278,4 @@ webback
 
 			color:#344c67;
 
 		}
 
 
-/*advertiser里面的end*/
 
+/*advertiser锟斤拷锟斤拷锟絜nd*/

+ 6 - 0
src/main/webapp/assets/js/dropDownList.js
View File 

@@ -135,6 +135,9 @@ $(document).ready(function() {
 
 	

  	//请选择广告位

  	if($("#main_zoneListUl").html()){

+ 		if($("#selectedZoneId").val() == -1 || $("#selectedZoneId").val() == ""){

+ 			$("#zoneListUl_span").html("全部广告位");

+ 		}

  		$("#son_zoneListUl").hide();

  		var url = "/ssp_web/widget/selector/provide/zone?parentId="+$("#sessionoperatorId").val();

  		getSelectData1("zoneListUl_span","son_zoneListUl","zoneListUl_box","全部广告位",url,"zoneList",null);

@@ -149,6 +152,9 @@ $(document).ready(function() {
 
  	

  	//请选择媒体

  	if($("#main_operatorListUl").html()){

+ 		if($("#selectedOperatorId").val() == -1 || $("#selectedOperatorId").val() == ""){

+ 			$("#operatorListUl_span").html("全部媒体");

+ 		}

  		$("#son_operatorListUl").hide();

  		var url = "/ssp_web/widget/selector/provide/operator?parentId=1";

  		getSelectData1("operatorListUl_span","son_operatorListUl","operatorListUl_box","全部媒体",url,"operatorList","operator");