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:
chenjinsong
2018-03-22 17:40:37 +08:00
parent bf300386d2 105d41b5fe
commit 7ffdb1c002
8 changed files with 183 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/messages/message_en.properties
View File

@@ -162,7 +162,7 @@ turning_page=It is turning to the page
login_timeout=No login or login timeout,please login again,Thank you!
captcha_error=captcha error
enter_captcha=Please enter the captcha
input=please input
input=please input
input_title=please input title
all_states=all states
filter=filter
@@ -278,4 +278,12 @@ case_insensitive_nohex=case insensitive and no hex
case_sensitive_nohex=case sensitive and no hex
area_effect_id=area effect id
ip_type=ip type
#==========guankongbaimingdan end=====================
#==========guankongbaimingdan end=====================
#==========tedingfuwu begin=====================
protocol_id=protocol ID
protocol_name=protocol name
group_id=group ID
input_protocol_id=please enter protocol ID
input_integer=please enter integer
protocol_desc=protocol description
#==========tedingfuwu end=====================

20
src/main/resources/messages/message_ru.properties
View File

@@ -146,7 +146,7 @@ task_time=task time
#==========message begin=====================
required=This field is required\uff01
required=This field is required！
select=Please select
date_list=Date List
confirm_message=Are you sure?
@@ -162,7 +162,7 @@ turning_page=It is turning to the page
login_timeout=No login or login timeout,please login again,Thank you!
captcha_error=captcha error
enter_captcha=Please enter the captcha
input=please input
input=please input
input_title=please input title
all_states=all states
filter=filter
@@ -173,6 +173,12 @@ has_approved=It has been approved and can not be operated on !
hasnot_approved=It has not been approved and can not be operated on !
check_one=choose one please !
one_more=please choose at least one !
custom_columns=custom columns
maxlength_64=The maxlength is 64！
maxlength_128=The maxlength is 128！
maxlength_256=The maxlength is 256！
maxlength_512=The maxlength is 512！
maxlength_4000=The maxlength is 4000！
#==========message end=====================
#==========yewuliexingguanli begin=====================
@@ -272,4 +278,12 @@ case_insensitive_nohex=case insensitive and no hex
case_sensitive_nohex=case sensitive and no hex
area_effect_id=area effect id
ip_type=ip type
#==========guankongbaimingdan end=====================
#==========guankongbaimingdan end=====================
#==========tedingfuwu begin=====================
protocol_id=protocol ID
protocol_name=protocol name
group_id=group ID
input_protocol_id=please enter protocol ID
input_integer=please enter integer
protocol_desc=protocol description
#==========tedingfuwu end=====================

12
src/main/resources/messages/message_zh_CN.properties
View File

@@ -181,7 +181,7 @@ maxlength_4000=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f4000\
#==========message end=====================
#==========yewuliexingguanli begin=====================
all=\u5168\u90E8
all=\u5168\u90e8
act=\u52a8\u4f5c
block=\u963b\u65ad
monitor=\u76d1\u6d4b
@@ -277,4 +277,12 @@ case_insensitive_nohex=\u5927\u5c0f\u5199\u4e0d\u654f\u611f\uff0c\u4e14\u975eHEX
case_sensitive_nohex=\u5927\u5c0f\u5199\u654f\u611f\uff0c\u4e14\u975eHEX
area_effect_id=\u533a\u57df\u751f\u6548id
ip_type=ip\u7c7b\u578b
#==========guankongbaimingdan end=====================
#==========guankongbaimingdan end=====================
#==========tedingfuwu begin=====================
protocol_id=\u534f\u8baeID
protocol_name=\u534f\u8bae\u540d\u79f0
group_id=maat\u7aef\u914d\u7f6e\u5206\u7ec4ID
input_protocol_id=\u8bf7\u8f93\u5165\u534f\u8baeID
input_integer=\u8bf7\u8f93\u5165\u6574\u6570
protocol_desc=\u534f\u8bae\u63cf\u8ff0
#==========tedingfuwu end=====================

4
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
View File

@@ -158,7 +158,6 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="seq"></spring:message></th>
<th><spring:message code="task_name"></spring:message></th>
<th><spring:message code="task_org"></spring:message></th>
<th><spring:message code="task_time"></spring:message></th>
@@ -176,7 +175,6 @@
<c:forEach items="${page.list}" var="taskInfo">
<tr>
<td><input type="checkbox" class="i-checks" id="${taskInfo.id}" value="${taskInfo.isAudit}"></td>
<td>${taskInfo.id }</td>
<td>${taskInfo.taskName }</td>
<td>${taskInfo.taskOrg }</td>
<td><fmt:formatDate value="${taskInfo.taskTime }" pattern="yyyy-MM-dd"/></td>
@@ -222,7 +220,7 @@
page();
});
$("#taskName").attr("placeholder","<spring:message code='input'/> "+"<spring:message code='task_name'/>");
$("#taskName").attr("placeholder","<spring:message code='input'/>"+"<spring:message code='task_name'/>");
//全选及取消
$("#checkAll").change(function(){
if($("#checkAll").prop("checked")){

8
src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
View File

@@ -149,19 +149,19 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>协议ID:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="protocol_id"/>:</label>
<div class="col-md-4">
<input id="specServiceId" name="specServiceId" maxlength="50" class="form-control" value="${specificServiceCfg.specServiceId}"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>协议名称:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="protocol_name"/>:</label>
<div class="col-md-4">
<form:input path="specServiceName" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">maat端配置分组id:</label>
<label class="col-md-3 control-label"><spring:message code="group_id"/>:</label>
<div class="col-md-4">
<form:input path="groupId" htmlEscape="false" maxlength="50" class="form-control" placeholder="0"/>
</div>
@@ -175,7 +175,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">协议描述:</label>
<label class="col-md-3 control-label"><spring:message code="protocol_desc"/>:</label>
<div class="col-md-4">
<form:textarea path="specServiceDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
</div>

42
src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
View File

@@ -98,7 +98,7 @@
filterActionInit();
$("#seltype").change(function(){
$("#intype").val("");
$("#intype").attr("placeholder","请输入"+$(this).find("option:selected").text());
$("#intype").attr("placeholder","<spring:message code='input'/>"+$(this).find("option:selected").text());
$("#intype").attr("name",$(this).find("option:selected").val());
$("#showError").hide();
});
@@ -148,12 +148,12 @@
<div class="input-group">
<div class="input-group-btn">
<select id="seltype" class="selectpicker select2 input-middle" >
<option value="specServiceId">协议ID</option>
<option value="specServiceName">协议名称</option>
<option value="groupId">maat端配置分组ID</option>
<option value="specServiceId"><spring:message code="protocol_id"/></option>
<option value="specServiceName"><spring:message code="protocol_name"/></option>
<option value="groupId"><spring:message code="group_id"/></option>
</select>
</div>
<input id="intype" class="form-control input-medium" placeholder="请输入协议ID" type="text" onchange="casec()">
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='input_protocol_id'/>" type="text" onchange="casec()">
<div class="input-group-btn">
<button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
</div>
@@ -161,21 +161,21 @@
</div>
</div>
<div class="pull-left" style="margin-top:10px;display:none" id="showError">
<label class="error">请填写整数</label>
<label class="error"><spring:message code='input_integer'/></label>
</div>
<div class="pull-left">
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code='filter'/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<button type="button" class="btn btn-default" onclick="cmd('${ctx}/specific/specificServiceCfg/form')">
<i class="fa fa-edit"></i> 编辑</button>
<i class="fa fa-edit"></i> <spring:message code="edit"/></button>
<button type="button" class="btn btn-default" onclick="cmd('${ctx}/specific/specificServiceCfg/delete')">
<i class="fa fa-trash"></i> 删除</button>
<i class="fa fa-trash"></i> <spring:message code="delete"/></button>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title="自定义列字段" href="javascript:;">
data-container="body" data-placement="top" data-original-title="<spring:message code='custom_columns'/>" href="javascript:;">
<i class="icon-wrench"></i>
</a>
</div>
@@ -191,14 +191,14 @@
<div class="col-md-6">
<div class="pull-left">
<label>操作时间：</label>
<label><spring:message code='operate_time'/>：</label>
</div>
<div class="pull-left">
<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
value="<fmt:formatDate value="${specificServiceCfg.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
<div class="pull-left">
<label>到</label>
<label><spring:message code='to'/></label>
</div>
<div class="pull-left">
<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
@@ -211,8 +211,8 @@
<div class="row">
<div class="pull-left">
<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> 搜索 </button>
<button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置 </button>
<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> <spring:message code='search'/> </button>
<button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> <spring:message code='reset'/> </button>
</div>
</div>
@@ -235,13 +235,13 @@
<thead>
<tr>
<th><input type="checkbox" class="ckboxs" id="selAll" onclick="selectAll()"></th>
<th>序号</th>
<th>协议ID</th>
<th>协议名称</th>
<th>协议描述</th>
<th>maat端配置分组id</th>
<!-- <th>序号</th> -->
<th><spring:message code="protocol_id"/></th>
<th><spring:message code="protocol_name"/></th>
<th><spring:message code="protocol_desc"/></th>
<th><spring:message code="group_id"/></th>
<th><spring:message code="is_leaf"/></th>
<th class="sort-column op_time">操作时间</th>
<th class="sort-column op_time"><spring:message code="operate_time"/></th>
<%-- <shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission>
--%> </tr>
</thead>
@@ -249,7 +249,7 @@
<c:forEach items="${list}" var="specificServiceCfg" varStatus="ss">
<tr id="${specificServiceCfg.specServiceId}" pId="${specificServiceCfg.parent.specServiceId ne 0?specificServiceCfg.parent.specServiceId:0}">
<td><input type="checkbox" class="ckbox" name="check" value="${specificServiceCfg.specServiceId}"></td>
<td>${specificServiceCfg.showSequence}</td>
<%-- <td>${specificServiceCfg.showSequence}</td> --%>
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/specific/specificServiceCfg/form?specServiceId=${specificServiceCfg.specServiceId}&doAction=0">${specificServiceCfg.specServiceId}</a></td>
<td title="${specificServiceCfg.specServiceName}">${specificServiceCfg.specServiceName}</td>
<td title="${specificServiceCfg.specServiceDesc}">${fns:abbr(specificServiceCfg.specServiceDesc,15)}</td>

90
src/main/webapp/WEB-INF/views/sys/dictForm.jsp
View File

@@ -22,7 +22,7 @@
});
//删除子项
$(".delItem").live("click",function(){
$("#items").delegate("button","click",function(){
$(this).parent().remove();
});
@@ -109,23 +109,38 @@
return true;
}
</script>
</head>
<body>
<ul class="nav nav-tabs">
<div class="page-content">
<div class="row">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
</div>
<h3 class="page-title">
<spring:message code="dictManage"/>
</h3>
<div class="col-md-12">
<%-- <ul class="nav nav-tabs">
<li><a href="${ctx}/sys/dict/list">字典列表</a></li>
<li class="active"><a href="${ctx}/sys/dict/form?id=${sysDataDictionaryName.id}">字典
<shiro:hasPermission name="sys:dict:edit"></shiro:hasPermission>${not empty sysDataDictionaryName.id?'修改':'添加'}
<shiro:lacksPermission name="sys:dict:edit">查看</shiro:lacksPermission>
</a></li>
</ul><br/>
</ul><br/> --%>
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><c:if test="${not empty sysDataDictionaryName.id}"><spring:message code="edit"/></c:if><c:if test="${empty sysDataDictionaryName.id}"><spring:message code="add"/></c:if></div>
</div>
<div class="portlet-body form">
<form:form id="inputForm" modelAttribute="sysDataDictionaryName" action="${ctx}/sys/dict/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="id"/>
<form:hidden path="revision"/>
<sys:message content="${message}"/>
@@ -141,35 +156,35 @@
<button class="close" data-dismiss="alert"></button>
表单验证成功！
</div>
<div class="control-group">
<label class="control-label">模块名:</label>
<div class="controls">
<form:input path="moduleName" htmlEscape="false" maxlength="50" class="required"/>
<span class="help-inline"><font color="red">*</font> </span>
<div class="form-body">
<div class="form-group">
<label class="col-md-3 control-label">模块名:</label>
<div class="col-md-4">
<form:input path="moduleName" htmlEscape="false" maxlength="50" class="required form-control"/>
</div>
<span class="help-inline"><font color="red">*</font> </span>
</div>
<div class="control-group">
<label class="control-label">字典标识:</label>
<div class="controls">
<form:input path="mark" htmlEscape="false" maxlength="50" class="required"/>
<span class="help-inline"><font color="red">*</font> </span>
<div class="form-group">
<label class="col-md-3 control-label">字典标识:</label>
<div class="col-md-4">
<form:input path="mark" htmlEscape="false" maxlength="50" class="required form-control"/>
</div>
<span class="help-inline"><font color="red">*</font> </span>
</div>
<div class="control-group">
<label class="control-label">词条项</label>
<div class="controls">
<div class="form-group">
<label class="col-md-3 control-label">词条项</label>
<div class="col-md-4">
<span type="button" class="btn black" title="点击添加词条项" id="btn_add_item">
<i class="icon-plus"></i> 添加词条
</span>
<span class="help-inline"><font color="red">*</font> </span>
</div>
<div id="items" class="controls">
</div>
<div class="form-group">
<div class="col-md-3"></div>
<div id="items" class="col-md-8">
<p id="itemModel" style="display: none;margin-top: 3px;">
标识 <input type="text" class="itemCode" autocomplete="off"/>
值 <input type="text" class="itemValue" autocomplete="off"/>
@@ -184,7 +199,7 @@
<option value="1">是</option>
<option value="0">否</option>
</select>
<input type="button" class="btn red delItem" value="删除"/>
<button type="button" class="btn red delItem" >删除</button>
</p>
<c:forEach items="${sysDataDictionaryName.dictItemList }" var="dictItem">
@@ -203,30 +218,37 @@
<option value="0" <c:if test="${dictItem.type==0}">selected</c:if>>否</option>
</select>
<c:if test="${dictItem.type==1}">
<input type="button" class="btn red delItem" value="删除"/>
<button type="button" class="btn red delItem" >删除</button>
</c:if>
</p>
</c:forEach>
</div>
</div>
<div class="control-group">
<label class="control-label">描述信息:</label>
<div class="controls">
<form:textarea path="remark" htmlEscape="false" rows="3" maxlength="200" class="span6"/>
<div class="form-group">
<label class="col-md-3 control-label">描述信息:</label>
<div class="col-md-4">
<form:textarea path="remark" htmlEscape="false" rows="3" maxlength="200" class="span6 form-control"/>
</div>
</div>
<div id="messageBox" class="alert alert-error hide"></div>
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:dict:edit"></shiro:hasPermission>
<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
<button type="submit" class="btn btn-circle blue"><spring:message code="submit"></spring:message></button>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
</div>
</div>
</div>
</div>
</form:form>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

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

@@ -202,29 +202,69 @@
</script>
</head>
<body>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/sys/dict/form'">
<i class="fa fa-plus"></i>
<spring:message code="add"/></button>
</div>
<ul class="nav nav-tabs">
<li class="active"><a href="${ctx}/sys/dict/list">字典列表</a></li>
<shiro:hasPermission name="sys:dict:edit"></shiro:hasPermission>
<li><a href="${ctx}/sys/dict/form">字典添加</a></li>
</ul>
<form:form id="searchForm" action="${ctx}/sys/dict/list" method="post" class="breadcrumb form-search">
<h3 class="page-title">
<spring:message code="dictManage"></spring:message>
<small><spring:message code="date_list"/></small>
</h3>
<h5 class="page-header"></h5>
<div class="row">
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" action="${ctx}/sys/dict/list" method="post" class="form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
<div>
<label>模块名称：</label><input id="moduleName" name="moduleName" type="text" maxlength="50" class="input-medium" value="${sysDataDictionaryName.moduleName}"/>
<label>字典标识：</label><input id="mark" name="mark" type="text" maxlength="50" class="input-medium" value="${sysDataDictionaryName.mark}"/>
<label>创建时间：&nbsp;</label><input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
value="<fmt:formatDate value="${sysDataDictionaryName.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
<label>&nbsp;--&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
value="<fmt:formatDate value="${sysDataDictionaryName.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>&nbsp;&nbsp;
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12 filter-action-select-panle" style="background-color:transparent">
<div class="row">
<div class="col-md-3">
<div class="pull-left">
<label>模块名称：</label>
</div>
<div class="pull-left">
<input id="moduleName" name="moduleName" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.moduleName}"/>
</div>
</div>
<div class="col-md-3">
<div class="pull-left">
<label>字典标识：</label>
</div>
<div class="pull-left">
<input id="mark" name="mark" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.mark}"/>
</div>
</div>
<div class="col-md-6">
<div class="pull-left">
<label>创建时间：</label>
</div>
<div class="pull-left">
<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${sysDataDictionaryName.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
<div class="pull-left">
<label><spring:message code="to"/></label>
</div>
<div class="pull-left">
<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${sysDataDictionaryName.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
<div class="pull-left">
<button type="submit" class="btn blue""><i class="fa fa-search"></i><spring:message code="search" /></button>
</div>
</div>
</div>
</div>
</form:form>
</div>
<sys:message content="${message}"/>
@@ -279,6 +319,12 @@
</c:forEach>
</tbody>
</table>
<div class="pagination">${page}</div>
<div class="page">${page}</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>