gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.调整加密隧道新增页面字段位置2.替换字典中中文提示

Browse Source
This commit is contained in:
zhanghongqing
2018-08-24 17:52:39 +08:00
parent d404305509
commit 5d2d5f2ba6
3 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/service/DictService.java
View File

@@ -52,7 +52,7 @@ public class DictService extends BaseService {
}else {//修改
//累加修改记录
String newRevision = "用户"+UserUtils.getUser().getName()+",在"+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"修改！";
String newRevision = "user:"+UserUtils.getUser().getName()+","+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"edit";
StringBuilder revisionBuilder = new StringBuilder(newRevision);
String oldRevision = sysDictName.getRevision();
if(!StringUtil.isBlank(oldRevision)){

59
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
View File

@@ -202,33 +202,7 @@ var delContent = function(contentClassName, addBtnClassName) {
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
<div class="col-md-6">
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
notAllowSelectRoot="true" cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
<div class="col-md-6" id="behaviour">
<select name="behavCode" data-live-search="true" class="selectpicker form-control">
<option value=""><spring:message code="select"/></option>
</select>
</div>
</div>
</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"><font color="red">*</font><spring:message code="action"/></label>
<div class="col-md-6">
@@ -273,8 +247,37 @@ var delContent = function(contentClassName, addBtnClassName) {
</c:forEach>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
<div class="col-md-6">
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
notAllowSelectRoot="true" cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
<div class="col-md-6" id="behaviour">
<select name="behavCode" data-live-search="true" class="selectpicker form-control">
<option value=""><spring:message code="select"/></option>
</select>
</div>
</div>
</div>
<div class="col-md-6" id="ratelimit">
</div>
<div class="row">
<div class="col-md-6" id="ratelimit">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6">

6
src/main/webapp/WEB-INF/views/sys/dictList.jsp
View File

@@ -109,7 +109,7 @@
html+="<td colspan='3'>";
html+="<table class='table table-bordered table-condensed'>";
html+="<thead>";
html+="<th><spring:message code="mark"/></th><th><spring:message code="value"/></th><th><spring:message code="describe"/></th><th><spring:message code="is_useable"/></th><th><spring:message code="is_maintain"/></th>";
html+="<th><spring:message code="mark"/></th><th><spring:message code="value"/></th><th><spring:message code="desc"/></th><th><spring:message code="is_useable"/></th><th><spring:message code="is_maintain"/></th>";
html+="</thead>";
html+="<tbody>";
for(i=0;i<data.dictItemList.length;i++){
@@ -158,7 +158,7 @@
html+="</tr>";
html+="<tr>";
html+="<th><spring:message code="describe"/>：";
html+="<th><spring:message code="desc"/>：";
html+="</th>";
html+="<td colspan='3'>"+data.remark;
html+="</td>";
@@ -281,7 +281,7 @@
<th class="sort-column module_name" width="15%"><spring:message code="module_name"/></th>
<th class="sort-column mark" width="20%"><spring:message code="dict_mark"/></th>
<th class="sort-column create_time" width="15%"><spring:message code="create_time"/></th>
<th width="17%"><spring:message code="describe"/></th>
<th width="17%"><spring:message code="desc"/></th>
<th width="18%"><spring:message code="edit_record"/></th>
<shiro:hasPermission name="sys:dict:edit">
<th width="15%"><spring:message code="operation"/></th>