From 3e37e0b0421e907b3cc43fd5625768510be7e9ad Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 19 Mar 2018 13:44:35 +0800
Subject: [PATCH] =?UTF-8?q?0000015:=20=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E5=A2=9E=E5=BC=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E9=9A=90=E8=97=8F=E4=BA=86=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E5=8C=BA=E5=9F=9F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/include/form/complexInfo.jsp      | 35 +++++--------------
 .../WEB-INF/views/cfg/complexCfgForm.jsp      |  7 +---
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index fe92d2b0f..f4d9ef5de 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -11,7 +11,7 @@
             <div for="cfgDesc"></div>
         </div>
     </div>
-    
+    <%-- 
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
@@ -20,10 +20,8 @@
             </div>
             <div for="district"></div>
         </div>
-    </div>
-</div>
-<div class="row">
-	<div class="col-md-6">
+    </div> --%>
+    <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
             <div class="col-md-6">
@@ -32,23 +30,8 @@
             <div for="keywords"></div>
         </div>
     </div>
-
-	<%-- <div class="col-md-6">
-	    <div class="form-group ">
-	            <label class="control-label col-md-3">管控类型</label>
-	            <div class="col-md-6">
-            	 <select name="action" class="selectpicker select2 form-control" readonly="readonly">
-            	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
-            	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
-            	 	<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> >封堵白名单</option>
-            	 	<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> >监测白名单</option>
-            	 	<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> >封堵监测都白名单</option>
-            	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> >灰名单</option>
-            	 </select>
-                 <input class="form-control" type="hidden" name="action" value="${_cfg.action}">
-            	</div>
-	    </div>
-    </div> --%>
+</div>
+<div class="row">
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
@@ -68,8 +51,6 @@
             <div for="isAreaEffective"></div>
         </div>
     </div>
-</div>
-<div class="row">
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
@@ -88,6 +69,8 @@
             <div for="isAreaEffective"></div>
         </div>
     </div>
+</div>
+<div class="row">
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
@@ -102,8 +85,6 @@
             <div for="matchMethod"></div>
         </div>
     </div>
-</div>
-<div class="row">
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
@@ -116,6 +97,8 @@
             </div>
         </div>
     </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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index d10240500..b6f9a1caa 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -36,9 +36,6 @@ $(function(){
 			'keywords':{
 				required:true
 			},
-			'district':{
-				required:true
-			},
 			'isAreaEffective':{
 				required:true
 			},
@@ -59,9 +56,6 @@ $(function(){
 			'keywords':{
 				required:'<spring:message code="required"/>'
 			},
-			'district':{
-				required:'<spring:message code="required"/>'
-			},
 			'isAreaEffective':{
 				required:'<spring:message code="required"/>'
 			},
@@ -124,6 +118,7 @@ $(function(){
                             <input type="hidden" name="serviceId" value="${_cfg.serviceId}">  
                             <input type="hidden" name="cfgName" value="${cfgName}">  
                             <input type="hidden" name="action" value="${_cfg.action}">  
+                            <input type="hidden" name="district" value="${_cfg.district}">  
                               <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>