Browse Source

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

fan.yang@cloudcross.com 10 years ago
parent
commit
9ae5bbd7dc
100 changed files with 3785 additions and 20781 deletions
  1. 13 0
      src/main/java/com/cloudcross/ssp/model/mapper/banner-template.sql.xml
  2. 38 46
      src/main/java/com/cloudcross/ssp/model/mapper/report.sql.xml
  3. 2 2
      src/main/java/com/cloudcross/ssp/model/mapper/rpt-zone.sql.xml
  4. 14 4
      src/main/java/com/cloudcross/ssp/service/impl/BannerTemplateService.java
  5. 0 1
      src/main/java/com/cloudcross/ssp/web/advertiser/main/DashboardController.java
  6. 1 1
      src/main/java/com/cloudcross/ssp/web/back/main/AuthorityController.java
  7. 8 47
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/adv-balance/distribution.ftl
  8. 10 49
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/adv-balance/list.ftl
  9. 20 102
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/create.ftl
  10. 18 101
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/edit.ftl
  11. 11 66
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/list.ftl
  12. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/update.ftl
  13. 16 37
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/banner-template/index.ftl
  14. 6 5
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/banner-template/list.ftl
  15. 3 5
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/create.ftl
  16. 3 5
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/edit.ftl
  17. 18 60
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/list.ftl
  18. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/update.ftl
  19. 46 195
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report.ftl
  20. 7 7
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/create.ftl
  21. 5 6
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/dimension.ftl
  22. 7 7
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/edit.ftl
  23. 34 192
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/osReport.ftl
  24. 34 193
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/regionReport.ftl
  25. 34 192
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/sceneReport.ftl
  26. 22 26
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/create.ftl
  27. 23 22
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/edit.ftl
  28. 20 63
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/list.ftl
  29. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/update.ftl
  30. 8 8
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/edit.ftl
  31. 23 65
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/list.ftl
  32. 2 2
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/update.ftl
  33. 7 6
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/create.ftl
  34. 7 6
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/edit.ftl
  35. 19 61
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/list.ftl
  36. 4 4
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/update.ftl
  37. 142 161
      src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/create-banner/list.ftl
  38. 4 18
      src/main/webapp/WEB-INF/pages/advertiser/main/authority/create.ftl
  39. 4 18
      src/main/webapp/WEB-INF/pages/advertiser/main/authority/edit.ftl
  40. 5 6
      src/main/webapp/WEB-INF/pages/advertiser/main/authority/list.ftl
  41. 4 4
      src/main/webapp/WEB-INF/pages/advertiser/main/authority/loginperson.ftl
  42. 3 4
      src/main/webapp/WEB-INF/pages/advertiser/main/code-class/create.ftl
  43. 3 4
      src/main/webapp/WEB-INF/pages/advertiser/main/code-class/edit.ftl
  44. 13 13
      src/main/webapp/WEB-INF/pages/advertiser/main/code-class/list.ftl
  45. 3 4
      src/main/webapp/WEB-INF/pages/advertiser/main/code-convert/create.ftl
  46. 3 4
      src/main/webapp/WEB-INF/pages/advertiser/main/code-convert/edit.ftl
  47. 13 14
      src/main/webapp/WEB-INF/pages/advertiser/main/code-convert/list.ftl
  48. 4 4
      src/main/webapp/WEB-INF/pages/advertiser/main/code-site/list.ftl
  49. 504 460
      src/main/webapp/WEB-INF/pages/advertiser/main/dashboard.ftl
  50. 14 34
      src/main/webapp/WEB-INF/pages/advertiser/main/finance/finance-data/allocation.ftl
  51. 10 10
      src/main/webapp/WEB-INF/pages/advertiser/main/finance/finance-data/financelist.ftl
  52. 9 4
      src/main/webapp/WEB-INF/pages/advertiser/main/public-head.ftl
  53. 3 3
      src/main/webapp/WEB-INF/pages/back/main/ad/message/list.ftl
  54. 150 875
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl
  55. 139 40
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/apmac.ftl
  56. 114 387
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/areal.ftl
  57. 133 1262
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/place.ftl
  58. 130 1250
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/position.ftl
  59. 134 1272
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/size.ftl
  60. 130 1445
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/system.ftl
  61. 128 1251
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/type.ftl
  62. 43 177
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report.ftl
  63. 12 6
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/create.ftl
  64. 15 10
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/dimension.ftl
  65. 12 6
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/edit.ftl
  66. 34 166
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/osReport.ftl
  67. 34 166
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/regionReport.ftl
  68. 34 165
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/sceneReport.ftl
  69. 0 110
      src/main/webapp/WEB-INF/pages/back/main/ad/report/system-report/system.ftl
  70. 0 110
      src/main/webapp/WEB-INF/pages/back/main/ad/report/type-report/type.ftl
  71. 5 7
      src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/index.ftl
  72. 63 68
      src/main/webapp/WEB-INF/pages/back/main/audit/audit/details.ftl
  73. 3 3
      src/main/webapp/WEB-INF/pages/back/main/audit/audit/index.ftl
  74. 4 4
      src/main/webapp/WEB-INF/pages/back/main/authority/create.ftl
  75. 4 4
      src/main/webapp/WEB-INF/pages/back/main/authority/edit.ftl
  76. 3 4
      src/main/webapp/WEB-INF/pages/back/main/authority/list.ftl
  77. 4 4
      src/main/webapp/WEB-INF/pages/back/main/authority/loginperson.ftl
  78. 4 4
      src/main/webapp/WEB-INF/pages/back/main/client-account/create.ftl
  79. 4 4
      src/main/webapp/WEB-INF/pages/back/main/client-account/edit.ftl
  80. 3 4
      src/main/webapp/WEB-INF/pages/back/main/client-account/list.ftl
  81. 107 116
      src/main/webapp/WEB-INF/pages/back/main/dashboard.ftl
  82. 88 94
      src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/deposit.ftl
  83. 42 48
      src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/index.ftl
  84. 6 1
      src/main/webapp/WEB-INF/pages/back/main/public-head.ftl
  85. 0 156
      src/main/webapp/WEB-INF/pages/operator/main/ad/advertiser/create.ftl
  86. 0 147
      src/main/webapp/WEB-INF/pages/operator/main/ad/advertiser/edit.ftl
  87. 0 157
      src/main/webapp/WEB-INF/pages/operator/main/ad/advertiser/list.ftl
  88. 0 90
      src/main/webapp/WEB-INF/pages/operator/main/ad/advertiser/update.ftl
  89. 0 212
      src/main/webapp/WEB-INF/pages/operator/main/ad/order/create.ftl
  90. 0 210
      src/main/webapp/WEB-INF/pages/operator/main/ad/order/edit.ftl
  91. 0 243
      src/main/webapp/WEB-INF/pages/operator/main/ad/order/list.ftl
  92. 0 106
      src/main/webapp/WEB-INF/pages/operator/main/ad/order/update.ftl
  93. 139 761
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report.ftl
  94. 122 933
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/apmac.ftl
  95. 100 299
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/areal.ftl
  96. 124 1164
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/place.ftl
  97. 121 1171
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/position.ftl
  98. 126 1181
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/size.ftl
  99. 120 1370
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/system.ftl
  100. 121 1161
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/type.ftl

+ 13 - 0
src/main/java/com/cloudcross/ssp/model/mapper/banner-template.sql.xml

@@ -144,6 +144,19 @@ where b.banner_template_id = a.id and a.id in
 <foreach close=")" separator="," open="(" collection="idList" item="id"> #{id} </foreach>
 
 </update>
+
+<update id="updataDeleteBannerTemplateOperatorStatus" parameterType="HashMap">
+		update t_banner_operator 
+		set checked =3,
+		supdated=#{updated}
+		where banner_id in (select id from t_banner 
+		where t_banner.banner_template_id in
+		<foreach item="id" collection="idList" open="(" separator=","
+			close=")">
+			#{id}
+		</foreach>)
+	</update>
+	
 	
 	<select id="findByCampaignId" parameterType="long" resultType="com.cloudcross.ssp.model.AdGroup">
 	    select

+ 38 - 46
src/main/java/com/cloudcross/ssp/model/mapper/report.sql.xml

@@ -123,16 +123,16 @@
 		</where>
 	</select>
 		<select id="findCountForDeliverEffectAnalysisOperator" parameterType="map" resultType="int">
-		select count(date) from ((
-		select distinct date 
+		select count(date) 
 		from t_rpt_zone  
 		<where>
-		operator_id = #{operatorId} and date &gt;= #{startDate} and #{endDate} &gt;=date
+		<if test="zoneId==null">
+		operator_id = #{operatorId} and zone_id = 0 and date &gt;= #{startDate} and #{endDate} &gt;=date
+		</if>
 		<if test="zoneId!=null">
-		and zone_id=#{zoneId}
+		zone_id=#{zoneId} and operator_id = #{operatorId} and date &gt;= #{startDate} and #{endDate} &gt;=date
 		</if>
 		</where>
-		) as a)
 	</select>
 	
 	
@@ -193,20 +193,21 @@
 		</where>
 	</select>
 	
-<select id="findDeliverEffectAnalysis" parameterType="map" resultType="com.cloudcross.ssp.model.DeliverAnalysis">
+	<select id="findDeliverEffectAnalysis" parameterType="map" resultType="com.cloudcross.ssp.model.DeliverAnalysis">
 		select 
-		zone_id as zoneId,date as reportDate,sum(pv) as pv,sum(uv) as uv,sum(impression) as impression,sum(uimpression) as uImpression,
-		sum(uclick) as uClick,
-		100*sum(impression)/sum(pv) as fillRate,
-        sum(click) as click,100* sum(click)/sum(impression) as clickRate,sum(ecpm) as eCpm,sum(income) as income
+		zone_id as zoneId,date as reportDate,pv,uv,impression,uImpression,
+		uClick,
+		100*impression/pv as fillRate,
+        click as click,100* click/impression as clickRate,ecpm as eCpm,income as income
 		from t_rpt_zone 
 		<where>
-		operator_id = #{operatorId} and date &gt;= #{startDate} and #{endDate} &gt;=date
+		<if test="zoneId==null">
+		operator_id = #{operatorId} and zone_id = 0 and date &gt;= #{startDate} and #{endDate} &gt;=date
+		</if>
 		<if test="zoneId!=null">
-		and zone_id=#{zoneId}
+		operator_id = #{operatorId} and zone_id=#{zoneId} and date &gt;= #{startDate} and #{endDate} &gt;=date
 		</if>
 		</where>
-		group by date
 		limit #{pager.offset}, #{pager.limit}
 	</select>
 	
@@ -214,13 +215,11 @@
 		select sum(pv) as pv, sum(uv) as uv, sum(impression) as impression, sum(click) as click, sum(income) as income
 		from t_rpt_zone 
 		<where>
-		operator_id = #{operatorId}
-		<if test="zoneId!=null">
-		and zone_id=#{zoneId}
+		<if test="zoneId==null">
+		operator_id = #{operatorId} and zone_id = 0 and date &gt;= #{startDate} and #{endDate} &gt;=date
 		</if>
-		
-		<if test="startDate!=null and endDate!=null"> 
-            and date &gt;= #{startDate} and #{endDate} &gt;=date
+		<if test="zoneId!=null">
+		operator_id = #{operatorId} and zone_id=#{zoneId} and date &gt;= #{startDate} and #{endDate} &gt;=date
 		</if>
 		</where>
 	</select>
@@ -1128,22 +1127,21 @@
 	
 	
 	<select id="findByAdvertiser" parameterType="map" resultType="map">
-		select ad.name as advertiserName,date as reportDate,a.consume as totalConsume,a.impression as totalImpression,
-click as totalClick, if(a.impression > 0,a.click/a.impression,0)
+		select ad.name as advertiserName,date as reportDate,sum(a.consume) as totalConsume,sum(a.impression) as totalImpression,
+sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression),0)
 		as clickRate from t_rpt_advertiser as a left join t_advertiser ad on a.advertiser_id=ad.id
-		where a.advertiser_id=#{advertiserId} and a.order_id = 0 and a.campaign_id = 0
-		and a.adgroup_id = 0 and a.banner_id = 0
+		where a.advertiser_id=#{advertiserId}
 		and a.date >= #{startDate} and a.date &lt;=#{endDate}
+		group by date(a.date)
 	</select>
 	
 	<select id="findByAdvertiser3" parameterType="map" resultType="map">
-		select ad.name as advertiserName,date as reportDate,a.consume as totalConsume,a.impression as totalImpression,
-click as totalClick, if(a.impression > 0,a.click/a.impression,0)
+		select ad.name as advertiserName,date as reportDate,sum(a.consume) as totalConsume,sum(a.impression) as totalImpression,
+sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression),0)
 		as clickRate from t_rpt_advertiser as a left join t_advertiser ad on a.advertiser_id=ad.id
 		where a.advertiser_id=#{advertiserId}
-		and a.order_id = 0 and a.campaign_id = 0
-		and a.adgroup_id = 0 and a.banner_id = 0
 		and a.date >= #{startDate} and a.date &lt;=#{endDate}
+		group by date(a.date)
 		limit #{pager.offset}, #{pager.limit} 
 	</select>
 	
@@ -1163,11 +1161,11 @@ click as totalClick, if(a.impression > 0,a.click/a.impression,0)
 	</select>
 	
 	<select id="findByAdvertiser1" parameterType="map" resultType="map">
-		select ad.name as advertiserName,date as reportDate, a.hour as hour,a.consume as totalConsume,a.impression as totalImpression,
-click as totalClick, if(a.impression > 0,a.click/a.impression,0)
+		select ad.name as advertiserName,date as reportDate, a.hour as hour,sum(a.consume) as totalConsume,sum(a.impression) as totalImpression,
+sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression),0)
 		as clickRate from t_rpt_advertiser_hour as a left join t_advertiser ad on a.advertiser_id=ad.id
-		where a.advertiser_id=#{advertiserId} and a.date = #{startDate} and a.order_id = 0 and a.campaign_id = 0
-		and a.adgroup_id = 0 and a.banner_id = 0
+		where a.advertiser_id=#{advertiserId} and a.date = #{startDate}
+		group by a.hour
 	</select>
 	
 	<select id="countByPlace" parameterType="map" resultType="int">
@@ -1177,12 +1175,11 @@ click as totalClick, if(a.impression > 0,a.click/a.impression,0)
 	
 	
 	<select id="findByAdvertiser2" parameterType="map" resultType="map">
-		select ad.name as advertiserName,date as reportDate, a.hour as hour,a.consume as totalConsume,a.impression as totalImpression,
-click as totalClick, if(a.impression > 0,a.click/a.impression,0)
+		select ad.name as advertiserName,date as reportDate, a.hour as hour,sum(a.consume) as totalConsume,sum(a.impression) as totalImpression,
+sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression),0)
 		as clickRate from t_rpt_advertiser_hour as a left join t_advertiser ad on a.advertiser_id=ad.id
 		where a.advertiser_id=#{advertiserId} and a.date = #{startDate}
-		and a.order_id = 0 and a.campaign_id = 0
-		and a.adgroup_id = 0 and a.banner_id = 0
+		group by a.hour
 		limit #{pager.offset}, #{pager.limit} 
 	</select>
 	
@@ -1202,9 +1199,8 @@ click as totalClick, if(a.impression > 0,a.click/a.impression,0)
 	</select>
 	
 	<select id="findCountForChart" parameterType="map" resultType="int">
-	select count(date) from t_rpt_advertiser where advertiser_id=#{advertiserId} and
-		order_id = 0 and campaign_id = 0 and adgroup_id = 0 and banner_id = 0
-		and date >= #{startDate} and date &lt;=#{endDate}
+	select count(date) from((select distinct date from t_rpt_advertiser where advertiser_id=#{advertiserId}
+		and date >= #{startDate} and date &lt;=#{endDate}) as a)
 	</select>
 	
 		<select id="findByPlace1" parameterType="map" resultType="com.cloudcross.ssp.model.DeliverAnalysis">
@@ -1221,16 +1217,13 @@ click as totalClick, if(a.impression > 0,a.click/a.impression,0)
 	</select>
 	
 	<select id="findCountForChart1" parameterType="map" resultType="int">
-		select count(hour) from t_rpt_advertiser_hour where advertiser_id=#{advertiserId} and
-		order_id = 0 and campaign_id = 0 and adgroup_id = 0 and banner_id = 0
-		and date = #{startDate}
+		select count(hour) from ((select distinct hour from t_rpt_advertiser_hour where advertiser_id=#{advertiserId} and date = #{startDate}) as a) 
 	</select>
 	
 	<select id="findTotalImpressionAndClickByAdvertiserId" parameterType="map" resultType="map">
-		select impression as totalImpression, click as totalClick
+		select sum(impression) as totalImpression, sum(click) as totalClick
 		from t_rpt_advertiser 
-		where advertiser_id = #{advertiserId} and date = #{date} and order_id = 0 and campaign_id = 0
-		and adgroup_id = 0 and banner_id = 0
+		where advertiser_id = #{advertiserId} and date = #{date}
 	</select>
 	
 	<select id="countByApmac" parameterType="map" resultType="int">
@@ -1242,8 +1235,7 @@ click as totalClick, if(a.impression > 0,a.click/a.impression,0)
 		select sum(a.impression) as totalImpression, sum(a.click) as totalClick
 		from t_rpt_advertiser  a,t_advertiser b
 		where b.id = a.advertiser_id and b.agent_id = #{agentId}
-		and a.date = #{date} and a.advertiser_id != 0 and a.order_id = 0 and a.campaign_id = 0
-		and a.adgroup_id = 0 and a.banner_id = 0
+		and a.date = #{date}
 	
 	</select>
 	

+ 2 - 2
src/main/java/com/cloudcross/ssp/model/mapper/rpt-zone.sql.xml

@@ -38,8 +38,8 @@
 	</select>
 	
 		<select id="findByOperatorIdAndDateOperator" parameterType="map" resultType="com.cloudcross.ssp.model.RptZone">
-		select operator_id as operatorId, date, pv, uv,
-        impression, click,income from t_rpt_zone
+			select operator_id as operatorId, date, sum(pv) as pv, sum(uv) as uv,
+        sum(impression) as impression, sum(click) as click,sum(income) as income from t_rpt_zone
         where  operator_id = #{operatorId} and date=#{date}
 	</select>
 	

+ 14 - 4
src/main/java/com/cloudcross/ssp/service/impl/BannerTemplateService.java

@@ -130,11 +130,21 @@ public class BannerTemplateService implements IBannerTemplateService {
 	
 	@Override
 	public boolean deleteUpdata(List<Long> idList, int status){
+		Date date = new Date();
+		//更新创意素材与创意状态
 		myBatisDao.save("bannerTemplateSqlMapper.updataDeleteBannerTemplateStatus",MapBuilder.create(HashMap.class)
 				.add("status", status)
 				.add("idList", idList)
-				.add("updated", new Date())
+				.add("updated", date)
 				.map());
+		
+		//更新运营商素材状态
+		myBatisDao.save("bannerTemplateSqlMapper.updataDeleteBannerTemplateOperatorStatus",MapBuilder.create(HashMap.class)
+				.add("status", status)
+				.add("idList", idList)
+				.add("updated", date)
+				.map());
+		
 		return true;
 	}
 
@@ -177,9 +187,9 @@ public class BannerTemplateService implements IBannerTemplateService {
 			if(paramMap.get("type") == ""){ paramMap.put("type", null); }
 			if(paramMap.get("status") == ""){ paramMap.put("status", null); }
 			if(paramMap.get("advertiserId") == ""){ paramMap.put("advertiserId", null); }
-			if(paramMap.get("orderId") == ""){ paramMap.put("orderId", null); }
-			if(paramMap.get("campaignId") == ""){ paramMap.put("campaignId", null); }
-			if(paramMap.get("adgroupId") == ""){ paramMap.put("adgroupId", null); }
+//			if(paramMap.get("orderId") == ""){ paramMap.put("orderId", null); }
+//			if(paramMap.get("campaignId") == ""){ paramMap.put("campaignId", null); }
+//			if(paramMap.get("adgroupId") == ""){ paramMap.put("adgroupId", null); }
 			return myBatisDao.getList("bannerTemplateSqlMapper.findByParams2advertiser", paramMap);
 		}
 

+ 0 - 1
src/main/java/com/cloudcross/ssp/web/advertiser/main/DashboardController.java

@@ -110,7 +110,6 @@ public class DashboardController extends SimpleController {
 			paramMap.put("agentId", String.valueOf(account.getAgentId()));
 		}
 		
-		
 		Map compareMap = adReportService.findCompare(paramMap);
 		
 		return compareMap;

+ 1 - 1
src/main/java/com/cloudcross/ssp/web/back/main/AuthorityController.java

@@ -107,7 +107,7 @@ public class AuthorityController extends SimpleController{
 			Account account = getLoginUser();
 			t.setSysType(account.getSysType());
 			t.setPassword(Md5Tool.getMd5(password));
-			t.setDescription("java2015....");
+			t.setDescription(account.getDescription());
 
 			accountService.addAccount(t);
 			

+ 8 - 47
src/main/webapp/WEB-INF/pages/advertiser/main/ad/adv-balance/distribution.ftl

@@ -6,14 +6,15 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
 	
 	<script type="text/javascript" >
 	
@@ -63,46 +64,6 @@
 			$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/adv-balance/exportAllocateReportExcel?selectedAdvertiserId="+$("#advertiserId").val()+"&dateRangePicker="+$("#dateRangePicker").val());
 		};
 		
-		Date.prototype.format = function(format)
-	    {
-	        var o = {
-	            "M+" : this.getMonth()+1, //month
-	            "d+" : this.getDate(),    //day
-	            "h+" : this.getHours(),   //hour
-	            "m+" : this.getMinutes(), //minute
-	            "s+" : this.getSeconds(), //second
-	            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-	            "S" : this.getMilliseconds() //millisecond
-	        }
-	        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-	                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-	        for(var k in o)if(new RegExp("("+ k +")").test(format))
-	            format = format.replace(RegExp.$1,
-	                    RegExp.$1.length==1 ? o[k] :
-	                            ("00"+ o[k]).substr((""+ o[k]).length));
-	        return format;
-	    }
-
-	    function getlastDate(last)
-	    {
-	        //获取系统时间
-	        var LSTR_ndate=new Date();
-	        var LSTR_Year=LSTR_ndate.getFullYear();
-	        var LSTR_Month=LSTR_ndate.getMonth();
-	        var LSTR_Date=LSTR_ndate.getDate();
-	        //处理
-	        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-	        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-	        var LINT_MM=uom.getMonth();
-	        LINT_MM++;
-	        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-	        var LINT_DD=uom.getDate();
-	        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-	        //得到最终结果
-	        var uom = (uom.format('yyyy-MM-dd'));
-	        return uom;
-	    }
-    
 	</script>
 	
 </@override>

+ 10 - 49
src/main/webapp/WEB-INF/pages/advertiser/main/ad/adv-balance/list.ftl

@@ -6,17 +6,18 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
 	
-	<script type="text/javascript" >
 	
+	<script type="text/javascript" >
 		$(function(){
 		
 			$('#dateRangePicker').dateRangePicker();
@@ -84,47 +85,7 @@
 		function exportExcel(){
 			$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/adv-balance/exportDataReportExcel?selectedAdvertiserId="+$("#advertiserId").val()+"&dateRangePicker="+$("#dateRangePicker").val()+"&type="+$("#typeId").val());
 		};
-		
-		Date.prototype.format = function(format)
-	    {
-	        var o = {
-	            "M+" : this.getMonth()+1, //month
-	            "d+" : this.getDate(),    //day
-	            "h+" : this.getHours(),   //hour
-	            "m+" : this.getMinutes(), //minute
-	            "s+" : this.getSeconds(), //second
-	            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-	            "S" : this.getMilliseconds() //millisecond
-	        }
-	        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-	                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-	        for(var k in o)if(new RegExp("("+ k +")").test(format))
-	            format = format.replace(RegExp.$1,
-	                    RegExp.$1.length==1 ? o[k] :
-	                            ("00"+ o[k]).substr((""+ o[k]).length));
-	        return format;
-	    }
-
-	    function getlastDate(last)
-	    {
-	        //获取系统时间
-	        var LSTR_ndate=new Date();
-	        var LSTR_Year=LSTR_ndate.getFullYear();
-	        var LSTR_Month=LSTR_ndate.getMonth();
-	        var LSTR_Date=LSTR_ndate.getDate();
-	        //处理
-	        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-	        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-	        var LINT_MM=uom.getMonth();
-	        LINT_MM++;
-	        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-	        var LINT_DD=uom.getDate();
-	        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-	        //得到最终结果
-	        var uom = (uom.format('yyyy-MM-dd'));
-	        return uom;
-	    }
-    
+	
 	</script>
 	
 </@override>

+ 20 - 102
src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/create.ftl

@@ -1,13 +1,14 @@
 <@override name="head">	
 	<title>创建广告主</title>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ajaxfileupload.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ace-elements.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/uploadFile.js"></script>
 	
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
@@ -22,11 +23,6 @@
 			color:red;
 			position: absolute;
 		}
-		.icon-upload-alt{
-			background-image: none;
-		    height: auto;
-		}
-		
 	</style>
 	<script type="text/javascript">
 	 	$(document).ready(function(){
@@ -38,22 +34,22 @@
 			 $.getJSON( url, function(data) {
 				var data_1 = data.allIndustry;
 				$.each( data_1, function( key, val ) {
-					$("#advertiser_son_ul").append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
+					$("#advertiser_son_ul").append('<li value='+ val.value +'>' + val.label + '</li>');
 				});
 			});
 	 		$("#advertiserul_span").click(function(){
-	 			if($('#advertiser_son_ul').height()>200){
-	 				$('#advertiser_son_ul').css({height:"200"+"px","overflow-y":"scroll" });
+	 			if($('#advertiser_son_ul').height()>210){
+	 				$('#advertiser_son_ul').css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
 	 			};
-		 		$('#advertiser_son_ul').slideDown(); //ul显示
+		 		$('#advertiser_son_ul').show(); //ul显示
 		 	});
 		 	$('ul#advertiser_son_ul li').live("click",function(){
 				$(this).parents('li').find('span').html($(this).html());
 				$("#industryId").val($(this).attr("value"));
-				$('#advertiser_son_ul').slideUp(); //ul隐藏
+				$('#advertiser_son_ul').hide(); //ul隐藏
 			});
 			$("ul#main_advertiserul #advertiserul_select_box").mouseleave(function(){
-		 		$('#advertiser_son_ul').slideUp(); //ul隐藏
+		 		$('#advertiser_son_ul').hide(); //ul隐藏
 		 		if($("#industryId").val() == "" || $("#industryId").val() == 0){
 					$("#main_advertiserul").css("box-shadow","20px 0 6px red").attr("title","请选择所属行业");
 					$("#advertiserul_selectdiv").find('span.spanVaildate').html("请选择所属行业");
@@ -64,10 +60,10 @@
 		 	});
 		 	
 		 	//初始化加载上传控件
-		 	initFile($("#icp_input_id"));initFile($("#licencePath_input_id"));initFile($("#idPath_input_id"));initFile($("#orgPath_input_id"));
+		 	initFile($("#icp_input_id"),null);initFile($("#licencePath_input_id"),null);initFile($("#idPath_input_id"),null);initFile($("#orgPath_input_id"),null);
 		 	$('#cpiPathUploadfilestr').unbind('click').click(function() {
 		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"icp_input_id","cpiPath_div","cpiPath");
+		 			getUploadFile($(this),"icp_input_id","cpiPath_div","cpiPath",null,null,null);
 		 		}else if($(this).html() == "预览"){
 		 			if($("#cpiPath").val() != ""){
 		 				bootbox.dialog({
@@ -80,7 +76,7 @@
 		 	});
 		 	$('#licencePathUploadfilestr').unbind('click').click(function() {
 		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"licencePath_input_id","licencePath_div","licencePath");
+		 			getUploadFile($(this),"licencePath_input_id","licencePath_div","licencePath",null,null,null);
 		 		}else if($(this).html() == "预览"){
 		 			if($("#licencePath").val() != ""){
 		 				bootbox.dialog({
@@ -93,7 +89,7 @@
 		 	});
 		 	$('#idPathUploadfilestr').unbind('click').click(function() {
 		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"idPath_input_id","idPath_div","idPath");
+		 			getUploadFile($(this),"idPath_input_id","idPath_div","idPath",null,null,null);
 		 		}else if($(this).html() == "预览"){
 		 			if($("#idPath").val() != ""){
 		 				bootbox.dialog({
@@ -106,7 +102,7 @@
 		 	});
 		 	$('#orgPathUploadfilestr').unbind('click').click(function() {
 		 		if($(this).html() == "上传"){
-		 			getUploadFile($(this),"orgPath_input_id","orgPath_div","orgPath");
+		 			getUploadFile($(this),"orgPath_input_id","orgPath_div","orgPath",null,null,null);
 		 		}else if($(this).html() == "预览"){
 		 			if($("#orgPath").val() != ""){
 		 				bootbox.dialog({
@@ -117,81 +113,6 @@
 		 			}
 		 		}
 		 	});
-		
-			//初始化选择文件框
-			function initFile(obj){
-				obj.ace_file_input({
-				    no_file:'No File ...',
-				    btn_choose:'选择',
-				    btn_change:'改变',
-				    droppable:false,
-				    onchange:null,
-				    thumbnail:false
-				});
-			}
-			
-			//文件上传ajax文件上传
-		 	function getUploadFile(obj,_elemId,_removeId,picPathId){
-		 		var _href = obj.attr('href');
-			    $.ajaxFileUpload({
-			        url:_href, 
-			        secureuri:false,
-			        fileElementId:_elemId,
-			        dataType: 'json',
-			        success: function (result, status) {
-			        	var path = result.data['url'];
-			        	removeFile(_elemId,_removeId,picPathId,result);
-			        	if (result.status == 'ok') {
-			        		var orgImg = path.substring(0,path.indexOf(","));
-				        	$("#"+picPathId).val(orgImg);
-			 				obj.html("预览");
-							var result = 0;
-							removeFile(_elemId,_removeId,picPathId,result);
-							bootbox.alert("上传成功!");
-			        	}else if (result.status == 'error') {
-			        		obj.html("上传");
-			        		bootbox.alert(result.msg);
-			            }
-			        },
-			        error: function (data, status, e)
-			        {
-			        	obj.html("上传");
-			        	removeFile(_elemId,_removeId,picPathId);
-			        	console.log(e);
-			        }
-			    });
-			    return false;
-		 	}
-		 	
-		 	//上传文件时conle file 删除 file
-			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==''){
-			    	filename = "No File ...";
-			    }
-			 	var option = {}; 
-			    var defaultOptions = {
-				    no_file:'No File ...',
-				    btn_choose:'选择',
-				    btn_change:'改变',
-				    droppable:false,
-				    onchange:null,
-				    thumbnail:false
-				};
-				if(isChrome && result == 0){
-					option = {no_file:filename };
-				}else if(isChrome && result == 1){
-					option = {no_file:'No File ...' };
-				}else{
-					option = {no_file:filename };
-				}
-			    var opts = $.extend(defaultOptions,option);
-				var newfile = $("#"+_elemId).clone();
-				$("#"+_removeId).find(".ace-file-input").remove();
-				$("#"+_removeId+" #"+picPathId).after(newfile);
-				$("#"+_elemId).ace_file_input(opts);
-			}
 		 	
 		 	$("#validation-form").autovalidate();
 			$(".btn3").click(function(){
@@ -209,9 +130,6 @@
 				location.href = "${ctx}/advertiser/main/ad/advertiser/list";
 			});
 			
-			$(".fileremoveflag span").mouseover(function(){
-				$(this).attr("title",$(this).text());
-			});
 	 	});
  	</script>
  

+ 18 - 101
src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/edit.ftl

@@ -1,13 +1,14 @@
 <@override name="head">	
 	<title>编辑广告主</title>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ajaxfileupload.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ace-elements.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/uploadFile.js"></script>
 	
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
@@ -36,17 +37,17 @@
 			});
 	 		$("#advertiserul_span").click(function(){
 	 			if($('#advertiser_son_ul').height()>210){
-	 				$('#advertiser_son_ul').css({height:"210"+"px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
+	 				$('#advertiser_son_ul').css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
 	 			};
-		 		$('#advertiser_son_ul').slideDown(); //ul显示
+		 		$('#advertiser_son_ul').show(); //ul显示
 		 	});
 		 	$('ul#advertiser_son_ul li').live("click",function(){
 				$(this).parents('li').find('span').html($(this).html());
 				$("#industryId").val($(this).attr("value"));
-				$('#advertiser_son_ul').slideUp(); //ul隐藏
+				$('#advertiser_son_ul').hide(); //ul隐藏
 			});
 			$("ul#main_advertiserul #advertiserul_select_box").mouseleave(function(){
-		 		$('#advertiser_son_ul').slideUp(); //ul隐藏
+		 		$('#advertiser_son_ul').hide(); //ul隐藏
 		 		if($("#industryId").val() == "" || $("#industryId").val() == 0){
 					$("#main_advertiserul").css("box-shadow","20px 0 6px red").attr("title","请选择所属行业");
 					$("#advertiserul_selectdiv").find('span.spanVaildate').html("请选择所属行业");
@@ -58,7 +59,7 @@
 		 	
 		 	//初始化加载上传控件
 			initFile($("#icp_input_id"),$("#cpiPath").val());
-		 	if($("#cpiPath").val() != ""){
+		 	if($("#cpiPath").val() != "" && $("#cpiPath").val() != "noFiles"){
 		 		$('#cpiPathUploadfilestr').html("预览");
 		 	}
 		 	$('#cpiPathUploadfilestr').unbind('click').click(function() {
@@ -75,7 +76,7 @@
 				}
 		 	});
 		 	initFile($("#licencePath_input_id"),$("#licencePath").val());
-		 	if($("#licencePath").val() != ""){
+		 	if($("#licencePath").val() != "" && $("#licencePath").val() != "noFiles"){
 		 		$('#licencePathUploadfilestr').html("预览");
 		 	}
 		 	$('#licencePathUploadfilestr').unbind('click').click(function() {
@@ -92,7 +93,7 @@
 		 		}
 		 	});
 		 	initFile($("#idPath_input_id"),$("#idPath").val());
-		 	if($("#idPath").val() != ""){
+		 	if($("#idPath").val() != "" && $("#idPath").val() != "noFiles"){
 		 		$('#idPathUploadfilestr').html("预览");
 		 	}
 		 	$('#idPathUploadfilestr').unbind('click').click(function() {
@@ -109,7 +110,7 @@
 		 		}
 		 	});
 		 	initFile($("#orgPath_input_id"),$("#orgPath").val());
-		 	if($("#orgPath").val() != ""){
+		 	if($("#orgPath").val() != "" && $("#orgPath").val() != "noFiles"){
 		 		$('#orgPathUploadfilestr').html("预览");
 		 	}
 		 	$('#orgPathUploadfilestr').unbind('click').click(function() {
@@ -125,88 +126,7 @@
 		 			}
 		 		}
 		 	});
-		
-			//初始化选择文件框
-			function initFile(obj,pictureName){
-				var name = "";
-				if(pictureName == "" || pictureName == null){
-					name = "No File ...";
-				}else{
-					name = pictureName.substring(pictureName.lastIndexOf("\\")+1,pictureName.length);
-				}
-				obj.ace_file_input({
-				    no_file:name,
-				    btn_choose:'选择',
-				    btn_change:'改变',
-				    droppable:false,
-				    onchange:null,
-				    thumbnail:false
-				});
-			}
 			
-			//文件上传ajax文件上传
-		 	function getUploadFile(obj,_elemId,_removeId,picPathId){
-		 		var _href = obj.attr('href');
-			    $.ajaxFileUpload({
-			        url:_href, 
-			        secureuri:false,
-			        fileElementId:_elemId,
-			        dataType: 'json',
-			        success: function (result, status) {
-			        	var path = result.data['url'];
-			        	removeFile(_elemId,_removeId,picPathId,result);
-			        	if (result.status == 'ok') {
-			        		var orgImg = path.substring(0,path.indexOf(","));
-				        	$("#"+picPathId).val(orgImg);
-			 				obj.html("预览");
-							var result = 0;
-							removeFile(_elemId,_removeId,picPathId,result);
-							bootbox.alert("上传成功!");
-			        	}else if (result.status == 'error') {
-			        		obj.html("上传");
-			        		bootbox.alert(result.msg);
-			            }
-			        },
-			        error: function (data, status, e)
-			        {
-			        	obj.html("上传");
-			        	removeFile(_elemId,_removeId,picPathId);
-			        	console.log(e);
-			        }
-			    });
-			    return false;
-		 	}
-		 	
-		 	//上传文件时conle file 删除 file
-			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==''){
-			    	filename = "No File ...";
-			    }
-			 	var option = {}; 
-			    var defaultOptions = {
-				    no_file:'No File ...',
-				    btn_choose:'选择',
-				    btn_change:'改变',
-				    droppable:false,
-				    onchange:null,
-				    thumbnail:false
-				};
-				if(isChrome && result == 0){
-					option = {no_file:filename };
-				}else if(isChrome && result == 1){
-					option = {no_file:'No File ...' };
-				}else{
-					option = {no_file:filename };
-				}
-			    var opts = $.extend(defaultOptions,option);
-				var newfile = $("#"+_elemId).clone();
-				$("#"+_removeId).find(".ace-file-input").remove();
-				$("#"+_removeId+" #"+picPathId).after(newfile);
-				$("#"+_elemId).ace_file_input(opts);
-			}
-		 	
 		 	$("#validation-form").autovalidate();
 			$(".btn3").click(function(){
 				if (!$("#validation-form").validate()) {
@@ -222,10 +142,7 @@
 			$(".btn4").click(function(){
 				location.href = "${ctx}/advertiser/main/ad/advertiser/list";
 			});
-			
-			$(".fileremoveflag span").mouseover(function(){
-				$(this).attr("title",$(this).text());
-			});
+		
 	 	});
  	</script>
  

+ 11 - 66
src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/list.ftl

@@ -6,12 +6,11 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
+	<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/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
 	<script type="text/javascript">
 		//搜索按钮的实现2015.10.18更新了在某个行业某个状态下的搜索
 		function picsubmit(){
@@ -56,7 +55,6 @@
 			});
 	
  			//状态全部、开启、停用
-
 			var p=${status};
 			if (p==2){
 				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
@@ -69,19 +67,8 @@
 				$(".zhtzhch").removeClass("zhuangtai1").addClass("zhuangtaiall");
 			}	
  
-			//搜索框
-			$("#search input[name='searchValue']").focus(function(){$(this).val("")});
-			$("#search input[name='searchValue']").blur(function(){
-					if($(this).val()==""){
-					$(this).val("请输入关键字");}
-			});
-	
-	
 			//开启,暂停
 			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				var url = "";var ids = [];
-				var advertiserId = parseInt($(this).attr("value"));
-				ids.push(advertiserId);
 				if($(this).attr("id") == "btn-enable"){
 					url = "${ctx}/advertiser/main/ad/advertiser/enable";
 				}else if($(this).attr("id") == "btn-disable"){
@@ -89,63 +76,21 @@
 				}else if($(this).attr("id") == "btn-delete"){
 					url = "${ctx}/advertiser/main/ad/advertiser/delete";
 				}
-				$.ajax({
-	            	type: "POST",
-	             	url: url,
-	             	data:"id="+ids,
-	             	success: function(data){
-						location.href = "${ctx}/advertiser/main/ad/advertiser/list.ftl";
-	             	}
-				});
+				singleOper($(this),url,"${ctx}/advertiser/main/ad/advertiser/list");
 			});
+			
 			//批量开启,批量暂停
 			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				var checkboxs = $(".fxk11");
-				var url = ""; var type = "";var ids = [];
 				if($(this).attr("id") == "all-btn-enable"){
 					url = "${ctx}/advertiser/main/ad/advertiser/enable";
-					type = "开启";
 				}else if($(this).attr("id") == "all-btn-disable"){
 					url = "${ctx}/advertiser/main/ad/advertiser/disable";
-					type = "暂停";
 				}else if($(this).attr("id") == "all-btn-delete"){
 					url = "${ctx}/advertiser/main/ad/advertiser/delete";
-					type = "删除";
 				}
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							checkboxs.each(function(){
-								var advertiserId = parseInt($(this).attr("id"));
-								ids.push(advertiserId);
-							});
-							$.ajax({
-								async: false, 
-								traditional: true, 
-				            	type: "POST",
-				             	url: url,
-				             	data:{"id":ids},
-				             	success: function(data){
-									location.href = "${ctx}/advertiser/main/ad/advertiser/list.ftl";
-				             	}
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的数据!");
-				}
-			});
-	
-			/*
-			* 实现分页跳转
-	 		*/
-			$("#pageDiv .pagination ul li a[href]").click(function(){
-				var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-				var _form = $('#search-form');
-				_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-				_form.find('img').click();//触发搜索
-				//return false;
+				batchOpear($(this),url,"${ctx}/advertiser/main/ad/advertiser/list");
 			});
+			
 		});
 
 </script>	
@@ -221,8 +166,8 @@
 								<td class="td2"><#if advertiser.status==0>正常<#else>停用</#if></td>
 								<td class="td3" >
 									<div class="zabtn" >
-										<a  href="${ctx}/advertiser/main/ad/advertiser/edit/${advertiser.id}"><button style="margin-right:5px;" class="btn122">编辑</button></a>
-										<a  data-toggle="dropdown" href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiser.id}&selectedadvertiserName=${advertiser.name}"><button style="margin:0px 5px 0 0;" class="btn122">查看报表</button></a>
+										<a href="${ctx}/advertiser/main/ad/advertiser/edit/${advertiser.id}"><button style="margin-right:5px;" class="btn122">编辑</button></a>
+										<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiser.id}&selectedadvertiserName=${advertiser.name}"><button style="margin:0px 5px 0 0;" class="btn122">查看报表</button></a>
 										<#if advertiser.status==0>
 										<button style="margin:0px;" id="btn-disable" value=${advertiser.id} class="btn122">停用</button>
 										<#elseif advertiser.status=1>

+ 2 - 2
src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/update.ftl

@@ -5,8 +5,8 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){

+ 16 - 37
src/main/webapp/WEB-INF/pages/advertiser/main/ad/banner-template/index.ftl

@@ -7,33 +7,22 @@
 	<!--这个页面的样式-->
 	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
 	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
+	<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/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.ui.widget.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.iframe-transport.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.fileupload.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+
 <style>
-.replace-file {
-display:block;
-overflow:hidden;
-position:relative;
- background-color: #36aeea;
- border: medium none;
- border-radius: 5px;
- color: #ffffff;
- font-size: 12px;
- height: 34px;
- width: 90px;
- float:left;
- text-align:center;
- line-height:34px;
-}
-.replace-file input{
-opacity:0;
-filter:alpha(opacity=0);
-font-size:100px;
-position:absolute;
-top:0;
-right:0;
-width:90px
-}
-
+table td a{background-color: #36aeea;
+    border: medium none;
+    border-radius: 5px;
+    color: #ffffff;
+    font-size: 12px;
+    height: 34px;
+    width: 90px;}
 </style>
 
 </@override>
@@ -111,12 +100,6 @@ width:90px
 </@override>
 <@extends name="/common/simple.ftl"/>
 
-
-<!--linked js-->
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.min.js"></script>
 <script type="text/javascript">
 	<!--修改个人信息js 控制上下切换-->
 	$(document).ready(function(){
@@ -321,10 +304,6 @@ width:90px
 	
 </script>
 
- 
-<script src="${ctx}/assets/advertiser/js/jquery.ui.widget.js"></script>
-<script src="${ctx}/assets/advertiser/js/jquery.iframe-transport.js"></script>
-<script src="${ctx}/assets/advertiser/js/jquery.fileupload.js"></script>
 <script type="text/javascript">
 $(function () {
     $("#fileupload_input").fileupload({
@@ -380,7 +359,7 @@ $(function () {
 	}
 	//调用loadDataForPullDownList,给广告主准备数据
 	function loadAdvertiser(agentId) {
-		loadDataForPullDownList($('#selectedAdvertiserId'), "advertiserList", "/ssp_advertiser/widget/selector/provide/advertiser?parentId=" + agentId, "全部广告主");
+		loadDataForPullDownList($('#selectedAdvertiserId'), "advertiserList", "/ssp_web/widget/selector/provide/advertiser?parentId=" + agentId, "全部广告主");
 	}
 	
 	$(document).ready(function(){

+ 6 - 5
src/main/webapp/WEB-INF/pages/advertiser/main/ad/banner-template/list.ftl

@@ -32,9 +32,11 @@
             	<#if bannerTemplate.type == 1>Flash<#elseif bannerTemplate.type == 2>图片<#else>视频</#if>
             </td>
             <td style="width:15%" class="hidden-480">${bannerTemplate.updated?datetime}</td>
-            <td style="width:5%"><#if bannerTemplate.status==0>开启<#else>停用</#if></td>
-            <td style="width:40%">
-            	<span class="replace-file">替换素材<input type="file" id="file${bannerTemplate.id}" valueId="${bannerTemplate.id!}"></span>     
+            <td style="width:9%"><#if bannerTemplate.status==0>开启<#else>停用</#if></td>
+            <td style="width:30%">
+            	<a href="javascript:;" id="uploadFile_banner" style="margin:0 5px 0 5px;">替换素材
+					<input type="file" id="file${bannerTemplate.id}" valueId="${bannerTemplate.id!}"/>
+				</a>
                 <button href="${ctx}/advertiser/main/ad/banner-template/alterName?id=${bannerTemplate.id!}" style="margin:0 5px 0 5px;">修改名称</button>
                 <#if bannerTemplate.status==0>
                 <button class="btn-status" data-toggle="dropdown" href="${ctx}/advertiser/main/ad/banner-template/disable?id=${bannerTemplate.id!}" style="margin-right:5px;">暂停</button>
@@ -64,14 +66,13 @@
 
 <script type="text/javascript">
 $(function () {
-	$('.replace-file input').each(function(){
+	$('#uploadFile_banner input').each(function(){
 		var bannerTemplateId = $(this).attr("valueId");
 		$(this).fileupload({
 		autoUpload: true,
 		url: '${ctx}/advertiser/main/ad/banner-template/replace',
 		formData:{bannerTemplateId:bannerTemplateId},
 		done:function(e,result){
-			alert(result.result);
 			$('#pagecontent .search-form').find('img').click();
 	        console.log(JSON.stringify(result.result));            
 	          }

+ 3 - 5
src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/create.ftl

@@ -7,11 +7,9 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 3 - 5
src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/edit.ftl

@@ -7,11 +7,9 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 18 - 60
src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/list.ftl

@@ -7,13 +7,14 @@
 	<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/zbchj.css"/>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
+	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
 	<script type="text/javascript">
  		$(document).ready(function(){
 
@@ -42,17 +43,9 @@
 				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
 				$(".zhtzhch").removeClass("zhuangtai1").addClass("zhuangtaiall");
 			}	
-		 	//搜索框
-			$("#search input[name='searchValue']").focus(function(){$(this).val("")});
-			$("#search input[name='searchValue']").blur(function(){
-					if($(this).val()==""){
-					$(this).val("请输入关键字");}
-			});
-			//开启,暂停
+		 	
+			//开启,暂停,删除
 			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				var url = "";var ids = [];
-				var orderId = parseInt($(this).attr("value"));
-				ids.push(orderId);
 				if($(this).attr("id") == "btn-enable"){
 					url = "${ctx}/advertiser/main/ad/order/enable";
 				}else if($(this).attr("id") == "btn-disable"){
@@ -60,54 +53,19 @@
 				}else if($(this).attr("id") == "btn-delete"){
 					url = "${ctx}/advertiser/main/ad/order/delete";
 				}
-				mm=${advertiserId};
-				$.ajax({
-					async: false,  
-	            	type: "POST",
-	             	url: url,
-	             	data:"id="+ids,
-	             	success: function(data){
-						location.href = "${ctx}/advertiser/main/ad/order/list?advertiserId="+mm;
-	             	}
-				});	
+				singleOper($(this),url,"${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}");
 			});
-			//批量开启,批量暂停
+			
+			//批量开启,批量暂停,批量删除
 			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				var checkboxs = $(".fxk11");
-				var url = ""; var type = "";var ids = [];
 				if($(this).attr("id") == "all-btn-enable"){
 					url = "${ctx}/advertiser/main/ad/order/enable";
-					type = "开启";
 				}else if($(this).attr("id") == "all-btn-disable"){
 					url = "${ctx}/advertiser/main/ad/order/disable";
-					type = "暂停";
 				}else if($(this).attr("id") == "all-btn-delete"){
 					url = "${ctx}/advertiser/main/ad/order/delete";
-					type = "删除";
-				}
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							checkboxs.each(function(){
-								var orderId = parseInt($(this).attr("id"));
-								ids.push(orderId);
-							});
-							mm=${advertiserId};
-							$.ajax({
-								async: false, 
-								traditional: true, 
-				            	type: "POST",
-				             	url: url,
-				             	data:{"id":ids},
-				             	success: function(data){
-									location.href = "${ctx}/advertiser/main/ad/order/list?advertiserId="+mm;
-				             	}
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的数据!");
 				}
+				batchOpear($(this),url,"${ctx}/advertiser/main/ad/order/list?advertiserId=${advertiserId!}");
 			});
 			
 			/*
@@ -115,17 +73,17 @@
 			 */
 			$("#pageDiv .pagination ul li a[href]").click(function(){
 				var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-				var _form = $(' .search-form');
+				var _form = $('.search-form');
 				_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
 				_form.find('img').click();//触发搜索
 				//return false;
 			});
 			
 			$(".btn1").click(function(){
-				if($("#putId").val() == "" || $("#putId").val() == -1){
+				if($("#advertiserId").val() == "" || $("#advertiserId").val() == -1){
 					$("#btnCreatelink").attr("href","javascript:void(0);");
-					alert("请选择投放");
-					$("#btnCreatelink").attr("title","请选择投放");
+					bootbox.alert("请选择广告主!");
+					$("#btnCreatelink").attr("title","请选择广告主");
 					return false;
 				}
 			});

+ 2 - 2
src/main/webapp/WEB-INF/pages/advertiser/main/ad/order/update.ftl

@@ -5,8 +5,8 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){

+ 46 - 195
src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report.ftl

@@ -8,17 +8,21 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
-	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
+	<style>
+	#date-radio input {	
+		opacity: 1 !important;
+		position: relative !important;
+	}
+	</style>
 </@override>
 
 <@override name="body">
@@ -26,16 +30,12 @@
 	<#include "/advertiser/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<input type="hidden" id="role" value="${role}">
-			<input type="hidden" id="agentId" value="${userSession.agentId}">
-			<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-			<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -89,22 +89,22 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		
 		   		<div id="date-radio" style="float:right;margin-right:20px;">
 		   			<span>显示列(此项可多选)</span>
@@ -113,7 +113,6 @@
 					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
 					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
 					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
-					
 				</div>
 		  	</div>
 		   		
@@ -185,7 +184,6 @@
 		            		<#else>
 		            			<#setting datetime_format="yyyy-MM-dd"/> 
 		            			<td style="text-align:center;">${report.reportDate!?datetime}</td>
-		            			  
 		            		</#if>
 			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
 			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
@@ -201,10 +199,23 @@
 					</#if>
 					</tbody>
 				</table>
+				<div id="hourrpt">
+					<#if rptZoneHourList ??>
+			    	<#list rptZoneHourList as hourrpt>
+				    <div class="hourrpt_son">
+				    	<div name="hr">${hourrpt.hour!}</div>
+				        <div name="hr">${hourrpt.pv!}</div>
+				        <div name="hr">${hourrpt.uv!}</div>
+				        <div name="hr">${hourrpt.impression!}</div>
+				        <div name="hr">${hourrpt.click!}</div>
+				        <div name="hr">${hourrpt.income!}</div>
+				    </div>
+				    </#list>  
+			    	</#if>
+				</div>
 	        </div>
-	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('total','${ctx}/advertiser/main/ad/report/advertiser-report/exportDataReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv">
@@ -216,166 +227,6 @@
 		
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$("#date #yesterday").addClass('dateChange');
-	}
-	
-	$('#date #date-one a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#date #date-one a').removeClass('dateChange');
-	});
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?total=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&selecteddimensionId="+$("#dimensionId").val()+"&checkItems="+checkboxStr; 
-		params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/report/advertiser-report/exportDataReportExcel"+params);
-	};
-	
-	$(function(){
-		// 分页中超链接跳转
-		$('#pagecontent .pagination ul li a[href]').click(function(){
-			var _page = $(this).attr('href').substr(1);
-			var _form = $('#formPage');
-			_form.find('input:hidden[name="page"]').val(_page);
-			_form.submit();
-			return false;
-		});
-	});
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
 <@extends name="/common/simple.ftl"/>
 

+ 7 - 7
src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/create.ftl

@@ -6,13 +6,13 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/yf.yang.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 5 - 6
src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/dimension.ftl

@@ -6,12 +6,11 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 	

+ 7 - 7
src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/edit.ftl

@@ -6,13 +6,13 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/yf.yang.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 34 - 192
src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/osReport.ftl

@@ -8,17 +8,21 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
-	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
+	<style>
+	#date-radio input {	
+		opacity: 1 !important;
+		position: relative !important;
+	}
+	</style>
 </@override>
 
 <@override name="body">
@@ -26,16 +30,12 @@
 	<#include "/advertiser/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<input type="hidden" id="role" value="${role}">
-			<input type="hidden" id="agentId" value="${userSession.agentId}">
-			<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-			<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -48,8 +48,8 @@
 				 </ul>  
 	 		</div>
 	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" method="post">
-	 		 <input type="hidden" id="page" name="page" value="${pager.page}">
-	 		 <input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
+	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="selectuls">
 				<ul id="main_advertiserul">
 					<li class="select_box" id="advertiserul_box">
@@ -67,22 +67,22 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		</div>
 	
 			<div id="date">
@@ -156,7 +156,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('system','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv">
@@ -166,164 +166,6 @@
 		</form>
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$("#date #yesterday").addClass('dateChange');
-	}
-	
-	$('#date #date-one a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#date #date-one a').removeClass('dateChange');
-	});
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?system=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&checkItems="+checkboxStr;
-	    params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel"+params);
-	};
-	
-	$(function(){
-		// 分页中超链接跳转
-		$('#pagecontent .pagination ul li a[href]').click(function(){
-			var _page = $(this).attr('href').substr(1);
-			var _form = $('#formPage');
-			_form.find('input:hidden[name="page"]').val(_page);
-			_form.submit();
-			return false;
-		});
-	});
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
 <@extends name="/common/simple.ftl"/>
 

+ 34 - 193
src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/regionReport.ftl

@@ -8,17 +8,21 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
-	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
+	<style>
+	#date-radio input {	
+		opacity: 1 !important;
+		position: relative !important;
+	}
+	</style>
 </@override>
 
 <@override name="body">
@@ -26,16 +30,12 @@
 	<#include "/advertiser/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<input type="hidden" id="role" value="${role}">
-			<input type="hidden" id="agentId" value="${userSession.agentId}">
-			<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-			<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -48,8 +48,8 @@
 				 </ul>  
 	 		</div>
 	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" method="post">
-	 		 <input type="hidden" id="page" name="page" value="${pager.page}">
-	 		 <input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
+	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="selectuls">
 				<ul id="main_advertiserul">
 					<li class="select_box" id="advertiserul_box">
@@ -67,22 +67,22 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		</div>
 	
 			<div id="date">
@@ -156,7 +156,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('location','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv">
@@ -166,165 +166,6 @@
 		</form>
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$("#date #yesterday").addClass('dateChange');
-	}
-	
-	$('#date #date-one a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#date #date-one a').removeClass('dateChange');
-	});
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?location=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&checkItems="+checkboxStr; 
-		params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel"+params);
-	};
-	
-	$(function(){
-		// 分页中超链接跳转
-		$('#pagecontent .pagination ul li a[href]').click(function(){
-			var _page = $(this).attr('href').substr(1);
-			var _form = $('#formPage');
-			_form.find('input:hidden[name="page"]').val(_page);
-			_form.submit();
-			return false;
-		});
-	});
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
 <@extends name="/common/simple.ftl"/>
 

+ 34 - 192
src/main/webapp/WEB-INF/pages/advertiser/main/ad/report/advertiser-report/sceneReport.ftl

@@ -8,17 +8,21 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
-	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
+	<style>
+	#date-radio input {	
+		opacity: 1 !important;
+		position: relative !important;
+	}
+	</style>
 </@override>
 
 <@override name="body">
@@ -26,16 +30,12 @@
 	<#include "/advertiser/main/public-head.ftl">
     <div id="pagecontent">
 		<div id="content">
-			<input type="hidden" id="role" value="${role}">
-			<input type="hidden" id="agentId" value="${userSession.agentId}">
-			<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId}">
-			<input type="hidden" id="sessionadvertiserName" value="${advertiserName}">
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -48,8 +48,8 @@
 				 </ul>  
 	 		</div>
 	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/sceneReport" method="post">
-	 		 <input type="hidden" id="page" name="page" value="${pager.page}">
-	 		 <input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
+	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="selectuls">
 				<ul id="main_advertiserul">
 					<li class="select_box" id="advertiserul_box">
@@ -67,22 +67,22 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		</div>
 	
 			<div id="date">
@@ -156,7 +156,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv">
@@ -166,164 +166,6 @@
 		</form>
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$("#date #yesterday").addClass('dateChange');
-	}
-	
-	$('#date #date-one a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#date #date-one a').removeClass('dateChange');
-	});
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?place=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&checkItems="+checkboxStr;
-	    params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel"+params);
-	};
-	
-	$(function(){
-		// 分页中超链接跳转
-		$('#pagecontent .pagination ul li a[href]').click(function(){
-			var _page = $(this).attr('href').substr(1);
-			var _form = $('#formPage');
-			_form.find('input:hidden[name="page"]').val(_page);
-			_form.submit();
-			return false;
-		});
-	});
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
 <@extends name="/common/simple.ftl"/>
 

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

@@ -2,23 +2,31 @@
 <!DOCTYPE html>
 <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/create.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/style.css">
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/geo.css">
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/js/schedule/s.css">
     <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
 	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
 	<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"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker1.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.validate.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.common.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.geo.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/areas_popup.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-ui-1.10.4.custom.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.cxselect.js"></script>
+	<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=2767a619003d806b2dba379e3e023dfd"></script> 
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-
-<style>
+	<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%;;}
@@ -157,7 +165,7 @@
   }
   .pitchon{
     background-color:red;
-    background:url(/ssp_advertiser/assets/advertiser/images/duihao.png) no-repeat right bottom;
+    background:url(/ssp_web/assets/images/duihao.png) no-repeat right bottom;
     background-size:16%;
   }
   
@@ -184,23 +192,6 @@
 	}
 </style>
 
-<script src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-<script src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.common.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.geo.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/areas_popup.js"></script>
-<script src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-<script src="${ctx}/assets/advertiser/js/jquery.daterangepicker1.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/schedule/common.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/schedule/geometry/drag.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/schedule/geometry/geometry.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.validate.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-ui-1.10.4.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.cxselect.js"></script>
-<!--<script type="text/javascript" src="${ctx}/assets/advertiser/js/jqueryui.daterangepick.js"></script>-->
-<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=2767a619003d806b2dba379e3e023dfd"></script> 
-
 <script type="text/javascript">
 
      $(document).ready(function(){
@@ -678,7 +669,7 @@ var datefalg = true;
 	
 <div class="control-group">
 			<input style="width:150px;margin-right:15px;" type="submit" value="保存" class="btn2" id="btnsave"/>
-			<button class="btn2"  href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}" style="background-color:#36aeea;"><i class="icon-undo"></i> 取消</button>
+			<button class="btn2"  href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" style="background-color:#36aeea;" id="btncancel"><i class="icon-undo"></i> 取消</button>
 		</div>
 		
 		
@@ -1198,6 +1189,11 @@ function genwifinav(pcount,pno,fun){
 			validateMoney();
 		});
 		
+		$("#btncancel").click(function(){
+			location.href = $(this).attr("href");
+			return false;
+		});
+		
     });
     
     function validateMoney(){

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

@@ -6,11 +6,26 @@
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/style.css">
 <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/geo.css">
-<link rel="stylesheet" href="${ctx}/assets/advertiser/js/schedule/s.css">
+<link rel="stylesheet" href="${ctx}/assets/js/schedule/s.css">
 <link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
 <link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>	
-	  <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker1.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.validate.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.common.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.geo.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/areas_popup.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-ui-1.10.4.custom.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.cxselect.js"></script>
+<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=2767a619003d806b2dba379e3e023dfd"></script> 
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+
 <style>
         /**map serch button**/ 
 		#btnmapSearch:hover {background:#344c67;}
@@ -255,25 +270,6 @@
 		  	background-color: #4c637b;
 		  }
 </style>
-
-<script src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-<script src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.common.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.geo.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/areas_popup.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/schedule/schedule_popup.js"></script>
-<script src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-<script src="${ctx}/assets/advertiser/js/jquery.daterangepicker1.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/schedule/common.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/schedule/geometry/drag.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/schedule/geometry/geometry.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.validate.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-ui-1.10.4.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.cxselect.js"></script>
-<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=2767a619003d806b2dba379e3e023dfd"></script> 
 <script type="text/javascript">
 
      $(document).ready(function(){
@@ -784,7 +780,7 @@ var datefalg = true;
 	
 <div class="control-group">
 			<input type="submit" style="width:150px;margin-right:15px;" value="保存" class="btn2" id="btnsave">
-			<button class="btn2" href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}" style="background-color:#36aeea;"><i class="icon-undo"></i> 取消</button>
+			<button class="btn2" href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId}&orderId=${orderId}&advertiserId=${advertiserId}" style="background-color:#36aeea;" id="btncancel"><i class="icon-undo"></i> 取消</button>
 		</div>
 		
 		
@@ -1387,6 +1383,11 @@ function genwifinav(pcount,pno,fun){
     	$("#validation-form input[name='totalBudget']").blur(function(){
 			validateMoney();
 		});
+		
+		$("#btncancel").click(function(){
+			location.href = $(this).attr("href");
+			return false;
+		});
     });
     
     function validateMoney(){

+ 20 - 63
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/list.ftl

@@ -2,18 +2,19 @@
 	<title>投放管理-投放管理</title>
     <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
 	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<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/zbchj.css"/>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
+	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
 
 	<script type="text/javascript">
 
@@ -53,19 +54,9 @@
 				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
 				$(".zhting").removeClass("zhuangtai1").addClass("zhuangtaiall");
 			}	
-				
-			//搜索框
-			$("#search input[name='searchValue']").focus(function(){$(this).val("")});
-			$("#search input[name='searchValue']").blur(function(){
-				if($(this).val()==""){
-					$(this).val("请输入关键字");
-				}
-			});
-			//开启,暂停
+		
+			//开启,暂停,删除
 			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				var url = "";var ids = [];
-				var adGroupId = parseInt($(this).attr("value"));
-				ids.push(adGroupId);
 				if($(this).attr("id") == "btn-enable"){
 					url = "${ctx}/advertiser/main/ad/target/ad-group/enable";
 				}else if($(this).attr("id") == "btn-disable"){
@@ -73,52 +64,18 @@
 				}else if($(this).attr("id") == "btn-delete"){
 					url = "${ctx}/advertiser/main/ad/target/ad-group/delete";
 				}
-				$.ajax({
-					async: false,  
-	            	type: "POST",
-	             	url: url,
-	             	data:"id="+ids,
-	             	success: function(data){
-	             		$('.search-form').find('img').click();
-	             	}
-				});
+				singleOper($(this),url,"${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&advertiserId=${advertiserId!}&orderId=${orderId!}");
 			});
-			//批量开启,批量暂停
+			//批量开启,批量暂停,批量删除
 			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				var checkboxs = $(".fxk11");
-				var url = ""; var type = "";var ids = [];
 				if($(this).attr("id") == "all-btn-enable"){
 					url = "${ctx}/advertiser/main/ad/target/ad-group/enable";
-					type = "开启";
 				}else if($(this).attr("id") == "all-btn-disable"){
 					url = "${ctx}/advertiser/main/ad/target/ad-group/disable";
-					type = "暂停";
 				}else if($(this).attr("id") == "all-btn-delete"){
 					url = "${ctx}/advertiser/main/ad/target/ad-group/delete";
-					type = "删除";
-				}
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							checkboxs.each(function(){
-								var adGroupId = parseInt($(this).attr("id"));
-								ids.push(adGroupId);
-							});
-							$.ajax({
-								async: false, 
-								traditional: true, 
-				            	type: "POST",
-				             	url: url,
-				             	data:{"id":ids},
-				             	success: function(data){
-				             		$('.search-form').find('img').click();
-				             	}
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的数据!");
 				}
+				batchOpear($(this),url,"${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaignId!}&advertiserId=${advertiserId!}&orderId=${orderId!}");
 			});
 			
 			/*
@@ -133,9 +90,9 @@
 			});	
 			
 			$(".btn1").click(function(){
-				if($("#activeId").val() == "" || $("#activeId").val() == -1){
+				if($("#campaignId").val() == "" || $("#campaignId").val() == -1){
 					$("#btnCreatelink").attr("href","javascript:void(0);");
-					alert("请选择活动");
+					bootbox.alert("请选择活动");
 					$("#btnCreatelink").attr("title","请选择活动");
 					return false;
 				}
@@ -188,13 +145,13 @@
 				</li>
 			</ul>
 			<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-			<ul id="main_activeul">
-				<li class="select_box" id="activeul_box">
-					<span id="activeul_span">${selectedcampaignName!}</span>
-					<ul class="son_ul" id="activeul_son_ul"></ul>
+			<ul id="main_campaignul">
+				<li class="select_box" id="campaignul_box">
+					<span id="campaignul_span">${selectedcampaignName!}</span>
+					<ul class="son_ul" id="campaignul_son_ul"></ul>
 				</li>
 			</ul>
-			<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
+			<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
 		</div>
 		<div id="class23">	 
 			<div id="class3" style="border-bottom:none;">

+ 2 - 2
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/update.ftl

@@ -5,8 +5,8 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){

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

@@ -6,14 +6,14 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
 
-	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script src="${ctx}/assets/advertiser/js/jquery.ui.widget.js"></script>
-	<script src="${ctx}/assets/advertiser/js/jquery.iframe-transport.js"></script>
-	<script src="${ctx}/assets/advertiser/js/jquery.fileupload.js"></script>
-	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.ui.widget.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.iframe-transport.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.fileupload.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+
 	<style>
 		#upload-click{
 		width:320px;

+ 23 - 65
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/list.ftl

@@ -7,13 +7,15 @@
 	<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/zbchj.css"/>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
 	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+
 	<script type="text/javascript">
 
 		 $(document).ready(function(){
@@ -48,18 +50,8 @@
 				$(".zhtty").removeClass("zhuangtai1").addClass("zhuangtaiall");
 			} 
 				
-			//搜索框
-			$("#search input[name='searchValue']").focus(function(){$(this).val("")});
-			$("#search input[name='searchValue']").blur(function(){
-				if($(this).val()==""){
-					$(this).val("请输入关键字");
-				}
-			});
-			//开启,暂停
+			//开启,暂停,删除
 			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				var url = "";var ids = [];
-				var bannerId = parseInt($(this).attr("value"));
-				ids.push(bannerId);
 				if($(this).attr("id") == "btn-enable"){
 					url = "${ctx}/advertiser/main/ad/target/ad/enable";
 				}else if($(this).attr("id") == "btn-disable"){
@@ -67,52 +59,18 @@
 				}else if($(this).attr("id") == "btn-delete"){
 					url = "${ctx}/advertiser/main/ad/target/ad/delete";
 				}
-				$.ajax({
-					async: false,  
-	            	type: "POST",
-	             	url: url,
-	             	data:"id="+ids,
-	             	success: function(data){
-	             		$('.search-form').find('img').click();
-	             	}
-				});
+				singleOper($(this),url,"${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}");
 			});
 			//批量开启,批量暂停
 			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				var checkboxs = $(".fxk11");
-				var url = ""; var type = "";var ids = [];
 				if($(this).attr("id") == "all-btn-enable"){
 					url = "${ctx}/advertiser/main/ad/target/ad/enable";
-					type = "开启";
 				}else if($(this).attr("id") == "all-btn-disable"){
 					url = "${ctx}/advertiser/main/ad/target/ad/disable";
-					type = "暂停";
 				}else if($(this).attr("id") == "all-btn-delete"){
 					url = "${ctx}/advertiser/main/ad/target/ad/delete";
-					type = "删除";
-				}
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							checkboxs.each(function(){
-								var bannerId = parseInt($(this).attr("id"));
-								ids.push(bannerId);
-							});
-							$.ajax({
-								async: false, 
-								traditional: true, 
-				            	type: "POST",
-				             	url: url,
-				             	data:{"id":ids},
-				             	success: function(data){
-				             		$('.search-form').find('img').click();
-				             	}
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的数据!");
 				}
+				batchOpear($(this),url,"${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroupId!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}");
 			});
 			
 			/*
@@ -127,9 +85,9 @@
 			});	
 			
 			$(".btn1").click(function(){
-				if($("#selectedAdgroupId").val() == "" || $("#selectedAdgroupId").val() == -1){
+				if($("#adGroupId").val() == "" || $("#adGroupId").val() == -1){
 					$("#btnCreatelink").attr("href","javascript:void(0);");
-					alert("请选择投放");
+					bootbox.alert("请选择投放");
 					$("#btnCreatelink").attr("title","请选择投放");
 					return false;
 				}
@@ -187,20 +145,20 @@
 				</li>
 			</ul>
 			<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-			<ul id="main_activeul">
-				<li class="select_box" id="activeul_box">
-					<span id="activeul_span">${selectedcampaignName!}</span>
-					<ul class="son_ul" id="activeul_son_ul"></ul>
+			<ul id="main_campaignul">
+				<li class="select_box" id="campaignul_box">
+					<span id="campaignul_span">${selectedcampaignName!}</span>
+					<ul class="son_ul" id="campaignul_son_ul"></ul>
 				</li>
 			</ul>
-			<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-			<ul id="main_putul">
-				<li class="select_box" id="putul_box">
-					<span id="putul_span">${selectedadGroupName!}</span>
-					<ul class="son_ul" id="putul_son_ul"></ul>
+			<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+			<ul id="main_adGroupul">
+				<li class="select_box" id="adGroupul_box">
+					<span id="adGroupul_span">${selectedadGroupName!}</span>
+					<ul class="son_ul" id="adGroupul_son_ul"></ul>
 				</li>
 			</ul>
-			<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+			<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 		</div>
 		<div id="class23">	 
 			<div id="class3" style="border-bottom:none;">

+ 2 - 2
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad/update.ftl

@@ -5,8 +5,8 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){

+ 7 - 6
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/create.ftl

@@ -6,16 +6,14 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
 	
 	<style>
 		.spanVaildate{
@@ -33,6 +31,9 @@
 					return false;
 				}
 			});
+			$(".btn4").click(function(){
+				location.href = "${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}";
+			});
 		});
 	</script>
 		

+ 7 - 6
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/edit.ftl

@@ -6,16 +6,14 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
 	
 	<style>
 		.spanVaildate{
@@ -33,6 +31,9 @@
 					return false;
 				}
 			});
+			$(".btn4").click(function(){
+				location.href = "${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}";
+			});
 		});
 	</script>
 		

+ 19 - 61
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/list.ftl

@@ -7,16 +7,17 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
 	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/zbcc.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
-
+	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/table.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	
 	<script type="text/javascript">
-   $(document).ready(function(){
+   	$(document).ready(function(){
 		 //搜索按钮的实现
 		$("#search_img").click(function(){
 			var $searchValue = $(".search-form input[name=searchValue]");
@@ -43,18 +44,9 @@
 				$(".zhuangtaiall").removeClass("zhuangtaiall").addClass("zhuangtai1");
 				$(".zhtzhch").removeClass("zhuangtai1").addClass("zhuangtaiall");
 			}	
-			//搜索框
-			$("#search input[name='searchValue']").focus(function(){$(this).val("")});
-			$("#search input[name='searchValue']").blur(function(){
-				if($(this).val()==""){
-					$(this).val("请输入关键字");
-				}
-			});
-			//开启,暂停
+			
+			//开启,暂停,删除
 			$("#btn-enable,#btn-disable,#btn-delete").click(function(){
-				var url = "";var ids = [];
-				var campaignId = parseInt($(this).attr("value"));
-				ids.push(campaignId);
 				if($(this).attr("id") == "btn-enable"){
 					url = "${ctx}/advertiser/main/ad/target/campaign/enable";
 				}else if($(this).attr("id") == "btn-disable"){
@@ -62,53 +54,19 @@
 				}else if($(this).attr("id") == "btn-delete"){
 					url = "${ctx}/advertiser/main/ad/target/campaign/delete";
 				}
-				$.ajax({
-					async: false,  
-	            	type: "POST",
-	             	url: url,
-	             	data:"id="+ids,
-	             	success: function(data){
-						location.href = "${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId=${orderId}";
-	             	}
-				});
+				singleOper($(this),url,"${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId!}&orderId=${orderId!}");
 			});
-			//批量开启,批量暂停
+			
+			//批量开启,批量暂停,批量删除
 			$("#all-btn-enable,#all-btn-disable,#all-btn-delete").click(function(){
-				var checkboxs = $(".fxk11");
-				var url = ""; var type = "";var ids = [];
 				if($(this).attr("id") == "all-btn-enable"){
 					url = "${ctx}/advertiser/main/ad/target/campaign/enable";
-					type = "开启";
 				}else if($(this).attr("id") == "all-btn-disable"){
 					url = "${ctx}/advertiser/main/ad/target/campaign/disable";
-					type = "暂停";
 				}else if($(this).attr("id") == "all-btn-delete"){
 					url = "${ctx}/advertiser/main/ad/target/campaign/delete";
-					type = "删除";
-				}
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							checkboxs.each(function(){
-								var campaignId = parseInt($(this).attr("id"));
-								ids.push(campaignId);
-							});
-							mm=${orderId};
-							$.ajax({
-								async: false, 
-								traditional: true, 
-				            	type: "POST",
-				             	url: url,
-				             	data:{"id":ids},
-				             	success: function(data){
-									location.href = "${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId}&orderId="+mm;
-				             	}
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的数据!");
 				}
+				batchOpear($(this),url,"${ctx}/advertiser/main/ad/target/campaign/list?advertiserId=${advertiserId!}&orderId=${orderId!}");
 			});
 			
 			/*
@@ -125,7 +83,7 @@
 			$(".btn1").click(function(){
 				if($("#orderId").val() == "" || $("#orderId").val() == -1){
 					$("#btnCreatelink").attr("href","javascript:void(0);");
-					alert("请选择订单");
+					bootbox.alert("请选择订单");
 					$("#btnCreatelink").attr("title","请选择订单");
 					return false;
 				}
@@ -234,8 +192,8 @@
 		                        <td class="td2" ><a href="${ctx}/advertiser/main/ad/target/campaign/update?campaignId=${campaign.id}&advertiserId=${advertiserId}" style="color:#36aeea; text-decoration: underline;">${campaign.upDated?datetime}</a></td>
 		                        <td class="td2" ><#if campaign.status==0>正常<#else>停用</#if></td>		                                     
 		                        <td class="td2" >
-		                           	<a   href="${ctx}/advertiser/main/ad/target/campaign/edit?advertiserId=${advertiserId}&id=${campaign.id}" ><button style="margin:0px 5px 0 0;" class="btn122">编辑</button></a>		                      
-                                	<a  href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId}&selectedadvertiserName=${selectedadvertiserName}&selectedorderId=${orderId}&selectedorderName=${selectedorderName}&selectedcampaignId=${campaign.id}&selectedcampaignName=${campaign.name}"><button style="margin:0px 5px 0 0;" class="btn122">查看报表</button></a>
+		                           	<a href="${ctx}/advertiser/main/ad/target/campaign/edit?advertiserId=${advertiserId}&id=${campaign.id}" ><button style="margin:0px 5px 0 0;" class="btn122">编辑</button></a>		                      
+                                	<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId}&selectedadvertiserName=${selectedadvertiserName}&selectedorderId=${orderId}&selectedorderName=${selectedorderName}&selectedcampaignId=${campaign.id}&selectedcampaignName=${campaign.name}"><button style="margin:0px 5px 0 0;" class="btn122">查看报表</button></a>
 		                           	<#if campaign.status==0>
 									<button style="margin:0px;" id="btn-disable" value=${campaign.id} class="btn122">停用</button>
 									<#elseif campaign.status=1>

+ 4 - 4
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/update.ftl

@@ -5,8 +5,8 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){
@@ -51,9 +51,9 @@
 				<li class="size3">活动信息修改记录</li>
 			</ul>  
 		</div>
-		<form id="formPage" action="${ctx}/advertiser/main/ad/campaign/update?campaignId=${campaignId}&advertiserId=${advertiserId}" method="post">
+		<form id="formPage" action="${ctx}/advertiser/main/ad/target/campaign/update?campaignId=${campaignId}&advertiserId=${advertiserId}" method="post">
 			<input  id="page" type="hidden" name="page" value="${pager.page}">
-			<input  id="page" type="hidden" name="orderId" value="${orderId}">
+			<input  id="orderId" type="hidden" name="orderId" value="${orderId}">
 			<div id="account-table" style="margin-top:10px;">
 				<table border="1" class="tablefig" id="tablefig">
 					<thead>

+ 142 - 161
src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/create-banner/list.ftl

@@ -1,26 +1,30 @@
 <@override name="head">
 <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/createbanner.css"/>
-		<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-		<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-		<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-		<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-		<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.min.js"></script>
-		<script src="${ctx}/assets/advertiser/js/jquery.ui.widget.js"></script>
-		<script src="${ctx}/assets/advertiser/js/jquery.iframe-transport.js"></script>
-		<script src="${ctx}/assets/advertiser/js/jquery.fileupload.js"></script>
-		<style>
-		#third{height:50px}
-		#third li{float:left;}
-		#up{ border: 1px solid #36aeea;
-    		border-radius: 5px;
-			 color: #36aeea;
-			 cursor: pointer;
-			 height: 34px;
-			 margin-top: 10px;
-			 width: 120px;
-			 line-height:34px;
-			 text-align:center}
-		</style>
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.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>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.ui.widget.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.iframe-transport.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.fileupload.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+		
+<style>
+	#third{height:50px}
+	#third li{float:left;}
+	#up{ border: 1px solid #36aeea;
+    	border-radius: 5px;
+		color: #36aeea;
+		cursor: pointer;
+		height: 34px;
+		margin-top: 10px;
+		width: 120px;
+		line-height:34px;
+		text-align:center}
+</style>
 </@override>
 
 <@override name="body">
@@ -164,58 +168,130 @@
 <script>
 $(function(){
 	
-	
 	$('#input-files').fileupload({
-				autoUpload: true,
-				url: '${ctx}/advertiser/main/ad/target/create-banner/upload?adGroupId=${adGroupId}',		
-				done:function(e,data){
-					alert(data.result);
-					window.location.reload();
-			     }				
-			})
-			
-			
- });
-
-$('#loadse').click(function(){
-	$('#input-files').click();
-})
-
+		autoUpload: true,
+		url: '${ctx}/advertiser/main/ad/target/create-banner/upload?adGroupId=${adGroupId}',		
+		done:function(e,data){
+			window.location.reload();
+		}				
+	});
 	
-     function mysubt(){
-	  
-				try{
-					var boxs = document.getElementsByName("id");		
-					for(var i=0;i<boxs.length;i++){
-						boxs[i].checked=true;
-						//alert(boxs[i].checked);
-					}
-					var jsonuserinfo = $("#form1").serializeObject();
-					var didjson =document.getElementById("hidjson").value 
-				 	document.getElementById("hidjson").value=jsonuserinfo;
-				}
-				catch(e){
-					return false;
+	$('#loadse').click(function(){
+		$('#input-files').click();
+	});
+	
+	// 分页中超链接跳转
+     $('#page-list .pagination ul li a[href]').click(function(){
+     	var _page = $(this).attr('href').substr(1);
+     	var _form = $('.btns .search-form');
+     	_form.find('input:hidden[name=\'page\']').val(_page);
+     	_form.find('img').click();
+     	return false;
+     });
+  
+  	//搜索事件
+    $('.btns img').click(function(){
+		var _form = $('.btns .search-form');
+		var $searchValue = $(".btns .search-form input[name=searchValue]")
+		if($searchValue.val() == "请输入需要搜索的内容"){
+			$searchValue.val(null);
+		};
+		var _url = _form.attr('action');
+		var _param =_form.serialize();
+		$.post(_url, _param, function(data) {
+			$('#page-content').html(data);
+		});
+		if($searchValue.val() == ''){
+			$searchValue.val("请输入需要搜索的内容");
+		};
+		return false;
+	});
+     
+   	//搜索输入框的样式改变
+	$(".btns input[name='searchValue']").focus(function(){
+		$(this).val("");
+	});
+	$(".btns input[name='searchValue']").blur(function(){
+		if($(this).val()== ""){
+			$(this).val("请输入需要搜索的内容");
+		}
+	});
+		
+	//复选框选择
+	$("#all").click(function(){
+		var obj=document.getElementsByName("id");
+		if(document.getElementById("all").checked==true){
+			for(var i=0;i<obj.length;i++){
+			   obj[i].checked=true;
+			}
+		}else{
+			for(var i=0;i<obj.length;i++){ obj[i].checked=false;}
+		}
+	});
+	
+	//批量删除
+	$('.btn-content #delete').click(function(){
+		var _checkboxes = $('table tbody input:checkbox:checked');
+		if (_checkboxes.size()>0) {		
+			var _url = $(this).attr("href");
+			var _param = _checkboxes.serializeArray();
+			// 删除时需要提醒
+			if ($(this).text() && ($(this).text().indexOf("删除")>-1
+				||$(this).text().indexOf("关闭")>-1)) {
+				bootbox.confirm("确定删除吗?删除后无法再找回", function(ensure) {
+					if (ensure) {
+						$.post(_url, _param, function(data) {
+							window.location.reload();
+						});
 					}
+				});
+			} else {
+				$.post(_url, _param, function(data) {
+					window.location.reload();
+				});			
+			}
+		}
+	});
+		
+	 // 页面中按钮的超链接跳转
+	$('.btn-content .banner-select').click(function(){
+		var _href = $(this).attr("href");
+		if (_href&&_href!='#') {
+			window.location.href=_href;
+			return false;
+		}
+	});
+});
+
+	function mysubt(){
+		try{
+			var boxs = document.getElementsByName("id");		
+			for(var i=0;i<boxs.length;i++){
+				boxs[i].checked=true;
+			}
+			var jsonuserinfo = $("#form1").serializeObject();
+			var didjson =document.getElementById("hidjson").value 
+			document.getElementById("hidjson").value=jsonuserinfo;
+		}catch(e){
+			return false;
+		}
 	}
      
     //序列化对象
-     $.fn.serializeObject = function()    
- 	{    
- 	   var o = {};    
- 	   var a = this.serializeArray();    
- 	   $.each(a, function() {    
- 	       if (o[this.name]) {    
- 	           if (!o[this.name].push) {    
- 	               o[this.name] = [o[this.name]];    
- 	           }    
- 	           o[this.name].push(this.value || '');    
- 	       } else {    
+    $.fn.serializeObject = function(){    
+ 		var o = {};    
+ 	   	var a = this.serializeArray();    
+ 	   	$.each(a, function() {    
+ 	       	if (o[this.name]) {    
+ 	           	if (!o[this.name].push) {    
+ 	               	o[this.name] = [o[this.name]];    
+ 	           	}    
+ 	           	o[this.name].push(this.value || '');    
+ 	       	} else {    
  	           o[this.name] = this.value || '';    
- 	       } 
- 	      
- 	   });  
- 	   var vCount = 0;
+ 	       	} 
+ 	   	});  
+ 	  	var vCount = 0;
         // 计算json内部的数组最大长度
         for(var item in o){
             var tmp = $.isArray(o[item]) ? o[item].length : 1;
@@ -236,99 +312,4 @@ $('#loadse').click(function(){
             return "[" + JSON.stringify(o) + "]";
         } 
  	} 
-     
-  // 分页中超链接跳转
-     $('#page-list .pagination ul li a[href]').click(function(){
-     	var _page = $(this).attr('href').substr(1);
-     	var _form = $('.btns .search-form');
-     	_form.find('input:hidden[name=\'page\']').val(_page);
-     	_form.find('img').click();
-     	return false;
-     });
-  
-  //搜索事件
-     $('.btns img').click(function(){
-			var _form = $('.btns .search-form');
-			var $searchValue = $(".btns .search-form input[name=searchValue]")
-			if($searchValue.val() == "请输入需要搜索的内容"){
-				$searchValue.val(null);
-			};
-			var _url = _form.attr('action');
-			var _param =_form.serialize();
-			//_param = _form.serialize() + "&" + _param;
-			console.log("search url:"+_url+", param:"+_param);
-			//window.location.assign(_url + "?" + _param);
-			$.post(_url, _param, function(data) {
-				$('#page-content').html(data);
-			});
-			if($searchValue.val() == ''){
-				$searchValue.val("请输入需要搜索的内容");
-			};
-			return false;
-		});
-     
-   //搜索输入框的样式改变
-		$(".btns input[name='searchValue']").focus(function(){
-			$(this).val("");
-		});
-		$(".btns input[name='searchValue']").blur(function(){
-			if($(this).val()== ""){
-				$(this).val("请输入需要搜索的内容");
-			}
-		});
-		
-	
-	//复选框选择
-		$("#all").click(function(){
-			/*alert("复选框进来了没有?");*/
-			 var obj=document.getElementsByName("id");
-			/* console.log(obj);*/
-			    if(document.getElementById("all").checked==true){
-			        for(var i=0;i<obj.length;i++){
-			            obj[i].checked=true;
-			        }
-			    }else{
-			        for(var i=0;i<obj.length;i++){ obj[i].checked=false;}
-			         }
-		 });
-	
-		//批量删除
-	    $('.btn-content #delete').click(function(){
-			var _checkboxes = $('table tbody input:checkbox:checked');
-			if (_checkboxes.size()>0) {		
-				var _url = $(this).attr("href");
-				var _param = _checkboxes.serializeArray();
-				
-				// 删除时需要提醒
-				if ($(this).text() && ($(this).text().indexOf("删除")>-1
-					||$(this).text().indexOf("关闭")>-1)) {
-					bootbox.confirm("确定删除吗?删除后无法再找回", function(ensure) {
-						console.log("[debug]press ensure button?"+ensure);
-						if (ensure) {
-							console.log("[debug]execute delete operation.");			
-							$.post(_url, _param, function(data) {
-								window.location.reload();
-							});
-						}
-					});
-				} else {
-					$.post(_url, _param, function(data) {
-						window.location.reload();
-					});			
-				}
-			}
-		});
-		
-		
-	 // 页面中按钮的超链接跳转
-		$('.btn-content .banner-select').click(function(){
-			var _href = $(this).attr("href");
-			if (_href&&_href!='#') {
-				window.location.href=_href;
-				return false;
-			}
-			//window.location.href=_href;	
-			
-		});
-	
 </script>

+ 4 - 18
src/main/webapp/WEB-INF/pages/advertiser/main/authority/create.ftl

@@ -6,10 +6,10 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<style>
 		.spanVaildate{
@@ -72,11 +72,6 @@
 				    	authority+=$(this).val()+",";
 				});
 				authority = authority.substring(0,authority.length-1);
-				if($("#selectedAdvertiserId").val() == "" || $("#selectedAdvertiserId").val() == 0){
-					$("#main_advertiserul").css({"box-shadow":"20px 0 6px red","width":"150px"}).attr("title","请选择广告主");
-					$("#advertiserul_selectuldiv").find('span.spanVaildate').html("请选择广告主");
-					return false;
-				}
 				var flag = isExistName();//判断账号名称是否重复
 				if(flag){
 					return false;
@@ -177,15 +172,6 @@
 				return flag;
 			}
 			
-			$("#advertiserul_select_box").mouseleave(function(){
-				if($("#selectedAdvertiserId").val() == "" || $("#selectedAdvertiserId").val() == 0){
-					$("#main_advertiserul").css({"box-shadow":"20px 0 6px red","width":"150px"}).attr("title","请选择广告主");
-					$("#advertiserul_selectuldiv").find('span.spanVaildate').html("请选择广告主");
-				}else{
-					$("#main_advertiserul").css("box-shadow","none").attr("title","");
-					$("#advertiserul_selectuldiv").find('span.spanVaildate').html("");
-				}
-		 	});
 		});
 	</script>
 	

+ 4 - 18
src/main/webapp/WEB-INF/pages/advertiser/main/authority/edit.ftl

@@ -6,10 +6,10 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<style>
 		.spanVaildate{
@@ -77,11 +77,6 @@
 				    	authority+=$(this).val()+",";
 				});
 				authority = authority.substring(0,authority.length-1);
-				if($("#selectedAdvertiserId").val() == "" || $("#selectedAdvertiserId").val() == 0){
-					$("#main_advertiserul").css({"box-shadow":"20px 0 6px red","width":"150px"}).attr("title","请选择广告主");
-					$("#advertiserul_selectuldiv").find('span.spanVaildate').html("请选择广告主");
-					return false;
-				}
 				if($("#ensurePassword").val() !="" && $("#ensurePassword").val() !=$("#password").val()){
 					$("#ensurePassword").css("box-shadow","0 0 6px red").attr('title','确认密码必须与密码一致!');
 					$("#ensurePassword").parent("span").parent("div").find("span.spanVaildate").html("确认密码必须与密码一致!");
@@ -169,15 +164,6 @@
 			}
 			getAuthority();
 			
-			$("#advertiserul_select_box").mouseleave(function(){
-				if($("#selectedAdvertiserId").val() == "" || $("#selectedAdvertiserId").val() == 0){
-					$("#main_advertiserul").css({"box-shadow":"20px 0 6px red","width":"150px"}).attr("title","请选择广告主");
-					$("#advertiserul_selectuldiv").find('span.spanVaildate').html("请选择广告主");
-				}else{
-					$("#main_advertiserul").css("box-shadow","none").attr("title","");
-					$("#advertiserul_selectuldiv").find('span.spanVaildate').html("");
-				}
-		 	});
 		});
 	</script>
 	

+ 5 - 6
src/main/webapp/WEB-INF/pages/advertiser/main/authority/list.ftl

@@ -6,12 +6,11 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 	

+ 4 - 4
src/main/webapp/WEB-INF/pages/advertiser/main/authority/loginperson.ftl

@@ -6,10 +6,10 @@
 	<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/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 3 - 4
src/main/webapp/WEB-INF/pages/advertiser/main/code-class/create.ftl

@@ -6,10 +6,9 @@
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 3 - 4
src/main/webapp/WEB-INF/pages/advertiser/main/code-class/edit.ftl

@@ -6,10 +6,9 @@
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 13 - 13
src/main/webapp/WEB-INF/pages/advertiser/main/code-class/list.ftl

@@ -8,19 +8,19 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/jquery-ui.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ZeroClipboard.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery-1.8.2.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.core.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.widget.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.mouse.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.button.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.draggable.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.dialog.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.position.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.resizable.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.effect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<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/ZeroClipboard.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery-1.8.2.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.widget.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.mouse.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.button.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.effect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript">
 		$(document).ready(function(){

+ 3 - 4
src/main/webapp/WEB-INF/pages/advertiser/main/code-convert/create.ftl

@@ -6,10 +6,9 @@
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 3 - 4
src/main/webapp/WEB-INF/pages/advertiser/main/code-convert/edit.ftl

@@ -6,10 +6,9 @@
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 13 - 14
src/main/webapp/WEB-INF/pages/advertiser/main/code-convert/list.ftl

@@ -8,20 +8,19 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/jquery-ui.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ZeroClipboard.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery-1.8.2.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.core.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.widget.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.mouse.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.button.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.draggable.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.dialog.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.position.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.resizable.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ui/jquery.ui.effect.js"></script>
+	<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/ZeroClipboard.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery-1.8.2.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.widget.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.mouse.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.button.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ui/jquery.ui.effect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript">
 		$(document).ready(function(){

+ 4 - 4
src/main/webapp/WEB-INF/pages/advertiser/main/code-site/list.ftl

@@ -6,10 +6,10 @@
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-code.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/ZeroClipboard.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ZeroClipboard.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript">
 	

+ 504 - 460
src/main/webapp/WEB-INF/pages/advertiser/main/dashboard.ftl

@@ -3,12 +3,489 @@
 <!--Include Required css file-->
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/dashboard.css"/>
-<!--<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/bootstrap/latest/css/bootstrap.css" />-->
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
+
 <!--Include Required Prerequisites js-->
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<!--图表生成 js-->
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<!-- 弹出框插件,bootbox.min.js 依赖bootstrap.min.js -->
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+
+<script type="text/javascript">
+$(document).ready(function(){
+	//显示今天时间
+	var date = new Date();	
+	$("#content-left .up .today").text(formatDate(date));
+	function formatDate(now)   {   
+		var year = now.getFullYear();   
+		var month = now.getMonth()+1;   
+		var date = now.getDate();   
+		var hour = now.getHours();   
+		var minute = now.getMinutes();   
+		var second = now.getSeconds(); 
+		if(hour < 12)  
+			return  year+"年"+month+"月"+date+"日      上午"+hour+":"+minute+":"+second;
+		else 
+			return  year+"年"+month+"月"+date+"日      下午"+hour+":"+minute+":"+second;
+	}
+	
+	/*
+	*根据时间选择,类型选择,广告主id,查询得到图表
+	*	初始化一些数值
+	*	
+	*/
+	var role = $("#role").val();//获取角色
+	var advertiserId = $("#sessionadvertiserId").val();//广告主id
+	var flow=[];flow[0] = [];flow[1] = [];flow[2] = [];flow[3] = [];//图表的纵坐标数据
+	var labels = [];//图表的横坐标数据
+	var tipLabel=new Array("Consume","Impression","Click","Rate");//折线的名字
+	var consume=tipLabel[0];
+	for (var i = 0; i < 24; i++) {  //默认的X轴的标签labels显示的是昨天的24个小时
+		flow[0].push(0);//初始值设置为0;
+		flow[1].push(0);//初始值设置为0;
+		flow[2].push(0);//初始值设置为0;
+		flow[3].push(0);//初始值设置为0;
+		if(i<10){
+			labels.push("0" + i);
+		} else {
+			labels.push(i);
+		}
+	}
+	
+	/*
+	*更改日期的函数,所有更改日期的事件都是调用此函数
+	*/
+	function cb(start, end) { 
+		$('#date-range input').val(start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));//将日期显示在input标签里面
+		searchAndDraw(start, end);
+	}
+	/*
+	*查询数据和绘制折线图函数, 只要advertiserId和date改变,就调用此函数重新绘制图形
+	*	@param 开始日期,结束日期
+	*	操作:		更改日期,
+	*			调用searchData函数查询数据
+	*			调用drawDiagram函数绘制折线图
+	*/
+	function searchAndDraw(start, end){
+		if(role == 'agent'){
+			advertiserId = $('#selectedAdvertiserId3').val();
+		}
+		if(advertiserId != null){
+			searchData(advertiserId,start, end);//调用searchData函数查询数据
+		}
+		var data = flow[0];	
+		drawDiagram(labels,data,consume);//调用绘制图表函数,绘制图表
+	}
+	/*
+	*	默认显示昨天,moment.js是时间日期处理插件,基于jquery
+	*/
+	cb(moment().subtract(1, 'days'),moment().subtract(1, 'days'));
+	
+	/*
+	*	显示日历插件,jquery.dateRangePicker.js是双日期选择插件,基于jquery
+	*		仅仅设置语言为cn, 最大选择日期问今天
+	*		绑定一个确定按钮点击事件,回调函数,执行cb函数,更改日期,其实不用改,只不过是为了查询数据和绘制图表
+	*/
+	$('#date-range-picker').dateRangePicker({  
+		language:'cn',
+		endDate:new Date(),
+	}).bind('datepicker-apply', function(evt, obj) {
+		cb(moment(obj.date1), moment(obj.date2));
+	});
 
+	/*
+	*下拉框广告主改变,调用searchAndDraw重新查询数据绘制图形
+	*/
+	$('#selectedAdvertiserId3').change(function() {
+		var opt = '#selectedAdvertiserId3 option[value=' + $(this).val() + ']';
+		var txt = '趋势图:' + $(opt).html();
+		console.log(txt);
+		$('#chartContent .chart-down .chart-down-left').html(txt);
+		var chooseDate = $('#date-range-picker').val().split(' to ',2);
+		var start = moment(chooseDate[0]);//转换为moment格式
+		var end = moment(chooseDate[1]);//转换为moment格式
+		searchAndDraw(start, end);
+	});
+	
+	/*
+    *发送ajax请求,查询数据
+    * @param 广告主id,开始日期,结束日期 格式为YYYY-MM-DD
+    * 将横坐标日期存储在labels数组中
+    * 将纵坐标数据存储在flow数组中
+    */
+	function searchData(advertiserId,start,end){    
+		//ajax请求的参数:param{advertiserId,startDate,endDate}
+		var param = {
+			"advertiserId" : advertiserId,
+			"startDate" : start.format('YYYY-MM-DD'),
+			"endDate" : end.format('YYYY-MM-DD'),
+		}
+		//发送ajax请求
+		$.ajax({
+			type : 'post',	//请求方式,post
+			data : param,	//请求参数,param
+			url : '${ctx}/advertiser/main/dashboard/chart',	//请求url
+			async : false,	//是否设置为异步请求
+			cache : false,	//是否缓存
+			dataType : 'json',	//数据类型为json
+			success : function(data){ //请求成功回调函数处理,参数为返回回来的json数组
+				//创建消费数,曝光数,点击数,点击率的数组,用于存储返回回来的数据,然后将这些数据存储在flow数组中,用于图表显示
+				var consume = [];
+				var impression = [];
+				var click = [];
+				var clickRate = [];
+				//判断是数据按小时还是天显示
+				if(start.format('YYYY-MM-DD') == end.format('YYYY-MM-DD')){
+					labels = [];//清空labels数组
+					console.log('按小时显示');
+					//如果不是今天
+					if(moment().format('YYYY-MM-DD') != start.format('YYYY-MM-DD')){
+						for(var i=0;i<24;i++){ //循环给消费数,曝光数,点击数,点击率赋值,循环24次
+							if(i<10){
+								labels.push("0" + i);
+							} else {
+								labels.push(i);
+							}
+							$.each(data,function(key,value){//循环遍历返回的数据data,如果data.hour和当前时间点相等,将相应的值付给数组
+								if(value.hour == i){
+									consume[i] = value.totalConsume;
+									impression[i] = value.totalImpression;
+									click[i] = value.totalClick;
+									clickRate[i] = value.clickRate;
+								}
+							});
+							//未赋值,将相应的数组值赋0.
+							if(consume[i] == null){ consume[i] = 0; }
+							if(impression[i] == null){ impression[i] = 0; }
+							if(click[i] == null){ click[i] = 0;	}
+							if(clickRate[i] == null){ clickRate[i] = 0;	}
+						}
+					} else { //如果是今天
+						var now_hour = new Date().getHours();
+						for(var i=0;i<now_hour;i++){ //循环给消费数,曝光数,点击数,点击率赋值,循环24次
+							if(i<10){
+								labels.push("0" + i);
+							} else {
+								labels.push(i);
+							}
+							$.each(data,function(key,value){//循环遍历返回的数据data,如果data.hour和当前时间点相等,将相应的值付给数组
+								if(value.hour == i){
+									consume[i] = value.totalConsume;
+									impression[i] = value.totalImpression;
+									click[i] = value.totalClick;
+									clickRate[i] = value.clickRate;
+								}
+							});
+							//未赋值,将相应的数组值赋0.
+							if(consume[i] == null){ consume[i] = 0; }
+							if(impression[i] == null){ impression[i] = 0; }
+							if(click[i] == null){ click[i] = 0;	}
+							if(clickRate[i] == null){ clickRate[i] = 0;	}
+						}
+					}
+					//如果是昨天或者今天,图表按小时显示数据,后端暂时没有写
+					
+				} else {
+					console.log('按日期显示');
+					labels = []; //清空labels数组
+					var days = moment.duration(end.diff(start,'days'), 'days').asDays(); //计算选择了几天,利用moment.js相关函数
+					for(var i=0;days>=0;i++,days--){ //循环给labels,消费数,曝光数,点击数,点击率赋值,循环days次
+						labels[i] = moment(end).subtract(days, 'days').format('MM-DD');//将选择的日期赋值给label,格式为MM-DD,例如选择过去三天:labels=[09-21,09-22,09-23]						
+						$.each(data,function(key,value){//循环遍历返回的数据data,如果data.reportDate和当前日期相等,将相应的值付给数组
+							if(value.reportDate == moment(end).subtract(days, 'days').format('YYYY-MM-DD')){
+								consume[i] = value.totalConsume;
+								impression[i] = value.totalImpression;
+								click[i] = value.totalClick;
+								clickRate[i] = value.clickRate;
+							}
+						});
+						//未赋值,将相应的数组值赋0.
+						if(consume[i] == null){ consume[i] = 0; }
+						if(impression[i] == null){ impression[i] = 0; }
+						if(click[i] == null){ click[i] = 0;	}
+						if(clickRate[i] == null){ clickRate[i] = 0;	}
+					}
+				}
+				//将消费数,曝光数,点击数,点击率的数组赋值给flow数组的元素
+				flow[0] = consume;
+				flow[1] = impression;
+				flow[2] = click;
+				flow[3] = clickRate;
+			},
+			error : function (XMLHttpRequest, textStatus, errorThrown) { //url请求出错的回调函数
+			    // 通常 textStatus 和 errorThrown 之中
+			    // 只有一个会包含信息
+				console.info('error');
+			    this; // 调用本次AJAX请求时传递的options参数
+			}
+		});
+	}
+	/*
+	*快速设置为(今天 昨天 过去7天 过去30天)
+	*/
+	$('#chartContent  .chart-up .right span.time').click(function(e){ //今天 昨天 过去七天 过去三十天触发函数
+        e.preventDefault;
+		$('#chartContent  .chart-up .right span').css('color','#344c67');
+		$(this).css('color','#36aeea');
+        var ind = $(this).index();
+        switch (ind){
+            case 0:
+                cb(moment(),moment());
+                break;
+            case 1:
+                cb(moment().subtract(1, 'days'),moment().subtract(1, 'days'));
+                break;
+            case 2:
+                cb(moment().subtract(7, 'days'),moment().subtract(1, 'days'));
+                break;
+            case 3:
+                cb(moment().subtract(30, 'days'),moment().subtract(1, 'days'));
+                break;
+        }
+    });
+	
+	/*
+	*四条折线(消费,曝光数,点击数,点击率),点击切换
+	*/
+	$('#chartContent form input[type="radio"]').click(function(){
+		var n = $(this).val();
+		var data = flow[n];
+		consume = tipLabel[n];
+		var txt = '';
+		if(n == 0){	txt = '消费(元)';	 }	
+		if(n == 1){	txt = '曝光数(次)'; }
+		if(n == 2){	txt = '点击数(次)'; }
+		if(n == 3){	txt = '点击率(%)'; }
+		$('#chartContent .chart-down .chart-down-right').html(txt);
+		drawDiagram(labels,data,consume);
+	});
+	
+	/*
+	*绘制折线图函数
+	*	@param 横坐标数值,纵坐标数值,和折线的名字
+	*/
+	function drawDiagram(labels,data,consume){		
+		$('#chart').highcharts({ 
+			chart: { type: 'line' },
+			title: { text: '' }, //标题
+			//subtitle: { text: 'Source: WorldClimate.com' }, //副标题
+			xAxis: { categories: labels }, 
+			yAxis: { 
+				title: { text: '' }, 
+				plotLines: [{ value: 0, width: 1, color: '#808080' }]
+			}, 
+			tooltip: { crosshairs: true, shared: true }, 
+			legend: { 
+				enabled:false,
+			},
+			credits:{
+				enabled:false,
+			},
+		
+			series: [{ 
+				name: consume, 
+				data: data,
+				color:'#36aeea',
+				marker:{
+					symbol: 'circle',
+					fillColor:'#ffffff',
+					lineColor:'#36aeea',
+					lineWidth: 2,
+					radius: 5,
+				}
+			}]
+		}); 
+	}
+	
+	/*
+	*切换折线图和图表
+	*/
+	$("#diagramHead span:first-child").click(function(){
+		$("#sheetContent").css("display","none");
+		$("#diagramHead span:first-child").css("border-bottom","1px solid #ffffff");
+		$("#chartContent").css("display","block");
+		$("#diagramHead span:last-child").css("border-bottom","1px solid #d5dee8");
+	});
+	$("#diagramHead span:last-child").click(function(){
+		$("#chartContent").css("display","none");
+		$("#diagramHead span:first-child").css("border-bottom","1px solid #d5dee8");
+		$("#sheetContent").css("display","block");
+		$("#diagramHead span:last-child").css("border-bottom","1px solid #ffffff");
+		var chooseDate = $('#date-range-picker').val().split(' to ',2);
+		var start = chooseDate[0];//转换为moment格式
+		var end = chooseDate[1];//转换为moment格式
+		var advertiserId = $('#selectedAdvertiserId3').val();
+		var param = {
+			'advertiserId':advertiserId,
+			'startDate':start,
+			'endDate':end,
+		};
+		var _url = '${ctx}/advertiser/main/dashboard/list';
+		console.log(param);
+		$.post(_url,param,function(data){
+			$('#sheetContent').html(data);
+		});
+	});
+		
+	/*
+	*根据广告主选择账户余额
+	*	选择一个广告主,发送ajax请求,获取数据
+	*/
+	$('#selectedAdvertiserId').change(function() {
+		var agentId = $("#agentId").val(); //获取代理商id
+		var advertiserId = $('#selectedAdvertiserId').val();
+		var param = {};
+		if(advertiserId == -1) {
+			param = {
+				'agentId':agentId
+			};
+		} else {
+			param = {
+				'advertiserId':advertiserId
+			};
+		}
+		//发送ajax请求
+		$.ajax({
+			type : 'post',	//请求方式,post
+			data : param,	//请求参数,param
+			url : '/ssp_web/advertiser/main/dashboard/findCompareAjax',	//请求url
+			async : false,	//是否设置为异步请求
+			cache : false,	//是否缓存
+			dataType : 'json',	//数据类型为json
+			success : function(data){ //请求成功回调函数处理,参数为返回回来的json数组
+				$('#accountBalance .data-down').text(data.balance);
+				$('#exposure .data-down').text(data.totalImpression);
+				$('#click .data-down').text(data.totalClick);
+			},
+			error : function (XMLHttpRequest, textStatus, errorThrown) { //url请求出错的回调函数
+				console.info('error');
+			}
+		});
+	});
+		
+	/*
+	*根据广告主id创建订单
+	*/
+	$('#content-right button').click(function(){
+		var advertiserId = null;
+		//判断是广告主还是代理商
+		if(role == "advertiser"){
+			advertiserId = $("#sessionadvertiserId").val();
+		} else {
+			advertiserId = $('#selectedAdvertiserId2').val();
+		}
+		//如果没有选择广告主,弹出提示
+		if((advertiserId == -1) || (advertiserId == null) || (advertiserId == "")){
+			bootbox.alert('请选择广告主');
+		} else {
+			var _href = $(this).attr('href') + '?advertiserId=' + advertiserId;
+			window.location.assign(_href);
+		}
+	});
+	
+	$("ul#advertiser_son_ul2 li").live("click",function(){
+	 	$(this).parents('li').find('span').html($(this).html());
+		$("#selectedAdvertiserId2").val($(this).attr("value"));
+		$("#selectedAdvertiserName2").val($(this).html());
+		$('#advertiser_son_ul2').hide(); //ul隐藏
+	});
+	
+	//获取广告主的值
+	if($("#role").val() == "agent"){
+		var _url = "${ctx}/widget/selector/provide/advertiser?parentId="+agentId; //请求地址
+		getSelectData("advertiserul_span","advertiser_son_ul","advertiserul_box","全部广告主",_url);
+		getSelectData("advertiserul_span2","advertiser_son_ul2","advertiserul_box2","请选择广告主",_url);
+		getSelectData("advertiserul_span3","advertiser_son_ul3","advertiserul_box3","请选择广告主",_url);
+	}else if($("#role").val() == "advertiser"){
+		$("#advertiserul_span").html($("#sessionadvertiserName").val());
+		$("#selectedAdvertiserId").val($("#sessionadvertiserId").val());
+		$("#selectedAdvertiserName").val($("#sessionadvertiserName").val());
+		$("#advertiserul_span2").html($("#sessionadvertiserName").val());
+		$("#selectedAdvertiserId2").val($("#sessionadvertiserId").val());
+		$("#selectedAdvertiserName2").val($("#sessionadvertiserName").val());
+		$("#advertiserul_span3").html($("#sessionadvertiserName").val());
+		$("#selectedAdvertiserId3").val($("#sessionadvertiserId").val());
+		$("#selectedAdvertiserName3").val($("#sessionadvertiserName").val());
+	}
+	
+	$("ul#advertiser_son_ul li").live("click",function(){
+	 	$(this).parents('li').find('span').html($(this).html());
+		$("#selectedAdvertiserId").val($(this).attr("value"));
+		$("#selectedAdvertiserName").val($(this).html());
+		$('#advertiser_son_ul').hide(); //ul隐藏
+		var agentId = $("#agentId").val(); //获取代理商id
+		var advertiserId = $('#selectedAdvertiserId').val();
+		var param = {};
+		if(advertiserId == -1) {
+			param = {
+				'agentId':agentId
+			};
+		} else {
+			param = {
+				'advertiserId':advertiserId
+			};
+		}
+		//发送ajax请求
+		$.ajax({
+			type : 'post',	//请求方式,post
+			data : param,	//请求参数,param
+			url : '${ctx}/advertiser/main/dashboard/findCompareAjax',	//请求url
+			async : false,	//是否设置为异步请求
+			cache : false,	//是否缓存
+			dataType : 'json',	//数据类型为json
+			success : function(data){ //请求成功回调函数处理,参数为返回回来的json数组
+				$('#accountBalance .data-down').text(data.balance);
+				$('#exposure .data-down').text(data.totalImpression);
+				$('#click .data-down').text(data.totalClick);
+			},
+			error : function (XMLHttpRequest, textStatus, errorThrown) { //url请求出错的回调函数
+				console.info('error');
+			}
+		});
+	});
+	
+	$("ul#advertiser_son_ul3 li").live("click",function(){
+	 	$(this).parents('li').find('span').html($(this).html());
+		$("#selectedAdvertiserId3").val($(this).attr("value"));
+		$("#selectedAdvertiserName3").val($(this).html());
+		$('#advertiser_son_ul3').hide(); //ul隐藏
+		$('#chartContent .chart-down .chart-down-left').html("趋势图:"+$(this).html());
+		var chooseDate = $('#date-range-picker').val().split(' to ',2);
+		var start = moment(chooseDate[0]);//转换为moment格式
+		var end = moment(chooseDate[1]);//转换为moment格式
+		searchAndDraw(start, end);
+	});
+	
+	function getSelectData(target_spanId,target_sonulId,target_boxId,defaultName,url){
+		$("#"+target_spanId).hide();
+		$("#"+target_sonulId).append("<li value='-1' style='width:130px;'>"+defaultName+"</li>");
+		$.getJSON( url, function(data) {
+			var data_1 = data.advertiserList;
+			$.each( data_1, function( key, val ) {
+				$("#"+target_sonulId).append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
+			});
+		});
+		$("#"+target_spanId).on("click",function(){
+	 		if($("#role").val() == "agent"){
+	 			if($('#'+target_sonulId).height()>210){
+	 				$('#'+target_sonulId).css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
+	 			};
+	 			$('#'+target_sonulId).show(); //ul显示
+	 		}
+	 	});
+		$("#"+target_boxId).mouseleave(function(){
+	 		$('#'+target_sonulId).hide(); //ul隐藏
+	 	});
+	}
+});
+</script>
 </@override>
 
 <@override name="body">
@@ -21,8 +498,14 @@
 		<div id="content-left">
 			<div class="up">
 				<span class="today"></span>
-				<select id="selectedAdvertiserId" name="selectedAdvertiserId" class="selectedAdvertiserId">
-				</select>
+				<ul id="main_advertiserul">
+					<li class="select_box" id="advertiserul_box">
+						<span id="advertiserul_span">${selectedadvertiserName!}</span>
+						<ul class="son_ul" id="advertiser_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedAdvertiserId" id="selectedAdvertiserId" value="${advertiserId!}">
+				<input type="hidden" name="selectedadvertiserName" id="selectedadvertiserName" value="${selectedadvertiserName!}">
 			</div>
 			<div class="down">
 				<div id="exposure">
@@ -60,8 +543,14 @@
 				<span>创建新的订单</span>
 			</div>
 			<div class="down">
-				<select id="selectedAdvertiserId2" name="selectedAdvertiserId2" class="selectedAdvertiserId">
-				</select>
+				<ul id="main_advertiserul2">
+					<li class="select_box" id="advertiserul_box2">
+						<span id="advertiserul_span2">${selectedadvertiserName2!}</span>
+						<ul class="son_ul" id="advertiser_son_ul2"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedAdvertiserId2" id="selectedAdvertiserId2" value="${advertiserId2!}">
+				<input type="hidden" name="selectedadvertiserName2" id="advertiserName2" value="${selectedadvertiserName2!}">
 				<button href='${ctx}/advertiser/main/ad/order/create'>创建新的订单</button>
 			</div>
 		</div>
@@ -75,8 +564,14 @@
 			<div class="chart-up">
 				<div class="pull-down">
 					<span class="span">选择广告主</span>
-					<select id="selectedAdvertiserId3" name="selectedAdvertiserId3" class="selectedAdvertiserId">
-					</select>
+					<ul id="main_advertiserul3">
+						<li class="select_box" id="advertiserul_box3">
+							<span id="advertiserul_span3">${selectedadvertiserName3!}</span>
+							<ul class="son_ul" id="advertiser_son_ul3"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedAdvertiserId3" id="selectedAdvertiserId3" value="${advertiserId3!}">
+					<input type="hidden" name="selectedadvertiserName3" id="advertiserName3" value="${selectedadvertiserName3!}">
 				</div>
 				<div class="time-period">
 					<span class="span">时间周期选择</span>
@@ -111,455 +606,4 @@
 </div>
 
 </@override>
-<@extends name="/common/simple.ftl"/>
-
-<script type="text/javascript">
-	<!--修改个人信息js 控制上下切换-->
-	$(document).ready(function(){
-	  $("#divselect").click(function(){
-	  	$("#divselect ul").slideToggle("fast");
-	  });
-	});
-	
-	//显示今天时间
-	var date = new Date();	
-	$("#content-left .up .today").text(formatDate(date));
-	function  formatDate(now)   {   
-		var   year=now.getFullYear();   
-		var   month=now.getMonth()+1;   
-		var   date=now.getDate();   
-		var   hour=now.getHours();   
-		var   minute=now.getMinutes();   
-		var   second=now.getSeconds(); 
-		if(hour < 12)  
-			return  year+"年"+month+"月"+date+"日      上午"+hour+":"+minute+":"+second;
-		else 
-			return  year+"年"+month+"月"+date+"日      下午"+hour+":"+minute+":"+second;
-	} 
-</script>
-
-
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/moment.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.daterangepicker.js"></script>
-<!--图表生成 js-->
-<!--canvas dependence js library-->
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/highcharts.js"></script>
-<script type="text/javascript">
-	$(document).ready(function(){
-		
-		/*
-		*根据时间选择,类型选择,广告主id,查询得到图表
-		*	初始化一些数值
-		*	
-		*/
-		var role = '${role}';//获取角色
-		var advertiserId = '${userSession.advertiserId}';//广告主id
-		var flow=[];flow[0] = [];flow[1] = [];flow[2] = [];flow[3] = [];//图表的纵坐标数据
-		var labels = [];//图表的横坐标数据
-		var tipLabel=new Array("Consume","Impression","Click","Rate");//折线的名字
-		var consume=tipLabel[0];
-		for (var i = 0; i < 24; i++) {  //默认的X轴的标签labels显示的是昨天的24个小时
-			flow[0].push(0);//初始值设置为0;
-			flow[1].push(0);//初始值设置为0;
-			flow[2].push(0);//初始值设置为0;
-			flow[3].push(0);//初始值设置为0;
-			if(i<10){
-				labels.push("0" + i);
-			} else {
-				labels.push(i);
-			}
-		}
-	
-		/*
-		*更改日期的函数,所有更改日期的事件都是调用此函数
-		*/
-		function cb(start, end) { 
-			$('#date-range input').val(start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));//将日期显示在input标签里面
-			searchAndDraw(start, end);
-		}
-		/*
-		*查询数据和绘制折线图函数, 只要advertiserId和date改变,就调用此函数重新绘制图形
-		*	@param 开始日期,结束日期
-		*	操作:		更改日期,
-		*			调用searchData函数查询数据
-		*			调用drawDiagram函数绘制折线图
-		*/
-		function searchAndDraw(start, end){
-			if(role == 'agent'){
-				advertiserId = $('#selectedAdvertiserId3').val();
-			}
-			if(advertiserId != null){
-				searchData(advertiserId,start, end);//调用searchData函数查询数据
-			}
-			var data = flow[0];	
-			drawDiagram(labels,data,consume);//调用绘制图表函数,绘制图表
-		}
-		/*
-		*	默认显示昨天,moment.js是时间日期处理插件,基于jquery
-		*/
-		cb(moment().subtract(1, 'days'),moment().subtract(1, 'days'));
-		
-		/*
-		*	显示日历插件,jquery.dateRangePicker.js是双日期选择插件,基于jquery
-		*		仅仅设置语言为cn, 最大选择日期问今天
-		*		绑定一个确定按钮点击事件,回调函数,执行cb函数,更改日期,其实不用改,只不过是为了查询数据和绘制图表
-		*/
-		$('#date-range-picker').dateRangePicker({  
-			language:'cn',
-			endDate:new Date(),
-		}).bind('datepicker-apply', function(evt, obj) {
-			cb(moment(obj.date1), moment(obj.date2));
-		});
-	
-		/*
-		*下拉框广告主改变,调用searchAndDraw重新查询数据绘制图形
-		*/
-		$('#selectedAdvertiserId3').change(function() {
-			var opt = '#selectedAdvertiserId3 option[value=' + $(this).val() + ']';
-			var txt = '趋势图:' + $(opt).html();
-			console.log(txt);
-			$('#chartContent .chart-down .chart-down-left').html(txt);
-			var chooseDate = $('#date-range-picker').val().split(' to ',2);
-			var start = moment(chooseDate[0]);//转换为moment格式
-			var end = moment(chooseDate[1]);//转换为moment格式
-			searchAndDraw(start, end);
-		});
-				
-        /*
-        *发送ajax请求,查询数据
-        * @param 广告主id,开始日期,结束日期 格式为YYYY-MM-DD
-        * 将横坐标日期存储在labels数组中
-        * 将纵坐标数据存储在flow数组中
-        */
-		function searchData(advertiserId,start,end){    
-			//ajax请求的参数:param{advertiserId,startDate,endDate}
-			var param = {
-				"advertiserId" : advertiserId,
-				"startDate" : start.format('YYYY-MM-DD'),
-				"endDate" : end.format('YYYY-MM-DD'),
-			}
-			//发送ajax请求
-			$.ajax({
-				type : 'post',	//请求方式,post
-				data : param,	//请求参数,param
-				url : '${ctx}/advertiser/main/dashboard/chart',	//请求url
-				async : false,	//是否设置为异步请求
-				cache : false,	//是否缓存
-				dataType : 'json',	//数据类型为json
-				success : function(data){ //请求成功回调函数处理,参数为返回回来的json数组
-					//创建消费数,曝光数,点击数,点击率的数组,用于存储返回回来的数据,然后将这些数据存储在flow数组中,用于图表显示
-					var consume = [];
-					var impression = [];
-					var click = [];
-					var clickRate = [];
-					//判断是数据按小时还是天显示
-					if(start.format('YYYY-MM-DD') == end.format('YYYY-MM-DD')){
-						labels = [];//清空labels数组
-						console.log('按小时显示');
-						//如果不是今天
-						if(moment().format('YYYY-MM-DD') != start.format('YYYY-MM-DD')){
-							for(var i=0;i<24;i++){ //循环给消费数,曝光数,点击数,点击率赋值,循环24次
-								if(i<10){
-									labels.push("0" + i);
-								} else {
-									labels.push(i);
-								}
-								$.each(data,function(key,value){//循环遍历返回的数据data,如果data.hour和当前时间点相等,将相应的值付给数组
-									if(value.hour == i){
-										consume[i] = value.totalConsume;
-										impression[i] = value.totalImpression;
-										click[i] = value.totalClick;
-										clickRate[i] = value.clickRate;
-									}
-								});
-								//未赋值,将相应的数组值赋0.
-								if(consume[i] == null){ consume[i] = 0; }
-								if(impression[i] == null){ impression[i] = 0; }
-								if(click[i] == null){ click[i] = 0;	}
-								if(clickRate[i] == null){ clickRate[i] = 0;	}
-							}
-						} else { //如果是今天
-							var now_hour = new Date().getHours();
-							for(var i=0;i<now_hour;i++){ //循环给消费数,曝光数,点击数,点击率赋值,循环24次
-								if(i<10){
-									labels.push("0" + i);
-								} else {
-									labels.push(i);
-								}
-								$.each(data,function(key,value){//循环遍历返回的数据data,如果data.hour和当前时间点相等,将相应的值付给数组
-									if(value.hour == i){
-										consume[i] = value.totalConsume;
-										impression[i] = value.totalImpression;
-										click[i] = value.totalClick;
-										clickRate[i] = value.clickRate;
-									}
-								});
-								//未赋值,将相应的数组值赋0.
-								if(consume[i] == null){ consume[i] = 0; }
-								if(impression[i] == null){ impression[i] = 0; }
-								if(click[i] == null){ click[i] = 0;	}
-								if(clickRate[i] == null){ clickRate[i] = 0;	}
-							}
-						}
-						//如果是昨天或者今天,图表按小时显示数据,后端暂时没有写
-						
-					} else {
-						console.log('按日期显示');
-						labels = []; //清空labels数组
-						var days = moment.duration(end.diff(start,'days'), 'days').asDays(); //计算选择了几天,利用moment.js相关函数
-						for(var i=0;days>=0;i++,days--){ //循环给labels,消费数,曝光数,点击数,点击率赋值,循环days次
-							labels[i] = moment(end).subtract(days, 'days').format('MM-DD');//将选择的日期赋值给label,格式为MM-DD,例如选择过去三天:labels=[09-21,09-22,09-23]						
-							$.each(data,function(key,value){//循环遍历返回的数据data,如果data.reportDate和当前日期相等,将相应的值付给数组
-								if(value.reportDate == moment(end).subtract(days, 'days').format('YYYY-MM-DD')){
-									consume[i] = value.totalConsume;
-									impression[i] = value.totalImpression;
-									click[i] = value.totalClick;
-									clickRate[i] = value.clickRate;
-								}
-							});
-							//未赋值,将相应的数组值赋0.
-							if(consume[i] == null){ consume[i] = 0; }
-							if(impression[i] == null){ impression[i] = 0; }
-							if(click[i] == null){ click[i] = 0;	}
-							if(clickRate[i] == null){ clickRate[i] = 0;	}
-						}
-					}
-					//将消费数,曝光数,点击数,点击率的数组赋值给flow数组的元素
-					flow[0] = consume;
-					flow[1] = impression;
-					flow[2] = click;
-					flow[3] = clickRate;
-				},
-				error : function (XMLHttpRequest, textStatus, errorThrown) { //url请求出错的回调函数
-				    // 通常 textStatus 和 errorThrown 之中
-				    // 只有一个会包含信息
-					console.info('error');
-				    this; // 调用本次AJAX请求时传递的options参数
-				}
-			});
-		}
-		
-		/*
-		*快速设置为(今天 昨天 过去7天 过去30天)
-		*/
-		$('#chartContent  .chart-up .right span.time').click(function(e){ //今天 昨天 过去七天 过去三十天触发函数
-	        e.preventDefault;
-			$('#chartContent  .chart-up .right span').css('color','#344c67');
-			$(this).css('color','#36aeea');
-	        var ind = $(this).index();
-	        switch (ind){
-	            case 0:
-	                cb(moment(),moment());
-	                break;
-	            case 1:
-	                cb(moment().subtract(1, 'days'),moment().subtract(1, 'days'));
-	                break;
-	            case 2:
-	                cb(moment().subtract(7, 'days'),moment().subtract(1, 'days'));
-	                break;
-	            case 3:
-	                cb(moment().subtract(30, 'days'),moment().subtract(1, 'days'));
-	                break;
-	        }
-        });
-		
-		/*
-		*四条折线(消费,曝光数,点击数,点击率),点击切换
-		*/
-		$('#chartContent form input[type="radio"]').click(function(){
-			var n = $(this).val();
-			var data = flow[n];
-			consume = tipLabel[n];
-			var txt = '';
-			if(n == 0){	txt = '消费(元)';	 }	
-			if(n == 1){	txt = '曝光数(次)'; }
-			if(n == 2){	txt = '点击数(次)'; }
-			if(n == 3){	txt = '点击率(%)'; }
-			$('#chartContent .chart-down .chart-down-right').html(txt);
-			drawDiagram(labels,data,consume);
-		});
-		
-		/*
-		*绘制折线图函数
-		*	@param 横坐标数值,纵坐标数值,和折线的名字
-		*/
-		function drawDiagram(labels,data,consume){		
-			$('#chart').highcharts({ 
-				chart: { type: 'line' },
-				title: { text: '' }, //标题
-				//subtitle: { text: 'Source: WorldClimate.com' }, //副标题
-				xAxis: { categories: labels }, 
-				yAxis: { 
-					title: { text: '' }, 
-					plotLines: [{ value: 0, width: 1, color: '#808080' }]
-				}, 
-				tooltip: { crosshairs: true, shared: true }, 
-				legend: { 
-					enabled:false,
-				},
-				credits:{
-					enabled:false,
-				},
-			
-				series: [{ 
-					name: consume, 
-					data: data,
-					color:'#36aeea',
-					marker:{
-						symbol: 'circle',
-						fillColor:'#ffffff',
-						lineColor:'#36aeea',
-						lineWidth: 2,
-						radius: 5,
-					}
-				}]
-			}); 
-		}
-	});
-</script>
-
-<!--切换图表和列表以及下拉框js-->
-<!-- 弹出框插件,bootbox.min.js 依赖bootstrap.min.js -->
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/advertiser/js/bootbox.min.js"></script>
-<script type="text/javascript">
-	$(document).ready(function(){
-		/*以下是下拉框的实现
-		*从session获取角色的类型,判断是代理商还是广告主
-		*	if(role==代理商)
-		*		获取代理商id,调用loadDataForPullDownList函数,请求url,获取代理商下面的广告主名称
-		*	if(role==广告主)
-		*		直接获取广告主名称和id,追加在下拉框下面
-		*/
-		var role = '${role}';//获取角色
-		if(role == "agent"){
-			//这里设置获取该代理商下的广告主,请求的地址后面参数为:?parentId="+agentId;
-			 var agentId = '${userSession.agentId}'; //获取代理商id
-		     var _url = "${ctx}/widget/selector/provide/advertiser?parentId="+agentId; //请求地址
-		     //调用获取代理商下面广告主的方法
-		     loadDataForPullDownList($('#selectedAdvertiserId'), "advertiserList", _url, "全部广告主");
-		     loadDataForPullDownList($('#selectedAdvertiserId2'), "advertiserList", _url, "请选择广告主");
-		     loadDataForPullDownList($('#selectedAdvertiserId3'), "advertiserList", _url, "请选择广告主");
-		}else if(role == "advertiser"){
-			var advertiserName = '${advertiserName}';//广告主名称
-			var advertiserId = '${userSession.advertiserId}';//广告主id
-		    // 这里设置:下拉框的值为advertiserName
-			//清空下拉框列表
-			$('.selectedAdvertiserId').empty();
-			//增加一个列
-			$('.selectedAdvertiserId').append(
-					'<option value=' + advertiserId + '>' + advertiserName + '</option>'
-			);
-			$('#chartContent .chart-down .chart-down-left').html('趋势图:' + advertiserName);
-		}
-		function loadDataForPullDownList(controlView, parentId, url, defaultLabel) {
-			//清空下拉框列表
-			controlView.empty();
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			
-			//json请求,请求地址是url, 返回数据为data,回调函数去处理
-			$.getJSON(url, function(data) {
-				//打印控制台信息
-				//console.log(data);
-				//console.log(data[parentId]);
-				//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-				$.each(data[parentId], function(key, val) {
-					controlView.append(
-						'<option value=' + val.value + '>' + val.label + '</option>'
-					);
-				});
-			});
-			//设置默认显示的列是-1;
-			controlView.val("-1");
-		}
-		
-		/*
-		*切换折线图和图表
-		*/
-		$("#diagramHead span:first-child").click(function(){
-			$("#sheetContent").css("display","none");
-			$("#diagramHead span:first-child").css("border-bottom","1px solid #ffffff");
-			$("#chartContent").css("display","block");
-			$("#diagramHead span:last-child").css("border-bottom","1px solid #d5dee8");
-		});
-		$("#diagramHead span:last-child").click(function(){
-			$("#chartContent").css("display","none");
-			$("#diagramHead span:first-child").css("border-bottom","1px solid #d5dee8");
-			$("#sheetContent").css("display","block");
-			$("#diagramHead span:last-child").css("border-bottom","1px solid #ffffff");
-			var chooseDate = $('#date-range-picker').val().split(' to ',2);
-			var start = chooseDate[0];//转换为moment格式
-			var end = chooseDate[1];//转换为moment格式
-			var advertiserId = $('#selectedAdvertiserId3').val();
-			var param = {
-					'advertiserId':advertiserId,
-					'startDate':start,
-					'endDate':end,
-			};
-			var _url = '${ctx}/advertiser/main/dashboard/list';
-			console.log(param);
-			$.post(_url,param,function(data){
-				$('#sheetContent').html(data);
-			});
-		});
-		
-		/*
-		*根据广告主选择账户余额
-		*	选择一个广告主,发送ajax请求,获取数据
-		*/
-		$('#selectedAdvertiserId').change(function() {
-			 var agentId = '${userSession.agentId}'; //获取代理商id
-			 var advertiserId = $('#selectedAdvertiserId').val();
-			 var param = {};
-			 if(advertiserId == -1) {
-				 param = {
-					'agentId':agentId,
-				 };
-			 } else {
-				 param = {
-					'advertiserId':advertiserId,
-				 };
-			 }
-			//发送ajax请求
-			$.ajax({
-				type : 'post',	//请求方式,post
-				data : param,	//请求参数,param
-				url : '${ctx}/advertiser/main/dashboard/findCompareAjax',	//请求url
-				async : false,	//是否设置为异步请求
-				cache : false,	//是否缓存
-				dataType : 'json',	//数据类型为json
-				success : function(data){ //请求成功回调函数处理,参数为返回回来的json数组
-					$('#accountBalance .data-down').text(data.balance);
-					$('#exposure .data-down').text(data.totalImpression);
-					$('#click .data-down').text(data.totalClick);
-				},
-				error : function (XMLHttpRequest, textStatus, errorThrown) { //url请求出错的回调函数
-					console.info('error');
-				}
-			});
-		});
-		
-		/*
-		*根据广告主id创建订单
-		*/
-		$('#content-right button').click(function(){
-			var advertiserId = null;
-			//判断是广告主还是代理商
-			if(role == "advertiser"){
-				advertiserId = '${userSession.advertiserId}';
-			} else {
-				advertiserId = $('#selectedAdvertiserId2').val();
-			}
-			//如果没有选择广告主,弹出提示
-			if((advertiserId == -1) || (advertiserId == null)){
-				bootbox.alert('请选择广告主');
-			} else {
-				var _href = $(this).attr('href') + '?advertiserId=' + advertiserId;
-				window.location.assign(_href);
-			}
-		});
-	});
-</script>
+<@extends name="/common/simple.ftl"/>

+ 14 - 34
src/main/webapp/WEB-INF/pages/advertiser/main/finance/finance-data/allocation.ftl

@@ -1,16 +1,18 @@
 <@override name="head">
 	<title>财务管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/public-head.css"/>
-	<link href="${ctx}/assets/advertiser/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/bootstrap.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/advertiser/css/regionReport.css">
+	<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"/>
+	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/finance.js"></script>
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
 	<style>
 		.spanVaildate{
 			margin:3px 0 0 30px;
@@ -38,7 +40,7 @@
 			});
 			
 			$("#allocate").blur(function(){
-				validateMoney();
+				validateMoney($("#allocate"),$("#agentBalance").val(),"分配金额","当前余额");
 			});
 			
 			$("#formPage").autovalidate();
@@ -48,7 +50,7 @@
 				if (!$("#formPage").validate()) {
 					return false;
 				}
-				var falg = validateMoney();
+				var falg = validateMoney($("#allocate"),$("#agentBalance").val(),"分配金额","当前余额");
 				if(falg == false){
 					return false;
 				}
@@ -68,28 +70,6 @@
 			});
 		});
 		
-		function validateMoney(){
-			var reg=/^\d{1,8}\.?\d{0,2}$/;
-			if($("#allocate").val().match(reg)!=null){
-				if(($("#allocate").val().indexOf('.') == -1 && $("#allocate").val().length > 8) || $("#allocate").val() <= 0){
-					$("#allocate").css("box-shadow","0 0 6px red").attr('title','分配金额必须大于0且整数位最多8位');
-					$("#allocate").parent("div").find("span.spanVaildate").html("分配金额必须大于0且整数位最多8位");
-					return false;
-				}else if($("#allocate").val()>parseInt($("#agentBalance").val())){
-					$("#allocate").css("box-shadow","0 0 6px red").attr('title','分配金额必须小于等于当前金额');
-					$("#allocate").parent("div").find("span.spanVaildate").html("分配金额必须小于等于当前金额");
-					return false;
-				}else{
-					$("#allocate").css("box-shadow","none").attr('title','');
-					$("#allocate").parent("div").find("span.spanVaildate").html("");
-				}
-			}else{
-				$("#allocate").css("box-shadow","0 0 6px red").attr('title','分配金额必须大于0整数位最多8位且最多有2位小数');
-				$("#allocate").parent("div").find("span.spanVaildate").html("分配金额必须大于0整数位最多8位且最多有2位小数");
-				return false;
-			}
-		}
-		
 	</script>
 	
 </@override>

+ 10 - 10
src/main/webapp/WEB-INF/pages/advertiser/main/finance/finance-data/financelist.ftl

@@ -1,16 +1,16 @@
 <@override name="head">
 	<title>财务管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/public-head.css"/>
-	<link href="${ctx}/assets/advertiser/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/bootstrap.min.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/advertiser/css/regionReport.css">
+	<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"/>
+	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
 	
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/advertiser/js/report.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
 	
 	<script type="text/javascript" >
 	

+ 9 - 4
src/main/webapp/WEB-INF/pages/advertiser/main/public-head.ftl

@@ -1,8 +1,8 @@
 <div id="top">	
     <div id="logoa">
-	<img class="logo1" src="${ctx}/assets/advertiser/images/datacross.png">		
-	<img class="logo2" src="${ctx}/assets/advertiser/images/cut-off-rule.png">		
-	<img class="logo3" src="${ctx}/assets/advertiser/images/wificross.png">	
+	<img class="logo1" src="${ctx}/assets/images/datacross.png">		
+	<img class="logo2" src="${ctx}/assets/images/cut-off-rule.png">		
+	<img class="logo3" src="${ctx}/assets/images/wificross.png">	
 	</div>	
 	<ul class="nav">
 		<li><a href="${ctx}/advertiser/main/dashboard"><span>首页</span></a></li>
@@ -27,7 +27,12 @@
 			<li><a href="${ctx}/logout" selectid="2">退出登录</a></li>       
 		</ul>
 		</ul>
-		<input name="" type="hidden" value="" id="input-top"/>
+		<input type="hidden" value="${ctx!}" id="ctx"/>
+		<input type="hidden" id="role" value="${role!}"/>
+		<input type="hidden" id="agentId" value="${userSession.agentId!}"/>
+		<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId!}"/>
+		<input type="hidden" id="sessionadvertiserName" value="${advertiserName!}"/>
+		<input type="hidden" id="sessionoperatorId" value="${userSession.operatorId!}"/>
 	</div>    		
 </div>	
 <script type="text/javascript">

+ 3 - 3
src/main/webapp/WEB-INF/pages/back/main/ad/message/list.ftl

@@ -6,9 +6,9 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){

+ 150 - 875
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl

@@ -1,887 +1,162 @@
 <@override name="head">
 <title>总体报表</title>
 <link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
-<link rel="stylesheet" href="${ctx}/assets/back/css/zone.css"/>
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/ad-report.css">
 <link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.validate.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-
-<!-- 下拉框js -->
-
-<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	function loadDataForPullDownList2(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedZoneId}==val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedZoneId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web_back/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	//调用loadDataForPullDownList,给广告位准备数据
-	function loadZone(operatorId) {
-		loadDataForPullDownList2($('#selectedZoneId'), "zoneList", "/ssp_web_back/widget/selector/provide/zone?parentId=" + operatorId, "全部广告位");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		p=${selectedOperatorId};
-		//alert(p);
-		loadZone(p);
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			clearPullDownList($('#selectedZoneId'), "全部广告位");
-			var id = $(this).val();
-			loadZone(id);
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$(".adver-choose  input[name=zoneId]").val(null);
-			
-			transcalender();
-		});	
-		//广告位value change调用此函数, 清除活动列表和策略列表
-		$('#selectedZoneId').change(function() {
-			var id = $(this).val();
-			if(id == -1){
-				$(".adver-choose  input[name=selectedZoneId]").val(null);
-			} else {
-				$(".adver-choose  input[name=selectedZoneId]").val(id);
-			}
-			transcalender();
-		});	
-});	
-		
-</script>
-<script type="text/javascript">
-        	$(document).ready(function(){
-			$("#pv1").removeClass().addClass('ffenlchange');
-			$("#pvname1").removeClass().addClass("ffenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("ffenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	  		$("#pv1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#pv1").removeClass().addClass('ffenlchange');
-				$("#pvname1").removeClass().addClass("ffenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#uv1").removeClass().addClass('ffenlchange');
-				$("#uvname1").removeClass().addClass("ffenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#bgs1").removeClass().addClass('ffenlchange');
-				$("#bgsname1").removeClass().addClass("ffenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-	  			})	
-	  			
-	  		$("#djs1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#djs1").removeClass().addClass('ffenlchange');
-				$("#djsname1").removeClass().addClass("ffenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart5").hide(); 
-	  			})				
-	
-	  			$("#shr1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#shr1").removeClass().addClass('ffenlchange');
-				$("#shrname1").removeClass().addClass("ffenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart5").show(); 
-	  			})	
-	  				
-	  		});
-	  		
-			
-	  			
-</script>
-
-<script type="text/javascript">
-			 
-		 //将毫秒转化为日期
-			function getDate(tm){ 
-					var tt=new Date(parseInt(tm)).toLocaleDateString();
-				
-					return tt; 
-			} 
- 
-			function getele1(){
-					try{
-		  				var d=document.getElementsByName("hr");
-		  				var c=[];
-		  				var e=[];
-		  				for(i=0;i<=d.length;i++){
-		  					c[i]=d[i].childNodes[0].nodeValue;
-		  					e[i]=c[i];
-		  				}
-		  				
-		  			}
-					catch(e){}
-					return c;
-			}
-		
-$(function () {
-
-			u=${startDate};
-			v=${endDate}; 	
-			if(u==v){
-							var m=getele1();
-							n=24;
-							var color=[];
-							for(i=0;i<n;i++){
-								color[i]='red';
-							}
-							n1=n*6;
-							var xlabel=[];		
-							var j=0;
-								for(i=0;i<n1;i+=6){
-										xlabel[j]=m[i];
-										j++;
-								}
-							//	alert(xlabel);
-						   //取y轴
-							var uv=[];
-							var j=0;
-							for(i=2;i<n1;i+=6){
-									uv[j]=parseFloat(m[i]);
-								 j++;
-							}
-							var pv=[];
-							var j=0;
-							for(i=1;i<n1;i+=6){
-									pv[j]=parseFloat(m[i]);
-									 j++;
-							}							
-							var adbaoguang=[];
-							var j=0;
-							for(i=3;i<n1;i+=6){		
-									adbaoguang[j]=parseFloat(m[i]);
-									j++;
-							}
-							var adclick=[];
-							var j=0;
-							for(i=4;i<n1;i+=6){
-									adclick[j]=parseFloat(m[i]);
-									j++;
-							}
-							var shouru=[];
-							var j=0;
-							for(i=5;i<n1;i+=6){
-									shouru[j]=parseFloat(m[i]);
-								   j++;
-							}	
-							setinterval=1;			
-	}else{
-					var selectedOperatorId=$(".media-choose  input[name=selectedOperatorId]").val();
-				 	var selectedZoneId=$(".adver-choose  input[name=selectedZoneId]").val();
-				 	if(selectedZoneId==null){selectedZoneId=-1}
-					var dateRangePicker=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/listChartData?dateRangePicker="+dateRangePicker+"&selectedOperatorId="+selectedOperatorId+"&selectedZoneId="+selectedZoneId;
-					var pv = [];
-					var uv = [];
-					var adbaoguang = [];
-					var adclick = [];
-					var shouru = [];
-					var xlabel = []
-					var k = 0;
- 					$.ajaxSettings.async = false; //getJSON同步执行
-					$.getJSON(url, function(data) {
-						$.each(data, function(key, val) {
-	
-						   		xlabel[k] = val.reportDate;
-						   		xlabel[k] = getDate(xlabel[k]);
-								pv[k] = val.pv;
-								uv[k] = val.uv;
-								adbaoguang[k] = val.impression;
-								adclick[k] = val.click;
-								shouru[k] = val.income;
-								k++;
-							});	
-						});	
-					setinterval=parseInt(xlabel.length/10);										
-}			
-    $('#linechart1').highcharts({
-        title: {
-            text: 'PV',
-          
-        },
-        xAxis: {
-            categories: xlabel,
-            tickInterval: setinterval 
-        },
-        yAxis: {
-            plotLines: [{
-                value: 0,
-                width: 1,
-               color: '#36aeea'
-           }]
-        },
-        
-        legend: {
-           layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [{
-            name: 'PV',
-            data: pv,
-            color:'#36aeea'
-        }]
-    });
-    $('#linechart2').highcharts({
-        title: {
-            text: 'UV',
-        },
-        xAxis: {
-            categories:xlabel,
-             tickInterval: setinterval 
-        },
-        yAxis: {
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#36aeea'
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: 'UV',
-            data: uv,
-            color:'#36aeea'
-        }]
-    });
-     $('#linechart3').highcharts({
-        title: {
-            text: '广告曝光数',
-        },
-        xAxis: {
-            categories: xlabel,
-            tickInterval: setinterval 
-        },
-        yAxis: {
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#36aeea'
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: '广告曝光数',
-            data: adbaoguang,
-            color:'#36aeea'
-        }]
-    });
-     $('#linechart4').highcharts({
-        title: {
-            text: '广告点击数',
-        },
-        xAxis: {
-            categories: xlabel,
-             tickInterval: setinterval 
-        },
-        yAxis: {
-          
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#36aeea'
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: '广告点击数',
-            data: adclick,
-            color:'#36aeea'
-        }]
-    });
-    
-     $('#linechart5').highcharts({
-        title: {
-            text: '收入',
-        },
-       
-        xAxis: {
-            categories: xlabel,
-             tickInterval: setinterval 
-        },
-        yAxis: {
-          
-            plotLines: [{
-                value: 0,
-                width: 1,
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: '收入',
-            data: shouru,
-            color:'#36aeea'
-        }]
-    });
-});
-						   		
-</script>
-<script src="${ctx}/assets/back/js/highcharts.js"></script>
-<script src="${ctx}/assets/back/js/exporting.js"></script>
-<script type="text/javascript">
-function transcalender(){
-					var url = ""; 
-					var type = "";
-					var ids = [];
-					var page = $("#page").val();
-					a=$(".media-choose  input[name=selectedOperatorId]").val();
-				 	c=$(".adver-choose  input[name=selectedZoneId]").val();
-				 	if(c==null){c=-1}
-				 	//如果b为空,默认为昨天的
-				 	if($("#dateRangePicker").val()==""){
-				 	$(".yesterday").trigger("click");
-				 	}
-				 	b=$("#dateRangePicker").val();
-				 	//判断是否超过一年
-				 	var outyear=b.split("to",1);
-					outyear = outyear[0].replace(/-/g,"/");  
-				 	var yeartomi = (new Date(outyear)).getTime();
-				 	var todaydate1 = new Date();
-				 	todaydate = todaydate1.getTime();
-				 	if(todaydate-yeartomi<=31536000000){
-					 	url = "${ctx}/back/main/ad/operator/operator-report?dateRangePicker=" + b+"&selectedZoneId="+c+"&page="+page+"&selectedOperatorId="+a; 
-				 	
-				 	}else{
-				 		alert("您好,请选择一年之内的时间!");
-				 		$(".yesterday").trigger("click");
-				 		var date = $("#dateRangePicker").val();
-					 	url = "${ctx}/back/main/ad/operator/operator-report?dateRangePicker="+date+"&selectedZoneId="+c+"&page="+page+"&selectedOperatorId="+a; 	
-				 	}
-				 	console.log(url); 
-					location.href = url;
-}
-function transdaochu(){
-					var url = ""; 
-					a=$(".media-choose  input[name=selectedOperatorId]").val();
-				 	c=$(".adver-choose  input[name=selectedZoneId]").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-				 	url = "${ctx}/back/main/ad/operator/operator-report/exportDataReportExcel?dateRangePicker=" + b+"&selectedZoneId="+c+"&selectedOperatorId="+a;  
-				 	location.href = url;
-}
-
-</script>	
- <style type="text/css">
- 		 #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 1px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;          
-        }
-        .icon-calendar{
-            margin-left:6px;
-           // border: 1px solid black;
-            margin-top: 6px;       
-        }
-       select {
-       		position:relative;
-       		left:-2px;
-       		top:-2px;
-       		font-size:12px;
-       		width:183px;
-       		line-height:14px;
-       		border:1px solid #dfdfdf;
-       	
-       		color:#4c637b;} 
-      .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-       	.adver-choose{
-       		float:left;
-       		}
-
-#pagecontent{
-	height:1000px;
-
-
-}
-select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }
-     #selectedZoneId{
-     	width:150px;
-     	border:none;
-     	border-radius:5px;
-     	height:30px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-
-
-
-   </style>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
-
 <@override name="body">
-   <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-   		<div id="page-edit">
-		    <div id="second">
-					<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-					<div></div>
-				
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a class="selectBar_change" 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 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/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>
-		 
-</br>
-<br>
-<br> 
- 			 <div id="third">
-			         <ul>
-			         <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页&nbsp;&nbsp;</a>
-				     <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			         <li style="color: #4c637b;">&nbsp;&nbsp;数据报表</li>
-			         
-			         </ul>  
- 			 </div>  
-   
-</br>
-  <br>  
-    <div id="form">
-        <form id="myform" action="${ctx}/back/main/ad/operator/operator-report" method="post">	
-        <input id="page" autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-		 <div class="control-group control-group-lfet">	
-				<div class="controls-reset">
-							<div class="row-fluid input-append date row-fluid-revise">
-							    <div class="controls-reset">
-							    	<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-									</div>
-							    	<div class="adver-choose">
-											<select id="selectedZoneId" name="selectedZoneId" >
-											<option value="-1">全部广告位</option>
-											</select>
-											<input type="hidden" id="aa"  name="selectedZoneId" value="${selectedZoneId!}"/>
-									</div>
-									<div class="calder">
-										<div class="singlechoo">
-											<span class="help-inline">
-												<a class="today da">今天</a> |
-												<a class="yesterday da">昨天</a> |
-												<a class="lastSevenDays da">前七天</a> |
-												<a class="lastWeek da">上周</a> |
-												<a class="thisMonth da">本月</a> |
-												<a class="lastMonth da">上月</a> 
-									  		</span>
-								  		</div>
-										<div class="widthdate">
-										
-										<span id="tex"><i class="icon-calendar"></i>   
-											<input  type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-								        </span>
-			   							</div>	
-			   							<div class="widthcheck">
-			   								 <button onclick="transcalender()" style="float:right" class="check_cal" id="check_cal ">查询</button>
-										</div>	
-									</div>
-						    
-							</div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>数据报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<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>
+							<ul class="son_ul" id="son_zoneListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedZoneId" id="selectedZoneId" value="${selectedZoneId!}">
+					<input type="hidden" name="selectedZoneName" id="selectedZoneName" value="${selectedZoneName!}">
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>
-		</div>
-
-			 		 <div class="ffenall">	
-					   		
-					   		<div  id="pv1" class="ffenl">
-					   			<div id="pvname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;PV</div>
-					   			<div id="pvdata1" class="ffenldata">${sumReport.pv}</div>
-					   		</div>
-					   		<div  id="uv1" class="ffenl">
-					   			<div id="uvname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;UV</div>
-					   			<div id="uvdata1" class="ffenldata">${sumReport.uv}</div>
-					   		</div>
-					   		<div id="bgs1" class="ffenl">
-					   			<div id="bgsname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;广告曝光数</div>
-					   			<div id="bgsdata1"  class="ffenldata">${sumReport.impression}</div>
-					   		</div>
-					   		
-					   		<div id="djs1" class="ffenl">
-					   			<div id="djsname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;广告点击数</div>
-					   			<div  id="djsdata1" class="ffenldata">${sumReport.click}</div>
-					   		</div>
-					   		
-					   		<div id="shr1" class="ffenl">
-					   			<div id="shrname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;收入</div>
-					   			<div id="shrdata1" class="ffenldata">${sumReport.income}</div>
-					   		</div>
-					   	</div>
-	   	
-			         <div class="chart_index"> 
-			         	 <div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					 </div>
-				 
-					<div class="fig">
-			            <table border="1" class="tablefig1" id="tablefig">
-			                <thead>
-			                <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-			                    <th class="td1"  style="text-align:center; width:10%">日期</th>
-			                    <th class="td1" style="text-align:center; width:10%" >PV</th>
-			                    <th class="td1" style="text-align:center; width:10%" >UV</th>
-			                    <th class="td1" style="text-align:center;  width:10%" >广告曝光数</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告填充率</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告点击数</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告点击率</th>
-			                    <th class="td1" style="text-align:center; width:10%">eCPM</th>
-			                    <th class="td1" style="text-align:center; width:10%" >收入</th>
-			                </tr> 
-			                </thead>
-			                <tbody>
-			                    <#if reportList ??>
-			                <#list reportList as report>
-				                <tr id="tr22">
-				                    <td class="td2" id="tdriqi" style="text-align:center;">${report.reportDate?string('yyyy/MM/dd')}</td> 
-				                    <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.pv!}</td>
-				                    <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-				                    <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-				                    <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-				                    <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-				                    <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-				                    <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-				                    <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-				                </tr>
-				                </#list>  
-			                    </#if>
-			                </tbody>
-		           		 </table>
-		           	</div>
-		           	<div class="hourrpt">
-				 	   <#if rptZoneHourList ??>
-			                <#list rptZoneHourList as hourrpt>
-				                <div id="tr22">
-				                  	 <div name="hr" >${hourrpt.hour!}</div>
-				                    <div name="hr" >${hourrpt.pv!}</div>
-				                    <div name="hr" >${hourrpt.uv!}</div>
-				                    <div name="hr" >${hourrpt.impression!}</div>
-				                    <div name="hr" >${hourrpt.click!}</div>
-				                    <div name="hr" >${hourrpt.income!}</div>
-				                </div>
-				                </#list>  
-			            </#if>
-				 	</div>
-		            <div id="daochu" >
-							<!--<button class="btn2" >导出Excel</button>-->
-							<a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-					
+				<div id="content_dataFrame">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="dataFrame0" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">PV</div>
+					   	<div class="dataFrame_data">${sumReport.pv}</div>
 					</div>
-					<div id="pagemove">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
+					<div id="dataFrame1" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">UV</div>
+					   	<div class="dataFrame_data">${sumReport.uv}</div>
 					</div>
-				 
-	     
-         </form>
-	  </div>        
-	 </div>       
+					<div id="dataFrame2" class="dataFrame dataFrame_style">
+						<div class="dataFrame_name">广告曝光数</div>
+					   	<div class="dataFrame_data">${sumReport.impression}</div>
+					</div>
+					<div id="dataFrame3" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">广告点击数</div>
+					   	<div class="dataFrame_data">${sumReport.click}</div>
+					</div>
+					<div id="dataFrame4" class="dataFrame dataFrame_last_style">
+					   	<div class="dataFrame_name">收入</div>
+					   	<div class="dataFrame_data">${sumReport.income}</div>
+					</div>
+				</div>
+				<div id="chartDivs" value="total"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>	
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:15%">日期</th>
+			                <th class="theadTh" style="width:7%">PV</th>
+			                <th class="theadTh" style="width:6%">UV</th>
+			                <th class="theadTh" style="width:8%">广告曝光数</th>
+			                <th class="theadTh" style="width:8%">广告填充率</th>
+			                <th class="theadTh" style="width:8%">广告点击数</th>
+			                <th class="theadTh" style="width:8%">广告点击率</th>
+			                <th class="theadTh" style="width:7%">eCPM</th>
+			                <th class="theadTh" style="width:8%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd">${report.reportDate!?string('yyyy/MM/dd')}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		     	<div id="hourrpt">
+					<#if rptZoneHourList ??>
+			        <#list rptZoneHourList as hourrpt>
+				    <div id="tr22">
+				    	<div name="hr">${hourrpt.hour!}</div>
+				        <div name="hr">${hourrpt.pv!}</div>
+				        <div name="hr">${hourrpt.uv!}</div>
+				        <div name="hr">${hourrpt.impression!}</div>
+				        <div name="hr">${hourrpt.click!}</div>
+				        <div name="hr">${hourrpt.income!}</div>
+				    </div>
+				   	</#list>  
+			        </#if>
+				</div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('total','${ctx}/back/main/ad/operator/operator-report/exportDataReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
     </div>
-  </div>
-  <script type="text/javascript" src="${ctx}/assets/back/js/bootstrap-datepicker.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/bootstrap-timepicker.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/bootstrap-datetimepicker.zh-CN.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/daterangepicker.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery.autosize-min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery.maskedinput.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery.dataTables.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery.dataTables.bootstrap.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-   $('.controls-reset .help-inline a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-    
-<script type="text/javascript">
-//控制页码
-      $('#dateRangePicker').dateRangePicker();
-      $(function(){
-      	$('#pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			//$('#check_cal').click();//触发搜索
-			transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$(".singlechoo .help-inline a").click(function(){
-	  		$(".singlechoo .help-inline a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>    
-		     
-
-<!-- basic scripts -->
-
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 139 - 40
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/apmac.ftl

@@ -1,40 +1,139 @@
-<html>
-<body>
-<table border="1" class="tablefig1" id="tablefig">
-				        	<thead>
-				            	<tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-				                	
-				                    <th class="td1"  style="text-align:center; width:5%">热点</th>
-				                    <th class="td1" style="text-align:center; width:7%" >浏览量占比</th>
-				                    <th class="td1" style="text-align:center; width:6%" >PV</th>
-				                    <th class="td1" style="text-align:center; width:6%" >UV</th>
-				                    <th class="td1" style="text-align:center;  width:9%" >广告曝光数</th>
-				                    <th class="td1" style="text-align:center; width:9%">广告填充率</th>
-				                    <th class="td1" style="text-align:center; width:8%">广告点击数</th>
-				                    <th class="td1" style="text-align:center; width:8%">广告点击率</th>
-				                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-				                    <th class="td1" style="text-align:center; width:8%" >收入</th>
-				                </tr> 
-				           	</thead>
-							<tbody>
-				            <#if reportList ??>
-				            <#list reportList as report>
-				            	<tr id="tr22">
-					               
-					                <td class="td2" id="tdriqi" style="text-align:center;">${report.apmac!}</td> 
-					                <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.viewRate!}%</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-					                <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-					                <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-					                <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-					                <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-					                <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-					                <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-					             </tr>
-					             </#list>  
-				                 </#if>
-				             </tbody>
-			           	</table>
-</body>
-</html>
+<@override name="head">
+<title>热点报表</title>
+<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<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 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/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>热点报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/apmac" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">热点</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.apmac!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('apmac','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

+ 114 - 387
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/areal.ftl

@@ -1,27 +1,20 @@
 <@override name="head">
-	<title>地域报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/ad-report.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/regionReport.css">
-	<link href="${ctx}/assets/back/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/bootstrap.min.css"/>
-	
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
-<script src="${ctx}/assets/back/js/highcharts.js"></script>
-<script src="${ctx}/assets/back/js/exporting.js"></script>
-  <script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script> 
-<script type="text/javascript" src="${ctx}/assets/back/js/drilldown.js"></script> 
+<title>地域报表</title>
+<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
-	<script type="text/javascript">
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+
+<script type="text/javascript">
 		$(function(){
 			
 			$("#img-city").live("click",function(){
@@ -30,14 +23,14 @@
 				if(img.attr("type") == "close"){
 					$.ajax({
 				    	type:"POST",
-				    	url:"${ctx}/back/main/ad/operator/operator-report/city",
-				    	data:{cn:cnName,page:$("#page").val(),dateRangePicker:$("#dateRangePicker").val(),selectedOperatorId:${selectedOperatorId}},
+				    	url:"${ctx}/back/main/ad/operator/operator-report/arealCtiy",
+				    	data:{cnName:cnName,page:$("#page").val(),dateRangePicker:$("#dateRangePicker").val()},
 				    	success:function(data){
 				    		var html = "";
 				    		if(data.length >0){
 				    			for(var i = 0;i<data.length;i++){
 				    				html += '<tr id='+cnName+' class="changeColor" style="background-color:#CCCCCC;">';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;margin-left:20px;"><img src="${ctx}/assets/back/images/defaultLeaf.gif" style="position: relative;top:-2px;left:-5px;"/>'+data[i].cn_city+'</td>';
+				    				html += '<td class="td2" id="tdriqi" style="text-align:center;margin-left:20px;"><img src="${ctx}/assets/operator/images/defaultLeaf.gif" style="position: relative;top:-2px;left:-5px;"/>'+data[i].cn_city+'</td>';
 				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].viewRate+'%</td>';
 				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].pv+'</td>';
 				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].uv+'</td>';
@@ -51,391 +44,125 @@
 				    			}
 				    		img.parents('tr').after(html);
 				    		}
-				    		img.attr("src","${ctx}/assets/back/images/folderOpen.gif");
+				    		img.attr("src","${ctx}/assets/images/folderOpen.gif");
 				    	}     
 					});	
 					img.attr("type","open");
 				}else if(img.attr("type") == "open"){
 				    $('tr').remove("#"+cnName);//删除id为cname的所有 tr
-				    img.attr("src","${ctx}/assets/back/images/folderClose.gif");
+				    img.attr("src","${ctx}/assets/images/folderClose.gif");
 				    img.attr("type","close");
 					//location.href = "${ctx}/back/main/ad/operator/operator-report/areal";
 				}
 			});
 			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
     	});
     	
     	//到处execl
-		function exportExcel(){
+		function exportExcel_areal(){
 			if($("#dateRangePicker").val()!=""){
-				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedOperatorId="+$("#selectedOperatorId").val());
+				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1&dateRangePicker="+$("#dateRangePicker").val());
 			}else{
-				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1&selectedOperatorId="+$("#selectedOperatorId").val());
+				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1");
 			}
 		};
 	</script>
-    	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web_back/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$('#sign').click();
-		});	
-	
-});	
-		
-</script>
- <style type="text/css">
-        #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 8px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;
-            margin-left:23px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-       #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36AEEA none repeat scroll 0px 0px;
-            cursor: pointer;
-            margin-left: 5px;
-            margin-top: -4px;
-            height: 21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-  .media-choose{
-       		float:left;
-       		margin-left:-15px;
-       		}
-       #pagecontent{
-		height:1000px;
-	  }  
-	   select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }		
-    </style>
+
 </@override>
 <@override name="body">
 <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-   		<div id="page-edit">
-    		
-		    
-		     <div id="second">
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-					<div class="report6all  re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-					<div></div>
-				
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<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 href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a class="selectBar_change" 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>
-			</br>
-			<br><br>  	    
-   			<div id="third">
-				<ul>
-			        <li class="size1"><i class="icon-home homepic_areal" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">地域报表</li>
-			    </ul>  
- 			</div> 
- 			
-			<form id="formPage" action="${ctx}/back/main/ad/operator/operator-report/areal" method="post">
-	    		<div id="date">
-	    			<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-					</div>
-					<span id="date-one">
-						<a class="today da">今天</a>|
-						<a class="yesterday da">昨天</a>|
-						<a class="lastSevenDays da">前七天</a>|
-						<a class="lastWeek da">上周</a>|
-						<a class="thisMonth da">本月</a>|
-						<a class="lastMonth da">上月</a> 
-					</span>
-					<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-					<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-			   		</span>
-			   		<input id="sign" type="submit" value="查询"/>
-			  </div>
-			 <input type="hidden" id="page" name="page" value="${pager.page}">
-		  	 <div id="fig_areal">
-				<table border="1" class="tablefig1" id="tablefig">
-					<thead>
-						<tr class="tr1"  id ='tr11' background:"#f2f6fa">
-							
-		                    <th class="td1" style="text-align:center; width:5%">地域</th>
-		                    <th class="td1" style="text-align:center; width:7%">浏览量占比</th>
-		                    <th class="td1" style="text-align:center; width:6%">PV</th>
-		                    <th class="td1" style="text-align:center; width:6%">UV</th>
-		                    <th class="td1" style="text-align:center; width:9%">广告曝光数</th>
-		                    <th class="td1" style="text-align:center; width:9%">广告填充率</th>
-		                    <th class="td1" style="text-align:center; width:9%">广告点击数</th>
-		                    <th class="td1" style="text-align:center; width:9%">广告点击率</th>
-		                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-		                    <th class="td1" style="text-align:center; width:8%">收入</th>
-						</tr>
-					
-					</thead>
-					<tbody>
-					<#if reportList ??>
-		            <#list reportList as report>
-						<tr id="tr22">
-			       
-			                <td class="td2" id="tdriqi" style="text-align:center;"><img id="img-city" type="close" value="${report.cn!}" src='${ctx}/assets/back/images/folderClose.gif' style="position: relative;top:-2px;left:-5px;cursor:pointer;"/>${report.cn!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.viewRate!}%</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.pv!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.uv!}</td>  
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.impression!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.fillRate!}%</td> 
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.click!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.clickRate!}%</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.eCpm!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.income!}</td>
-			            </tr>
-					</#list>
-					</#if>
-					</tbody>
-				</table>
-	        </div>
-	       
-			<div id="daochu_areal" >
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-			</div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>地域报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/areal" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+		 		<div id="content_choose">
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 						
-			<div id="pagemove_areal">
-							<div id="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-			</div>
-        </form>
-        </div>
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">地域</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd"><img id="img-city" type="close" value="${report.cn!}" src='${ctx}/assets/images/folderClose.gif' style="position: relative;top:-2px;left:-5px;cursor:pointer;"/>${report.cn!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_areal()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
- 	     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-    
-    function getlastMonth_start(){
-    var now = new Date(); 
-    var nowMonth = now.getMonth(); 
-    var lastMonthDate = new Date(); 
-    lastMonthDate.setDate(1);
-    lastMonthDate.setMonth(lastMonthDate.getMonth()-1); 
-    
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    
-</script>
-
-<script type="text/javascript">
-  
-  //  var $tooltip = $("<div class='tooltip right in' style='display:none;'><div class='tooltip-arrow'></div><div class='tooltip-inner'></div></div>").appendTo('body');
-    $('#dateRangePicker').dateRangePicker();
-    $(function(){
-      	$('#pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#formPage');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			//transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-    
-</script>
-		     
-		     
-
-
+<@extends name="/common/simple.ftl"/>

+ 133 - 1262
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/place.ftl

@@ -1,1268 +1,139 @@
 <@override name="head">
-	<title>场景报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
-	<link rel="stylesheet" href="/ssp_operator/assets/back/css/indexpage.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/ad-report.css">
-	<link href="${ctx}/assets/back/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
-	<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.n2.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.validate.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script src="${ctx}/assets/back/js/highcharts.js"></script>
-	<script src="${ctx}/assets/back/js/exporting.js"></script>
- 	<script type="text/javascript" src="${ctx}/assets/back/js/data.js"></script> 
- 	<script type="text/javascript" src="${ctx}/assets/back/js/drilldown.js"></script> 
-
-<script type="text/javascript">
-
-        	$(document).ready(function(){
-			$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})		
-	  		});
- </script>
-<!--控制柱状图取值-->			
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-						}
-					catch(e){}
-					return c;
-	}
-
-$(function () {
-			b=$("#dateRangePicker").val();
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n2=10;
-			n1=n*n2;
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				if(m[i]!=null){
-				xlabel[j]=m[i];
-				}
-				   j++;
-			}
-
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-     $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-</script>
-    <style type="text/css">
-        #tex{
-            border: 1px solid #DFDFDF;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: medium none;
-            margin-top: 4px;
-            padding: 0px;
-            font-size: 14px;
-            height: 15px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #67BA2F none repeat scroll 0% 0%;
-            cursor: pointer;
-            margin-left: 3px;
-            height: 21px;
-            display: inline;
-            font-size: 14px;
-            margin-top: -6px;
-        }
-        .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-        #pagecontent{
-		height:1000px;
-	  } 
-	   select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }		
-    </style>
-    	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web_back/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			transcalender();
-		});	
-	
-});	
-		
-</script>
-    <script type="text/javascript">
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?place=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}
-function transcalender(){
-					var url = ""; 
-					a=$("#selectedOperatorId").val();
-				 	b=$("#dateRangePicker").val();
-				 	var page = $('#myform').find('input:hidden[name="page"]').val();
-				 	url = "${ctx}/back/main/ad/operator/operator-report/place?dateRangePicker=" + b+"&page="+page+"&selectedOperatorId="+a; 
-				 	console.log(url); 
-				 	location.href = url;
-}
-</script>
+<title>场景报表</title>
+<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    	<div id= "pagecontent">
-    		<div id="page-edit">
-		    <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-				<div></div>
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<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 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/areal">地域报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
 		    </div>
-			<br><br><br>	   
-
-			<div id="third">
-				<ul>
-			        <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">场景报表</li>
-			    </ul>  
- 			</div>  
-			<br></br>			 
-
-    		<div id="form">
-	    		<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/place" method="post">
-	    		<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
-					<div id="date">
-						<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-									</div>
-				    	<span id="date-one">&nbsp;
-							<a class="today da">今天</a> |
-							<a class="yesterday da">昨天</a> |
-							<a class="lastSevenDays da">前七天</a> |
-							<a class="lastWeek da">上周</a> |
-							<a class="thisMonth da">本月</a> |
-							<a class="lastMonth da">上月</a>
-						</span>
-						<span id="tex"><i class="icon-calendar"></i>
-						<input class="inputrili" type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-				        </span>
-				         <button onclick="transcalender()" style="float:right" class="check_cal_place" id="check_cal_place">查询</button>
-						
-		      		</div>
-				 	
-				   <div class="chart"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>场景报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/place" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 					
-					 <div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>	
-					<div class="fig">
-				    	<table border="1" class="tablefig1" id="tablefig">
-				        	<thead>
-				            	<tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-				                	
-				                    <th class="td1"  style="text-align:left; width:10%">&nbsp;&nbsp;&nbsp;&nbsp;场景</th>
-				                    <th class="td1" style="text-align:center; width:10%" >浏览量占比</th>
-				                    <th class="td1" style="text-align:center; width:10%" >PV</th>
-				                    <th class="td1" style="text-align:center; width:10%" >UV</th>
-				                    <th class="td1" style="text-align:center;  width:10%" >广告曝光数</th>
-				                    <th class="td1" style="text-align:center; width:10%">广告填充率</th>
-				                    <th class="td1" style="text-align:center; width:10%">广告点击数</th>
-				                    <th class="td1" style="text-align:center; width:10%">广告点击率</th>
-				                    <th class="td1" style="text-align:center; width:10%">eCPM</th>
-				                    <th class="td1" style="text-align:center; width:10%" >收入</th>
-				                </tr> 
-				           	</thead>
-							<tbody>
-				            <#if reportList ??>
-				            <#list reportList as report>
-				            	<tr id="tr22">
-					               
-					                <td class="td2" id="tdriqi" style="text-align:left;">&nbsp;&nbsp;&nbsp;&nbsp;${report.place!}</td> 
-					                <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.viewRate!}%</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-					                <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-					                <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-					                <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-					                <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-					                <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-					                <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-					             </tr>
-					             </#list>  
-				                 </#if>
-				             </tbody>
-			           	</table>
-			       	</div>
-			        <div id="daochu">
-						<!--<button class="btn2" >导出Excel</button>-->
-						<a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-					</div>
-						
-					<div id="pagemove_place">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-					</div>
-	        	</form>
-	 		</div>
-	 		</div>       
-    	</div>
-	</div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-     $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-    </script>   
-    
-<script type="text/javascript">
-	$('#dateRangePicker').dateRangePicker();
-	$(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			//$('#check_cal').click();//触发搜索
-			transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>    
-
-<!-- basic scripts -->
-
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">场景</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.place!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('place','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 130 - 1250
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/position.ftl

@@ -1,1259 +1,139 @@
 <@override name="head">
-	<title>位置报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/ad-report.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/zbone.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/daterangepicker.css">
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-<script src="${ctx}/assets/back/js/highcharts.js"></script>
-<script src="${ctx}/assets/back/js/exporting.js"></script>
-  	<script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script>  
-  	
-  	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web_back/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$('#sign').click();
-		});	
-	
-});	
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?position=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}		
-</script>	
-  <style>
-  	 #pagecontent{
-		height:1000px;
-	  } 
-     #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 3px;
-            height: 16px;
-            padding: 0px;
-            font-size:14px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36AEEA none repeat scroll 0px 0px;
-            cursor: pointer;
-            margin-left: 5px;
-            margin-top: -5px;
-            height: 21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-        .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-       	 select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }
-  </style>
+<title>位置报表</title>
+<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
- <div id=content_bg>
-     <#include "/back/main/public-head.ftl">
-   		<div id="pagecontent">
-   			<div id="page-edit"> 
-		   		<div id="second">
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-						<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-						<div></div>
-			 </div>
-	    </br></br></br>
-   		 	<div id="third">
-				<ul>
-			    	<li class="size1">&nbsp;<i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">&nbsp;首页&nbsp;</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">&nbsp;&nbsp;数据报表&nbsp;&nbsp;</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">&nbsp;&nbsp;位置报表&nbsp;</li>
-			    </ul>  
- 			</div>  
- 			</br></br>  
-    		<form id="searchform" action="${ctx}/back/main/ad/operator/operator-report/position" method="post">		
-					<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-					</div>
-					<span id="date-one" style="margin-left:9px;">
-									<a class="today da">今天</a> |
-									<a class="yesterday da">昨天</a> |
-									<a class="lastSevenDays da">前七天</a> |
-									<a class="lastWeek da">上周</a> |
-									<a class="thisMonth da">本月</a> |
-									<a class="lastMonth da">上月</a> 
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a 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/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">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>位置报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/position" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
 					</span>
-					<span id="tex"><i class="icon-calendar"></i>
-					<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>		
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
 					</span>
-					<input type="submit" name="submit" id="sign" value="查询">
-					<div class="chart"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-						
-					<div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-				   </div>		
-								
-			
-	  			 <div class="fig">
-					<table border="1" class="tablefig1" id="tablefig">					        
-						 <thead>
-					      	 <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">		                    
-			                    <th class="td1" style="text-align:center;width:10%;">位置</th>                
-			                    <th class="td1" style="text-align:center;width:10%;">浏览量占比(%)</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-impression">PV</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-impression">UV</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-impression">广告曝光数</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-impression">广告填充率(%)</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-click">广告点击数</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-visit">广告点击率(%)</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-conversion">eCPM</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-income">收入</th>                  
-                			</tr>
-                		</thead>
-                	<tbody>
-                    <#if reportList ??>
-                	<#list reportList as report>
-	                	<tr>		                    
-		                    <td  class="td2" style="text-align:center;"><#if report.position==1>认证<#elseif report.position==2>跳转<#elseif report.position==3>上网过程</#if></td>
-		                    <td  class="td2" style="text-align:center;">${report.viewRate!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.pv!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.uv!}</td>
-		                    <td  class="td2" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-		                    <td  class="td2" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-		                    <td  class="td2" style="text-align:center;">${report.click!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.clickRate!}%</td>  
-		                    <td  class="td2" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-		                    <td  class="td2" style="text-align:center;" class="hidden-income">${report.income!}</td>
-	                	</tr>
-	                </#list>  
-                    </#if>
-               	 	</tbody>
-            	</table>
-        	</div>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">位置</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.position==1>认证<#elseif report.position==2>跳转<#elseif report.position==3>上网过程</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('position','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
 			</form>
-			<div id="daochu_size">
-			  <!--<button class="export">导出EXCEL</button>-->
-			  <a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-			</div> 
-			
-	</div>	
+	  	</div>        
+    </div>
 </div>
-</div>     		
-
-<style type="text/css">
-.calendar{
-float:right;
-margin:5px 10px;
-}
-.controls-reset{
-margin-left:25px;
-margin-top:20px;
-}
-
-</style>
-<script type="text/javascript">
-   Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-    
-    function getlastMonth_start(){
-    var now = new Date(); 
-    var nowMonth = now.getMonth(); 
-    var lastMonthDate = new Date(); 
-    lastMonthDate.setDate(1);
-    lastMonthDate.setMonth(lastMonthDate.getMonth()-1); 
-    }
-    $('#date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0:
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1:
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3:
-                var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4:
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5:
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-</script>
-<script type="text/javascript">
-  $('#dateRangePicker').dateRangePicker({});
-  
-    var tooltip = $("<div class='tooltip right in' style='display:none;'><div class='tooltip-arrow'></div><div class='tooltip-inner'></div></div>").appendTo('body'); 
-$(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			//transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-
-</script>
-<!--控制柱状图的显示隐藏变化-->
-<script type="text/javascript">
-        	$(document).ready(function(){
-        	$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  		$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  		$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  		$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})			  				  			
-	  		});
- </script>
- 
- <!--控制柱状图取值-->			
-<script type="text/javascript">
-
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");	  				
-		  				var c=[];	  			
-			  			for(i=0;i<b.length;i++){ 
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}	
-					}
-					catch(e){}
-					return c;
-	}
-$(function () {
-			u=${startDate};
-			v=${endDate}; 				
-			m=getele();
-			n=${listSize};			
-			<!--给柱子加颜色-->
-			var color=[];
-			for(i=0;i<n;i++){
-					color[i]='#36aeea';
-			}		
-			n2=10;
-			n1=n*n2;
-			<!--取x轴-->
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				j++;
-			}
-			<!--取y轴-->
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-</script>
-<!-- basic scripts -->
-
 </@override>
 <@extends name="/common/simple.ftl"/>

+ 134 - 1272
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/size.ftl

@@ -1,1277 +1,139 @@
 <@override name="head">
-	<title>尺寸报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/report_size.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/zbone.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/ad-report.css">
-	<link href="${ctx}/assets/back/css/font-awesome.min.css"  rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
-
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report_size_bar.js"></script>
-	<script src="${ctx}/assets/back/js/highcharts.js"></script>
-	<script src="${ctx}/assets/back/js/exporting.js"></script>
-	<script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script>
-	
-	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web_back/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$('#sign').click();
-		});	
-	
-});	
-		
-</script>
-	 <style type="text/css">
-        .tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-          	border: none;
-            margin-top: 4px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36AEEA none repeat scroll 0px 0px;
-            cursor: pointer;
-            margin-left: 5px;
-            margin-top: -5px;
-            height: 21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-        
-      
-  .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-      #pagecontent{
-		height:1000px;
-	  }  
-	  select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }
-   
-	   		
-    </style>
+<title>尺寸报表</title>
+<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
-
- <@override name="body">
- <div id=content_bg>
-	 <#include "/back/main/public-head.ftl">
-   <div id= "pagecontent"> 
-	    
-	   <div id="page-edit"> 
-	     <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-				<div></div>
+<@override name="body">
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a 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/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>
-	    </br></br></br>
-   		 	<div id="third">
-				<ul>
-			    	<li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">尺寸报表</li>
-			    </ul>  
- 			</div>  
- 			 </br></br>
-    
-	    <form id="myform" action="${ctx}/back/main/ad/operator/operator-report/size" method="post">
-	   
-	    	 <input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-	    	 					<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-									</div>
-								<span id="date-one" style="margin-left:9px;">
-									<a class="today da">今天</a> |
-									<a class="yesterday da">昨天</a> |
-									<a class="lastSevenDays da">前七天</a> |
-									<a class="lastWeek da">上周</a> |
-									<a class="thisMonth da">本月</a> |
-									<a class="lastMonth da">上月</a> 
-								</span>
-								<span class="tex"><i class="icon-calendar"></i>
-								<input  type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-								</span>
-								<input id="sign" type="submit" value="查询"/>
-					 <div class="chart"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-						
-					<div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>		
-						
-						
-						 <div class="fig">
-						 		<table border="1" class="tablefig1" id="tablefig">
-					            
-					                <thead>
-					                <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-					                    
-					                    <th class="td1" style="width:10%;">尺寸</th>
-					                    <th class="td1" style="width:10%;">浏览量占比(%)</th>
-					                    <th class="td1" style="width:10%;" class="hidden-impression">PV</th>
-					                    <th class="td1" style="width:10%;" class="hidden-impression">UV</th>
-					                    <th class="td1" style="width:10%;" class="hidden-impression">广告曝光数</th>
-					                    <th class="td1" style="width:10%;" class="hidden-impression">广告填充率</th>
-					                    <th class="td1" style="width:10%;" class="hidden-click">广告点击数</th>
-					                    <th class="td1" style="width:10%;" class="hidden-visit">广告点击率</th>
-					                    <th class="td1" style="width:10%;" class="hidden-conversion">eCPM</th>
-					                    <th class="td1" style="width:10%;" class="hidden-income">收入</th>
-					                  
-					                </tr>
-					                
-					                </thead>
-					
-					                <tbody>
-					                   <#if reportList ??>
-					                     <#list reportList as report>
-					             
-						                 <tr id="tr22">
-						                  
-						                    <td class="td2" style="text-align:center;">${report.width!}×${report.height!}</td> 
-						                    <td class="td2" style="text-align:center;">${report.viewRate!}</td>
-						                    <td class="td2" style="text-align:center;">${report.pv!}</td>
-						                    <td class="td2" style="text-align:center;">${report.uv!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-						                    <td class="td2" style="text-align:center;">${report.click!}</td>
-						                    <td class="td2" style="text-align:center;">${report.clickRate!}%</td>  
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.income!}</td>
-						                 </tr>
-					                   </#list>  
-				                      </#if>
-					                </tbody>
-					            </table>
-                          </div>
-						
-			
-	    </form>	
-					
-
-    
-    		<div id="daochu_size">
-				<!--<button class="btn2" >导出Excel</button>-->
-				<a class="ljbtn2" onclick="transdaochu()">导出Excel</a>	
-			</div>
-			<div id="pagemove_size">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-			</div>
-        
-  </div>   
- </div>  
- 
-  </div>    
-
-	
-
-			     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date-one  a').click(function(e){
-       	e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-               	var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-    </script>   
-    
-    
-    
-    
-    
-<script type="text/javascript">
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?size=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}
-		$('#dateRangePicker').dateRangePicker();
-		  $(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			//transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  	
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>
-<!--控制柱状图的显示隐藏变化-->
-<script type="text/javascript">
-        	$(document).ready(function(){
-        	$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			//alert("pvdata");
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-			
-     
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})			  				  			
-	  		});
- </script>
- 
- <!--控制柱状图取值-->			
-<script type="text/javascript">
-
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");	  				
-		  				var c=[];	  			
-			  			for(i=0;i<b.length;i++){  
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}	
-					}
-					catch(e){}
-					return c;
-	}
-
-$(function () {
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			<!--给柱子加颜色-->
-			var color=[];
-			for(i=0;i<n;i++){
-					color[i]='#36aeea';
-			}
-			n2=10;
-			n1=n*n2;
-			<!--取x轴-->
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				   j++;
-			}
-			<!--取y轴-->
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>尺寸报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/size" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);			
-			
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]       
-    });   
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true     
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]       
-    });    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv          
-        }]        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang         
-        }]       
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchongxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]       
-    });    
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]      
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });
-    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                  
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]        
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouruxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru
-     }]       
-    });
-});
-</script>
- 
- 
- 
-<!-- basic scripts -->
-
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">尺寸</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.width!}×${report.height!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('size','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 130 - 1445
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/system.ftl

@@ -1,1454 +1,139 @@
 <@override name="head">
 <title>系统报表</title>
 <link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/back/css/xitong.css"/>
-<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
-<link rel="stylesheet" href="/ssp_operator/assets/back/css/indexpage.css"/>
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/ad-report.css">
-<link href="${ctx}/assets/back/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
 <link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.validate.min.js"></script>
-<script src="${ctx}/assets/back/js/highcharts.js"></script>
-<script src="${ctx}/assets/back/js/exporting.js"></script>
- <script type="text/javascript" src="${ctx}/assets/back/js/data.js"></script> 
- <script type="text/javascript" src="${ctx}/assets/back/js/drilldown.js"></script> 
-	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web_back/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$('#sign').click();
-		});	
-	
-});	
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?system=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}			
-</script>
-<script type="text/javascript">
-
-	var datefalg = true;
-    $('#f1').validate({
-        errorElement: 'span',
-        errorClass: 'help-inline',
-        focusInvalid: false,
-        onfocusout: function(element) {
-                $(element).valid();
-            },
-        rules: {
-             campaignName: {
-                required: true,
-                maxlength:50
-            },
-            totalBudget:{
-                number:true,
-                required:true
-            },
-           dailyBudget:{
-                number:true,
-                
-            },
-           maxImpression:{
-                 number:true,
-            },
-           maxClick: {
-                number:true,
-            },
-            maxConversion: {
-                 number:true,
-              
-            },
-           
-            dailyMaxImpression:{
-                digits:true,
-            },
-            dailyMaxclick:{
-                digits:true,
-            },
-            dailyMaxConversion:{
-                digits:true,
-            }
-           },
-        messages: {
-            campaignName:{
-                required:"请输入内容!",
-                maxlength:"输入的长度大于50超出范围!"
-            },
-            totalBudget:{
-                required:"请输入内容!",
-                number:"请输入数字!"
-            },
-            dailyBudget:{
-                number:"请输入数字!"
-            },
-            maxImpression:{
-                number:"请输入数字!"
-            },
-           maxClick:{
-                
-                number:"请输入数字!"
-            },
-            
-            maxConversion:{
-               
-                number:"请输入数字!"
-            },
-           
-            dailyMaxImpression:{
-                digits:"请输入整数!"
-            },
-            dailyMaxclick:{
-                digits:"请输入整数!"
-            },
-            dailyMaxConversion:{
-                digits:"请输入整数!"
-            }
-           
-        },
-      invalidHandler: function (event, validator) { //display error alert on form submit
-            $('.alert-error', $('.login-form')).show();
-        },
-        highlight: function (e) {
-            $(e).closest('.p1').removeClass('info').addClass('error');
-            $(e).closest('.p1').find("span.c1").addClass('hidden');
-        },
-        success: function (e) {
-            $(e).closest('.p1').removeClass('error').addClass('info');
-            $(e).closest('.p1').find("span.c1").removeClass('hid');
-            $(e).remove();
-        },
-        errorPlacement: function (error, element) {
-        	element.next($("span .c1")).addClass('hid')
-            error.insertAfter(element.after());
-        },
-        
-    });
-
-$('input[name=startDate]').change(function(){
-        var startDate = $('input[name=startDate]').val();
-        var endDate = $('input[name=endDate]').val();
-        if(startDate!==null||startDate!==""){
-            $(this).nextAll(".date-inline").text("选择开始投放日期").removeClass("loginerror");
-            if(startDate>endDate){
-                $('input[name=endDate]').nextAll(".date-inline").text("必须大于或等于开始日期").addClass("loginerror");
-                datefalg = false;
-            }else{
-                $('input[name=endDate]').nextAll(".date-inline").text("选择开始投放日期").removeClass("loginerror");
-                datefalg = true;
-            }
-        }
-    });
-    $('input[name=endDate]').change(function(){
-        var startDate = $('input[name=startDate]').val();
-        var endDate = $('input[name=endDate]').val();
-        if(startDate==null||startDate==""){
-            $('input[name=startDate]').nextAll(".date-inline").text("请输入内容").addClass("loginerror");
-        }else{
-            if(startDate>endDate){
-                $(this).nextAll(".date-inline").text("必须大于或等于开始日期").addClass("loginerror");
-                datefalg = false;
-            }else{
-                $(this).nextAll(".date-inline").text("选择结束投放日期").removeClass("loginerror");
-                datefalg = true;
-            }
-        }
-    });
-</script>
-
-
-<script type="text/javascript">
-
-        	$(document).ready(function(){
-        	
-	        
-	        	 
-			$("#pv1").removeClass().addClass('fenlchange');
-			// alert("pv");
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			 //alert("pvname");
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			//alert("pvdata");
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-			
-     
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				 //alert("pv");
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				// alert("pvname");
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				 //alert("pv");
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				// alert("pvname");
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})		
-	  			
-	  		//alert("hahaha");	
-	  			
-	  		});
-        </script>
-		
-<!--控制柱状图取值-->		
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-					}
-					catch(e){}
-					return c;
-	}
-$(function () {
-			b=$(".span11").val();
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			n2=10;
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n1=n*n2;
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				j++;
-			}
-
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-
-</script>
-
- <style type="text/css">
-        #banner{
-            margin-left:10px;
-            
-            
-        }
-        #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 1px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-         #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36AEEA none repeat scroll 0px 0px;
-            cursor: pointer;
-            margin-left: 5px;
-            margin-top: 0px;
-            height: 21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-		.date a{
-			color:#36aeea;
-		}
-		#third{
-			margin-top:5px;
-			margin-bottom:5px;
-			margin-left:2px;
-		}
-		 .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-      #pagecontent{
-		height:1000px;
-	  } 
-	   select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }		
-    </style>
-
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-    <div id="page-edit">
-		    	 <div id="second">
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-							<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-							<div></div>
-						
-				 </div>
-			</br>	<br>	<br>
-		   	
-
-			<div id="third">
-				<ul>
-			        <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">系统报表</li>
-			    </ul>  
- 			</div>  
-
-
-				<div id="form1">
-		    		<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/system" method="post">
-				    <input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">  
-				   		
-				        		<div class="control-group control-group-lfet">
-									<div class="controls-reset">
-										<div class="row-fluid input-append date " >
-										 <div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-										</div>  
-										<span id="banner">
-											<a >今天</a> |
-											<a class="yesterday">昨天</a> |
-											<a>前七天</a> |
-											<a>上周</a> |
-											<a>本月</a> |
-											<a>上月</a>
-										</span >			
-										<span id="tex" ><i class="icon-calendar"></i>
-										<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}" />
-										</span>
-										<input id="sign" type="submit" value="查询"/>
-									</div>
-									
-								</div>
-							</div>
-					
-							<div class="chart"> 
-								<div  id="linechart1" style="min-width: 94%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							</div>
-					
-							<div class="fenall">	
-								<div  id="pv1" class="fenl">
-									<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-								</div>
-								<div  id="PV2" class="fenl">
-									<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-								</div>
-								<div  id="uv1" class="fenl">
-									<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-								</div>
-								<div id="bgs1" class="fenl">
-									<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-								</div>
-								<div  id="tan1" class="fenl">
-									<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-								</div>
-								<div id="djs1" class="fenl">
-									<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-								</div>
-								<div  id="dian1" class="fenl">
-									<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-								</div>
-								<div id="E1" class="fenl">
-									<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-								</div>
-								<div id="shr1" class="fenl">
-									<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-								</div>
-							</div>	
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<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/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">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>系统报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/system" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 					
-				       		<div class="fig">
-							    <table border="1" class="tablefig1" id="tablefig">
-							    	<thead>
-					                	<tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-						                   
-						                    <th  class="td1" style="width:10%;text-align:center;">系统</th>
-						                    <th class="td1" style="width:10%;text-align:center;">浏览量占比</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-impression">PV</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-impression">UV</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-impression">广告曝光数</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-impression">广告填充率</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-click">广告点击数</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-visit">广告点击率</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-conversion">eCPM</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-income">收入</th>
-					                	</tr>
-				                	</thead>
-				                	<tbody>
-				                    <#if reportList ??>
-				                	<#list reportList as report>
-					                	 <tr id="tr22">
-						                 
-						                    <td class="td2" style="text-align:center;"><#if report.system==1>windows<#elseif report.system==2>ios<#elseif report.system==3>android<#elseif report.system==4>mac<#elseif report.system==5>wp<#elseif report.system==6>other</#if></td> 
-						                    <td class="td2" style="text-align:center;">${report.viewRate!}%</td>
-						                    <td class="td2" style="text-align:center;">${report.pv!}</td>
-						                    <td class="td2" style="text-align:center;">${report.uv!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-						                    <td class="td2" style="text-align:center;">${report.click!}</td>
-						                    <td class="td2" style="text-align:center;">${report.clickRate!}%</td>  
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.income!}</td>
-					                	</tr>
-					                </#list>  
-				                    </#if>
-				                	</tbody>
-				            	</table>
-				        	</div>
-		       				 <div id="daochu_system">
-								<a  class="ljbtn2" onclick="transdaochu()" id="exportExcel">导出Excel</a>
-							</div>
-		       		
-				       		<div id="pagemove_system">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-							</div>
-		        </form>
-		     </div>
-   </div>
-  </div>
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">系统</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.system==1>windows<#elseif report.system==2>ios<#elseif report.system==3>android<#elseif report.system==4>mac<#elseif report.system==5>wp<#elseif report.system==6>other</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('system','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
 </div>
-    <!-- basic scripts -->
 </@override>
-<@extends name="/common/simple.ftl"/>
-	     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-    
-    function getlastMonth_start(){
-    var now = new Date(); 
-    var nowMonth = now.getMonth(); 
-    var lastMonthDate = new Date(); 
-    lastMonthDate.setDate(1);
-    lastMonthDate.setMonth(lastMonthDate.getMonth()-1); 
-    
-    }
-
-    $('.controls-reset a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-</script>
-
-<script type="text/javascript">
-  
-    var $tooltip = $("<div class='tooltip right in' style='display:none;'><div class='tooltip-arrow'></div><div class='tooltip-inner'></div></div>").appendTo('body');
-    $('#dateRangePicker').dateRangePicker();
-    
-     $(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			//transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#banner a").click(function(){
-	  		$("#banner a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>
-		     
-		     
-
-
+<@extends name="/common/simple.ftl"/>

+ 128 - 1251
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/type.ftl

@@ -1,1258 +1,135 @@
 <@override name="head">
-	<title>类型报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
-	<link rel="stylesheet" href="/ssp_operator/assets/back/css/indexpage.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/back/css/ad-report.css">
-	<link href="${ctx}/assets/back/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script src="${ctx}/assets/back/js/highcharts.js"></script>
-	<script src="${ctx}/assets/back/js/exporting.js"></script>
- 	<script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script>
- 	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web_back/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			transcalender();
-		});	
-	
-});	
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?device=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}			
-</script>
-
- <style type="text/css">
-        #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 4px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #67BA2F none repeat scroll 0% 0%;
-            cursor: pointer;
-            margin-left: 3px;
-            height: 21px;
-            display: inline;
-            font-size: 14px;
-        }
-        .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-       	#pagecontent{
-			height:1000px;
-		}
-		 select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }
-    </style>
-
+<title>类型报表</title>
+<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    	<div id= "pagecontent">
-    	  <div id="page-edit">
-		    <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-				<div></div>
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<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 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>
-			</br></br></br>
-   		 	<div id="third">
-				<ul>
-			    	<li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">类型报表</li>
-			    </ul>  
- 			</div>  
-	 		<br></br>	
-	 		<form action="${ctx}/back/main/ad/operator/operator-report/type" method="post">	
-	 				<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-					</div>	 
-			    		<span id="date-one">&nbsp;
-							<a class="today da">今天</a> |
-							<a class="yesterday da">昨天</a> |
-							<a class="lastSevenDays da">前七天</a> |
-							<a class="lastWeek da">上周</a> |
-							<a class="thisMonth da">本月</a> |
-							<a class="lastMonth da">上月</a>
-						</span >
-						<span id="tex"><i class="icon-calendar"></i>   
-						<input class="inputrili" type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-			            </span>
-			             <button onclick="transcalender()" style="float:right" class="check_cal_type" id="check_cal">查询</button>
-					 <div class="chart"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-				 
-				 	<div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>	
-				 
-				 
-					<div class="fig">
-			            <table border="1" class="tablefig1" id="tablefig">
-			                <thead>
-			                <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-			                
-			                    <th class="td1"  style="text-align:center; width:10%">类型</th>
-			                    <th class="td1" style="text-align:center; width:10%" >浏览量占比</th>
-			                    <th class="td1" style="text-align:center; width:10%" >PV</th>
-			                    <th class="td1" style="text-align:center; width:10%" >UV</th>
-			                    <th class="td1" style="text-align:center;  width:10%" >广告曝光数</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告填充率</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告点击数</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告点击率</th>
-			                    <th class="td1" style="text-align:center; width:10%">eCPM</th>
-			                    <th class="td1" style="text-align:center; width:10%" >收入</th>
-			                </tr> 
-			                </thead>
-			
-			                <tbody>
-			                    <#if reportList ??>
-			                <#list reportList as report>
-			             
-				                <tr id="tr22">
-				                	
-				                    <td class="td2" id="tdriqi" style="text-align:center;"><#if report.device==1>网页<#else>app</#if></td> 
-				                    <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.viewRate!}%</td>
-				                    <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-				                     <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-				                    <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-				                    <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-				                    <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-				                    <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-				                    <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-				                    <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-				                	
-				                </tr>
-				                </#list>  
-			                    </#if>
-			                </tbody>
-		           		 </table>
-		           	</div>
-		           			
-        </form>
-		           <div id="daochu_type">
-							
-							<a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-				
-					</div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>类型报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/type" method="post">		
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 					
-				
-		
-  		</div>    
-	 </div>       
- 
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">类型</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.device==1>网页<#else>app</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('type','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+			</form>
+	  	</div>        
+    </div>
 </div>
- 			     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-     $('#date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-    </script>   
-    
-<script type="text/javascript">
-         $('#dateRangePicker').dateRangePicker();
-          $(function(){
-      	$('#pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			//$('#check_cal').click();//触发搜索
-			transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>    
-
-<script type="text/javascript">
-		function transcalender(){
-					var url = ""; 
-					a=$("#selectedOperatorId").val();
-				 	b=$("#dateRangePicker").val();
-				 	url = "${ctx}/back/main/ad/operator/operator-report/type?dateRangePicker=" + b+"&selectedOperatorId="+a;  
-				 	location.href = url;
-		}
-</script>
-		     
-<!--控制柱状图的显示隐藏变化-->
-<script type="text/javascript">
-        	$(document).ready(function(){
-        	$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})			  				  			
-	  		});
- </script>
-<!--控制柱状图取值-->		
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-					}
-					catch(e){}
-					return c;
-	}
-$(function () {
-			b=$(".span11").val();
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			n2=10;
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n1=n*n2;
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				j++;
-			}
-
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-     $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-
-</script>
-<!-- basic scripts -->
-
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 43 - 177
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report.ftl

@@ -8,17 +8,21 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/back/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
-	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
+	<style>
+	#date-radio input {	
+		opacity: 1 !important;
+		position: relative !important;
+	}
+	</style>
 </@override>
 
 <@override name="body">
@@ -26,13 +30,12 @@
 	<#include "/back/main/public-head.ftl">
     <div id="pagecontent" style="height:800px;">
 		<div id="content">
-			
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -44,6 +47,7 @@
 	 		</div>
 	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report" method="post">
 	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="date">
 				<ul id="main_dimensionul" style="float:left; margin-right:10px;">
 					<li class="select_box" id="dimensionul_box">
@@ -56,12 +60,12 @@
 				
 		        <a id="a-dimension" href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a>
 				<span id="date-one">
-					<a class="today da">今天</a>|
-					<a class="yesterday da">昨天</a>|
-					<a class="lastSevenDays da">前七天</a>|
-					<a class="lastWeek da">上周</a>|
-					<a class="thisMonth da">本月</a>|
-					<a class="lastMonth da">上月</a> 
+					<a class="today da" value="today">今天</a> |
+					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
+					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
+					<a class="lastWeek da" value="lastWeek">上周</a> |
+					<a class="thisMonth da" value="thisMonth">本月</a> |
+					<a class="lastMonth da" value="lastMonth">上月</a> 
 				</span>
 				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
 				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
@@ -85,22 +89,22 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		
 		   		<div id="date-radio" style="float:right;margin-right:20px;">
 		   			<span>显示列(此项可多选)</span>
@@ -109,7 +113,6 @@
 					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
 					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
 					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
-					
 				</div>
 		  	</div>
 		   		
@@ -134,7 +137,7 @@
 								<td style="text-align:center; width:5%">${dimension.dimension}</td>
 							</#list>
 		            		<#else>
-		            			<td style="text-align:center; width:5%">广告主</td>
+		            			<td style="text-align:center; width:5%">日期</td>
 		            		</#if>
 			                <td style="text-align:center; width:5%" class="hidden-impression">曝光数</td>
 			                <td style="text-align:center; width:5%" class="hidden-click">点击数</td>
@@ -179,7 +182,8 @@
 								</#if>
 							</#list>
 		            		<#else>
-		            			<td style="text-align:center;">${report.advertiserName!}</td> 
+		            			<#setting datetime_format="yyyy-MM-dd"/> 
+		            			<td style="text-align:center;">${report.reportDate!?datetime}</td>
 		            		</#if>
 			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
 			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
@@ -198,7 +202,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('total','${ctx}/back/main/ad/report/advertiser-report/exportDataReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv" style="margin: 12px 10px 0 0;">
@@ -209,145 +213,7 @@
 		</div>
 		
     </div>
-</div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?total=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&selecteddimensionId="+$("#dimensionId").val()+"&checkItems="+checkboxStr; 
-		params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/back/main/ad/report/advertiser-report/exportDataReportExcel"+params);
-	};
-	
-	
-</script>    
-<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>		     
-
-<!-- basic scripts -->
-
+</div>		     
 </@override>
 <@extends name="/common/simple.ftl"/>
 

+ 12 - 6
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/create.ftl

@@ -5,15 +5,17 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/yf.yang.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
 	
 	<style>
 		.spanVaildate{
-			margin-left:20px;
+			margin:10px 0 0 20px;
 			color:red;
 			position: absolute;
 		}
@@ -31,6 +33,10 @@
 				if (!$("#validation-form").validate()) {
 					return false;
 				}
+				if($("#selected_ops").val() == ""){
+					bootbox.alert("请选择维度方案!");
+					return false;
+				}
 				$.ajax({
 			    	type: "POST",
 			        url: "${ctx}/back/main/ad/report/advertiser-report/save",

+ 15 - 10
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/dimension.ftl

@@ -6,10 +6,11 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 	
@@ -46,13 +47,17 @@
 			$("#all-btn-delete").click(function(){
 				var checkboxs = $("#tablefig tbody input[type='checkbox']:checked");
 				var _param = checkboxs.serialize();
-				if(checkboxs.length==0){
-					alert("请选择需要删除的维度!");
-					return false;
+				if(checkboxs.length > 0){
+					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
+						if (ensure) {	
+							$.post("${ctx}/back/main/ad/report/advertiser-report/delete", _param, function(data) {
+								$('#formPage').submit();
+							});
+						}
+					});
+				}else{
+					bootbox.alert("请选择需要删除的维度!");
 				}
-				$.post("${ctx}/back/main/ad/report/advertiser-report/delete", _param, function(data) {
-					$('#formPage').submit();
-				});
 			});
 			
 			//删除

+ 12 - 6
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/edit.ftl

@@ -5,15 +5,17 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/yf.yang.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
 	
 	<style>
 		.spanVaildate{
-			margin-left:20px;
+			margin:10px 0 0 20px;
 			color:red;
 			position: absolute;
 		}
@@ -39,6 +41,10 @@
 				if (!$("#validation-form").validate()) {
 					return false;
 				}
+				if($("#selected_ops").val() == ""){
+					bootbox.alert("请选择维度方案!");
+					return false;
+				}
 				$.ajax({
 			    	type: "POST",
 			        url: "${ctx}/back/main/ad/report/advertiser-report/save",

+ 34 - 166
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/osReport.ftl

@@ -8,16 +8,15 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/back/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 	<style>
 	#date-radio input {	
 		opacity: 1 !important;
@@ -32,13 +31,12 @@
 	<#include "/back/main/public-head.ftl">
     <div id="pagecontent" style="height:800px;">
 		<div id="content">
-			
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -51,7 +49,8 @@
 				 </ul>  
 	 		</div>
 	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/osReport" method="post">
-	 		 <input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="selectuls">
 				<ul id="main_advertiserul">
 					<li class="select_box" id="advertiserul_box">
@@ -69,32 +68,32 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		</div>
 	
 			<div id="date">
 				<span id="date-one">
-					<a class="today da">今天</a>|
-					<a class="yesterday da">昨天</a>|
-					<a class="lastSevenDays da">前七天</a>|
-					<a class="lastWeek da">上周</a>|
-					<a class="thisMonth da">本月</a>|
-					<a class="lastMonth da">上月</a> 
+					<a class="today da" value="today">今天</a> |
+					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
+					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
+					<a class="lastWeek da" value="lastWeek">上周</a> |
+					<a class="thisMonth da" value="thisMonth">本月</a> |
+					<a class="lastMonth da" value="lastMonth">上月</a>
 				</span>
 				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
 				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
@@ -158,7 +157,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('system','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv" style="margin: 12px 10px 0 0;">
@@ -168,137 +167,6 @@
 		</form>
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?system=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&checkItems="+checkboxStr;
-	    params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel"+params);
-	};
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
 <@extends name="/common/simple.ftl"/>
 

+ 34 - 166
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/regionReport.ftl

@@ -8,16 +8,15 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/back/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 	<style>
 	#date-radio input {	
 		opacity: 1 !important;
@@ -32,13 +31,12 @@
 	<#include "/back/main/public-head.ftl">
     <div id="pagecontent" style="height:800px;">
 		<div id="content">
-			
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -51,7 +49,8 @@
 				 </ul>  
 	 		</div>
 	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/regionReport" method="post">
-	 		 <input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="selectuls">
 				<ul id="main_advertiserul">
 					<li class="select_box" id="advertiserul_box">
@@ -69,32 +68,32 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		</div>
 	
 			<div id="date">
 				<span id="date-one">
-					<a class="today da">今天</a>|
-					<a class="yesterday da">昨天</a>|
-					<a class="lastSevenDays da">前七天</a>|
-					<a class="lastWeek da">上周</a>|
-					<a class="thisMonth da">本月</a>|
-					<a class="lastMonth da">上月</a> 
+					<a class="today da" value="today">今天</a> |
+					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
+					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
+					<a class="lastWeek da" value="lastWeek">上周</a> |
+					<a class="thisMonth da" value="thisMonth">本月</a> |
+					<a class="lastMonth da" value="lastMonth">上月</a> 
 				</span>
 				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
 				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
@@ -158,7 +157,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('location','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv" style="margin: 12px 10px 0 0;">
@@ -168,137 +167,6 @@
 		</form>
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?location=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&checkItems="+checkboxStr; 
-		params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel"+params);
-	};
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
 <@extends name="/common/simple.ftl"/>
 

+ 34 - 165
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/sceneReport.ftl

@@ -8,16 +8,15 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/back/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 	<style>
 	#date-radio input {	
 		opacity: 1 !important;
@@ -34,10 +33,10 @@
 			
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -50,7 +49,8 @@
 				 </ul>  
 	 		</div>
 	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/sceneReport" method="post">
-	 		 <input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="selectuls">
 				<ul id="main_advertiserul">
 					<li class="select_box" id="advertiserul_box">
@@ -68,32 +68,32 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		</div>
 	
 			<div id="date">
 				<span id="date-one">
-					<a class="today da">今天</a>|
-					<a class="yesterday da">昨天</a>|
-					<a class="lastSevenDays da">前七天</a>|
-					<a class="lastWeek da">上周</a>|
-					<a class="thisMonth da">本月</a>|
-					<a class="lastMonth da">上月</a> 
+					<a class="today da" value="today">今天</a> |
+					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
+					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
+					<a class="lastWeek da" value="lastWeek">上周</a> |
+					<a class="thisMonth da" value="thisMonth">本月</a> |
+					<a class="lastMonth da" value="lastMonth">上月</a>
 				</span>
 				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
 				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
@@ -157,7 +157,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv" style="margin: 12px 10px 0 0;">
@@ -167,137 +167,6 @@
 		</form>
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?place=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&checkItems="+checkboxStr;
-	    params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel"+params);
-	};
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
 <@extends name="/common/simple.ftl"/>
 

+ 0 - 110
src/main/webapp/WEB-INF/pages/back/main/ad/report/system-report/system.ftl

@@ -1,110 +0,0 @@
-<@override name="breadcrumb">
-    <li><i class="icon-home"></i> <a href="${ctx}/back/main/dashboard">首页</a><span class="divider"><i
-            class="icon-angle-right"></i></span></li>
-    <@sec.authorize access="hasAnyRole('ROLE_ADMIN,ROLE_MANAGER')">
-    <li><a href="${ctx}/back/main/ad/report/media-report/system">系统报表</a><span class="divider"><i class="icon-angle-right"></i></span></li>
-    </@sec.authorize>
-   <li class="active">系统报表报表</li>
-   
-</@override>
-
-<@override name="body">
-   <div id=content_bg>
-    <div id= "pagecontent">
-   
-		    <div id="second">
-			    <ul>
-					
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/media-report/system"><span>系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/media-report/type"><span>类型报表</span></a></li>
-					
-					<li></li>
-				</ul>
-		    </div>
-
-
-    
-    <div id="form">
-    	<form action="${ctx}/back/main/ad/report/media-report/system" method="post">
-        
-		      
-		         <div class="control-group control-group-lfet">
-						<div class="controls-reset">
-							<select id="" name="">
-								<option value="-1">全部媒体</option>
-								
-							</select>
-						</div>
-				</div>
-			
-				 
-					<div class="fig">
-			            <table border="1" class="tablefig" id="tablefig">
-			                <thead>
-			                <tr class="tr1"  id ='tr11' background:"#f2f6fa">
-			                	<th class="td1"  style="text-align:center; width:4%"></th>
-			                    <th class="td1"  style="text-align:center; width:5%">类型</th>
-			                    <th class="td1" style="text-align:center; width:7%" >浏览量占比</th>
-			                    <th class="td1" style="text-align:center; width:6%" >PV</th>
-			                    <th class="td1" style="text-align:center; width:6%" >UV</th>
-			                    <th class="td1" style="text-align:center;  width:9%" >广告曝光数</th>
-			                    <th class="td1" style="text-align:center; width:9%">广告填充率</th>
-			                    <th class="td1" style="text-align:center; width:9%">广告点击数</th>
-			                    <th class="td1" style="text-align:center; width:9%">广告点击率</th>
-			                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-			                    <th class="td1" style="text-align:center; width:8%" >收入</th>
-			                </tr> 
-			                </thead>
-			
-			                <tbody>
-			                    <#if reportList ??>
-			                <#list reportList as report>
-			             
-				                <tr id="tr22">
-				                	 <td class="td2" id="tdriqi" style="text-align:center;">${report.id!}</td> 
-<td style="text-align:center;"><#if report.os==1>windows<#elseif report.os==2>ios<#elseif report.os==3>android<#elseif report.os==4>mac<#elseif report.os==5>wp</#if></td>  
-				                    <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.pageviewsPercent!}%</td>
-				                    <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-				                     <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-				                    <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-				                    <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-				                    <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-				                    <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-				                    <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.ecpm!}</td>
-				                    <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-				                	
-				                </tr>
-				                </#list>  
-			                    </#if>
-			                </tbody>
-		           		 </table>
-		           	</div>
-		            <div id="daochu">
-							<button class="btn2" >导出Excel</button>
-				
-					</div>
-					
-				<div class="yema"> 
-								<a class="qianmian"><div class="page2">&lt;&lt;</div></a>
-								<a href="?page=1" class="page1" style="color:white;"><div class="page2">1</div></a>
-								<a href="?page=2"><div class="page2">2</div></a>
-								<a href="?page=3"><div class="page2">3</div></a>
-								<div class="page23">...</div>
-								<a href="#?page=19"><div class="page2">19</div></a>
-								<a href="?page=20"><div class="page2">20</div></a>
-								<a href="?page=2"> <div class="page2">&gt;&gt; </div></a>
-								<div class="allpage">共269条 </div>
-				</div> 
-	     
-        
-        </form>
-  
-	         
-	 </div>       
-    </div>
-</div>
-     
-
-</@override>
-<@extends name="/common/simple.ftl"/>
-

+ 0 - 110
src/main/webapp/WEB-INF/pages/back/main/ad/report/type-report/type.ftl

@@ -1,110 +0,0 @@
-<@override name="breadcrumb">
-    <li><i class="icon-home"></i> <a href="${ctx}/back/main/dashboard">首页</a><span class="divider"><i
-            class="icon-angle-right"></i></span></li>
-    <@sec.authorize access="hasAnyRole('ROLE_ADMIN,ROLE_MANAGER')">
-    <li><a href="${ctx}/back/main/ad/report/media-report/type">类型报表</a><span class="divider"><i class="icon-angle-right"></i></span></li>
-    </@sec.authorize>
-   <li class="active">类型报表报表</li>
-   
-</@override>
-
-<@override name="body">
-   <div id=content_bg>
-    <div id= "pagecontent">
-   
-		    <div id="second">
-			    <ul>
-					
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/media-report/system"><span>系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/media-report/type"><span>类型报表</span></a></li>
-					
-					<li></li>
-				</ul>
-		    </div>
-
-
-    
-    <div id="form">
-    	<form action="${ctx}/back/main/ad/report/media-report/type" method="post">
-        
-		      
-		         <div class="control-group control-group-lfet">
-						<div class="controls-reset">
-							<select id="" name="">
-								<option value="-1">全部媒体</option>
-								
-							</select>
-						</div>
-				</div>
-			
-				 
-					<div class="fig">
-			            <table border="1" class="tablefig" id="tablefig">
-			                <thead>
-			                <tr class="tr1"  id ='tr11' background:"#f2f6fa">
-			                	<th class="td1"  style="text-align:center; width:4%"></th>
-			                    <th class="td1"  style="text-align:center; width:5%">类型</th>
-			                    <th class="td1" style="text-align:center; width:7%" >浏览量占比</th>
-			                    <th class="td1" style="text-align:center; width:6%" >PV</th>
-			                    <th class="td1" style="text-align:center; width:6%" >UV</th>
-			                    <th class="td1" style="text-align:center;  width:9%" >广告曝光数</th>
-			                    <th class="td1" style="text-align:center; width:9%">广告填充率</th>
-			                    <th class="td1" style="text-align:center; width:9%">广告点击数</th>
-			                    <th class="td1" style="text-align:center; width:9%">广告点击率</th>
-			                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-			                    <th class="td1" style="text-align:center; width:8%" >收入</th>
-			                </tr> 
-			                </thead>
-			
-			                <tbody>
-			                    <#if reportList ??>
-			                <#list reportList as report>
-			             
-				                <tr id="tr22">
-				                	 <td class="td2" id="tdriqi" style="text-align:center;">${report.id!}</td> 
-				                    <td class="td2" id="tdriqi" style="text-align:center;"><#if report.device==1>网页<#else>app</#if></td> 
-				                    <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.pageviewsPercent!}%</td>
-				                    <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-				                     <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-				                    <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-				                    <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-				                    <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-				                    <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-				                    <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.ecpm!}</td>
-				                    <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-				                	
-				                </tr>
-				                </#list>  
-			                    </#if>
-			                </tbody>
-		           		 </table>
-		           	</div>
-		            <div id="daochu">
-							<button class="btn2" >导出Excel</button>
-				
-					</div>
-					
-				<div class="yema"> 
-								<a class="qianmian"><div class="page2">&lt;&lt;</div></a>
-								<a href="?page=1" class="page1" style="color:white;"><div class="page2">1</div></a>
-								<a href="?page=2"><div class="page2">2</div></a>
-								<a href="?page=3"><div class="page2">3</div></a>
-								<div class="page23">...</div>
-								<a href="#?page=19"><div class="page2">19</div></a>
-								<a href="?page=20"><div class="page2">20</div></a>
-								<a href="?page=2"> <div class="page2">&gt;&gt; </div></a>
-								<div class="allpage">共269条 </div>
-				</div> 
-	     
-        
-        </form>
-  
-	         
-	 </div>       
-    </div>
-</div>
-     
-
-</@override>
-<@extends name="/common/simple.ftl"/>
-

+ 5 - 7
src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/index.ftl

@@ -4,7 +4,11 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/audit.css"/>
 	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
+	<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/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/audit.js"></script>
+
 </@override>
 <@override name="body">
 	<#include "/back/main/public-head.ftl">
@@ -43,9 +47,3 @@
 	</div>
 </@override>
 <@extends name="/common/simple.ftl"/>
-
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/back/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/bootbox.min.js"></script>
-<!--linked js-->
-<script type="text/javascript" src="${ctx}/assets/back/js/audit.js"></script>

+ 63 - 68
src/main/webapp/WEB-INF/pages/back/main/audit/audit/details.ftl

@@ -4,7 +4,68 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/audit.css"/>
 	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
+	<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/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	
+<script type="text/javascript">
+	$(function(){
+		$("#subNav span").click(function(){
+			var _href = $(this).attr('href');
+			window.location.assign(_href);
+		});
+		
+		//搜索输入框的样式改变
+		$("#searchBar input[name='searchValue']").focus(function(){
+			$(this).val("");
+		});
+		$("#searchBar input[name='searchValue']").blur(function(){
+			if($(this).val()== ""){
+				$(this).val("请输入需要搜索的内容");
+			}
+		});
+		$('#searchBar button').click(function(){
+			var _href = $(this).attr('href');
+			var _value = $(this).attr('value');
+			var _text = $(this).text();
+			if(_text == '审核通过'){
+				var _param = {
+            			'auditId':_value,
+            			'checkStatus':1,
+            	};
+				$.post(_href,_param,function(data){
+					if(data == "ok"){
+						window.location = document.referrer;
+					} else {
+						bootbox.alert("审核失败!");
+					}
+				})
+			} else{
+				 bootbox.prompt("请输入审核不通过的理由", function(result) {
+		            if(result === null){
+		            	
+		            } else if (result == '') {
+		            	bootbox.alert("请输入审核不通过的理由");
+		            } else {
+		            	var _param = {
+		            			'auditId':_value,
+		            			'checkMemo':result,
+		            			'checkStatus':-1,
+		            	};
+		            	$.post(_href,_param,function(data){
+		            		if(data == "ok"){
+		            			window.location = document.referrer; 
+							} else {
+								bootbox.alert("审核失败!");
+							}
+						})
+		            }
+		        });
+			}
+		});
+	});
+</script>
 </@override>
 <@override name="body">
 	<#include "/back/main/public-head.ftl">
@@ -69,70 +130,4 @@
 		</div>
 	</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/back/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/bootbox.min.js"></script>
-<script type="text/javascript">
-	$(function(){
-		$("#subNav span").click(function(){
-			var _href = $(this).attr('href');
-			window.location.assign(_href);
-		});
-		
-		//个人信息栏的js控制
-		$("#divselect").click(function(){
-			$("#divselect ul").slideToggle("fast");
-		});
-		
-		//搜索输入框的样式改变
-		$("#searchBar input[name='searchValue']").focus(function(){
-			$(this).val("");
-		});
-		$("#searchBar input[name='searchValue']").blur(function(){
-			if($(this).val()== ""){
-				$(this).val("请输入需要搜索的内容");
-			}
-		});
-		$('#searchBar button').click(function(){
-			var _href = $(this).attr('href');
-			var _value = $(this).attr('value');
-			var _text = $(this).text();
-			if(_text == '审核通过'){
-				var _param = {
-            			'auditId':_value,
-            			'checkStatus':1,
-            	};
-				$.post(_href,_param,function(data){
-					if(data == "ok"){
-						window.location = document.referrer;
-					} else {
-						bootbox.alert("审核失败!");
-					}
-				})
-			} else{
-				 bootbox.prompt("请输入审核不通过的理由", function(result) {
-		            if(result === null){
-		            	
-		            } else if (result == '') {
-		            	bootbox.alert("请输入审核不通过的理由");
-		            } else {
-		            	var _param = {
-		            			'auditId':_value,
-		            			'checkMemo':result,
-		            			'checkStatus':-1,
-		            	};
-		            	$.post(_href,_param,function(data){
-		            		if(data == "ok"){
-		            			window.location = document.referrer; 
-							} else {
-								bootbox.alert("审核失败!");
-							}
-						})
-		            }
-		        });
-			}
-		});
-	});
-</script>
+<@extends name="/common/simple.ftl"/>

+ 3 - 3
src/main/webapp/WEB-INF/pages/back/main/audit/audit/index.ftl

@@ -4,7 +4,8 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/audit.css"/>
 	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/audit.js"></script>
 </@override>
 <@override name="body">
 	<#include "/back/main/public-head.ftl">
@@ -43,5 +44,4 @@
 		</div>
 	</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-<script type="text/javascript" src="${ctx}/assets/back/js/audit.js"></script>
+<@extends name="/common/simple.ftl"/>

+ 4 - 4
src/main/webapp/WEB-INF/pages/back/main/authority/create.ftl

@@ -4,10 +4,10 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 4 - 4
src/main/webapp/WEB-INF/pages/back/main/authority/edit.ftl

@@ -4,10 +4,10 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 3 - 4
src/main/webapp/WEB-INF/pages/back/main/authority/list.ftl

@@ -6,10 +6,9 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){

+ 4 - 4
src/main/webapp/WEB-INF/pages/back/main/authority/loginperson.ftl

@@ -4,10 +4,10 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{

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

@@ -4,10 +4,10 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{

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

@@ -4,10 +4,10 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 3 - 4
src/main/webapp/WEB-INF/pages/back/main/client-account/list.ftl

@@ -6,10 +6,9 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){

+ 107 - 116
src/main/webapp/WEB-INF/pages/back/main/dashboard.ftl

@@ -1,16 +1,114 @@
 <@override name="head">
 <title>广告投放系统</title>
-	<!--linked css-->
-	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/back/css/dashboard.css"/>
-	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
+<!--linked css-->
+<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/back/css/dashboard.css"/>
+<!--js dependence-->
+<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/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+
+<script type="text/javascript">
+$(function () {
+	var flow=[];
+	var tipLabel=new Array("PV","UV","Impression","Click","Income");
+	var pv=tipLabel[0];
+	$.ajax({
+		type : 'post',
+		url : '/ssp_web/back/main/dashboard/list',
+		async : false,
+		cache : false,
+		dataType : 'json',
+		success : function(data){
+			var pvArray = [];
+			var uvArray = [];
+			var impressionArray = [];
+			var clickArray = [];
+			var incomeArray = [];
+			$.each(data,function(n,value) {
+				pvArray[n] = value.pv;
+				uvArray[n] = value.uv;
+				impressionArray[n] = value.impression;
+				clickArray[n] = value.click;
+				incomeArray[n] = value.income;
+			});
+			flow[0] = pvArray;
+			flow[1] = uvArray;
+			flow[2] = impressionArray;
+			flow[3] = clickArray;
+			flow[4] = incomeArray;	 
+		},
+		error : function (XMLHttpRequest, textStatus, errorThrown) {
+			// 通常 textStatus 和 errorThrown 之中
+			// 只有一个会包含信息
+			//alert('error');
+			this; // 调用本次AJAX请求时传递的options参数
+		}
+	});
+		
+	//设置日期,当前日期的前七天
+	var myDate = new Date(); //获取今天日期
+	var myYear = myDate.getFullYear();//获取年份
+	myDate.setDate(myDate.getDate() - 7);
+	var labels = [];
+	var dateTemp;
+	var flag = 1;
+	for (var i = 0; i < 7; i++) {
+		dateTemp = myDate.getFullYear() + "/" + (myDate.getMonth() + 1) + "/" + myDate.getDate();
+		labels.push(dateTemp);
+		myDate.setDate(myDate.getDate() + flag);
+	}		
+	drawDiagram(myDate,flow[0],pv);
+		
+	$('#data_number td').click(function(){
+		$('#data_number td').css({"background-color":"#ffffff","color":"black"});
+		$(this).css({"background-color":"#36aeea","color":"#ffffff"});
+		var n = $(this).index();
+		pv=tipLabel[n];
+		var data = flow[n];
+		$('#baseTitle').text('近7天全部广告位' + pv);
+		drawDiagram(myDate,data,pv);
+	});
+		
+	function drawDiagram(myDate,data,pv){		
+		$('#diagram').highcharts({ 
+			chart: { type: 'line' },
+			title: { text: '' }, //标题
+			//subtitle: { text: 'Source: WorldClimate.com' }, //副标题
+			xAxis: { categories: labels }, 
+			yAxis: { 
+				title: { text: '' }, 
+				plotLines: [{ value: 0, width: 1, color: '#808080' }]
+			}, 
+			tooltip: { crosshairs: true, shared: true }, 
+			legend: { 
+				enabled:false,
+			},
+			credits:{
+				enabled:false,
+			},
+			
+			series: [{ 
+				name: pv, 
+				data: data,
+				color:'#36aeea',
+				marker:{
+					symbol: 'circle',
+					fillColor:'#ffffff',
+					lineColor:'#87b9f6',
+					lineWidth: 2,
+					radius: 5,
+				}
+			}]
+		}); 
+	}
+});
+</script>
 </@override>
 
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<#include "public-head.ftl">
-		
+<!-- PAGE CONTENT BEGINS HERE -->
+<#include "public-head.ftl">
 	<div id="pagecontent">
 		<div id="quickJump">
 			<span><i class="icon-home">&nbsp;</i><a src="${ctx}/back/main/dashboard">首页</a></span>
@@ -49,111 +147,4 @@
 	</div>
 
 </@override>
-<@extends name="/common/simple.ftl"/>
-<script src="http://cdn.hcharts.cn/highcharts/highcharts.js" type="text/javascript"></script> 
-<!--修改个人信息js 控制上下切换-->
-<script type="text/javascript">
-	$(document).ready(function(){
-		  $("#divselect").click(function(){
-		  	$("#divselect ul").slideToggle("fast");
-		  });
-	});
-	
-	$(function () {
-		var flow=[];
-		var tipLabel=new Array("PV","UV","Impression","Click","Income");
-		var pv=tipLabel[0];
-		$.ajax({
-			type : 'post',
-			url : '/ssp_web/back/main/dashboard/list',
-			async : false,
-			cache : false,
-			dataType : 'json',
-			success : function(data){
-				var pvArray = [];
-				var uvArray = [];
-				var impressionArray = [];
-				var clickArray = [];
-				var incomeArray = [];
-				 $.each(data,function(n,value) {
-					 pvArray[n] = value.pv;
-					 uvArray[n] = value.uv;
-					 impressionArray[n] = value.impression;
-					 clickArray[n] = value.click;
-					 incomeArray[n] = value.income;
-			      });
-				 flow[0] = pvArray;
-				 flow[1] = uvArray;
-				 flow[2] = impressionArray;
-				 flow[3] = clickArray;
-				 flow[4] = incomeArray;
-				 
-			},
-			error : function (XMLHttpRequest, textStatus, errorThrown) {
-			    // 通常 textStatus 和 errorThrown 之中
-			    // 只有一个会包含信息
-				//alert('error');
-			    this; // 调用本次AJAX请求时传递的options参数
-			}
-		});
-		
-		//设置日期,当前日期的前七天
-		var myDate = new Date(); //获取今天日期
-		var myYear = myDate.getFullYear();//获取年份
-		myDate.setDate(myDate.getDate() - 7);
-		var labels = [];
-		var dateTemp;
-		var flag = 1;
-		for (var i = 0; i < 7; i++) {
-			dateTemp = myDate.getFullYear() + "/" + (myDate.getMonth() + 1) + "/" + myDate.getDate();
-			labels.push(dateTemp);
-			myDate.setDate(myDate.getDate() + flag);
-		}		
-		drawDiagram(myDate,flow[0],pv);
-		
-		$('#data_number td').click(function(){
-			$('#data_number td').css({"background-color":"#ffffff","color":"black"});
-			$(this).css({"background-color":"#36aeea","color":"#ffffff"});
-			var n = $(this).index();
-			pv=tipLabel[n];
-			var data = flow[n];
-			$('#baseTitle').text('近7天全部广告位' + pv);
-			drawDiagram(myDate,data,pv);
-		});
-		
-		function drawDiagram(myDate,data,pv){		
-			$('#diagram').highcharts({ 
-				chart: { type: 'line' },
-				title: { text: '' }, //标题
-				//subtitle: { text: 'Source: WorldClimate.com' }, //副标题
-				xAxis: { categories: labels }, 
-				yAxis: { 
-					title: { text: '' }, 
-					plotLines: [{ value: 0, width: 1, color: '#808080' }]
-				}, 
-				tooltip: { crosshairs: true, shared: true }, 
-				legend: { 
-					enabled:false,
-				},
-				credits:{
-					enabled:false,
-				},
-			
-				series: [{ 
-					name: pv, 
-					data: data,
-					color:'#36aeea',
-					marker:{
-						symbol: 'circle',
-						fillColor:'#ffffff',
-						lineColor:'#87b9f6',
-						lineWidth: 2,
-						radius: 5,
-					}
-				}]
-			}); 
-		}
-	});
-</script>
-
-
+<@extends name="/common/simple.ftl"/>

+ 88 - 94
src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/deposit.ftl

@@ -4,101 +4,12 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/finance.css"/>
 	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-
-</@override>
-<@override name="body">
-	<#include "/back/main/public-head.ftl">
-	<div id= "pagecontent">
-		<div id="shortcutBar">
-			<ul>
-				<li >
-					<i class="icon-home"></i>
-					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-				</li>
-				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
-				<li >
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-					<a class="homepage2" href="">需求方充值</a>
-				</li>				         
-			</ul>
-		</div>
-		<div id="recharge">
-			<form id="form1" action="${ctx}/back/main/finance/finance-management/recharge" method="post">
-				<div>
-					<span>选择需求方:</span>
-					<select id="agentId" name="agentId" class="agentId">
-						<option value="-1">请选择代理商</option>
-					</select>
-				</div>
-				<div>
-					<span>充值:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-					<input type="text" name="money" value="100">
-					<span>元</span>
-					<span class='remind'></span>
-				</div>
-				<div>
-				<button type="submit" name="submit" value="submit">提交</button>
-				<button type='button' href='${ctx}/back/main/finance/finance-management'>取消</button>
-				</div>
-			</form>
-		</div>
-		<div id="searchBar">
-			<span>充值记录&nbsp;:</span>
-			<form action="${ctx}/back/main/finance/finance-management/deposit" method="post" class="search-form" >
-				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
-		   		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
-		   		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入日期进行搜索" onkeydown="if(event.keyCode==13){return false;}">
-		   		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
-			</form>
-		</div>
-		
-		<div id="tableList">
-			<table class="table">
-				<thead>
-					<tr>
-						<th>日期</th>
-						<th>广告主/代理商</th>
-						<th>充值金额</th>
-						<th>余额</th>
-						<th>操作</th>
-					</tr>
-				</thead>
-				<tbody>
-					<#if advBalanceList ??>
-					<#list advBalanceList as advBalance>
-					<tr>
-						<td>${advBalance.actTime?date}</td>
-						<td>${advBalance.agentName!}</td>
-						<td>${advBalance.charge!}</td>
-						<td>${advBalance.balance!}</td>
-						<td><a href='${ctx}/back/main/finance/finance-management/backOut?advBalanceId=${advBalance.id}'>撤销</a></td>
-					</tr>
-				 	</#list>
-		            </#if>
-				</tbody>
-			</table>
-		</div>
-		<div id="footBar">
-			<button id="exportExcel" href="${ctx}/back/main/finance/finance-management/exportExcel">导出Excel</button>
-			<div id="paged">
-		       <#include "/common/pagination/simple.ftl"/>
-		    </div>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/back/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/bootbox.min.js"></script>
+	<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/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 <script type="text/javascript">
 	$(function(){
-		//个人信息栏的js控制
-		$("#divselect").click(function(){
-			$("#divselect ul").slideToggle("fast");
-		});
-		
 		//搜索输入框的样式改变
 		$(document).on('focus',"#searchBar input[name='searchValue']",function(){
 			$(this).val("");
@@ -226,4 +137,87 @@
 			});
 		})
 	});
-</script>
+</script>
+</@override>
+<@override name="body">
+	<#include "/back/main/public-head.ftl">
+	<div id= "pagecontent">
+		<div id="shortcutBar">
+			<ul>
+				<li >
+					<i class="icon-home"></i>
+					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
+					<span class="divider1"><i class="icon-angle-right"></i></span>
+				</li>
+				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
+				<li >
+					<span class="divider1"><i class="icon-angle-right"></i></span>
+					<a class="homepage2" href="">需求方充值</a>
+				</li>				         
+			</ul>
+		</div>
+		<div id="recharge">
+			<form id="form1" action="${ctx}/back/main/finance/finance-management/recharge" method="post">
+				<div>
+					<span>选择需求方:</span>
+					<select id="agentId" name="agentId" class="agentId">
+						<option value="-1">请选择代理商</option>
+					</select>
+				</div>
+				<div>
+					<span>充值:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+					<input type="text" name="money" value="100">
+					<span>元</span>
+					<span class='remind'></span>
+				</div>
+				<div>
+				<button type="submit" name="submit" value="submit">提交</button>
+				<button type='button' href='${ctx}/back/main/finance/finance-management'>取消</button>
+				</div>
+			</form>
+		</div>
+		<div id="searchBar">
+			<span>充值记录&nbsp;:</span>
+			<form action="${ctx}/back/main/finance/finance-management/deposit" method="post" class="search-form" >
+				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
+		   		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
+		   		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入日期进行搜索" onkeydown="if(event.keyCode==13){return false;}">
+		   		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
+			</form>
+		</div>
+		
+		<div id="tableList">
+			<table class="table">
+				<thead>
+					<tr>
+						<th>日期</th>
+						<th>广告主/代理商</th>
+						<th>充值金额</th>
+						<th>余额</th>
+						<th>操作</th>
+					</tr>
+				</thead>
+				<tbody>
+					<#if advBalanceList ??>
+					<#list advBalanceList as advBalance>
+					<tr>
+						<td>${advBalance.actTime?date}</td>
+						<td>${advBalance.agentName!}</td>
+						<td>${advBalance.charge!}</td>
+						<td>${advBalance.balance!}</td>
+						<td><a href='${ctx}/back/main/finance/finance-management/backOut?advBalanceId=${advBalance.id}'>撤销</a></td>
+					</tr>
+				 	</#list>
+		            </#if>
+				</tbody>
+			</table>
+		</div>
+		<div id="footBar">
+			<button id="exportExcel" href="${ctx}/back/main/finance/finance-management/exportExcel">导出Excel</button>
+			<div id="paged">
+		       <#include "/common/pagination/simple.ftl"/>
+		    </div>
+		</div>
+	</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

+ 42 - 48
src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/index.ftl

@@ -4,55 +4,12 @@
 	<link rel="stylesheet" href="${ctx}/assets/back/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/back/css/finance.css"/>
 	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-
-</@override>
-<@override name="body">
-	<#include "/back/main/public-head.ftl">
-	<div id= "pagecontent">
-		<div id="shortcutBar">
-			<ul>
-				<li >
-					<i class="icon-home"></i>
-					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-				</li>
-				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
-				<li >
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-					<a class="homepage2" href="">提现管理</a>
-				</li>				         
-			</ul>  
-		</div>
-		<div id="searchBar">
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management">媒体体现申请</button>
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/deposit">需求方充值</button>
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/enable">批量通过</button>
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/disable">批量不通过</button>
-			<form action="${ctx}/back/main/finance/finance-management/list" method="post" class="search-form" >
-				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
-          		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
-          		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入交易号进行搜索" onkeydown="if(event.keyCode==13){return false;}">
-          		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
-			</form>
-		</div>
-		<div id="tableList">
-			<#include "list.ftl">
-		</div>
-		
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/back/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/bootbox.min.js"></script>
+	<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/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 <script type="text/javascript" charset="utf-8">
 	$(function(){
-		//个人信息栏的js控制
-		$("#divselect").click(function(){
-			$("#divselect ul").slideToggle("fast");
-		});
-		
 		//搜索输入框的样式改变
 		$("#searchBar input[name='searchValue']").focus(function(){
 			$(this).val("");
@@ -185,4 +142,41 @@
 				}
 		});
 	});
-</script>
+</script>
+</@override>
+<@override name="body">
+	<#include "/back/main/public-head.ftl">
+	<div id= "pagecontent">
+		<div id="shortcutBar">
+			<ul>
+				<li >
+					<i class="icon-home"></i>
+					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
+					<span class="divider1"><i class="icon-angle-right"></i></span>
+				</li>
+				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
+				<li >
+					<span class="divider1"><i class="icon-angle-right"></i></span>
+					<a class="homepage2" href="">提现管理</a>
+				</li>				         
+			</ul>  
+		</div>
+		<div id="searchBar">
+			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management">媒体体现申请</button>
+			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/deposit">需求方充值</button>
+			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/enable">批量通过</button>
+			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/disable">批量不通过</button>
+			<form action="${ctx}/back/main/finance/finance-management/list" method="post" class="search-form" >
+				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
+          		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
+          		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入交易号进行搜索" onkeydown="if(event.keyCode==13){return false;}">
+          		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
+			</form>
+		</div>
+		<div id="tableList">
+			<#include "list.ftl">
+		</div>
+		
+	</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

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

@@ -21,7 +21,12 @@
 			<li><a href="${ctx}/back/main/authority/loginperson" selectid="1">修改个人信息</a></li>
 			<li><a href="${ctx}/login" selectid="2">退出登录</a></li>       
 		</ul>
-		<input name="" type="hidden" value="" id="input-top"/>
+		<input type="hidden" value="${ctx!}" id="ctx"/>
+		<input type="hidden" id="role" value="${role!}"/>
+		<input type="hidden" id="agentId" value="${userSession.agentId!}"/>
+		<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId!}"/>
+		<input type="hidden" id="sessionadvertiserName" value="${advertiserName!}"/>
+		<input type="hidden" id="sessionoperatorId" value="${userSession.operatorId!}"/>
 	</div>    		
 </div>	   	
 <script type="text/javascript">

+ 0 - 156
src/main/webapp/WEB-INF/pages/operator/main/ad/advertiser/create.ftl

@@ -1,156 +0,0 @@
-<@override name="breadcrumb">	
-	<title>广告投放系统</title>
-	
-	  <script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.validate.min.js"></script>
-	 <script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/form_validateH.js"></script>
-	 
-	   <link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-
-		<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/Ncontent.css"/>
-		<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/NAdform.css"/>
-		
-		
-      
-     			<!--以下从数据库中获得下拉列表需要显示的数据-->
- <script type="text/javascript">
-       var  excelParam ;
-		function loadDataForPullDownList2(controlView, parentId, url, defaultLabel) {
-		//alert("进入PullDownList2了··············");
-		controlView.empty();
-		controlView.append(  
-            '<li class="selectedli" value="-1"  >' + defaultLabel + '</li>'  
-        );  
-           
-		$.getJSON( url, function(data) {
-			console.log(data.allIndustry);
-			 var data_1 = data.allIndustry;
-			
-			$.each( data_1, function( key, val ) {
-			
-				// alert("id= "+val.value+",name= " +val.label);
-				controlView.append(  
-		         '<li class="selectedli" value=' + val.value +'>' + val.label + '</li>'  
-		          
-		       );
-			});
-		});
-		
-	//	controlView.val("-1");
-	}
-
-	function loadIndustry() {
-	 	// alert("要开始调用咯~············");
-		loadDataForPullDownList2($('#selectedIndustryId'), "ADVERTISER", "${ctx}/widget/selector/provide/industry?parentId=ADVERTISER", "请选择所属行业");
-	}
-	</script>
-	
-	 <script type="text/javascript">
-	 		$(document).ready(function(){
-	 		
-	 		
-	 		
-			$(".select_box input").click(function(){
-				alert($(".selectedli").length);
-			
-				var thisinput=$(this);
-			//	var thisul=$(this).parent().find("ul");
-				var thisul=$("#selectedIndustryId");
-				if(thisul.css("display")=="none"){
-					if(thisul.height()>200){thisul.css({height:"200"+"px","overflow-y":"scroll" })};
-					thisul.fadeIn("100");
-					
-					thisul.hover(function(){},function(){thisul.fadeOut("100");})
-					$(".selectedli").bind("click",function(){
-			
-							thisinput.val($(this).text());
-							$("#myselect2").val($(this).attr("value"));	//隐藏的<input>的 value获得了当前li的id
-						//	alert("当前li的id是 : "+$(this).attr("value"));
-							thisul.fadeOut("100");
-									}).hover(function(){									
-									$(this).addClass("hover");},function(){$(this).removeClass("hover");}
-									);
-					}
-				else{
-					thisul.fadeOut("fast");
-					}
-				})
-			});
- 		</script>
- 
-</@override>	
-	
-<@override name="page">
-	
-	<!--/page-header-->
- 		<#include "/operator/main/public-head.ftl">
-		
-		<div id= "pagecontent">
-			
-				<div id="content">
-				 <form id="form_validate" action="${ctx}/operator/main/ad/advertiser/save" method="post">
-					<div id="f_div">
-						<span class="c_span"><sup class="star">*</sup>广告主名称</span>   
-							<input class="c_input" id="form-field-1" type="text" name="name" >
-							<label class="help_inline" for="form-field-1">请输入2~32个字符</label>
-							<br />
-						<span class="c_span" ><sup class="star">*</sup>广告主行业</span>
-																			
-						<div class="select_box">
-						  <input id="myselect" class="c_input"   type="text"  name="industry" value="请选择所属行业" onclick="loadIndustry()" readonly="readonly">
-						 <input id="myselect2" class="c_input"  type="hidden" name="industryId" value="请选择所属行业"       				 readonly="readonly">
-					    	<ul id="selectedIndustryId" name="selectedIndustryId" class="select_ul"  >
-								<li value="-1">请选择所属行业</li>
-								
-							</ul>
-						</div>
-						<label  id="select_label" for="myselect" class="help_inline"></label>	
-						<br />
-						
-						<span class="c_span"><sup class="star">*</sup>公司注册名</span>  
-							<input class="c_input" id="form-field-3" type="text" name="regName" >
-							<label class="help_inline" for="form-field-3">请输入2~32个字符</label>
-							<br />
-						<span class="c_span">&nbsp;&nbsp;网址</span>             
-							<input class="c_input" id="form-field-4" type="text" name="homePage" >
-							<label class="help_inline" for="form-field-4"></label>
-							<br />
-						<span class="c_span"><sup class="star">*</sup>联系人</span>        
-							<input class="c_input" id="form-field-5" type="text" name="contacts" >
-							<label class="help_inline" for="form-field-5">请输入2~32个字符</label>
-							<br />
-						<span class="c_span">&nbsp;&nbsp;电话 </span>            
-							<input class="c_input" id="form-field-6" type="text" name="tel" >
-							<label class="help_inline" for="form-field-6">请输入11位有效手机号码</label>
-							<br />
-						<span class="c_span">&nbsp;&nbsp;E-mail</span>    
-							<input class="c_input" id="form-field-7" type="text" name="email" >
-							<label class="help_inline" for="form-field-7">请输入有效的email地址</label>
-							<br />
-						<span class="c_span">&nbsp;&nbsp;备注 </span>           
-							<input class="c_input" id="form-field-8" type="text" name="memo" >
-							<label class="help_inline" for="form-field-8"></label>
-							<br />
-							
-						<button id="c_save" type="submit" >保存</button>
-						<button id="c_cancle" href="${ctx}/operator/main/ad/advertiser/list" type="reset" >取消</button>
-						
-					</div>
-				 </form>
-			   </div>			
-		</div>
-    </div>
-    
-		<div class="space-24ger"></div>
-		<!-- PAGE CONTENT ENDS HERE -->
-	</div>
-	<!--/row-->
-	
-	
-</@override>
-<@extends name="/common/page.ftl"/>		
-		
-
-
-

+ 0 - 147
src/main/webapp/WEB-INF/pages/operator/main/ad/advertiser/edit.ftl

@@ -1,147 +0,0 @@
-<@override name="breadcrumb">	
-	<title>广告投放系统</title>
-	
-	  <script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.validate.min.js"></script>
-	 <script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/form_validateH.js"></script>
-	 
-	   <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-
-		<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/Ncontent.css"/>
-		<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/NAdform.css"/>
-    
-         			<!--以下从数据库中获得下拉列表需要显示的数据-->
- <script type="text/javascript">
-       var  excelParam ;
-		function loadDataForPullDownList2(controlView, parentId, url, defaultLabel) {
-		//alert("进入PullDownList2了··············");
-		controlView.empty();
-		controlView.append(  
-            '<li class="selectedli" value="-1"  >' + defaultLabel + '</li>'  
-        );  
-           
-		$.getJSON( url, function(data) {
-			console.log(data.allIndustry);
-			 var data_1 = data.allIndustry;
-			
-			$.each( data_1, function( key, val ) {
-			
-				// alert("id= "+val.value+",name= " +val.label);
-				controlView.append(  
-		         '<li class="selectedli" value=' + val.value +'>' + val.label + '</li>'  
-		          
-		       );
-			});
-		});
-		
-	//	controlView.val("-1");
-	}
-
-	function loadIndustry() {
-	 	// alert("要开始调用咯~············");
-		loadDataForPullDownList2($('#selectedIndustryId'), "ADVERTISER", "${ctx}/widget/selector/provide/industry?parentId=ADVERTISER", "请选择所属行业");
-	}
-	</script>
-        
-        <!--遍历完数据库之后进行操作,添加hover,click等-->
-      <script type="text/javascript">
-	 		$(document).ready(function(){
-	 
-			$(".select_box input").click(function(){
-				alert($(".selectedli").length);
-				var thisinput=$(this);
-			//	var thisul=$(this).parent().find("ul");
-				var thisul=$("#selectedIndustryId");
-				if(thisul.css("display")=="none"){
-					if(thisul.height()>200){thisul.css({height:"200"+"px","overflow-y":"scroll" })};
-					thisul.fadeIn("100");
-					
-					thisul.hover(function(){},function(){thisul.fadeOut("100");})
-					$(".selectedli").bind("click",function(){
-			
-							thisinput.val($(this).text());
-							$("#myselect2").val($(this).attr("value"));	//隐藏的<input>的 value获得了当前li的id
-							thisul.fadeOut("100");
-									}).hover(function(){									
-									$(this).addClass("hover");},function(){$(this).removeClass("hover");}
-									);
-					}
-				else{
-					thisul.fadeOut("fast");
-					}
-				})
-			});
- 		</script>
-</@override>	
-	
-<@override name="page">
-	
-	<!--/page-header-->
-	<#include "/operator/main/public-head.ftl">
-		
-		<div id= "pagecontent">
-			
-				<div id="content">
-				 <form id="form_validate" action="${ctx}/operator/main/ad/advertiser/save" method="post">
-				 <input  autocomplete="off"  type="hidden" name="id" value="${advertiser.id}" >
-					<div id="f_div">
-						<span class="c_span"><sup class="star">*</sup>广告主名称</span>   
-						<input class="c_input" id="form-field-1" type="text" name="name" value=${advertiser.name} >
-						<label class="help_inline" for="form-field-1">请输入2~32个字符</label>
-						<br/>
-						<span class="c_span" ><sup class="star">*</sup>广告主行业</span>
-						
-													
-						<div class="select_box">
-						 <input id="myselect" class="c_input"  type="text"                   value=${industryName}  onclick="loadIndustry()" readonly="readonly">
-						 <input id="myselect2" class="c_input"  type="hidden" name="industryId" value=${advertiser.industryId}       				 readonly="readonly">
-					    	<ul id="selectedIndustryId" name="selectedIndustryId" class="select_ul">
-								<li class="selectedli" value="-1">请选择所属行业</li>
-							</ul>
-						</div>
-						<label  id="select_label" for="myselect" class="help_inline">请选择行业</label>	
-						<br/>
-						
-						<span class="c_span"><sup class="star">*</sup>公司注册名</span>  
-						<input class="c_input" id="form-field-3" type="text" name="regName" value=${advertiser.regName} >
-						<label class="help_inline" for="form-field-3">请输入2~32个字符</label>
-						<br/>
-						<span class="c_span">&nbsp;&nbsp;网址</span>             
-						<input class="c_input" id="form-field-4" type="text" name="homePage" value=${advertiser.homePage} >
-						<label class="help_inline" for="form-field-4"></label>
-						<br/>
-						<span class="c_span"><sup class="star">*</sup>联系人</span>        
-						<input class="c_input" id="form-field-5" type="text" name="contacts" value=${advertiser.contacts}>
-						<label class="help_inline" for="form-field-5">请输入2~32个字符</label>
-						<br/>
-						<span class="c_span">&nbsp;&nbsp;电话 </span>            
-						<input class="c_input" id="form-field-6" type="text" name="tel" value=${advertiser.tel} >
-						<label class="help_inline" for="form-field-6">请输入11位有效手机号码</label>
-						<br/>
-						<span class="c_span">&nbsp;&nbsp;E-mail</span>    
-						<input class="c_input" id="form-field-7" type="text" name="email" value=${advertiser.email} >
-						<label class="help_inline" for="form-field-7">请输入有效的email地址</label>
-						<br/>
-						<span class="c_span">&nbsp;&nbsp;备注 </span>           
-						<input class="c_input" type="text" name="memo" value=${advertiser.memo} >
-						<br/>
-						
-						<button id="c_save" type="submit" >保存</button>
-						<button id="c_cancle" href="${ctx}/operator/main/ad/advertiser/list" type="reset" >取消</button>
-					</div>
-				</form>
-	   		</div>			
-		</div>
-    </div>
-    
-		<div class="space-24ger"></div>
-		<!-- PAGE CONTENT ENDS HERE -->
-	</div>
-	<!--/row-->
-</@override>
-<@extends name="/common/page.ftl"/>		
-		
-
-
-

+ 0 - 157
src/main/webapp/WEB-INF/pages/operator/main/ad/advertiser/list.ftl

@@ -1,157 +0,0 @@
-<@override name="breadcrumb">
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/showBo.css" />
-<script type="text/javascript" src="${ctx}/operator/assets/js/showBo.js"></script>
-<script type="text/javascript" src="${ctx}/operator/assets/js/jquery.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/zbcc.js"></script>
-
-	
-
-</@override> 
-<@override name="page">
-<div id=content_bg>
-	<#include "/operator/main/public-head.ftl">
-    <div id= "pagecontent">
-			<div id="class23">	   
-			    <div id="class2">
-							<ul id="hangye">
-								<li class="hangye2 ">行业:</li>
-								<li class="hangyeall hy">全部</li>
-								<li class="hangye1 hy">电商</li>
-								<li class="hangye11 hy hyc">鞋服包饰</li>
-								<li class="hangye11 hy hyc">美容护肤</li>
-								<li class="hangye1 hy">视频</li>
-								<li class="hangye1 hy">母婴</li>
-								<li class="hangye1 hy">3c</li>
-								<li class="hangye1 hy">家电</li>
-								<li class="hangye1 hy">办公</li>
-							</ul>	
-				</div>  
-			      
-			      
-			     
-			   	<div id="class3">
-							<ul id="zhuangtai">
-								<li class="zhuangtai2">状态:</li>
-								<a href="${ctx}/operator/main/ad/advertiser/list?status=2" ><li class="zhuangtaiall zht zhtqb">全部</li></a>
-						 		<a href="${ctx}/operator/main/ad/advertiser/list?status=0" ><li class="zhuangtai1 zht">正常</li></a>
-						 		<a href="${ctx}/operator/main/ad/advertiser/list?status=1" ><li class="zhuangtai1 zht">停用</li></a>
-							</ul>
-			    </div> 
-			 </div>       
-      
-
-		    <div id="class4">
-			    <div id="button">					
-									<a class="abtn" href="${ctx}/operator/main/ad/advertiser/create"><button  class="btn1" >创建广告主
-									</button></a>
-									<a class="abtn" href="#"><button class="btn1"  onclick="Showbo.Msg.confirm('是否确认批量开启?')" onclick="checkgou('en')" >批量开启
-									</button></a>
-									<a class="abtn" href="#" ><button class="btn1" onclick="Showbo.Msg.confirm('是否确认批量停用?')" onclick="checkgou('en')" >批量停用</button></a>
-									<a class="abtn" href="#" ><button class="btn1" onclick="Showbo.Msg.confirm('是否确认批量删除?')" onclick="checkgou('en')">批量删除</button></a>
-		</div>
-				
-				 <form action="${ctx}/operator/main/ad/advertiser/list" method="post" class="search-form">
-				  
-				     <div  id="search">
-				         <input  id="search1" autocomplete="off"   type="hidden" name="page" value="${pager.page}"> 
-				          <input id="search1"  autocomplete="off"   type="hidden" name="searchKey" value="name">
-				          <input id="search1" autocomplete="off"   type="text" name="searchValue" id="gap-correction" style="color:#444444"; value="&nbsp;&nbsp;请输入关键字" value="${searchValue!}" aria-controls="table_report">
-				         <!-- <button class="btn btn-mini search-btn">搜索</button>  -->
-				      </div>
-				 
-		        </form>
-			</div>
-    
-
-		  <div id="class5">
-		
-			
-				 <table  border="1" class="table1">
-			
-			
-					<thead>
-					
-						<tr class="tr1"  id ='tr11' background:"#f2f6fa" >
-								<th class="th11"  > 
-									<div class="fxk" }"></div>
-									
-						        </th>
-						        <th class="td1" style="width:7%;">ID</th>
-								<th class="td1" style="width:9%;">广告主名称</th>
-								<th class="td1" style="width:10%;">行业</th>
-								<th class="td1" style="width:9%;">类型</th>
-								<th class="td1" style="width:18%;">最后更新日期</th>
-								<th class="td1" style="width:13%;">启用状态</th>
-								
-								<th class="td1" style="width:36%;" >操作</th>
-						        
-						        
-						  
-						</tr>
-					</thead>
-											
-					<tbody id="tbody1">
-						<#if advertiserList ??>
-						<#list advertiserList as advertiser>
-						
-						
-						<tr id="nuh" class="">
-								<td class="td22" >
-								<div class="fxk1" id="#{advertiser.id}"></div>
-								
-								<!--	<label><input  autocomplete="off"   type="checkbox" name="id" value="#{advertiser.id}"><span class="lbl"></span></label>-->
-								</td>
-								<td class="td2" ">${advertiser.id!}</td>
-								<td class="td2">${advertiser.name!}</td>
-								<td class="td2">${advertiser.industryName!}</td>
-								<td class="td2"><a href="${ctx}/operator/main/ad/order?advertiserId=${advertiser.id}" style="color:#36aeea; text-decoration: underline;">${advertiser.orderNum!}个订单</a></td>
-								<td class="td2"><a href="${ctx}/operator/main/ad/advertiser/update?advertiserId=${advertiser.id}" style="color:#36aeea; text-decoration: underline;">${advertiser.updated?datetime}</a></td>
-								<td class="td2"><#if advertiser.status==0>正常<#else>停用</#if></td>
-								
-								<td class="td3">
-									<div class="zabtn">
-									<a data-toggle="dropdown" href="${ctx}/operator/main/ad/advertiser/edit/${advertiser.id}"><button class="btn122">编辑</button></a>
-									<a  data-toggle="dropdown" href=""><button class="btn122">查看报表</button></a>
-									<#if advertiser.status==0>
-									<a  data-toggle="dropdown" href="${ctx}/operator/main/ad/advertiser/disable?id=${advertiser.id}"><button class="btn122">停用</button></a>
-									<#elseif advertiser.status=1>
-									<a  data-toggle="dropdown" href="${ctx}/operator/main/ad/advertiser/enable?id=${advertiser.id}"><button class="btn122">开启</button></a>
-									</#if>
-									<a  data-toggle="dropdown" href="${ctx}/operator/main/ad/advertiser/delete?id=${advertiser.id}"><button class="btn122">删除</button></a>
-								    <div>
-								</td>
-							</tr>
-						</#list>
-						</#if>
-					</tbody>
-				</table>
-				
-				
-				
-				<div id="daochu">
-					<button class="btn2" >导出Excel</button>
-		
-				</div>
-				
-				<div class="yema"> 
-						<a class="qianmian"><div class="page2">&lt;&lt;</div></a>
-						<a href="?page=1" class="page1" style="color:white;"><div class="page2">1</div></a>
-						<a href="?page=2"><div class="page2">2</div></a>
-						<a href="?page=3"><div class="page2">3</div></a>
-						<div class="page23">...</div>
-						<a href="#?page=19"><div class="page2">19</div></a>
-						<a href="?page=20"><div class="page2">20</div></a>
-						<a href="?page=2"> <div class="page2">&gt;&gt; </div></a>
-						<div class="allpage">共${pager.totalRow!}条,${pager.totalPage!}页 </div>
-				</div> 
-				
-		</div>
-</div>
-
-
-<!-- PAGE CONTENT ENDS HERE --/>
-</div><!--/row-->
-</@override>
-<@extends name="/common/page.ftl"/>

+ 0 - 90
src/main/webapp/WEB-INF/pages/operator/main/ad/advertiser/update.ftl

@@ -1,90 +0,0 @@
-
-<@override name="page">
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/index.css"/>
-   <link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-   <link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-   <script type="text/javascript" src="${ctx}/assets/operator/js/zbcc.js"></script>
-<div id=content_bg>
-	<#include "/operator/main/public-head.ftl">
-    <div id= "pagecontent">
-		
-		   <div id="data_show">
-		   
-		   	   <table cellspacing="0" cellpadding="0">
-		   	   <thead>
-		  	     <tr class="add">
-		   	   	 	<th class="th1">变更时间</th>
-		   	   	 	<th class="th2">操作人</th>
-		   	   	 	<th class="th3">登录IP</th>
-		   	   	 	<th class="th4">操作类型</th>
-		   	   	 	<th>变更详情</th>
-		   	   	 </tr>	
-		   	   	   	</thead> 
-		   	   	  
-		   	   	  <tbody>
-		   	   	<#if logList ??>
-				<#list logList as log>
-		   	        <tr class="odd">
-					<td >${log.operTime?datetime!}</td>
-		   	   	 	<td >${log.userRealName!}</td>
-		   	   	 	<td >${log.userIp!}</td>
-		   	   	 	<td >${log.actionType!}</td>
-		   	   	 	<td >${log.action!}</td>
-		   	   	 	</tr>
-				</#list>
-				</#if>
-			</tbody>
-			 	 	
-		   	 
-		   	
-		   	   </table>	
-		   	
-		
-	   </div>
-  
-			<div id=button0>			
-			
-		
-	       
-	         <div id="daochu">
-					<button class="btn2" >导出Excel</button>
-	            	<button class="btn1" type="button" >返回</button>
-				</div>
-   
-</div>
-
-
-<div class="yema"> 
-						<a class="qianmian"><div class="page2">&lt;&lt;</div></a>
-						<a href="?page=1" class="page1" style="color:white;"><div class="page2">1</div></a>
-						<a href="?page=2"><div class="page2">2</div></a>
-						<a href="?page=3"><div class="page2">3</div></a>
-						<div class="page23">...</div>
-						<a href="#?page=19"><div class="page2">19</div></a>
-						<a href="?page=20"><div class="page2">20</div></a>
-						<a href="?page=2"> <div class="page2">&gt;&gt; </div></a>
-						<div class="allpage">共${pager.totalRow!}条,${pager.totalPage!}页  </div>
-				</div> 
-
-
-	  </div>	
-		<div class="space-24ger"></div>
-		<!-- PAGE CONTENT ENDS HERE -->
-	</div>
-	<!--/row-->
-</@override>
-<@extends name="/common/page.ftl"/>
-        <script type="text/javascript" src="${ctx}/assets/js/jquery.js"></script>
-        <script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-
-        <script type="text/javascript">
-           $(function(){
-	         $.divselect("#divselect","#inputselect");
-           });
-            $(function(){
-	         $.divselect("#select_left","#inputselect");
-           });
-            $(function(){
-	         $.divselect("#select_right","#inputselect");
-           });
-        </script>

+ 0 - 212
src/main/webapp/WEB-INF/pages/operator/main/ad/order/create.ftl

@@ -1,212 +0,0 @@
-<@override name="breadcrumb">
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/zbchj.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/zbcc.js"></script>
-
-		<div id=content_bg>
-			<div id="top">
-				<input class="logo" type="image" src="${ctx}/assets/operator/images/logo12.png" alt="submit"/></li>		
-			        <ul class="nav">
-			 		 <!--   <li><a href="${ctx}/operator/main/dashboard">首页</a></i></span></li>-->
-			 		    
-			 		    <li><a href="#index"><span>首页</span></a></li>
-			 		    
-			 		    
-			  			<li><a href="#adspace"><span>广告位管理</span></a></li>
-						<li><a href="${ctx}/operator/main/ad/advertiser/list"><span>投放管理</span></a></li>
-						<li><a href="#creative"><span>创意中心</span></a></li>
-						<li><a href="#code"><span>代码中心</span></a></li>
-						<li><a href="#culculation"><span>统计报表</span></a></li>
-						<li><a href="#controlation"><span>权限管理</span></a></li>
-			       </ul>	
-					 <div id="divselect" )>
-		               <cite>vip@demo</cite>
-		               <ul>
-		                   <li><a href="javascript:;" selectid="1">修改个人信息</a></li>
-		                   <li class="last"><a href="javascript:;" selectid="2">退出登录</a></li>       
-		               </ul>
-		               <input name="" type="hidden" value="" id="input-top"/>
-		            </div>
-		   </div>
-	
-</@override>
-<@override name="page">
-	<div id= "pagecontent">
-			
-			<form id="validation-form" class="form-horizontal" action="${ctx}/operator/main/ad/order/save" method="post">
-			<div class="all">
-				<div class="line1" >
-					<label class="label1" ><span>*</span>订单名称:</label>
-					<div class="xianzhi" >
-						<input class="shuru1"  autocomplete="off" id="shuru1" onkeyup="changdu()" name="name" type="text" placeholder="">
-						<div><input id="mc" class="mingcheng" value="请输入2~64个字符"></div>
-					</div>
-				</div>
-				
-				<div class="line2">
-					<label class="label2"><span>*</span>总预算:</label>
-					<div class="xianzhi" >
-						<input class="shuru2" autocomplete="off" id="yusuan" onkeyup="buweifu()" name="budget" type="text" placeholder="">
-						<div><input id="ys" class="yusuanyu" value="元"></div>
-					</div>
-				</div>
-				
-				<div class="line3">
-	                    <label class="label3">&nbsp;&nbsp;备注:</label>
-	                    <div >
-	                        <input class="shuru3" autocomplete="off"   type="text" name = "comment" placeholder="">
-	                    </div>
-	           </div>
-			 	
-			</div>	
-				<div class="btnall">
-					<button  class="btn3" onmousedown="buweikong()" type="submit">
-						 保存
-					</button>
-					&nbsp; &nbsp; &nbsp;
-					
-					<button  class="btn4" type="reset" href="${ctx}/operator/main/ad/order/list?advertiserId=${advertiserId}">
-						 取消
-					</button>
-				</div>
-				
-				<input  autocomplete="off"   type="hidden" name="advertiserId" value="${advertiserId}">
-		</form>
-			
-	</div>			
-	<div class="row-fluid">
-		<!-- PAGE CONTENT BEGINS HERE -->
-
-		<div class="space-24ger"></div>
-		<!-- PAGE CONTENT ENDS HERE -->
-	</div>
-	<!--/row-->
-</@override>
-<@extends name="/common/page.ftl"/>
-<script type="text/javascript" src="${ctx}/assets/js/jquery.validate.min.js"></script>
-<script type="text/javascript">
-$(".pswToggle input[type=checkbox]").on('click',function(){
-    var inp = $(this).parents('form').find("input[name=password],input[name=ensurePassword]")
-    if(inp.attr("type")=='password'){
-        inp.attr('type','text');
-    }else{
-        inp.attr('type','password');
-    };
-});
-
-jQuery.validator.addMethod("phone", function (value, element) {
-            return this.optional(element) || /0\d{2}-\d{8}|0\d{2}-\d{7}|0\d{3}-\d{7}|0\d{3}-\d{8}|(1[3-8]{1}[0-9]{9})/.test(value);
-        }, "请输入正确的电话号码!");
-
-jQuery.validator.addMethod("pswcheck", function (value, element) {
-               return this.optional(element) || /^(?![0-9]+$)(?![a-zA-Z]+$)[A-Za-z0-9]+$/.test(value);
-        }, "请输入字母和数字组合!");
-
-        
-$('#validation-form').validate({
-    errorElement: 'span',
-    errorClass: 'help-inline',
-    focusInvalid: false,
-    ignore:".ignore",
-    onfocusout: function(element) {
-                    $(element).valid();
-                },
-    rules: {
-        username: {
-            required:true,
-            email:true
-        },
-        password: {
-            required:true,
-            minlength: 6,
-            maxlength:16,
-            pswcheck:'required'
-        },
-        ensurePassword: {
-            required:true,
-            minlength: 6,
-            maxlength:16,
-            equalTo: "input[name=password]",
-            pswcheck:'required'
-        },
-        contactName: {
-            required: true,
-            minlength:2
-        },
-        phone: {
-            required: true,
-            phone: 'required'
-        },
-        userGroupType:{
-            required:true
-        },
-        status:{
-            required:true
-        }
-    },
-    messages: {
-        username: {
-            required:"请输入邮箱",
-            email: "请输入正确的邮箱格式."
-        },
-        password: {
-            required:"请输入密码",
-            minlength: "输入正确的密码长度.",
-            maxlength:"密码长度过长"
-        },
-        ensurePassword: {
-            required: "请输入密码",
-            minlength: "输入正确的密码长度.",
-            maxlength:"密码长度过长",
-            equalTo:"请输入相同的密码"
-        },
-        contactName:{
-            required:"请输入姓名",
-            minlength:"请输入正确的姓名长度"
-        },
-        phone:{
-            required:"请输入电话号码"
-        },
-        userGroupType:{
-            required:"请选择"
-        },
-        status:{
-            required:"请选择"
-        }
-    },
-    invalidHandler: function (event, validator) { //display error alert on form submit
-        $('.alert-error', $('.login-form')).show();
-    },
-    highlight: function (e) {
-        $(e).closest('.control-group').removeClass('info').addClass('error');
-    },
-    success: function (e) {
-        $(e).closest('.control-group').removeClass('error').addClass('info');
-        $(e).remove();
-    },
-    errorPlacement: function (error, element) {
-        if(element.is(':checkbox') || element.is(':radio')) {
-            var controls = element.closest('.controls');
-            if(controls.find(':checkbox,:radio').length > 1) controls.append(error);
-            else error.insertAfter(element.nextAll('.lbl').eq(0));
-        }
-        else if(element.is('.chzn-select')) {
-            error.insertAfter(element.nextAll('[class*="chzn-container"]').eq(0));
-        }
-        else error.insertAfter(element);
-    },
-    submitHandler: function (form) {
-    	// 防止表单二次提交
-		$(this).attr('disabled', 'disabled');
-		var _url = $('form').attr('action');
-		var _param = $('form').serialize();
-		$.post(_url,_param,function(data) {
-			$('#main-content').html(data);
-		});
-    },
-    invalidHandler: function (form) {
-    }
-});
-</script>

+ 0 - 210
src/main/webapp/WEB-INF/pages/operator/main/ad/order/edit.ftl

@@ -1,210 +0,0 @@
-<@override name="breadcrumb">
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbchj.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<script type="text/javascript" src="${ctx}/operator/assets/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/operator/assets/js/zbcc.js"></script>
-	<div id=content_bg>
-			<div id="top">
-				<input class="logo" type="image" src="${ctx}/assets/operator/images/logo12.png" alt="submit"/></li>		
-			        <ul class="nav">
-			 		 <!--   <li><a href="${ctx}/operator/main/dashboard">首页</a></i></span></li>-->
-			 		    
-			 		    <li><a href="#index"><span>首页</span></a></li>
-			 		    
-			 		    
-			  			<li><a href="#adspace"><span>广告位管理</span></a></li>
-						<li><a href="${ctx}/operator/main/ad/advertiser/list"><span>投放管理</span></a></li>
-						<li><a href="#creative"><span>创意中心</span></a></li>
-						<li><a href="#code"><span>代码中心</span></a></li>
-						<li><a href="#culculation"><span>统计报表</span></a></li>
-						<li><a href="#controlation"><span>权限管理</span></a></li>
-			     
-		   </div>
-</@override>
-
-<@override name="page">
-	<div id= "pagecontent">
-	<!--/page-header-->
-	<div class="row-fluid">
-		<!-- PAGE CONTENT BEGINS HERE -->
-		<form id="validation-form" class="form-horizontal" action="${ctx}/operator/main/ad/order/save" method="post">
-			
-			<div class="all">
-					<div class="line1" >
-							<label class="label1" ><span>*</span>订单名称:</label>
-							<div class="xianzhi" >
-								<input class="shuru1"  autocomplete="off" value=${order.name} id="shuru1" onkeyup="changdu()" name="name" type="text" placeholder="">
-								<div><input id="mc" class="mingcheng" value="请输入2~64个字符"></div>
-							</div>
-						</div>
-					
-				
-					
-					
-					<div class="line2">
-							<label class="label2"><span>*</span>总预算:</label>
-							<div class="xianzhi" >
-								<input class="shuru2" autocomplete="off"  value=${order.budget}  id="yusuan" onkeyup="buweifu()" name="budget" type="text" placeholder="">
-								<div><input id="ys" class="yusuanyu" value="元"></div>
-							</div>
-						</div>
-					
-					
-					
-						<div class="line3">
-			                    <label class="label3">&nbsp;&nbsp;备注:</label>
-			                    <div >
-			                        <input class="shuru3" autocomplete="off"  value="${order.comment!}"  type="text" name = "comment" placeholder="">
-			                    </div>
-			           </div>
-			 </div>
-			
-			
-            
-            <div class="btnall">
-            		<button  class="btn3" onmousedown="buweikong()" type="submit">
-						 保存
-					</button>
-                  <!-- <button class="btn btn-info" type="submit"><i class="icon-ok"></i> 确定</button>--> 
-                    &nbsp; &nbsp; &nbsp;
-                    
-                    <button class="btn4"  href="${ctx}/main/md/media?audienceId=${order.advertiserId}" type="reset">
-                    <i class="icon-undo"></i> 取消</button>
-            </div>
-            
-            <!--在点击确定时自动向controller传对应的id-->
-            <input  autocomplete="off"   type="hidden" name="id" value="${order.id}">
-	        <input  autocomplete="off"   type="hidden" name="advertiserId" value="${order.advertiserId}">
-		</form>
-		<div class="space-24ger"></div>
-		<!-- PAGE CONTENT ENDS HERE -->
-	</div>
-	<!--/row-->
-</@override>
-<@extends name="/common/page.ftl"/>
-<script type="text/javascript" src="${ctx}/assets/js/jquery.validate.min.js"></script>
-<script type="text/javascript">
-$(".pswToggle input[type=checkbox]").on('click',function(){
-    var inp = $(this).parents('form').find("input[name=password],input[name=ensurePassword]")
-    if(inp.attr("type")=='password'){
-        inp.attr('type','text');
-    }else{
-        inp.attr('type','password');
-    };
-});
-
-jQuery.validator.addMethod("phone", function (value, element) {
-            return this.optional(element) || /0\d{2}-\d{8}|0\d{2}-\d{7}|0\d{3}-\d{7}|0\d{3}-\d{8}|(1[3-8]{1}[0-9]{9})/.test(value);
-        }, "请输入正确的电话号码!");
-
-jQuery.validator.addMethod("pswcheck", function (value, element) {
-               return this.optional(element) || /^(?![0-9]+$)(?![a-zA-Z]+$)[A-Za-z0-9]+$/.test(value);
-        }, "请输入字母和数字组合!");
-
-        
-$('#validation-form').validate({
-    errorElement: 'span',
-    errorClass: 'help-inline',
-    focusInvalid: false,
-    ignore:".ignore",
-    onfocusout: function(element) {
-                    $(element).valid();
-                },
-    rules: {
-        username: {
-            required:true,
-            email:true
-        },
-        password: {
-            required:true,
-            minlength: 6,
-            maxlength:16,
-            pswcheck:'required'
-        },
-        ensurePassword: {
-            required:true,
-            minlength: 6,
-            maxlength:16,
-            equalTo: "input[name=password]",
-            pswcheck:'required'
-        },
-        contactName: {
-            required: true,
-            minlength:2
-        },
-        phone: {
-            required: true,
-            phone: 'required'
-        },
-        userGroupType:{
-            required:true
-        },
-        status:{
-            required:true
-        }
-    },
-    messages: {
-        username: {
-            required:"请输入邮箱",
-            email: "请输入正确的邮箱格式."
-        },
-        password: {
-            required:"请输入密码",
-            minlength: "输入正确的密码长度.",
-            maxlength:"密码长度过长"
-        },
-        ensurePassword: {
-            required: "请输入密码",
-            minlength: "输入正确的密码长度.",
-            maxlength:"密码长度过长",
-            equalTo:"请输入相同的密码"
-        },
-        contactName:{
-            required:"请输入姓名",
-            minlength:"请输入正确的姓名长度"
-        },
-        phone:{
-            required:"请输入电话号码"
-        },
-        userGroupType:{
-            required:"请选择"
-        },
-        status:{
-            required:"请选择"
-        }
-    },
-    invalidHandler: function (event, validator) { //display error alert on form submit
-        $('.alert-error', $('.login-form')).show();
-    },
-    highlight: function (e) {
-        $(e).closest('.control-group').removeClass('info').addClass('error');
-    },
-    success: function (e) {
-        $(e).closest('.control-group').removeClass('error').addClass('info');
-        $(e).remove();
-    },
-    errorPlacement: function (error, element) {
-        if(element.is(':checkbox') || element.is(':radio')) {
-            var controls = element.closest('.controls');
-            if(controls.find(':checkbox,:radio').length > 1) controls.append(error);
-            else error.insertAfter(element.nextAll('.lbl').eq(0));
-        }
-        else if(element.is('.chzn-select')) {
-            error.insertAfter(element.nextAll('[class*="chzn-container"]').eq(0));
-        }
-        else error.insertAfter(element);
-    },
-    submitHandler: function (form) {
-    	// 防止表单二次提交
-		$(this).attr('disabled', 'disabled');
-		var _url = $('form').attr('action');
-		var _param = $('form').serialize();
-		$.post(_url,_param,function(data) {
-			$('#main-content').html(data);
-		});
-    },
-    invalidHandler: function (form) {
-    }
-});
-</script>

+ 0 - 243
src/main/webapp/WEB-INF/pages/operator/main/ad/order/list.ftl

@@ -1,243 +0,0 @@
-<@override name="breadcrumb">
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.validate.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/zbcc.js"></script>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/showBo.css" />
-<script type="text/javascript" src="${ctx}/assets/operator/js/showBo.js"></script>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/zbchj.css"/>
-
-<script type="text/javascript" >
-
-		function loadDataForPullDownList2(controlView, parentId, url, defaultLabel) {
-		//	alert("little girl");
-		//	alert(controlView.length);
-			controlView.empty();
-		//	alert("eat apple");
-		//	alert(controlView.length);
-			controlView.append(  
-		       '<li class="selectop" value="-1">' + defaultLabel + '</li>'  
-		   );
-			//alert("china");
-			
-			$.getJSON( url, function(data) {
-			//	alert("advertiserList");
-			console.log(data.advertiserList);
-			 var data_1 = data.advertiserList;
-			
-			$.each( data_1, function( key, val ) {
-			 //alert("each");
-				// alert("id= "+val.value+",name= " +val.label);
-				controlView.append(  
-		         '<li class="selectop" value=' + val.value +'>' + val.label + '</li>'  
-		          
-		       );
-			});
-		});
-			
-			
-		//	alert(" apple is sweet");
-		//	alert(controlView.length);
-			controlView.val("-1");
-		}
-		
-		
-		
-		function loadAdvertiser() {
-		//alert("看一下啊");
-		//alert($('#selectedAdvertiserId').length);
-		loadDataForPullDownList2($("#selectedAdvertiserId"), "0", "${ctx}/widget/selector/provide/advertiser?parentId=0" , "请选择广告主");
-		
-		
-		}
-
-
-
-</script>
-<script type="text/javascript" >
-		
-		$(document).ready(function(){
-			$.divselect("#divselect","#inputselect");
-		
-		
-				$(".ad input").click(function(){
-				//alert("星期三");
-				var thisinput=$(this);
-				//var thisul=$(this).parent().find("ul");
-				//alert("1");
-				var thisul=$("#selectedAdvertiserId");
-				//alert("2");
-				if(thisul.css("display")=="none"){
-					alert("3");
-					if(thisul.height()>200){thisul.css({height:"200"+"px","overflow-y":"scroll" })};
-					thisul.fadeIn("100");
-					//alert("4");
-					thisul.hover(function(){},function(){thisul.fadeOut("100");})
-					$(".selectop").bind("click",function(){
-						//alert("5");
-							thisinput.val($(this).text());
-							$("#myad2").val($(this).attr("value"));	//隐藏的<input>的 value获得了当前li的id
-						//	alert("当前li的id是 : "+$(this).attr("value"));
-							thisul.fadeOut("100");
-									}).hover(function(){									
-									$(this).addClass("hover");},function(){$(this).removeClass("hover");}
-									);
-					}
-				else{
-					thisul.fadeOut("fast");
-					alert("6");
-					}
-				})
-		})
-		
-
-
-</script>
-
-
-
-
-</@override> <@override name="page">
-<div id=content_bg>
-	<#include "/operator/main/public-head.ftl">
-    <div id= "pagecontent">
-	   
-    
-      
-     
-   	<div id="class3">
-				<ul id="zhuangtai">
-					<li class="zhuangtai2">状态:</li>
-					<a href="${ctx}/operator/main/ad/order/list?advertiserId=${advertiserId}&status=2" ><li class="zhuangtaiall">全部</li></a>
-			 		<a href="${ctx}/operator/main/ad/order/list?advertiserId=${advertiserId}&status=0" ><li class="zhuangtai1">正常</li></a>
-			 		<a href="${ctx}/operator/main/ad/order/list?advertiserId=${advertiserId}&status=1"><li class="zhuangtai1">停用</li></a>
-				</ul>
-    </div> 
-      
-      
-
-    <div id="class4">
-	    <div id="button">					
-							<a href="${ctx}/operator/main/ad/order/create?advertiserId=${advertiserId}"><button  class="btn1" >创建订单
-							</button></a>
-							<a href="#"><button class="btn1" onclick="Showbo.Msg.confirm('是否确认批量开启?')"  onclick="checkgou('en')" >批量开启</button></a>
-							<a href="#" ><button class="btn1" onclick="Showbo.Msg.confirm('是否确认批量停用?')" onclick="checkgou('en')" >批量停用</button></a>
-							<a href="#" ><button class="btn1" onclick="Showbo.Msg.confirm('是否确认批量删除?')" onclick="checkgou('en')">批量删除</button></a>
-		</div>
-		
-		 <div class="class41"> 
-		 					 <div class="ad">
-					                            
-					                            <input id="myad"  type="text" class="b_input" value="请选择广告主" onclick="loadAdvertiser()" readonly="readonly"> 
-											    <input id="myad2"   type="hidden" class="b_input" name="orderId" value="请选择广告主"       				 readonly="readonly">
-										    	<ul id="selectedAdvertiserId" name="selectedAdvertiserId" class="select_ul" value="shenme" >
-												
-													
-												</ul>
-				                        
-				                            </div>  
-		
-		</div>  
-		
-		
-		
-		
-		 <form action="${ctx}/operator/main/ad/order/list?advertiserId=${advertiserId}" method="post" class="search-form">
-		  
-		     <div  id="search">
-		         <input  id="search1" autocomplete="off"   type="hidden" name="page" value="${pager.page}"> 
-		          <input id="search1"  autocomplete="off"   type="hidden" name="searchKey" value="name">
-		          <input id="search1" autocomplete="off"   type="text" name="searchValue" id="gap-correction" value="${searchValue!}" aria-controls="table_report">
-		         <!-- <button class="btn btn-mini search-btn">搜索</button>  -->
-		      </div>
-		 
-        </form>
-	</div>
-    
-
-  <div id="class5">
-
-	
-		 <table  width="100%" border="1" class="table1">
-	
-	
-			<thead>
-			
-				<tr class="tr1"  id ='tr11' background:"#f2f6fa" >
-						<th class="th11"  > 
-							<div class="fxk" }"></div>
-							
-				        </th>
-				         <th class="td1" style="width:7%;">ID</th>
-								<th class="td1" style="width:11%;">订单名称</th>
-								<th class="td1" style="width:9%;">总预算</th>
-								<th class="td1" style="width:11%;">活动</th>
-								<th class="td1" style="width:17%;">最后更新日期</th>
-								<th class="td1" style="width:9%;">状态</th>
-								<th class="td1" style="width:36%;" >操作</th>
-				        
-		
-				</tr>
-			</thead>
-			
-				<tbody id="tbody1">
-				<#if orderList ??>
-				<#list orderList as order>
-					<tr id="nuh" class="">
-						<td class="td2">
-						<div class="fxk1" id="#{order.id}"></div>
-						</td>
-						<td class="td2">${order.id!}</td>
-						<td class="td2">${order.name!}</td>
-						<td class="td2">${order.budget!}</td>
-						<td class="td2"><a href="${ctx}/main/ad/target/campaign?orderId=${order.id}" style="color:#36aeea; text-decoration: underline;">${order.campaignNumber!}个活动</a></td>
-						<td class="td2"><a href="${ctx}/operator/main/ad/order/update?orderId=${order.id}" style="color:#36aeea; text-decoration: underline;">${order.updated?datetime}</a></td>
-						<td class="td2"><#if order.status==0>正常<#else>停用</#if></td>
-						<td class="td2">
-						
-							
-							<a  data-toggle="dropdown" href="${ctx}/operator/main/ad/order/edit/${order.id}"><button class="btn122">编辑</button></a>
-							<a  data-toggle="dropdown" href="${ctx}/operator/main/ad/order/edit/${order.id}"><button class="btn122">查看报表</button></a>
-							<#if order.status==0>
-							<a  data-toggle="dropdown" href="${ctx}/operator/main/ad/order/disable?id=${order.id}"><button class="btn122">停用</button></a>
-							<#elseif order.status=1>
-							<a  data-toggle="dropdown" href="${ctx}/operator/main/ad/order/enable?id=${order.id}"><button class="btn122">开启</button></a>
-							</#if>
-							<a  data-toggle="dropdown" href="${ctx}/operator/main/ad/order/delete?id=${order.id}"><button class="btn122">删除</button></a>
-							
-						</td>
-					</tr>
-				</#list>
-				</#if>
-			</tbody> 
-			
-			
-
-		</table>
-		
-		
-		
-		<div id="daochu">
-			<button class="btn2" >导出Excel</button>
-
-		</div>
-		<div class="yema"> 
-						<a class="qianmian"><div class="page2">&lt;&lt;</div></a>
-						<a href="?page=1" class="page1" style="color:white;"><div class="page2">1</div></a>
-						<a href="?page=2"><div class="page2">2</div></a>
-						<a href="?page=3"><div class="page2">3</div></a>
-						<div class="page23">...</div>
-						<a href="#?page=19"><div class="page2">19</div></a>
-						<a href="?page=20"><div class="page2">20</div></a>
-						<a href="?page=2"> <div class="page2">&gt;&gt; </div></a>
-						<div class="allpage">共269条 </div>
-		</div> 
-</div>
-
-
-<!-- PAGE CONTENT ENDS HERE --/>
-</div><!--/row-->
-</@override>
-<@extends name="/common/page.ftl"/>

+ 0 - 106
src/main/webapp/WEB-INF/pages/operator/main/ad/order/update.ftl

@@ -1,106 +0,0 @@
-
-<@override name="page">
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/index.css"/>
-
-		<div id=content_bg>
-		  <div id="top">	
-			<input class="logo" type="image" src="${ctx}/assets/operator/images/logo12.png" alt="submit"/></li>		
-			<ul class="nav">
-				
-				<li><a href="#index"><span>首页</span></a></li>
-				<li><a href="#adspace"><span>广告位管理</span></a></li>
-				<li><a href="#advertiser"><span>投放管理</span></a></li>
-				<li><a href="#creative"><span>创意中心</span></a></li>
-				<li><a href="#code"><span>代码中心</span></a></li>
-				<li><a href="#culculation"><span>统计报表</span></a></li>
-				<li><a href="#controlation"><span>权限管理</span></a></li>
-					  			
-			</ul>	
-		     <div id="divselect">
-               <cite>j@cloudcross.com</cite>
-               <ul>
-                   <li><a href="javascript:;" selectid="1">修改个人信息</a></li>
-                   <li class="last"><a href="javascript:;" selectid="2">退出登录</a></li>       
-               </ul>
-               <input name="" type="hidden" value="" id="inputselect"/>
-            </div>
-			    		
-		</div>
-		
-		<div id= "pagecontent">
-		
-		   <div id="data_show">
-		   
-		   	   <table cellspacing="0" cellpadding="0">
-		   	   <thead>
-		  	     <tr class="add" onMouseOver="moveon()" onMouseOut="moveout()">
-		   	   	 	<th class="th1">变更时间</th>
-		   	   	 	<th class="th2">操作人</th>
-		   	   	 	<th class="th3">登录IP</th>
-		   	   	 	<th class="th4">操作类型</th>
-		   	   	 	<th>变更详情</th>
-		   	   	 </tr>	
-		   	   	   	</thead> 
-		   	   	  
-		   	   	  <tbody>
-		   	   	<#if logList ??>
-				<#list logList as log>
-		   	        <tr class="odd">
-					<td >${log.operTime?datetime!}</td>
-		   	   	 	<td >${log.userRealName!}</td>
-		   	   	 	<td >${log.userIp!}</td>
-		   	   	 	<td >${log.actionType!}</td>
-		   	   	 	<td >${log.action!}</td>
-		   	   	 	</tr>
-				</#list>
-				</#if>
-			</tbody>
-			 	 	
-		   	 
-		   	
-		   	   </table>	
-		   	
-		
-	   </div>
-  
-			<div id=button0>			
-			
-		    <input id="button" type="button" value="导出Excel"/>
-	         <input id="button1" type="button" value="返回"/>
-   
-</div>
-<div id="page0">
-	<ul class=word>			
-				<li class="li1"><a href=""><<</a></li>
-				<li class="li0"><a href="?page=1">1</a></li>
-				<li class="li0"><a href="?page=2">2</a></li>
-				<li class="li0"><a href="?page=3">3</a></li>
-				<li class="li1"><a href="#">...</a></li>
-				<li class="li0"><a href="?page=29">29</a></li>
-				<li class="li1"><a href="?page=2">&gt;&gt;</a></li>
-				<li class="li1">共${pager.totalRow!}条,${pager.totalPage!}页</a></li>
-					  			
-					  			
-			</ul>	
-</div>
-	  </div>	
-		<div class="space-24ger"></div>
-		<!-- PAGE CONTENT ENDS HERE -->
-	</div>
-	<!--/row-->
-</@override>
-<@extends name="/common/page.ftl"/>
-        <script type="text/javascript" src="${ctx}/assets/operator/js/jquery.js"></script>
-        <script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-
-        <script type="text/javascript">
-           $(function(){
-	         $.divselect("#divselect","#inputselect");
-           });
-            $(function(){
-	         $.divselect("#select_left","#inputselect");
-           });
-            $(function(){
-	         $.divselect("#select_right","#inputselect");
-           });
-        </script>

+ 139 - 761
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report.ftl

@@ -1,776 +1,154 @@
 <@override name="head">
 <title>总体报表</title>
 <link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/zone.css"/>
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/ad-report.css">
 <link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.validate.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
-<!-- 下拉框js -->
-
-<script type="text/javascript" >
-			
-			//广告位
-			
-			$(document).ready(function loadZone() {
-				  
-				  
-				loadDataForPullDownList($("#selectedZoneId"), "1", "/ssp_operator/widget/selector/provide/zone?parentId=1" , $("#aa").val());
-				
-				function loadDataForPullDownList(controlView, parentId, url, defaultLabel) {
-					
-				//controlView.empty();
-				if(defaultLabel==-1){controlView.append('<option class="selectop1" value="-1" selected>选择全部</option>');}
-				else{controlView.append('<option class="selectop1" value="-1">选择全部</option>');}
-				
-				$.getJSON(url, function(data) {
-					//alert("aaa");
-					var data_1 = data.zoneList;
-					
-					$.each(data_1, function(key, val ) {
-					//去掉数字+ val.value +'|''|'+ val.label +
-			
-						if( val.value  == defaultLabel){controlView.append('<option class="selectop2" value=' + val.value + ' selected>' + val.label + '</option>');}   
-				        else{controlView.append('<option class="selectop2" value=' + val.value +' >' + val.label +'</option>');}  
-				       
-					});
-				});
-				};
-			//下拉框传值	
-			
-			$(".btncx").click(function(){
-				  
-		    	  $("#aa").val($("#selectedZoneId").val().split("|")[1]);
-		    	  if($("#selectedZoneId").val().split("|")[0]!=-1){
-		    	  var zoneId = $("#selectedZoneId").val().split("|")[0];
-	    	      var f = $("#myform").attr("action")+"?zoneId="+zoneId;
-	    	      //alert(f);
-	    	      $("#myform").attr("action",f);
-		    	  }
-		    	  
-		    	  else {
-		    		  var f = $("#myform").attr("action");
-		    		  //alert(f);
-		    		  $("#myform").attr("action",f);
-		    	  } 		    	   
-		      });		
-		});
-</script>
-<script type="text/javascript">
-        	$(document).ready(function(){
-			$("#pv1").removeClass().addClass('ffenlchange');
-			$("#pvname1").removeClass().addClass("ffenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("ffenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	  		$("#pv1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#pv1").removeClass().addClass('ffenlchange');
-				$("#pvname1").removeClass().addClass("ffenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#uv1").removeClass().addClass('ffenlchange');
-				$("#uvname1").removeClass().addClass("ffenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#bgs1").removeClass().addClass('ffenlchange');
-				$("#bgsname1").removeClass().addClass("ffenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-	  			})	
-	  			
-	  		$("#djs1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#djs1").removeClass().addClass('ffenlchange');
-				$("#djsname1").removeClass().addClass("ffenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart5").hide(); 
-	  			})				
-	
-	  			$("#shr1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#shr1").removeClass().addClass('ffenlchange');
-				$("#shrname1").removeClass().addClass("ffenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart5").show(); 
-	  			})			
-	  		});
-</script>
-<script type="text/javascript">
- 			//将毫秒转化为日期
-			function getDate(tm){ 
-					var tt=new Date(parseInt(tm)).toLocaleDateString();
-				
-					return tt; 
-			} 
-			
-			function getele1(){
-					try{
-		  				var d=document.getElementsByName("hr");
-		  				var c=[];
-		  				for(i=0;i<=d.length;i++){
-		  					c[i]=d[i].childNodes[0].nodeValue;
-		  				}
-		  			}
-					catch(e){}
-					return c;
-			}
-$(function () {
-			
-			u=${startDate};
-			v=${endDate}; 	
-			if(u==v){
-							var m=getele1();
-							n=24;
-							var color=[];
-							for(i=0;i<n;i++){
-								color[i]='red';
-							}
-							n1=n*6;
-							
-							var xlabel=[];		
-							var j=0;
-								for(i=0;i<n1;i+=6){
-										xlabel[j]=m[i];
-										j++;
-								}
-						   //取y轴
-							var uv=[];
-							var j=0;
-							for(i=2;i<n1;i+=6){
-									uv[j]=parseFloat(m[i]);
-								 j++;
-							}
-							var pv=[];
-							var j=0;
-							for(i=1;i<n1;i+=6){
-									pv[j]=parseFloat(m[i]);
-									 j++;
-							}							
-							var adbaoguang=[];
-							var j=0;
-							for(i=3;i<n1;i+=6){		
-									adbaoguang[j]=parseFloat(m[i]);
-									j++;
-							}
-							var adclick=[];
-							var j=0;
-							for(i=4;i<n1;i+=6){
-									adclick[j]=parseFloat(m[i]);
-									j++;
-							}
-							var shouru=[];
-							var j=0;
-							for(i=5;i<n1;i+=6){
-									shouru[j]=parseFloat(m[i]);
-								   j++;
-							}	
-							setinterval=1;				
-	}else{
-					
-				 	var selectedZoneId=$("#aa").val();
-				 	if(selectedZoneId==null){selectedZoneId=-1}
-					var dateRangePicker=$("#dateRangePicker").val();
-					url = "${ctx}/operator/main/ad/report/advertiser-report/listChartData?dateRangePicker="+dateRangePicker+"&selectedZoneId="+selectedZoneId;
-					var pv = [];
-					var uv = [];
-					var adbaoguang = [];
-					var adclick = [];
-					var shouru = [];
-					var xlabel = []
-					var k = 0;
-					
- 					$.ajaxSettings.async = false; //getJSON同步执行
-					$.getJSON(url, function(data) {
-						$.each(data, function(key, val) {
-	
-						   		xlabel[k] = val.reportDate;
-						   		xlabel[k] = getDate(xlabel[k]);
-								pv[k] = val.pv;
-								uv[k] = val.uv;
-								adbaoguang[k] = val.impression;
-								adclick[k] = val.click;
-								shouru[k] = val.income;
-								k++;
-							});	
-						});	
-					//alert(xlabel);
-					setinterval=parseInt(xlabel.length/10);							
-}			
-    $('#linechart1').highcharts({
-        title: {
-            text: 'PV',
-          
-        },
-        xAxis: {
-            categories: xlabel,
-            tickInterval: setinterval 
-        },
-        yAxis: {
-            plotLines: [{
-                value: 0,
-                width: 1,
-               color: '#36aeea'
-           }]
-        },
-        legend: {
-           layout: 'vertical',
-            align: 'right',
-          verticalAlign: 'middle',
-           borderWidth: 0
-        },
-        series: [{
-            name: 'PV',
-            data: pv,
-            color:'#36aeea'
-        }]
-    });
-    $('#linechart2').highcharts({
-        title: {
-            text: 'UV',
-        },
-        xAxis: {
-            categories:xlabel,
-            tickInterval: setinterval 
-        },
-        yAxis: {
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#36aeea'
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: 'UV',
-            data: uv,
-            color:'#36aeea'
-        }]
-    });
-     $('#linechart3').highcharts({
-        title: {
-            text: '广告曝光数',
-        },
-        xAxis: {
-            categories: xlabel,
-            tickInterval: setinterval 
-        },
-        yAxis: {
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#36aeea'
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: '广告曝光数',
-            data: adbaoguang,
-            color:'#36aeea'
-        }]
-    });
-     $('#linechart4').highcharts({
-        title: {
-            text: '广告点击数',
-        },
-        xAxis: {
-            categories: xlabel,
-            tickInterval: setinterval 
-        },
-        yAxis: {
-          
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#36aeea'
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: '广告点击数',
-            data: adclick,
-            color:'#36aeea'
-        }]
-    });
-    
-     $('#linechart5').highcharts({
-        title: {
-            text: '收入',
-        },
-       
-        xAxis: {
-            categories: xlabel,
-            tickInterval: setinterval 
-        },
-        yAxis: {
-          
-            plotLines: [{
-                value: 0,
-                width: 1,
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: '收入',
-            data: shouru,
-            color:'#36aeea'
-        }]
-    });
-});
-</script>
-<style>
-#selectedZoneId{
-margin-left:0px;}
-</style>
-<script src="${ctx}/assets/operator/js/highcharts.js"></script>
-<script src="${ctx}/assets/operator/js/exporting.js"></script>
-<script type="text/javascript">
-function transcalender(){
-					var url = ""; 
-					var type = "";
-					var ids = [];
-					var page = $("#page").val();
-				 	c=$("#selectedZoneId").val();
-				 	//如果b为空,默认为昨天的
-				 	if($("#dateRangePicker").val()==""){
-				 	$(".yesterday").trigger("click");
-				 	}
-				 	b=$("#dateRangePicker").val();
-				 	//判断是否超过一年
-				 	var outyear=b.split("to",1);
-					outyear = outyear[0].replace(/-/g,"/");  
-				 	var yeartomi = (new Date(outyear)).getTime();
-				 	var todaydate1 = new Date();
-				 	todaydate = todaydate1.getTime();
-				 	if(todaydate-yeartomi<=31536000000){
-					 	url = "${ctx}/operator/main/ad/report/advertiser-report?dateRangePicker=" + b+"&selectedZoneId="+c+"&page="+page; 
-				 		
-				 	}else{
-				 		alert("您好,请选择一年之内的时间!");
-				 		$(".yesterday").trigger("click");
-				 		var date = $("#dateRangePicker").val();	
-					 	url = "${ctx}/operator/main/ad/report/advertiser-report?dateRangePicker="+date+"&selectedZoneId="+c+"&page="+page; 
-				 		
-				 	}
-				 	console.log(url); 
-				 	location.href = url;
-}
-function transdaochu(){
-					var url = ""; 
-					var type = "";
-					var ids = [];
-				 	var param = {
-						"dateRangePicker" : ""
-					}
-				 	c=$("#selectedZoneId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-				 	param.dateRangePicker = b;
-				 	url = "${ctx}/operator/main/ad/report/advertiser-report/exportDataReportExcel?dateRangePicker=" + b+ "&" +"selectedZoneId="+c;  
-				 	location.href = url;
-				 	
-}
-
-</script>	
- <style type="text/css">
-        #dateRangePicker{
-            border: medium none;
-		    font-size: 12px;
-		    height: 21px;
-		    width: 160px;
-		    border: 1px solid #dfdfdf;
-		    padding:0 0 0 20px;         
-        }
-        .icon-calendar{
-        	z-index:9999;
-           	background-image:none;
-           	position:absolute;
-           	margin:0px 0 0 5px;      
-        }
-       select {
-       		position:relative;
-       		left:-2px;
-       		top:2px;
-       		font-size:12px;
-       		width:183px;
-       		line-height:14px;
-       		border:1px solid #dfdfdf;
-       	
-       		color:#4c637b;} 
-      .calder{
-      		height:21px;
-      		line-height:21px;
-      }
-   </style>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
-
 <@override name="body">
-   <div id=content_bg>
+<div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
-    <div id= "pagecontent">
-   		<div id="page-edit">
-		    <div id="second">
-					<div class="report6all re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report" >总体报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/size" >尺寸报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/position" >位置报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/system" >系统报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/type" >类型报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/areal" >地域报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/place"  >场景报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a></div>
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a class="selectBar_change" href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/place">场景报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a>
 		    </div>
- 			 <div id="third" style="margin:10px 0 0 -5px;">
-			         <ul>
-			         <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/operator/main/dashboard" style="color:#36aeea">首页&nbsp;&nbsp;</a>
-				     <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			         <li style="color: #4c637b;">&nbsp;&nbsp;数据报表</li>
-			         
-			         </ul>  
- 			 </div>  
-    <div id="form">
-        <form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report" method="post">		
-        <input id="page" autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-        <input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-		 <div class="control-group control-group-lfet">	
-				<div class="controls-reset">
-							<div class="row-fluid input-append date row-fluid-revise">
-							    <div class="controls-reset">
-							    	<div class="adver-choose">
-											<select id="selectedZoneId" name="selectedZoneId" >
-											</select>
-											<input type="hidden" id="aa" value="${selectedZoneId!}"/>
-									</div>
-									<div class="calder">
-										<div class="singlechoo">
-											<span class="help-inline">
-												<a class="today da" value="today">今天</a> |
-												<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-												<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-												<a class="lastWeek da" value="lastWeek">上周</a> |
-												<a class="thisMonth da" value="thisMonth">本月</a> |
-												<a class="lastMonth da" value="lastMonth">上月</a> 
-									  		</span>
-								  		</div>
-										<div class="widthdate">
-										
-										<i class="icon-calendar"></i>   
-										<input  type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-								       
-			   							</div>	
-			   							<div class="widthcheck">
-			   								 <button onclick="transcalender()" style="float:right" class="check_cal" id="check_cal ">查询</button>
-										</div>	
-									</div>
-						    
-							</div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>数据报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+		 		<div id="content_choose">	
+					<ul id="main_zoneListUl">
+						<li class="select_box" id="zoneListUl_box">
+							<span id="zoneListUl_span">${selecteddimensionName!}</span>
+							<ul class="son_ul" id="son_zoneListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedZoneId" id="selectedZoneId" value="${selectedZoneId!}">
+					<input type="hidden" name="selectedZoneName" id="selectedZoneName" value="${selectedZoneName!}">
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>
-		</div>
-
-			 		 <div class="ffenall">	
-					   		
-					   		<div  id="pv1" class="ffenl">
-					   			<div id="pvname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;PV</div>
-					   			<div id="pvdata1" class="ffenldata">${sumReport.pv}</div>
-					   		</div>
-					   		<div  id="uv1" class="ffenl">
-					   			<div id="uvname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;UV</div>
-					   			<div id="uvdata1" class="ffenldata">${sumReport.uv}</div>
-					   		</div>
-					   		<div id="bgs1" class="ffenl">
-					   			<div id="bgsname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;广告曝光数</div>
-					   			<div id="bgsdata1"  class="ffenldata">${sumReport.impression}</div>
-					   		</div>
-					   		
-					   		<div id="djs1" class="ffenl">
-					   			<div id="djsname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;广告点击数</div>
-					   			<div  id="djsdata1" class="ffenldata">${sumReport.click}</div>
-					   		</div>
-					   		
-					   		<div id="shr1" class="ffenl" style="margin-right:0px;">
-					   			<div id="shrname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;收入</div>
-					   			<div id="shrdata1" class="ffenldata">${sumReport.income}</div>
-					   		</div>
-					   	</div>
-	   	
-			         <div class="chart_index"> 
-			         	 <div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					 </div>
-				 
-					<div class="fig">
-			            <table border="1" class="tablefig1" id="tablefig" style="width:100%;">
-			                <thead>
-			                <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-			                    <th class="td1"  style="text-align:center; width:15%">日期</th>
-			                    <th class="td1" style="text-align:center; width:7%" >PV</th>
-			                    <th class="td1" style="text-align:center; width:6%" >UV</th>
-			                    <th class="td1" style="text-align:center;  width:8%" >广告曝光数</th>
-			                    <th class="td1" style="text-align:center; width:8%">广告填充率</th>
-			                    <th class="td1" style="text-align:center; width:8%">广告点击数</th>
-			                    <th class="td1" style="text-align:center; width:8%">广告点击率</th>
-			                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-			                    <th class="td1" style="text-align:center; width:8%" >收入</th>
-			                </tr> 
-			                </thead>
-			                <tbody>
-			                    <#if reportList ??>
-			                <#list reportList as report>
-				                <tr id="tr22">
-				                    <td class="td2" id="tdriqi" style="text-align:center;">${report.reportDate?string('yyyy/MM/dd')}</td> 
-				                    <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.pv!}</td>
-				                    <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-				                    <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-				                    <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}</td>
-				                    <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-				                    <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}</td>  
-				                    <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-				                    <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-				                </tr>
-				                </#list>  
-			                    </#if>
-			                </tbody>
-		           		 </table>
-		           	</div>
-		           	<div class="hourrpt">
-				 	   <#if rptZoneHourList ??>
-			                <#list rptZoneHourList as hourrpt>
-				                <div id="tr22">
-				                  	 <div name="hr" >${hourrpt.hour!}</div>
-				                    <div name="hr" >${hourrpt.pv!}</div>
-				                    <div name="hr" >${hourrpt.uv!}</div>
-				                    <div name="hr" >${hourrpt.impression!}</div>
-				                    <div name="hr" >${hourrpt.click!}</div>
-				                    <div name="hr" >${hourrpt.income!}</div>
-				                </div>
-				                </#list>  
-			                    </#if>
-				 	    </div>
-		            <div id="daochu" >
-							<!--<button class="btn2" >导出Excel</button>-->
-							<a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-					
+				<div id="content_dataFrame">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="dataFrame0" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">PV</div>
+					   	<div class="dataFrame_data">${sumReport.pv}</div>
 					</div>
-					<div id="pagemove">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
+					<div id="dataFrame1" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">UV</div>
+					   	<div class="dataFrame_data">${sumReport.uv}</div>
 					</div>
-				 
-	     
-  </form>
-	  </div>        
-	 </div>       
+					<div id="dataFrame2" class="dataFrame dataFrame_style">
+						<div class="dataFrame_name">广告曝光数</div>
+					   	<div class="dataFrame_data">${sumReport.impression}</div>
+					</div>
+					<div id="dataFrame3" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">广告点击数</div>
+					   	<div class="dataFrame_data">${sumReport.click}</div>
+					</div>
+					<div id="dataFrame4" class="dataFrame dataFrame_last_style">
+					   	<div class="dataFrame_name">收入</div>
+					   	<div class="dataFrame_data">${sumReport.income}</div>
+					</div>
+				</div>
+				<div id="chartDivs" value="total"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>	
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:15%">日期</th>
+			                <th class="theadTh" style="width:7%">PV</th>
+			                <th class="theadTh" style="width:6%">UV</th>
+			                <th class="theadTh" style="width:8%">广告曝光数</th>
+			                <th class="theadTh" style="width:8%">广告填充率</th>
+			                <th class="theadTh" style="width:8%">广告点击数</th>
+			                <th class="theadTh" style="width:8%">广告点击率</th>
+			                <th class="theadTh" style="width:7%">eCPM</th>
+			                <th class="theadTh" style="width:8%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd">${report.reportDate!?string('yyyy/MM/dd')}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		     	<div id="hourrpt">
+					<#if rptZoneHourList ??>
+			        <#list rptZoneHourList as hourrpt>
+				    <div id="tr22">
+				    	<div name="hr">${hourrpt.hour!}</div>
+				        <div name="hr">${hourrpt.pv!}</div>
+				        <div name="hr">${hourrpt.uv!}</div>
+				        <div name="hr">${hourrpt.impression!}</div>
+				        <div name="hr">${hourrpt.click!}</div>
+				        <div name="hr">${hourrpt.income!}</div>
+				    </div>
+				   	</#list>  
+			        </#if>
+				</div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('total','${ctx}/operator/main/ad/report/advertiser-report/exportDataReportExcel','operator')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
     </div>
 </div>
-  <script type="text/javascript" src="${ctx}/assets/operator/js/bootstrap-datepicker.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/operator/js/bootstrap-timepicker.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/operator/js/bootstrap-datetimepicker.zh-CN.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/operator/js/daterangepicker.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/operator/js/jquery.autosize-min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/operator/js/jquery.maskedinput.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/operator/js/date.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/operator/js/jquery.dataTables.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/operator/js/jquery.dataTables.bootstrap.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.custom.js"></script>
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-   $('.controls-reset .help-inline a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    </script>   
-    
-<script type="text/javascript">
-    $('#dateRangePicker').dateRangePicker();
-    if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$(".calder #yesterday").addClass('dateChange');
-	}
-	
-	$('.calder a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('.calder a').removeClass('dateChange');
-	});
-</script>    
-<script type="text/javascript">
- //控制页码
-  
-      $(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			//$('#check_cal').click();//触发搜索
-			transcalender();
-			
-		});
-});	     
-</script>  
-<!-- basic scripts -->
-
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 122 - 933
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/apmac.ftl

@@ -1,940 +1,129 @@
 <@override name="head">
-	<title>场景报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="/ssp_operator/assets/operator/css/indexpage.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/ad-report.css">
-	<link href="${ctx}/assets/operator/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.n2.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.validate.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-	<script src="${ctx}/assets/operator/js/highcharts.js"></script>
-	<script src="${ctx}/assets/operator/js/exporting.js"></script>
- 	<script type="text/javascript" src="${ctx}/assets/operator/js/data.js"></script> 
- 	<script type="text/javascript" src="${ctx}/assets/operator/js/drilldown.js"></script> 
+<title>热点报表</title>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
-<script type="text/javascript">
-
-        	$(document).ready(function(){
-			$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})		
-	  		});
- </script>
-<!--控制柱状图取值-->			
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-						}
-					catch(e){}
-					return c;
-	}
-
-$(function () {
-			
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n2=10;
-			n1=n*n2;
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				if(m[i]!=null){
-				xlabel[j]=m[i];
-				}
-				   j++;
-			}
-
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){	
-					lll[j]=parseFloat(m[i]);
-				   j++;
-			}
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					pv[j]=parseFloat(m[i]);
-				   j++;
-			}
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					uv[j]=parseFloat(m[i]);
-				   j++;
-			}
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					adbaoguang[j]=parseFloat(m[i]);
-				   j++;
-			}
-	
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					adtianchong[j]=parseFloat(m[i]);
-				   j++;
-			}
-
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					adclick[j]=parseFloat(m[i]);
-				   j++;
-			}
-		
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					adclickl[j]=parseFloat(m[i]);
-				   j++;
-			}
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					ecpm[j]=parseFloat(m[i]);
-				   j++;
-			}
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					shouru[j]=parseFloat(m[i]);
-				   j++;
-			}
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: xlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: lll
-        }]
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: xlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: pv
-        }]
-    });
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: xlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: uv
-        }]
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: xlabel
-        },
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: adbaoguang
-        }]
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: xlabel
-        },
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: adtianchong
-        }]
-    });
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: xlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  adclick
-        }]
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: xlabel
-        },
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: adclickl
-        }]
-    });
-    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: xlabel
-        },
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: ecpm
-        }]
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: xlabel
-        },
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: shouru
-        }]
-    });
-});
-</script>
-    <style type="text/css">
-        #tex{
-            border: 1px solid #DFDFDF;
-        }
-        #dateRangePicker{
-           border: medium none;
-		    font-size: 12px;
-		    height: 21px;
-		    width: 160px;
-		    border: 1px solid #dfdfdf;
-		    padding:0 0 0 20px;
-		    position: relative;
-    		top: 9px; 
-        }
-        .icon-calendar{
-            z-index:9999;
-           	background-image:none;
-           	position:absolute;
-           	margin:9px 0 0 5px;
-        }
-       
-        
-    </style>
-    <script type="text/javascript">
-
-function transcalender(){
-					var url = ""; 
-					page=$("#page").val();
-				 	b=$("#dateRangePicker").val();
-				 	url = "${ctx}/operator/main/ad/report/advertiser-report/apmac?dateRangePicker=" + b+"&page="+page;  
-				 	location.href = url;
-}
-</script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
+<div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
-    	<div id= "pagecontent">
-    		<div id="page-edit">
-		    <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/place">场景报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a></div>
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/place">场景报表</a>
+				<a class="selectBar_change" href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a>
 		    </div>
-			<div id="third" style="clear:both;margin:10px 0 -10px -7px;">
-				<ul>
-			        <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/operator/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/operator/main/ad/report/advertiser-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">热点报表</li>
-			    </ul>  
- 			</div> 
-    		<div id="form">
-	    		<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/apmac" method="post">
-	    		 <input id="page" autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-	    		 <input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-					<div id="date" style="clear:both;">
-				    	<span id="date-one" style="margin-left:-5px;position:relative;top:5px;">
-							<a class="today da" value="today">今天</a> |
-							<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-							<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-							<a class="lastWeek da" value="lastWeek">上周</a> |
-							<a class="thisMonth da" value="thisMonth">本月</a> |
-							<a class="lastMonth da" value="lastMonth">上月</a>
-						</span>
-						<i class="icon-calendar"></i>
-						<input class="inputrili" type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-				         <button onclick="transcalender()" class="check_cal_place" id="check_cal_place">查询</button>
-						
-		      		</div>
-				 	
-				   <div class="chart" style="margin-top:13px;"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-					
-					 <div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>	
-					<div class="fig">
-				    	<table border="1" class="tablefig1" id="tablefig">
-				        	<thead>
-				            	<tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-				                	
-				                    <th class="td1"  style="text-align:center; width:5%">热点</th>
-				                    <th class="td1" style="text-align:center; width:7%" >浏览量占比</th>
-				                    <th class="td1" style="text-align:center; width:6%" >PV</th>
-				                    <th class="td1" style="text-align:center; width:6%" >UV</th>
-				                    <th class="td1" style="text-align:center;  width:9%" >广告曝光数</th>
-				                    <th class="td1" style="text-align:center; width:9%">广告填充率</th>
-				                    <th class="td1" style="text-align:center; width:8%">广告点击数</th>
-				                    <th class="td1" style="text-align:center; width:8%">广告点击率</th>
-				                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-				                    <th class="td1" style="text-align:center; width:8%" >收入</th>
-				                </tr> 
-				           	</thead>
-							<tbody>
-				            <#if reportList ??>
-				            <#list reportList as report>
-				            	<tr id="tr22">
-					               
-					                <td class="td2" id="tdriqi" style="text-align:center;">${report.apmac!}</td> 
-					                <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.viewRate!}%</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-					                <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-					                <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-					                <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-					                <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-					                <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-					                <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-					             </tr>
-					             </#list>  
-				                 </#if>
-				             </tbody>
-			           	</table>
-			       	</div>
-			        <div id="daochu">
-						<!--<button class="btn2" >导出Excel</button>-->
-						<a class="ljbtn2" onclick="transdaochu()">导出Excel</a>
-					</div>
-						
-					<div id="pagemove_place">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-					</div>
-	        	</form>
-	 		</div>
-	 		</div>       
-    	</div>
-	</div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-     $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    </script>   
-    
-<script type="text/javascript">
-	$('#dateRangePicker').dateRangePicker();
-	if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$("#date #date-one #yesterday").addClass('dateChange');
-	}
-			
-	$('#date #date-one a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#date #date-one a').removeClass('dateChange');
-	});
-	  //控制页码
-    $('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			 transcalender();//触发搜索
-		});
-</script>    
-<script type="text/javascript">	
-function transdaochu(){
-					var url = ""; 
-				 	b=$("#dateRangePicker").val();
-				 	url = "${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel?apmac=1&dateRangePicker=" + b; 
-				 	location.href = url;			 	
-}	
-</script>	
-<!-- basic scripts -->
-
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/operator/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>热点报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/apmac" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">热点</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.apmac!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('apmac','${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel','operator')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

+ 100 - 299
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/areal.ftl

@@ -1,27 +1,19 @@
 <@override name="head">
-	<title>地域报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/ad-report.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/regionReport.css">
-	<link href="${ctx}/assets/operator/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/bootstrap.min.css"/>
-	
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/zbcc.js"></script>
-  <script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/highcharts.js"></script>
-  <script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/exporting.js"></script>
-  <script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script> 
-<script type="text/javascript" src="${ctx}/assets/operator/js/drilldown.js"></script> 
+<title>地域报表</title>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
-	<script type="text/javascript">
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+
+<script type="text/javascript">
 		$(function(){
 			
 			$("#img-city").live("click",function(){
@@ -51,30 +43,22 @@
 				    			}
 				    		img.parents('tr').after(html);
 				    		}
-				    		img.attr("src","${ctx}/assets/operator/images/folderOpen.gif");
+				    		img.attr("src","${ctx}/assets/images/folderOpen.gif");
 				    	}     
 					});	
 					img.attr("type","open");
 				}else if(img.attr("type") == "open"){
 				    $('tr').remove("#"+cnName);//删除id为cname的所有 tr
-				    img.attr("src","${ctx}/assets/operator/images/folderClose.gif");
+				    img.attr("src","${ctx}/assets/images/folderClose.gif");
 				    img.attr("type","close");
-					//location.href = "${ctx}/main/ad/report/advertiser-report/areal";
+					//location.href = "${ctx}/operator/main/ad/report/advertiser-report/areal";
 				}
 			});
 			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
     	});
     	
     	//到处execl
-		function exportExcel(){
+		function exportExcel_areal(){
 			if($("#dateRangePicker").val()!=""){
 				$("#exportExcel").attr("href","${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel?location=1&dateRangePicker="+$("#dateRangePicker").val());
 			}else{
@@ -83,275 +67,92 @@
 		};
 	</script>
 
- <style type="text/css">
-        #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            border: medium none;
-		    font-size: 12px;
-		    height: 21px;
-		    width: 160px;
-		    border: 1px solid #dfdfdf;
-		    padding:0 0 0 20px;
-		    position: relative;
-    		top: 4px; 
-    		left:-15px;
-        }
-        .icon-calendar{
-            z-index:9999;
-           	background-image:none;
-           	position:absolute;
-           	margin:7px 0 0 -10px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36aeea none repeat scroll 0% 0%;
-            cursor: pointer;
-            margin-top:-4px;
-            margin-left:-5px;
-            height: 21px;
-            line-height:21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-
-    </style>
 </@override>
 <@override name="body">
 <div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
-    <div id= "pagecontent">
-   		<div id="page-edit">
-    		
-		    
-		     <div id="second">
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report" >总体报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/size" >尺寸报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/position" >位置报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/system" >系统报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/type" >类型报表</a></div>
-					<div class="report6all  re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/areal" >地域报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/place"  >场景报表</a></div> 
-					<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a></div> 		    </div>
-   			<div id="third" style="margin:10px 0 0 19px;">
-				<ul style="margin:0 0 5px 9px;">
-			        <li class="size1"><i class="icon-home homepic_areal" style="background-image:none;margin-top:2px;"></i> <a href="${ctx}/operator/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2" style="margin:0 -10px;"><a href="${ctx}/operator/main/ad/report/advertiser-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2" style="margin: 0 0 0 10px;"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">地域报表</li>
-			    </ul>  
- 			</div> 
- 			
-			<form id="formPage" action="${ctx}/operator/main/ad/report/advertiser-report/areal" method="post">
-			<input id="page" autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-			<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-    		<div id="date">
-				<span id="date-one" style="left:-15px;position:relative;">
-					<a class="today da" value="today">今天</a> |
-					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-					<a class="lastWeek da" value="lastWeek">上周</a> |
-					<a class="thisMonth da" value="thisMonth">本月</a> |
-					<a class="lastMonth da" value="lastMonth">上月</a>
-				</span>
-				<i class="icon-calendar" style="background-image:none;"></i>
-				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-		   		<input id="sign" type="submit" value="查询"/>
-		  </div>
-		
-		   <div id="fig">
-				<table border="1" class="tablefig" id="tablefig" style="width:98.5%;margin-top:-2px;">
-					<thead>
-						<tr class="tr1"  id ='tr11'>
-							
-		                    <th class="td1" style="text-align:center; width:10%">地域</th>
-		                    <th class="td1" style="text-align:center; width:5.5%">浏览量占比</th>
-		                    <th class="td1" style="text-align:center; width:5.5%">PV</th>
-		                    <th class="td1" style="text-align:center; width:5.5%">UV</th>
-		                    <th class="td1" style="text-align:center; width:5.5%">广告曝光数</th>
-		                    <th class="td1" style="text-align:center; width:5.5%">广告填充率</th>
-		                    <th class="td1" style="text-align:center; width:5.5%">广告点击数</th>
-		                    <th class="td1" style="text-align:center; width:5.5%">广告点击率</th>
-		                    <th class="td1" style="text-align:center; width:5.5%">eCPM</th>
-		                    <th class="td1" style="text-align:center; width:5.5%">收入</th>
-						</tr>
-					
-					</thead>
-					<tbody>
-					<#if reportList ??>
-		            <#list reportList as report>
-						<tr id="tr22">
-			       
-			                <td class="td2" id="tdriqi" style="text-align:center;"><img id="img-city" type="close" value="${report.cn!}" src='${ctx}/assets/operator/images/folderClose.gif' style="position: relative;top:-2px;left:-5px;cursor:pointer;"/>${report.cn!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.viewRate!}%</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.pv!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.uv!}</td>  
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.impression!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.fillRate!}%</td> 
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.click!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.clickRate!}%</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.eCpm!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.income!}</td>
-			            </tr>
-					</#list>
-					</#if>
-					</tbody>
-				</table>
-	        </div>
-	       
-			<div id="daochu" >
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-			</div>
-						
-			<div id="pagemove_system" style="padding:20px 20px 0 0;">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-			</div>
-        
-        </form>
-        </div>
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a>
+				<a class="selectBar_change" href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/place">场景报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a>
+		    </div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/operator/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>地域报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/areal" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+		 		<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">地域</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd"><img id="img-city" type="close" value="${report.cn!}" src='${ctx}/assets/images/folderClose.gif' style="position: relative;top:-2px;left:-5px;cursor:pointer;"/>${report.cn!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_areal()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
- 	     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-    
-    function getlastMonth_start(){
-    var now = new Date(); 
-    var nowMonth = now.getMonth(); 
-    var lastMonthDate = new Date(); 
-    lastMonthDate.setDate(1);
-    lastMonthDate.setMonth(lastMonthDate.getMonth()-1); 
-    
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    
-</script>
-
-<script type="text/javascript">
-  
-  //  var $tooltip = $("<div class='tooltip right in' style='display:none;'><div class='tooltip-arrow'></div><div class='tooltip-inner'></div></div>").appendTo('body');
-    $('#dateRangePicker').dateRangePicker();
-    if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$("#date-one #yesterday").addClass('dateChange');
-	}
-			
-	$('#date-one a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#date-one a').removeClass('dateChange');
-	});
-     //控制页码
-    $('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#formPage');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click(); //触发搜索
-		});
-</script>
-		     
-		     
-
-
+<@extends name="/common/simple.ftl"/>

+ 124 - 1164
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/place.ftl

@@ -1,1169 +1,129 @@
 <@override name="head">
-	<title>场景报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="/ssp_operator/assets/operator/css/indexpage.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/ad-report.css">
-	<link href="${ctx}/assets/operator/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.n2.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.validate.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-	<script src="${ctx}/assets/operator/js/highcharts.js"></script>
-	<script src="${ctx}/assets/operator/js/exporting.js"></script>
- 	<script type="text/javascript" src="${ctx}/assets/operator/js/data.js"></script> 
- 	<script type="text/javascript" src="${ctx}/assets/operator/js/drilldown.js"></script> 
-
-<script type="text/javascript">
-
-        	$(document).ready(function(){
-			$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})		
-	  		});
- </script>
-<!--控制柱状图取值-->			
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-						}
-					catch(e){}
-					return c;
-	}
-
-$(function () {
-			
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n2=10;
-			n1=n*n2;
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				if(m[i]!=null){
-				xlabel[j]=m[i];
-				}
-				   j++;
-			}
-
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-     $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-
-</script>
-    <style type="text/css">
-        #tex{
-            border: 1px solid #DFDFDF;
-        }
-        #dateRangePicker{
-           border: medium none;
-		    font-size: 12px;
-		    height: 21px;
-		    width: 160px;
-		    border: 1px solid #dfdfdf;
-		    padding:0 0 0 20px;
-		    position: relative;
-    		top: 9px; 
-        }
-        .icon-calendar{
-            z-index:9999;
-           	background-image:none;
-           	position:absolute;
-           	margin:9px 0 0 5px;
-        }
-       
-        
-    </style>
-    <script type="text/javascript">
-
-function transcalender(){
-					var url = ""; 
-					page=$("#page").val();
-				 	b=$("#dateRangePicker").val();
-				 	url = "${ctx}/operator/main/ad/report/advertiser-report/place?dateRangePicker=" + b+"&page="+page;  
-				 	location.href = url;
-}
-</script>
+<title>场景报表</title>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
+<div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
-    	<div id= "pagecontent">
-    		<div id="page-edit">
-		    <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/place"  >场景报表</a></div> 
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a></div> 		    </div>
-			<div id="third" style="clear:both;margin:10px 0 -10px -7px;">
-				<ul>
-			        <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/operator/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/operator/main/ad/report/advertiser-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">场景报表</li>
-			    </ul>  
- 			</div> 
-    		<div id="form">
-	    		<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/place" method="post">
-	    		 <input id="page" autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-	    		 <input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
-					<div id="date" style="clear:both;">
-				    	<span id="date-one" style="margin-left:-5px;position:relative;top:5px;">
-							<a class="today da" value="today">今天</a> |
-							<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-							<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-							<a class="lastWeek da" value="lastWeek">上周</a> |
-							<a class="thisMonth da" value="thisMonth">本月</a> |
-							<a class="lastMonth da" value="lastMonth">上月</a>
-						</span>
-						<i class="icon-calendar"></i>
-						<input class="inputrili" type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-				         <button onclick="transcalender()" class="check_cal_place" id="check_cal_place">查询</button>
-						
-		      		</div>
-				 	
-				   <div class="chart" style="margin-top:13px;"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-					
-					 <div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>	
-					<div class="fig">
-				    	<table border="1" class="tablefig1" id="tablefig">
-				        	<thead>
-				            	<tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-				                	
-				                    <th class="td1"  style="text-align:center; width:5%">场景</th>
-				                    <th class="td1" style="text-align:center; width:7%" >浏览量占比</th>
-				                    <th class="td1" style="text-align:center; width:6%" >PV</th>
-				                    <th class="td1" style="text-align:center; width:6%" >UV</th>
-				                    <th class="td1" style="text-align:center;  width:9%" >广告曝光数</th>
-				                    <th class="td1" style="text-align:center; width:9%">广告填充率</th>
-				                    <th class="td1" style="text-align:center; width:8%">广告点击数</th>
-				                    <th class="td1" style="text-align:center; width:8%">广告点击率</th>
-				                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-				                    <th class="td1" style="text-align:center; width:8%" >收入</th>
-				                </tr> 
-				           	</thead>
-							<tbody>
-				            <#if reportList ??>
-				            <#list reportList as report>
-				            	<tr id="tr22">
-					               
-					                <td class="td2" id="tdriqi" style="text-align:center;">${report.place!}</td> 
-					                <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.viewRate!}%</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-					                <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-					                <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}</td>
-					                <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-					                <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}</td>  
-					                <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-					                <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-					             </tr>
-					             </#list>  
-				                 </#if>
-				             </tbody>
-			           	</table>
-			       	</div>
-			        <div id="daochu">
-						<!--<button class="btn2" >导出Excel</button>-->
-						<a class="ljbtn2" onclick="transdaochu()">导出Excel</a>
-					</div>
-						
-					<div id="pagemove_place">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-					</div>
-	        	</form>
-	 		</div>
-	 		</div>       
-    	</div>
-	</div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-     $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    </script>   
-    
-<script type="text/javascript">
-	$('#dateRangePicker').dateRangePicker();
-	if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$("#date #date-one #yesterday").addClass('dateChange');
-	}
-			
-	$('#date #date-one a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#date #date-one a').removeClass('dateChange');
-	});
-	  //控制页码
-    $('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			 transcalender();//触发搜索
-		});
-</script>    
-<script type="text/javascript">	
-function transdaochu(){
-					var url = ""; 
-				 	b=$("#dateRangePicker").val();
-				 	url = "${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel?place=1&dateRangePicker=" + b; 
-				 	location.href = url;			 	
-}	
-</script>	
-<!-- basic scripts -->
-
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a>
+				<a class="selectBar_change" href="${ctx}/operator/main/ad/report/advertiser-report/place">场景报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a>
+		    </div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/operator/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>场景报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/place" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">场景</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.place!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('place','${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel','operator')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 121 - 1171
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/position.ftl

@@ -1,1179 +1,129 @@
 <@override name="head">
-	<title>位置报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/ad-report.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/zbone.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/daterangepicker.css">
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-<script src="${ctx}/assets/operator/js/highcharts.js"></script>
-<script src="${ctx}/assets/operator/js/exporting.js"></script>
-  	<script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script>  	
-  <style>
-     #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            border: medium none;
-		    font-size: 12px;
-		    height: 21px;
-		    width: 160px;
-		    border: 1px solid #dfdfdf;
-		    padding:0 0 0 20px; 
-		    position: relative;
-    		top: 4px;
-        }
-        .icon-calendar{
-           z-index:9999;
-           	background-image:none;
-           	position:absolute;
-           	margin:4px 0 0 5px; 
-        }
-        #sign{
-        	border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36aeea none repeat scroll 0% 0%;
-            cursor: pointer;
-            margin-left: 10px;
-            margin-top: -4px;
-            height: 21px;
-            line-height:21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-  </style>
+<title>位置报表</title>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
- <div id=content_bg>
-     <#include "/operator/main/public-head.ftl">
-   		<div id="pagecontent">
-   			<div id="page-edit"> 
-		   		<div id="second" style="width:100%;">
-						<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report" >总体报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/size" >尺寸报表</a></div>
-						<div class="report6all re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/position" >位置报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/system" >系统报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/type" >类型报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/areal" >地域报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/place"  >场景报表</a></div> 
-						<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a></div> 			 </div>
-   		 	<div id="third" style="clear:both;margin:10px 0 -5px -9px;">
-				<ul>
-			    	<li class="size1">&nbsp;<i class="icon-home homepic"></i> <a href="${ctx}/operator/main/dashboard" style="color:#36aeea">&nbsp;首页&nbsp;</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/operator/main/ad/report/advertiser-report" style="color:#36aeea">&nbsp;&nbsp;数据报表&nbsp;&nbsp;</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">&nbsp;&nbsp;位置报表&nbsp;</li>
-			    </ul>  
- 			</div>  
-    		<form id="searchform" action="${ctx}/operator/main/ad/report/advertiser-report/position" method="post">	
-    		 <input id="page" autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-    		 <input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">	
-    		 	<div style="clear:both;">	
-					<span id="date-one" style="margin-left:-5px;">
-						<a class="today da" value="today">今天</a> |
-						<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-						<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-						<a class="lastWeek da" value="lastWeek">上周</a> |
-						<a class="thisMonth da" value="thisMonth">本月</a> |
-						<a class="lastMonth da" value="lastMonth">上月</a>
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a>
+				<a class="selectBar_change" href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/place">场景报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a>
+		    </div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/operator/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>位置报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/position" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
 					</span>
-					<i class="icon-calendar"></i>
-					<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>		
-					<input type="submit" name="submit" id="sign" value="查询">
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">位置</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.position==1>认证<#elseif report.position==2>跳转<#elseif report.position==3>上网过程</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('position','${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel','operator')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
 				</div>
-					<div class="chart" style="margin-top:8px;"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-						
-					<div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-				   </div>		
-								
-			
-	  			 <div class="fig">
-					<table border="1" class="tablefig1" id="tablefig">					        
-						 <thead>
-					      	 <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">		                    
-			                    <th class="td1" style="text-align:center;">位置</th>                
-			                    <th class="td1" style="text-align:center;">浏览量占比(%)</th>
-			                    <th class="td1" style="text-align:center;" class="hidden-impression">PV</th>
-			                    <th class="td1" style="text-align:center;" class="hidden-impression">UV</th>
-			                    <th class="td1" style="text-align:center;" class="hidden-impression">广告曝光数</th>
-			                    <th class="td1" style="text-align:center;" class="hidden-impression">广告填充率(%)</th>
-			                    <th class="td1" style="text-align:center;" class="hidden-click">广告点击数</th>
-			                    <th class="td1" style="text-align:center;" class="hidden-visit">广告点击率(%)</th>
-			                    <th class="td1" style="text-align:center;" class="hidden-conversion">eCPM</th>
-			                    <th class="td1" style="text-align:center;" class="hidden-income">收入</th>                  
-                			</tr>
-                		</thead>
-                	<tbody>
-                    <#if reportList ??>
-                	<#list reportList as report>
-	                	<tr>		                    
-		                    <td  class="td2" style="text-align:center;"><#if report.position==1>认证<#elseif report.position==2>跳转<#elseif report.position==3>上网过程</#if></td>
-		                    <td  class="td2" style="text-align:center;">${report.viewRate!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.pv!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.uv!}</td>
-		                    <td  class="td2" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-		                    <td  class="td2" style="text-align:center;" class="hidden-impression">${report.fillRate!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.click!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.clickRate!}</td>  
-		                    <td  class="td2" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-		                    <td  class="td2" style="text-align:center;" class="hidden-income">${report.income!}</td>
-	                	</tr>
-	                </#list>  
-                    </#if>
-               	 	</tbody>
-            	</table>
-        	</div>
 			</form>
-			<div id="daochu_size" style="margin-top:0px;">
-			  <!--<button class="export">导出EXCEL</button>-->
-			  <a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-			</div> 
-			
-	</div>	
+	  	</div>        
+    </div>
 </div>
-</div>     		
 </@override>
-<@extends name="/common/simple.ftl"/>
-<style type="text/css">
-.calendar{
-float:right;
-margin:5px 10px;
-}
-.controls-reset{
-margin-left:25px;
-margin-top:20px;
-}
-
-</style>
-<script type="text/javascript">
-   Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-    
-    function getlastMonth_start(){
-    var now = new Date(); 
-    var nowMonth = now.getMonth(); 
-    var lastMonthDate = new Date(); 
-    lastMonthDate.setDate(1);
-    lastMonthDate.setMonth(lastMonthDate.getMonth()-1); 
-    }
-    $('#date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0:
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1:
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3:
-                var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4:
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5:
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-</script>
-<script type="text/javascript">
-  	$('#dateRangePicker').dateRangePicker({});
-  	if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$("#date-one #yesterday").addClass('dateChange');
-	}
-		
-	$('#date-one a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#date-one a').removeClass('dateChange');
-	});
-    var tooltip = $("<div class='tooltip right in' style='display:none;'><div class='tooltip-arrow'></div><div class='tooltip-inner'></div></div>").appendTo('body'); 
-</script>
-<!--控制柱状图的显示隐藏变化-->
-<script type="text/javascript">
-        	$(document).ready(function(){
-        	$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  		$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  		$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  		$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})			  				  			
-	  		});
- </script>
- 
- <!--控制柱状图取值-->			
-<script type="text/javascript">
-
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");	  				
-		  				var c=[];	  			
-			  			for(i=0;i<b.length;i++){ 
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}	
-					}
-					catch(e){}
-					return c;
-	}
-$(function () {
-			u=${startDate};
-			v=${endDate}; 				
-			m=getele();
-			n=${listSize};			
-			<!--给柱子加颜色-->
-			var color=[];
-			for(i=0;i<n;i++){
-					color[i]='#36aeea';
-			}		
-			n2=10;
-			n1=n*n2;
-			<!--取x轴-->
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				j++;
-			}
-			<!--取y轴-->
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-
-	//到处execl
-	function exportExcel(){
-		if($("#dateRangePicker").val()!=""){
-			$("#exportExcel").attr("href","${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel?position=1&dateRangePicker="+$("#dateRangePicker").val());
-		}else{
-			$("#exportExcel").attr("href","${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel?position=1");
-		}
-	};
-</script>
-<script type="text/javascript">
- //控制页码
-  
-      $(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#searchform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			
-			
-		});
-});	 
-</script>    
+<@extends name="/common/simple.ftl"/>

+ 126 - 1181
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/size.ftl

@@ -1,1184 +1,129 @@
 <@override name="head">
-	<title>尺寸报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/report_size.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/zbone.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/ad-report.css">
-	<link href="${ctx}/assets/operator/css/font-awesome.min.css"  rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
-
-    <script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/date.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/report_size_bar.js"></script>
-	<script src="${ctx}/assets/operator/js/highcharts.js"></script>
-	<script src="${ctx}sjs/exporting.js"></script>
-	<script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script>
-	
-	 <style type="text/css">
-        .tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            border: medium none;
-		    font-size: 12px;
-		    height: 21px;
-		    width: 160px;
-		    border: 1px solid #dfdfdf;
-		    padding:0 0 0 20px; 
-		    position: relative;
-    		top: 4px;
-        }
-        .icon-calendar{
-            z-index:9999;
-           	background-image:none;
-           	position:absolute;
-           	margin:4px 0 0 5px; 
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36aeea none repeat scroll 0% 0%;
-            cursor: pointer;
-            margin-left: 10px;
-            margin-top: -4px;
-            height: 21px;
-            line-height:21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-      
-
-    </style>
+<title>尺寸报表</title>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
-
- <@override name="body">
- <div id=content_bg>
-	 <#include "/operator/main/public-head.ftl">
-   <div id= "pagecontent"> 
-	    
-	   <div id="page-edit"> 
-	     <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report" >总体报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/size" >尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/position" >位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/system" >系统报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/type" >类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/areal" >地域报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/place"  >场景报表</a></div> 
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a></div> 		    </div>
-		    
-   		 	<div id="third" style="margin:10px 0 -5px -7px;">
-				<ul>
-			    	<li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/operator/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/operator/main/ad/report/advertiser-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">尺寸报表</li>
-			    </ul>  
- 			</div>  
-	    <form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/size" method="post">
-	     <input id="page" autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-	     <input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">	
-								<span id="date-one" style="display:inline-block;margin-left:-5px;">
-									<a class="today da" value="today">今天</a> |
-									<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-									<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-									<a class="lastWeek da" value="lastWeek">上周</a> |
-									<a class="thisMonth da" value="thisMonth">本月</a> |
-									<a class="lastMonth da" value="lastMonth">上月</a> 
-								</span>
-								<i class="icon-calendar"></i>
-								<input  type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-								<input id="sign" type="submit" value="查询"/>
-					 <div class="chart" style="margin-top:8px;"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-						
-					<div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>		
-						
-						
-						 <div class="fig">
-						 		<table border="1" class="tablefig1" id="tablefig">
-					            
-					                <thead>
-					                <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-					                    
-					                    <th class="td1" style="width:10%;">尺寸</th>
-					                    <th class="td1" style="width:10%;">浏览量占比(%)</th>
-					                    <th class="td1" style="width:9%;" class="hidden-impression">PV</th>
-					                    <th class="td1" style="width:9%;" class="hidden-impression">UV</th>
-					                    <th class="td1" style="width:9%;" class="hidden-impression">广告曝光数</th>
-					                    <th class="td1" style="width:9%;" class="hidden-impression">广告填充率</th>
-					                    <th class="td1" style="width:9%;" class="hidden-click">广告点击数</th>
-					                    <th class="td1" style="width:9%;" class="hidden-visit">广告点击率</th>
-					                    <th class="td1" style="width:9%;" class="hidden-conversion">eCPM</th>
-					                    <th class="td1" style="width:9%;" class="hidden-income">收入</th>
-					                  
-					                </tr>
-					                
-					                </thead>
-					
-					                <tbody>
-					                   <#if reportList ??>
-					                     <#list reportList as report>
-					             
-						                 <tr id="tr22">
-						                  
-						                    <td class="td2" style="text-align:center;">${report.width!}×${report.height!}</td> 
-						                    <td class="td2" style="text-align:center;">${report.viewRate!}</td>
-						                    <td class="td2" style="text-align:center;">${report.pv!}</td>
-						                    <td class="td2" style="text-align:center;">${report.uv!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.fillRate!}</td>
-						                    <td class="td2" style="text-align:center;">${report.click!}</td>
-						                    <td class="td2" style="text-align:center;">${report.clickRate!}</td>  
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.income!}</td>
-						                 </tr>
-					                   </#list>  
-				                      </#if>
-					                </tbody>
-					            </table>
-                          </div>
-	 
-						<div id="daochu_size">
-				<!--<button class="btn2" >导出Excel</button>-->
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-			</div>
-			<div id="pagemove_size">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-						  </div>	
-						  </form>			
-			</div>
-  </div>   
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date-one a').click(function(e){
-       	e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-               	var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    </script>   
-    
-    
-    
-    
-    
-<script type="text/javascript">
-		$('#dateRangePicker').dateRangePicker();
-		if($('#dateRangePicker').val() == ""){
-			$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-			$("#date-one #yesterday").addClass('dateChange');
-		}
-		
-		$('#date-one a').each(function(){
-			var value = $(this).attr("value");
-			if($("#dateTab").val() == value){
-				$(this).addClass('dateChange');
-			}
-		});
-		//点击日期控件的按钮时,去掉前面时间标签的样式
-		$(".apply-btn").click(function(){
-			$("#dateTab").val("");
-			$('#date-one a').removeClass('dateChange');
-		});
-</script>
-<!--控制柱状图的显示隐藏变化-->
-<script type="text/javascript">
-        	$(document).ready(function(){
-        	$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			//alert("pvdata");
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-			
-     
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})			  				  			
-	  		});
- </script>
- 
- <!--控制柱状图取值-->			
-<script type="text/javascript">
-
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");	  				
-		  				var c=[];	  			
-			  			for(i=0;i<b.length;i++){  
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}	
-					}
-					catch(e){}
-					return c;
-	}
-
-$(function () {
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			<!--给柱子加颜色-->
-			var color=[];
-			for(i=0;i<n;i++){
-					color[i]='#36aeea';
-			}
-			n2=10;
-			n1=n*n2;
-			<!--取x轴-->
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				   j++;
-			}
-			<!--取y轴-->
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);			
-			
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]       
-    });   
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true     
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]       
-    });    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv          
-        }]        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang         
-        }]       
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchongxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]       
-    });    
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]      
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });
-    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                  
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]        
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouruxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru
-     }]       
-    });
-});
-
-	//到处execl
-	function exportExcel(){
-		if($("#dateRangePicker").val()!=""){
-			$("#exportExcel").attr("href","${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel?size=1&dateRangePicker="+$("#dateRangePicker").val());
-		}else{
-			$("#exportExcel").attr("href","${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel?size=1");
-		}
-	};
-</script>
- <script type="text/javascript">
- //控制页码
-  
-      $(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			
-			
-		});
-});	     
-</script>  
- 
- 
-<!-- basic scripts -->
-
+<@override name="body">
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a>
+				<a class="selectBar_change" href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/place">场景报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a>
+		    </div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/operator/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>尺寸报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/size" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">尺寸</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.width!}×${report.height!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('size','${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel','operator')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 120 - 1370
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/system.ftl

@@ -1,1379 +1,129 @@
 <@override name="head">
 <title>系统报表</title>
 <link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/xitong.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-<link rel="stylesheet" href="/ssp_operator/assets/operator/css/indexpage.css"/>
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/ad-report.css">
-<link href="${ctx}/assets/operator/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
 <link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.validate.min.js"></script>
-<script src="${ctx}/assets/operator/js/highcharts.js"></script>
-<script src="${ctx}/assets/operator/js/exporting.js"></script>
- <script type="text/javascript" src="${ctx}/assets/operator/js/data.js"></script> 
- <script type="text/javascript" src="${ctx}/assets/operator/js/drilldown.js"></script> 
-
-<script type="text/javascript">
-
-	var datefalg = true;
-    $('#f1').validate({
-        errorElement: 'span',
-        errorClass: 'help-inline',
-        focusInvalid: false,
-        onfocusout: function(element) {
-                $(element).valid();
-            },
-        rules: {
-             campaignName: {
-                required: true,
-                maxlength:50
-            },
-            totalBudget:{
-                number:true,
-                required:true
-            },
-           dailyBudget:{
-                number:true,
-                
-            },
-           maxImpression:{
-                 number:true,
-            },
-           maxClick: {
-                number:true,
-            },
-            maxConversion: {
-                 number:true,
-              
-            },
-           
-            dailyMaxImpression:{
-                digits:true,
-            },
-            dailyMaxclick:{
-                digits:true,
-            },
-            dailyMaxConversion:{
-                digits:true,
-            }
-           },
-        messages: {
-            campaignName:{
-                required:"请输入内容!",
-                maxlength:"输入的长度大于50超出范围!"
-            },
-            totalBudget:{
-                required:"请输入内容!",
-                number:"请输入数字!"
-            },
-            dailyBudget:{
-                number:"请输入数字!"
-            },
-            maxImpression:{
-                number:"请输入数字!"
-            },
-           maxClick:{
-                
-                number:"请输入数字!"
-            },
-            
-            maxConversion:{
-               
-                number:"请输入数字!"
-            },
-           
-            dailyMaxImpression:{
-                digits:"请输入整数!"
-            },
-            dailyMaxclick:{
-                digits:"请输入整数!"
-            },
-            dailyMaxConversion:{
-                digits:"请输入整数!"
-            }
-           
-        },
-      invalidHandler: function (event, validator) { //display error alert on form submit
-            $('.alert-error', $('.login-form')).show();
-        },
-        highlight: function (e) {
-            $(e).closest('.p1').removeClass('info').addClass('error');
-            $(e).closest('.p1').find("span.c1").addClass('hidden');
-        },
-        success: function (e) {
-            $(e).closest('.p1').removeClass('error').addClass('info');
-            $(e).closest('.p1').find("span.c1").removeClass('hid');
-            $(e).remove();
-        },
-        errorPlacement: function (error, element) {
-        	element.next($("span .c1")).addClass('hid')
-            error.insertAfter(element.after());
-        },
-        
-    });
-
-$('input[name=startDate]').change(function(){
-        var startDate = $('input[name=startDate]').val();
-        var endDate = $('input[name=endDate]').val();
-        if(startDate!==null||startDate!==""){
-            $(this).nextAll(".date-inline").text("选择开始投放日期").removeClass("loginerror");
-            if(startDate>endDate){
-                $('input[name=endDate]').nextAll(".date-inline").text("必须大于或等于开始日期").addClass("loginerror");
-                datefalg = false;
-            }else{
-                $('input[name=endDate]').nextAll(".date-inline").text("选择开始投放日期").removeClass("loginerror");
-                datefalg = true;
-            }
-        }
-    });
-    $('input[name=endDate]').change(function(){
-        var startDate = $('input[name=startDate]').val();
-        var endDate = $('input[name=endDate]').val();
-        if(startDate==null||startDate==""){
-            $('input[name=startDate]').nextAll(".date-inline").text("请输入内容").addClass("loginerror");
-        }else{
-            if(startDate>endDate){
-                $(this).nextAll(".date-inline").text("必须大于或等于开始日期").addClass("loginerror");
-                datefalg = false;
-            }else{
-                $(this).nextAll(".date-inline").text("选择结束投放日期").removeClass("loginerror");
-                datefalg = true;
-            }
-        }
-    });
-</script>
-
-
-<script type="text/javascript">
-
-        	$(document).ready(function(){
-        	
-	        
-	        	 
-			$("#pv1").removeClass().addClass('fenlchange');
-			// alert("pv");
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			 //alert("pvname");
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			//alert("pvdata");
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-			
-     
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				 //alert("pv");
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				// alert("pvname");
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				 //alert("pv");
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				// alert("pvname");
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})		
-	  			
-	  		//alert("hahaha");	
-	  			
-	  		});
-        </script>
-		
-
-
- <style type="text/css">
-        #banner{
-            margin-left:10px;
-            
-            
-        }
-        #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            border: medium none;
-		    font-size: 12px;
-		    height: 21px;
-		    width: 160px;
-		    border: 1px solid #dfdfdf;
-		    padding:0 0 0 20px;
-		    position: relative;
-    		top: 6px; 
-        }
-        .icon-calendar{
-            z-index:9999;
-           	background-image:none;
-           	position:absolute;
-           	margin:9px 0 0 5px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36aeea none repeat scroll 0% 0%;
-            cursor: pointer;
-            top:5px;
-            margin-left:14px;
-            height: 21px;
-            line-height:21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-		.date a{
-			color:#36aeea;
-		}
-		#third{
-			margin-top:5px;
-			margin-bottom:5px;
-			margin-left:2px;
-		}
-    </style>
-
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
+<div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
-    <div id= "pagecontent">
-    <div id="page-edit">
-		    	 <div id="second">
-							<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report" >总体报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/size" >尺寸报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/position" >位置报表</a></div>
-							<div class="report6all re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/system" >系统报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/type" >类型报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/areal" >地域报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/place"  >场景报表</a></div> 
-							<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a></div> 				 </div>
-			<div id="third" style="clear:both;margin:10px 0 -10px -7px;">
-				<ul>
-			        <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/operator/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/operator/main/ad/report/advertiser-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">系统报表</li>
-			    </ul>  
- 			</div>  
-
-
-				<div id="form1">
-		    		<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/system" method="post">
-		    		 <input id="page" autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-		    		 <input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">	
-				        		<div class="control-group control-group-lfet">
-									<div class="controls-reset">
-										<div class="row-fluid input-append date " >
-										<span id="banner" style="margin-left:-4px;position:relative;top:10px;">
-											<a value="today">今天</a> |
-											<a id="yesterday" value="yesterday">昨天</a> |
-											<a value="lastSevenDays">前七天</a> |
-											<a value="lastWeek">上周</a> |
-											<a value="thisMonth">本月</a> |
-											<a value="lastMonth">上月</a>
-										</span >			
-										<i class="icon-calendar"></i>
-										<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}" />
-										<input id="sign" type="submit" value="查询"/>
-									</div>
-									
-								</div>
-							</div>
-					
-							<div class="chart" style="width:99.8%;"> 
-								<div  id="linechart1" style="min-width: 94%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							</div>
-					
-							<div class="fenall">	
-								<div  id="pv1" class="fenl">
-									<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-								</div>
-								<div  id="PV2" class="fenl">
-									<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-								</div>
-								<div  id="uv1" class="fenl">
-									<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-								</div>
-								<div id="bgs1" class="fenl">
-									<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-								</div>
-								<div  id="tan1" class="fenl">
-									<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-								</div>
-								<div id="djs1" class="fenl">
-									<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-								</div>
-								<div  id="dian1" class="fenl">
-									<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-								</div>
-								<div id="E1" class="fenl">
-									<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-								</div>
-								<div id="shr1" class="fenl">
-									<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-								</div>
-							</div>	
-					
-				       		<div class="fig1">
-							    <table border="1" class="tablefig" id="tablefig">
-							    	<thead>
-					                	<tr>
-						                   
-						                    <th  class="t1" style="text-align:center;">系统</th>
-						                    <th class="t1" style="text-align:center;">浏览量占比</th>
-						                    <th class="t1" style="text-align:center;" class="hidden-impression">PV</th>
-						                    <th class="t1" style="text-align:center;" class="hidden-impression">UV</th>
-						                    <th class="t1" style="text-align:center;" class="hidden-impression">广告曝光数</th>
-						                    <th class="t1" style="text-align:center;" class="hidden-impression">广告填充率</th>
-						                    <th class="t1" style="text-align:center;" class="hidden-click">广告点击数</th>
-						                    <th class="t1" style="text-align:center;" class="hidden-visit">广告点击率</th>
-						                    <th class="t1" style="text-align:center;" class="hidden-conversion">eCPM</th>
-						                    <th class="t1" style="text-align:center;" class="hidden-income">收入</th>
-					                	</tr>
-				                	</thead>
-				                	<tbody>
-				                    <#if reportList ??>
-				                	<#list reportList as report>
-					                	<tr>
-						                 
-						                    <td class="d1" style="text-align:center;"><#if report.system==1>windows<#elseif report.system==2>ios<#elseif report.system==3>android<#elseif report.system==4>mac<#elseif report.system==5>wp<#else>other</#if></td> 
-						                    <td class="d1" style="text-align:center;">${report.viewRate!}%</td>
-						                    <td class="d1" style="text-align:center;">${report.pv!}</td>
-						                    <td class="d1" style="text-align:center;">${report.uv!}</td>
-						                    <td class="d1" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-						                    <td class="d1" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-						                    <td class="d1" style="text-align:center;">${report.click!}</td>
-						                    <td class="d1" style="text-align:center;">${report.clickRate!}%</td>  
-						                    <td class="d1" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-						                    <td class="d1" style="text-align:center;" class="hidden-income">${report.income!}</td>
-					                	</tr>
-					                </#list>  
-				                    </#if>
-				                	</tbody>
-				            	</table>
-				        	</div>
-		       				 <div id="daochu_system">
-								<a  class="ljbtn2" id="exportExcel" onclick="transdaochu()" >导出Excel</a>
-							</div>
-		       		
-				       		<div id="pagemove_system">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-							</div>
-		        </form>
-		     </div>
-   </div>
-  </div>
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a>
+				<a class="selectBar_change" href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/place">场景报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a>
+		    </div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/operator/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>系统报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/system" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">系统</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.system==1>windows<#elseif report.system==2>ios<#elseif report.system==3>android<#elseif report.system==4>mac<#elseif report.system==5>wp<#else>other</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('system','${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel','operator')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
 </div>
-    <!-- basic scripts -->
 </@override>
-<@extends name="/common/simple.ftl"/>
-	     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-    
-    function getlastMonth_start(){
-    var now = new Date(); 
-    var nowMonth = now.getMonth(); 
-    var lastMonthDate = new Date(); 
-    lastMonthDate.setDate(1);
-    lastMonthDate.setMonth(lastMonthDate.getMonth()-1); 
-    
-    }
-
-    $('.controls-reset a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-</script>
-<script type="text/javascript">	
-function transdaochu(){
-					var url = ""; 
-					var type = "";
-					var ids = [];
-				 	var param = {
-						"dateRangePicker" : ""
-					}
-				 	b=$("#dateRangePicker").val();
-				 	param.dateRangePicker = b;
-				 	url = "${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel?system=1&dateRangePicker=" + b; 
-				 	location.href = url;			 	
-}	
-</script>	
-<script type="text/javascript">
-  
-    var $tooltip = $("<div class='tooltip right in' style='display:none;'><div class='tooltip-arrow'></div><div class='tooltip-inner'></div></div>").appendTo('body');
-    $('#dateRangePicker').dateRangePicker();
-    if($('#dateRangePicker').val() == ""){
-		$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-		$("#banner #yesterday").addClass('dateChange');
-	}
-		
-	$('#banner a').each(function(){
-		var value = $(this).attr("value");
-		if($("#dateTab").val() == value){
-			$(this).addClass('dateChange');
-		}
-	});
-	//点击日期控件的按钮时,去掉前面时间标签的样式
-	$(".apply-btn").click(function(){
-		$("#dateTab").val("");
-		$('#banner a').removeClass('dateChange');
-	});
-</script>
-
-<!--控制柱状图取值-->		
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  					c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-					}
-					catch(e){}
-					return c;
-	}
-	$(document).ready(function(){
-			b=$(".span11").val();
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			n2=10;
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n1=n*n2;
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				j++;
-			}
-
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-
-</script>
-
-<script type="text/javascript">
- //控制页码
-  
-      $(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click(); //触发搜索
-		});
-});	     
-</script>  		     
-		     
-
-
+<@extends name="/common/simple.ftl"/>

+ 121 - 1161
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/type.ftl

@@ -1,1169 +1,129 @@
 <@override name="head">
-	<title>类型报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="/ssp_operator/assets/operator/css/indexpage.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/ad-report.css">
-	<link href="${ctx}/assets/operator/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />	
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-	<script src="${ctx}/assets/operator/js/highcharts.js"></script>
-	<script src="${ctx}/assets/operator/js/exporting.js"></script>
- 	<script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script>
- 
-
- <style type="text/css">
-        #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            border: medium none;
-		    font-size: 12px;
-		    height: 21px;
-		    width: 160px;
-		    border: 1px solid #dfdfdf;
-		    padding:0 0 0 20px;
-		    position: relative;
-    		top: 4px; 
-        }
-        .icon-calendar{
-            z-index:9999;
-           	background-image:none;
-           	position:absolute;
-           	margin:4px 0 0 5px;
-        }
-    </style>
-
+<title>类型报表</title>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
+<div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
-    	<div id= "pagecontent">
-    	  <div id="page-edit">
-		    <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report" >总体报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/size" >尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/position" >位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/system" >系统报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/type" >类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/areal" >地域报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/place"  >场景报表</a></div> 
-				<div class="report6 re"><a class="alj" href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a></div> 
-
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/operator/main/ad/report/advertiser-report">总体报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/size">尺寸报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/position">位置报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/system">系统报表</a>
+				<a class="selectBar_change" href="${ctx}/operator/main/ad/report/advertiser-report/type">类型报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/areal">地域报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/place">场景报表</a>
+				<a href="${ctx}/operator/main/ad/report/advertiser-report/apmac">热点报表</a>
 		    </div>
-   		 	<div id="third" style="clear:both;margin:10px 0 -5px -7px;">
-				<ul>
-			    	<li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/operator/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/operator/main/ad/report/advertiser-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">类型报表</li>
-			    </ul>  
- 			</div>  
-	 		<form action="${ctx}/operator/main/ad/report/advertiser-report/type" method="post">	
-	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">	
-	 				<div style="clear:both;"> 
-			    		<span id="date-one" style="margin-left:-5px;">
-							<a class="today da" value="today">今天</a> |
-							<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
-							<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
-							<a class="lastWeek da" value="lastWeek">上周</a> |
-							<a class="thisMonth da" value="thisMonth">本月</a> |
-							<a class="lastMonth da" value="lastMonth">上月</a>
-						</span >
-					
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/operator/main/ad/report/advertiser-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>类型报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/type" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
 						<i class="icon-calendar"></i>   
-						<input class="inputrili" type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-			             <button onclick="transcalender()" class="check_cal_type" id="check_cal">查询</button>
-			         </div>
-					 <div class="chart" style="margin-top:8px;width: 99.8%;"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-				 
-				 	<div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>	
-				 
-				 
-					<div class="fig">
-			            <table border="1" class="tablefig1" id="tablefig" style="width:100%;">
-			                <thead>
-			                <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-			                
-			                    <th class="td1"  style="text-align:center; width:5%">类型</th>
-			                    <th class="td1" style="text-align:center; width:7%" >浏览量占比</th>
-			                    <th class="td1" style="text-align:center; width:6%" >PV</th>
-			                    <th class="td1" style="text-align:center; width:6%" >UV</th>
-			                    <th class="td1" style="text-align:center;  width:9%" >广告曝光数</th>
-			                    <th class="td1" style="text-align:center; width:9%">广告填充率</th>
-			                    <th class="td1" style="text-align:center; width:9%">广告点击数</th>
-			                    <th class="td1" style="text-align:center; width:9%">广告点击率</th>
-			                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-			                    <th class="td1" style="text-align:center; width:8%" >收入</th>
-			                </tr> 
-			                </thead>
-			
-			                <tbody>
-			                    <#if reportList ??>
-			                <#list reportList as report>
-			             
-				                <tr id="tr22">
-				                	
-				                    <td class="td2" id="tdriqi" style="text-align:center;"><#if report.device==1>网页<#else>app</#if></td> 
-				                    <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.viewRate!}%</td>
-				                    <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-				                     <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-				                    <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-				                    <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-				                    <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-				                    <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-				                    <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-				                    <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-				                	
-				                </tr>
-				                </#list>  
-			                    </#if>
-			                </tbody>
-		           		 </table>
-		           	</div>
-		           			
-        </form>
-		           <div id="daochu_type">
-							
-							<a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-				
-					</div>
-					
-  		</div>    
-	 </div>       
- 
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">类型</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><<#if report.device==1>网页<#else>app</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('type','${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel','operator')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
 </div>
- 			     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-     $('#date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        $("#dateTab").val($(this).attr("value"));
-        $(this).addClass('dateChange').siblings('.dateChange').removeClass('dateChange');
-    });
-    </script>   
-    
-<script type="text/javascript">
-        $('#dateRangePicker').dateRangePicker();
-        if($('#dateRangePicker').val() == ""){
-			$('#dateRangePicker').val(getlastDate(1)+" to "+getlastDate(1));
-			$("#date-one #yesterday").addClass('dateChange');
-		}
-			
-		$('#date-one a').each(function(){
-			var value = $(this).attr("value");
-			if($("#dateTab").val() == value){
-				$(this).addClass('dateChange');
-			}
-		});
-		//点击日期控件的按钮时,去掉前面时间标签的样式
-		$(".apply-btn").click(function(){
-			$("#dateTab").val("");
-			$('#date-one a').removeClass('dateChange');
-		});
-</script>    
-
-<script type="text/javascript">
-		function transcalender(){
-					var url = ""; 
-					var type = "";
-					var ids = [];
-				 	var param = {
-						"dateRangePicker" : ""
-					}
-				 	b=$(".inputrili").val();
-				 	param.choosedDate = b;
-				 	url = "${ctx}/operator/main/ad/report/advertiser-report/type?dateRangePicker=" + b;  
-				 	location.href = url;
-		}		
-</script>
-<script type="text/javascript">	
-function transdaochu(){
-					var url = ""; 
-					var type = "";
-					var ids = [];
-				 	var param = {
-						"dateRangePicker" : ""
-					}
-				 	b=$("#dateRangePicker").val();
-				 	param.dateRangePicker = b;
-				 	url = "${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel?device=1&dateRangePicker=" + b; 
-				 	
-				 	location.href = url;			 	
-}	
-</script>	
-	
-		     
-<!--控制柱状图的显示隐藏变化-->
-<script type="text/javascript">
-        	$(document).ready(function(){
-        	$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})			  				  			
-	  		});
- </script>
-<!--控制柱状图取值-->		
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-					}
-					catch(e){}
-					return c;
-	}
-$(function () {
-			b=$(".span11").val();
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			n2=10;
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n1=n*n2;
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				j++;
-			}
-
-			var lll=[];
-			var j=0;
-			for(i=1;i<n1;i+=n2){
-				lll[j]=parseFloat(m[i]);
-			    j++;
-			}
-			//排序
-			var lllxlabel = xlabel;
-			var uselllxlabel = [];
-			var uselll = [];
-			var num;
-			for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			var pv=[];
-			var j=0;
-			for(i=2;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					pv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var pvxlabel = xlabel;
-			var usepvxlabel = [];
-			var usepv = [];
-			var num;
-			for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					uv[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var uvxlabel = xlabel;
-			var useuvxlabel = [];
-			var useuv = [];
-			var num;
-			for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			var adbaoguang=[];
-			var j=0;
-			for(i=4;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adbaoguang[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adbaoguangxlabel = xlabel;
-			var useadbaoguangxlabel = [];
-			var useadbaoguang = [];
-			var num;
-			for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adtianchong[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-//排序
-			var adtianchongxlabel = xlabel;
-			var useadtianchongxlabel = [];
-			var useadtianchong = [];
-			var num;
-			for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			var adclick=[];
-			var j=0;
-			for(i=6;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclick[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclickxlabel = xlabel;
-			var useadclickxlabel = [];
-			var useadclick = [];
-			var num;
-			for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			var adclickl=[];
-			var j=0;
-			for(i=7;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					adclickl[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var adclicklxlabel = xlabel;
-			var useadclicklxlabel = [];
-			var useadclickl = [];
-			var num;
-			for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			var ecpm=[];
-			var j=0;
-			for(i=8;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					ecpm[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-
-//排序
-			var ecpmxlabel = xlabel;
-			var useecpmxlabel = [];
-			var useecpm = [];
-			var num;
-			for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-     $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-
-</script>
-<!-- basic scripts -->
-
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

Some files were not shown because too many files changed in this diff