修复关联分类,性质,标签的类型sql join 1,2,3

数值类,增强字符串类PZ搜索调整
This commit is contained in:
wangxin
2018-03-12 16:34:55 +08:00
parent d842c773ec
commit 2df9aa9665
10 changed files with 559 additions and 254 deletions

View File

@@ -5,7 +5,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
</div>
@@ -14,7 +14,7 @@
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="match_area"/></label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="district" value="${_cfg.district}">
</div>
</div>
@@ -24,7 +24,7 @@
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="key_word"/></label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="keywords" value="${_cfg.keywords}">
</div>
</div>
@@ -33,7 +33,7 @@
<%-- <div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">管控类型</label>
<div class="col-md-8">
<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>
@@ -49,7 +49,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
<div class="col-md-8">
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="1"
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
@@ -69,7 +69,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="expression_type"/></label>
<div class="col-md-8">
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="exprType" value="1"
<c:if test="${_cfg.exprType==1}">checked</c:if>
@@ -86,7 +86,7 @@
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="match_method"/></label>
<div class="col-md-8">
<div class="col-md-6">
<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
@@ -101,7 +101,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
<div class="col-md-8">
<div class="col-md-6">
<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
@@ -113,7 +113,7 @@
<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-8">
<div class="col-md-6">
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
</div>
</div>