Browse Source

“实现视频文件截图功能”

tony.qu 9 years ago
parent
commit
7061a6b6a9

+ 1 - 0
.classpath

@@ -30,5 +30,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 		</attributes>
 	</classpathentry>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="output" path="target/classes"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
 </classpath>

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

@@ -34,12 +34,7 @@
 				<div class="input-group" id="industryul_selectdiv">
 				<div class="input-group" id="industryul_selectdiv">
 					<label class="input-label"><span class="lbl-yes">*</span>广告主行业:</label>
 					<label class="input-label"><span class="lbl-yes">*</span>广告主行业:</label>
 					<span class="spanVaildate_ul"></span>
 					<span class="spanVaildate_ul"></span>
-					<ul id="main_industryul">
-						<li class="select_box" id="industryul_select_box">
-						   	<span id="industryul_span">请选择所属行业</span>
-						    <ul class="son_ul" id="industry_son_ul"></ul>
-						 </li>
-					</ul>
+					<a class="btn2" href="#">选择</a>
 					<input type="hidden" id="industryId" name="industryId" value=""/>
 					<input type="hidden" id="industryId" name="industryId" value=""/>
 				</div>
 				</div>
 				<div class="input-group">
 				<div class="input-group">

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

@@ -20,7 +20,6 @@
 <script type="text/javascript" src="${ctx}/assets/js/wifi.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/wifi.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/advertiser/operatoradAllGroup.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/advertiser/operatoradAllGroup.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/common/popup.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/layer/layer.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/layer/layer.js"></script>
 </@override>	
 </@override>	
 <@override name="body">
 <@override name="body">
@@ -46,7 +45,7 @@
 					<li class="navDiv_currentLi">运营投放</li>
 					<li class="navDiv_currentLi">运营投放</li>
 				</ul>  
 				</ul>  
 	 		</div>
 	 		</div>
-	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/operator-ad-group/save" method="post">
+	 		<form id="validateForm" action="${ctx}/advertiser/main/ad/target/ad-group-alloperator/save" method="post">
 	 			<input type="hidden" id="adGroupId" name="id" value=""/>
 	 			<input type="hidden" id="adGroupId" name="id" value=""/>
 	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}"/>
 	 			<input type="hidden" id="advertiserId" name="advertiserId" value="${advertiserId!}"/>
 	 			<input type="hidden" id="orderId" name="orderId" value="${orderId!}"/>
 	 			<input type="hidden" id="orderId" name="orderId" value="${orderId!}"/>

+ 7 - 1
src/main/webapp/assets/css/common.css

@@ -1177,6 +1177,12 @@ table.tableApmac td,table.tableApmacOther td{
 }
 }
 
 
 .aChange{
 .aChange{
-	background-color: #36aeea;
+	background-color: #a0a0a0;
 	color:#ffffff;
 	color:#ffffff;
+	border:0px;
+}
+.aChange:hover{
+	background-color: #a0a0a0;
+	color:#ffffff;
+	border:0px;
 }
 }

+ 1 - 25
src/main/webapp/assets/js/advertiser/operatoradAllGroup.js

@@ -386,31 +386,7 @@ $(document).ready(function(){
 				$("#os").val(osId);
 				$("#os").val(osId);
 			}
 			}
 		}
 		}
-		//提示场景选择
-		var placelist = $("#operatorAdgroup_placeDiv input[type='checkbox']:checked");
-		var placeId = "";
-		var placeName = "";
-		if(placelist.length == 0){
-			bootbox.alert("场景为必填项,请选择!");
-			return false;
-		}else{
-			placelist.each(function(){
-				placeId += $(this).val()+",";
-				placeName += $(this).attr("title")+",";
-			});
-			
-			if(placeId!=""){
-				placeId = placeId.substring(0, placeId.length-1);
-				placeName = placeName.substring(0, placeName.length-1);
-				var checked_id =$(".input-group input[name=aa]:checked").val();
-				if(checked_id==1){
-					$("#placeId").val("a,"+placeId);
-				}else if(checked_id==2){
-					$("#placeId").val("b,"+placeId);
-				}
-				$("#placeName").val(placeName);
-			}
-		}
+		//保存整体页面
 		$("#validateForm").submit();
 		$("#validateForm").submit();
 		return false;
 		return false;
 	});
 	});