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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
leijun
2018-08-31 16:32:50 +08:00
parent c531619177 781d236859
commit 3a16c894ab
25 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
View File

@@ -25,7 +25,7 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_number"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control required" maxlength="64" name="requestNumber" value="${requestInfo.requestNumber}">
<input type="text" class="form-control required" maxlength="512" name="requestTitle" value="${requestInfo.requestTitle}"><!--requestTitle当成来函函号使用 -->
</div>
</div>
<div class="form-group">
@@ -44,7 +44,7 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="title"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control required" name="requestTitle" maxlength="512" value="${requestInfo.requestTitle}">
<input type="text" class="form-control required" name="requestNumber" maxlength="512" value="${requestInfo.requestNumber}"><!--requestTitle当成来函标题使用 -->
</div>
</div>
<div class="form-group">

8
src/main/webapp/WEB-INF/views/cfg/requestList.jsp
View File

@@ -74,8 +74,8 @@
<div class="input-group">
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="requestTitle"><spring:message code="title"></spring:message></form:option>
<form:option value="requestNumber"><spring:message code="request_number"></spring:message></form:option>
<form:option value="requestNumber"><spring:message code="title"></spring:message></form:option>
<form:option value="requestTitle"><spring:message code="request_number"></spring:message></form:option>
<form:option value="requestContent"><spring:message code="content"></spring:message></form:option>
</form:select>
</div>
@@ -221,7 +221,7 @@
<tr>
<td><input type="checkbox" class="i-checks" id="${requestInfo.id}" value="${requestInfo.isAudit}"></td>
<td>${requestInfo.id }</td>
<td>${requestInfo.requestNumber }</td>
<td>${requestInfo.requestTitle }</td><!--requestTitle当成来函函号使用 -->
<td>${requestInfo.requestOrg }</td>
<td><fmt:formatDate value="${requestInfo.requestTime }" pattern="yyyy-MM-dd"/></td>
<td>
@@ -232,7 +232,7 @@
<c:when test="${requestInfo.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose>
</td>
<td>${requestInfo.requestTitle }</td>
<td>${requestInfo.requestNumber }</td><!--requestTitle当成来函标题使用 -->
<td>${requestInfo.requestContent }</td>
<td>${requestInfo.taskName }</td>
<td>${requestInfo.creatorName }</td>

3
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -66,6 +66,7 @@
hasInvisibleChar:"The tag {0} has invisible character",
haveInvisibleChar:"The tags {0} have invisible character",
httpCheck:"Please enter a correct url(http[s]://xxx.xx)",
failed:"Failed"
failed:"Failed",
go_back:"Go Back Policies"
});
}(jQuery));

4
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
View File

@@ -66,7 +66,7 @@
hasInvisibleChar:"标签{0}包含不可见字符",
haveInvisibleChar:"标签{0}包含不可见字符",
httpCheck:"请输入正确的url(http[s]://xxx.xx)",
failed:"获取失败"
failed:"获取失败",
go_back:"返回配置界面"
});
}(jQuery));

5
src/main/webapp/static/global/scripts/common.js
View File

@@ -433,6 +433,11 @@ $(function(){
return false;
});
initCommIpVal();
//去掉首尾空格
$("input,textarea").on("blur",function(){
var val=$(this).val();
$(this).val(val.trim());
});
});
window.onload=function(){
// 配置id的搜索下拉框选择切换

2
src/main/webapp/static/pages/scripts/pageLogs.js
View File

@@ -52,7 +52,7 @@ $(document).ready(function() {
// 添加由配置界面跳转到日志查询界面后的返回按钮
var cfgId = $("#cfgId").val();
if(cfgId != undefined && cfgId != ''){
$(".theme-panel").html("<button type='button' onclick='back()' class='btn btn-primary'>cancel</button>");
$(".theme-panel").html("<button type='button' onclick='back()' class='btn btn-primary'>"+$.validator.messages.go_back+"</button>");
}
});