单域配置调整

(1)简化逻辑部分代码写到了BaseController里 (2)字符串，增强字符串配置的区域GK提交 (3)单域配置的审核部分目前不会下发area_ip_cfg给maat,后续会调整
2018-04-09 16:38:45 +08:00
parent de3d730cd4
commit 3e1b3e391d
18 changed files with 480 additions and 453 deletions
--- a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
@@ -3,8 +3,8 @@
 <script type="text/javascript">
 $(function(){
 	$(".glyphicon-plus").on("click",function(){
-		var obj=$(this).parents(".form-section").next(".container").clone();
-		var len=$(this).parents("div").find(".container:visible").size();
+		var obj=$(this).parents(".form-section").next(".container-fluid").clone();
+		var len=$(this).parents("div").find(".container-fluid:visible").size();
 		if($(this).parent().parent().parent().attr("id")=="areaIp"){
 			obj.find("[id^='_areaCfg']").each(function(){
 				var name=$(this).attr("id").replace("_areaCfg.","");
@@ -18,7 +18,7 @@ $(function(){
 				switchIpType($(this));
 			});
 			obj.appendTo("#areaIp");
-			$("#areaIsp").find(".container").each(function(){
+			$("#areaIsp").find(".container-fluid").each(function(){
 				if(!$(this).hasClass("hidden")) $(this).remove();
 			});
 		}else if($(this).parent().parent().parent().attr("id")=="areaIsp"){
@@ -33,7 +33,7 @@ $(function(){
 			});
 			obj.removeClass("hidden");
 			obj.appendTo("#areaIsp");
-			$("#areaIp").find(".container").each(function(){
+			$("#areaIp").find(".container-fluid").each(function(){
 				if(!$(this).hasClass("hidden")) $(this).remove();
 			});
 		}
@@ -41,12 +41,12 @@ $(function(){
 });
 function delAreaIp(obj){ 
 	var thisObj=$(obj);
-	thisObj.parents(".container").remove();
-	var len=$("#areaIp").find(".container:visible").size();
+	thisObj.parents(".container-fluid").remove();
+	var len=$("#areaIp").find(".container-fluid:visible").size();
 	//调整角标
 	if(len>0){
 		len--;
-		$("#areaIp").find(".container:visible").each(function(){
+		$("#areaIp").find(".container-fluid:visible").each(function(){
 			$(this).find("[name^='areaCfg']").each(function(){
 				var name=$(this).attr("name");
 				name=name.substring(name.lastIndexOf(".")+1,name.length);
@@ -59,11 +59,11 @@ function delAreaIp(obj){
 }
 function delAreaIsp(obj){ 
 	var thisObj=$(obj);
-	thisObj.parents(".container").remove();
-	var len=$("#areaIsp").find(".container:visible").size();
+	thisObj.parents(".container-fluid").remove();
+	var len=$("#areaIsp").find(".container-fluid:visible").size();
 	if(len>0){
 		len--;
-		$("#areaIsp").find(".container:visible").each(function(){
+		$("#areaIsp").find(".container-fluid:visible").each(function(){
 			$(this).find("[name^='areaIsp']").each(function(){
 				var name=$(this).attr("name");
 				name=name.substring(name.lastIndexOf(".")+1,name.length);
@@ -77,10 +77,10 @@ function delAreaIsp(obj){
 </script>
 <div class="hidden" id="areaIsp">
 <h4 class="form-section"><spring:message code="area"/> <spring:message code="isp"/><small><span class="glyphicon glyphicon-plus" title="add"></span></small></h4>
-	<div class="container hidden">
+	<div class="container-fluid hidden">
 		<div class="row">
 			<div class="pull-right">
-			<span class="glyphicon glyphicon-remove" title="remove" onClick="delAreaIsp(this);"/>
+				<span class="glyphicon glyphicon-remove pull-right" title="remove" onClick="delAreaIsp(this);"/>
 			</div>
 		</div>
 		<div class="row">
@@ -114,7 +114,7 @@ function delAreaIsp(obj){
 		</div>
 	</div>
 	<c:forEach items="${_areaIsps}" var="areaIsp" varStatus="status">
-		<div class="container">
+		<div class="container-fluid">
 			<div class="row">
 				<div class="pull-right">
 				<span class="glyphicon glyphicon-remove" title="remove" onClick="delAreaIsp(this);"/>
@@ -159,7 +159,7 @@ function delAreaIsp(obj){
 </div>
 <div class="hidden" id="areaIp">
 <h4 class="form-section"><spring:message code="area"/> ip<small><span class="glyphicon glyphicon-plus" title="add"></span></small></h4>
-	<div class="container hidden">
+	<div class="container-fluid hidden">
 		<div class="row">
 			<input type="hidden" id="_areaCfg.isAreaEffective" value="${_areaCfg.isAreaEffective}">
 			<div class="pull-right">
@@ -303,7 +303,7 @@ function delAreaIsp(obj){
 	</div>
 	<input type="hidden" name="areaCfgIds" value="${areaCfgIds}">
 	<c:forEach items="${areaCfgs}" var ="areaCfg" varStatus="status">
-	<div class="container">
+	<div class="container-fluid">
 		<div class="row">
 			<input type="hidden" name="areaCfg[${status.index}].isAreaEffective" value="${areaCfg.isAreaEffective}">
 			<div class="pull-right">
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -106,12 +106,19 @@
    </div>
 </div>
 <div class="row">
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
+    <div class="hidden areaType col-md-6">
+        <div class="form-group">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
            <div class="col-md-6">
-                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
+            	<label class="radio-inline">
+            		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
+            	</label>
+            	<label class="radio-inline">
+            		<input type="radio" name="areaType" value="0" class="required"><spring:message code="area"/> ip
+            	</label>
            </div>
+            <div for="areaType"></div>
+            <input class="form-control" type="hidden" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
        </div>
    </div>
 </div>
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -205,14 +205,14 @@
 		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
 		            <div class="col-md-6">
 		            	<label class="radio-inline">
-		            		<input type="radio" name="areaType" value="1"><spring:message code="area"/> <spring:message code="isp"/>
+		            		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
 		            	</label>
 		            	<label class="radio-inline">
-		            		<input type="radio" name="areaType" value="0"><spring:message code="area"/> ip
+		            		<input type="radio" name="areaType" value="0" class="required"><spring:message code="area"/> ip
 		            	</label>
 		            </div>
+		            <div for="areaType"></div>
 		            <input class="form-control" type="hidden" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
-		            <div for="areaEffectiveIds"></div>
 		        </div>
 		    </div>
 		</div>
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -104,7 +104,7 @@
 		    </div>
 		</div>
 		<div class="row">
-		    <div class="col-md-6">
+		    <%-- <div class="col-md-6">
 		        <div class="form-group ">
 		            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
 		            <div class="col-md-6">
@@ -112,6 +112,21 @@
 		            </div>
 		            <div for="areaEffectiveIds"></div>
 		        </div>
+		    </div> --%>
+		    <div class="hidden areaType col-md-6">
+		        <div class="form-group">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="区域管控类型"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="areaType" value="0" class="required"><spring:message code="area"/> ip
+		            	</label>
+		            </div>
+		            <div for="areaType"></div>
+		            <input class="form-control" type="hidden" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
+		        </div>
 		    </div>
 		</div>
 	</c:otherwise>