Browse Source

修改下拉框js

fan.yang@cloudcross.com 9 years ago
parent
commit
8211493281

+ 7 - 7
src/main/java/com/cloudcross/ssp/service/impl/CampaignService.java

@@ -122,7 +122,7 @@ public class CampaignService implements ICampaignService,ISelectorProvider{
 	@Override
 	@Override
 	public boolean updateStatus(List<Long> idList, int status) {
 	public boolean updateStatus(List<Long> idList, int status) {
 		ibatisDao.save(
 		ibatisDao.save(
-				"advertiser.campaignSqlMapper.updateCampaignStatus",
+				"campaignSqlMapper.updateCampaignStatus",
 				MapBuilder.create(HashMap.class)
 				MapBuilder.create(HashMap.class)
 				.add("status", status)
 				.add("status", status)
 				.add("idList", idList)
 				.add("idList", idList)
@@ -134,7 +134,7 @@ public class CampaignService implements ICampaignService,ISelectorProvider{
 	@Override
 	@Override
 	public boolean updateUpstatus(List<Long> idList, int status) {
 	public boolean updateUpstatus(List<Long> idList, int status) {
 		ibatisDao.save(
 		ibatisDao.save(
-				"advertiser.campaignSqlMapper.updateCampaignStatus",
+				"campaignSqlMapper.updateCampaignStatus",
 				MapBuilder.create(HashMap.class)
 				MapBuilder.create(HashMap.class)
 				.add("status", status)
 				.add("status", status)
 				.add("idList", idList)
 				.add("idList", idList)
@@ -172,7 +172,7 @@ public class CampaignService implements ICampaignService,ISelectorProvider{
 	
 	
 	@Override
 	@Override
 	public boolean deleteByID(long id) {
 	public boolean deleteByID(long id) {
-		ibatisDao.delete("advertiser.campaignSqlMapper.deleteByID", id);
+		ibatisDao.delete("campaignSqlMapper.deleteByID", id);
 		return true;
 		return true;
 	}
 	}
 	
 	
@@ -186,12 +186,12 @@ public class CampaignService implements ICampaignService,ISelectorProvider{
 		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
 		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
 		paramMap.put("key", paramMap.get("searchKey"));
 		paramMap.put("key", paramMap.get("searchKey"));
 		paramMap.put("value", searchValue);
 		paramMap.put("value", searchValue);
-		return ibatisDao.getList("advertiser.campaignSqlMapper.selectByStatus", paramMap);
+		return ibatisDao.getList("campaignSqlMapper.selectByStatus", paramMap);
 	}
 	}
 	@Override
 	@Override
 	public List<Campaign> findDeliverEffectAnalysis(Map<String, Object> paramMap) {
 	public List<Campaign> findDeliverEffectAnalysis(Map<String, Object> paramMap) {
 		// TODO Auto-generated method stub
 		// TODO Auto-generated method stub
-		return myBatisDao.getList("advertiser.campaignSqlMapper.findDeliverEffectAnalysis", paramMap);
+		return myBatisDao.getList("campaignSqlMapper.findDeliverEffectAnalysis", paramMap);
 
 
 	}
 	}
 	
 	
@@ -202,7 +202,7 @@ public class CampaignService implements ICampaignService,ISelectorProvider{
 	}
 	}
 	@Override
 	@Override
 	public boolean updateStatusByAdvertiserId(List<Long> advertiserIdList,int status) {
 	public boolean updateStatusByAdvertiserId(List<Long> advertiserIdList,int status) {
-		myBatisDao.save("advertiser.campaignSqlMapper.updateStatusByAdvertiserId",
+		myBatisDao.save("campaignSqlMapper.updateStatusByAdvertiserId",
 				MapBuilder.create(HashMap.class)
 				MapBuilder.create(HashMap.class)
 					.add("advertiserIdList", advertiserIdList)
 					.add("advertiserIdList", advertiserIdList)
 					.add("modifyDate", new Date())
 					.add("modifyDate", new Date())
@@ -211,7 +211,7 @@ public class CampaignService implements ICampaignService,ISelectorProvider{
 	}
 	}
 	
 	
 	public boolean updateStatusByOrderId(List<Long> orderIdList,int status) {
 	public boolean updateStatusByOrderId(List<Long> orderIdList,int status) {
-		myBatisDao.save("advertiser.campaignSqlMapper.updateStatusByOrderId",
+		myBatisDao.save("campaignSqlMapper.updateStatusByOrderId",
 				MapBuilder.create(HashMap.class)
 				MapBuilder.create(HashMap.class)
 					.add("orderIdList", orderIdList)
 					.add("orderIdList", orderIdList)
 					.add("modifyDate", new Date())
 					.add("modifyDate", new Date())

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

@@ -37,7 +37,7 @@
 					<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/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/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>
 					<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>
-					<li class="report6 re"><a href="${ctx}/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
 				</ul>
 				</ul>
 			</div>
 			</div>
 	   		<div id="third">
 	   		<div id="third">

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

@@ -1,9 +1,7 @@
 <@override name="head">
 <@override name="head">
 	<title>创建账号</title>
 	<title>创建账号</title>
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<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/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.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-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.min.js"></script>
@@ -163,7 +161,7 @@
 					<div class="control-group" id="ensurePassword-div">
 					<div class="control-group" id="ensurePassword-div">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码:</label>
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码:</label>
 						<span id="ensurePassword-span"><input tabindex="3" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/1/0"></span>
 						<span id="ensurePassword-span"><input tabindex="3" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/1/0"></span>
-						<input id="input-password" autocomplete="off" type="checkbox"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">显示密码</span><span class="spanVaildate"></span>
+						<input id="input-password" autocomplete="off" type="checkbox" style="padding-bottom:2px;margin-top: 8px;"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">显示密码</span><span class="spanVaildate"></span>
 					</div>
 					</div>
 					
 					
 					<div class="control-group">
 					<div class="control-group">
@@ -179,7 +177,7 @@
 					<div class="control-group" style="margin-bottom:10px;">
 					<div class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态:</label>
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态:</label>
 						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" value="1" checked="checked"><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
 						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" value="1" checked="checked"><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
-						<label class="form-align-radio"><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span class="lbl" style="position:absolute;left:155px;"></span><span>暂停</span></label>
+						<label class="form-align-radio"  style="margin-left:135px;margin-top:-40px;"><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span class="lbl" style="position:absolute;left:155px;"></span><span>暂停</span></label>
 					</div>
 					</div>
 					
 					
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">

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

@@ -12,7 +12,7 @@
 		<li><a href="${ctx}/back/main/ad/report/advertiser-report"><span>需求方报表</span></a></li>
 		<li><a href="${ctx}/back/main/ad/report/advertiser-report"><span>需求方报表</span></a></li>
 		</@sec.authorize>
 		</@sec.authorize>
 		
 		
-		<@sec.authorize access="hasAnyRole('ROLE_back_operator_reprot,ROLE_MANAGER')">
+		<@sec.authorize access="hasAnyRole('ROLE_back_operator_report,ROLE_MANAGER')">
 		<li><a href="${ctx}/back/main/ad/operator/operator-report"><span>媒体数据报表</span></a></li>
 		<li><a href="${ctx}/back/main/ad/operator/operator-report"><span>媒体数据报表</span></a></li>
 		</@sec.authorize>
 		</@sec.authorize>
 		
 		

+ 3 - 2
src/main/webapp/assets/css/authority.css

@@ -15,9 +15,10 @@
 }
 }
 
 
 #handler{
 #handler{
-	margin:20px 0 20px 1px;
+	margin:20px 0 20px 10px;
 	height:14px;
 	height:14px;
 	line-height:14px;
 	line-height:14px;
+	padding-top:20px;
 }
 }
 #handler ul{
 #handler ul{
 	margin-left:20px;
 	margin-left:20px;
@@ -262,7 +263,7 @@ span.input-checkbox-span{
 
 
 #createForm input[type=radio],#createForm input[type=checkbox],#editForm input[type=radio],#editForm input[type=checkbox]{
 #createForm input[type=radio],#createForm input[type=checkbox],#editForm input[type=radio],#editForm input[type=checkbox]{
 	opacity:10;
 	opacity:10;
-	margin-top: -3px;
+	margin-top: 0px;
 }
 }
 
 
 .form-align-radio{
 .form-align-radio{