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

完成分类性质菜单，地域运营商特征作用域，特定服务管理权限控制，

Browse Source 
修订分类性质菜单，地域运营商特征作用域国际化错误及特定服务管理国际化
This commit is contained in:
zhangshilin
2018-03-28 18:24:09 +08:00
parent 94c8fb6de5
commit 0fde30ee6e
16 changed files with 133 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

@@ -134,10 +134,12 @@
'itemCode':{
//isLevelNoSure:true,
required:true,
remote:'${ctx}/basics/serviceDictInfo/isItemCodeRepeat?oldItemCode=${serviceDictInfo.itemCode}'
remote:'${ctx}/basics/serviceDictInfo/isItemCodeRepeat?oldItemCode=${serviceDictInfo.itemCode}',
maxlength:64
},
'itemValue':{
required:true
required:true,
maxlength:64
},
'itemType':{
typeSame:true,
@@ -146,6 +148,9 @@
'isLeaf':{
leafChange:true
//leafHasTree:true
},
'itemDesc':{
maxlength:128
}
},
@@ -156,10 +161,12 @@
'itemCode':{
//isLevelNoSure:"选择此配置上下层级数将超过四级",
required:'<spring:message code="required"/>',
remote:'<spring:message code="repeat"/>'
remote:'<spring:message code="repeat"/>',
maxlength:'<spring:message code="maxlength_64"/>'
},
'itemValue':{
required:'<spring:message code="required"/>'
required:'<spring:message code="required"/>',
maxlength:'<spring:message code="maxlength_64"/>'
},
'itemType':{
typeSame:'<spring:message code="typeSame"/>',
@@ -168,15 +175,14 @@
'isLeaf':{
leafChange:'<spring:message code="leafChange"/>'
//leafHasTree:'该配置上级为根节点，不得设为叶子节点'
}
},
'itemDesc':{
maxlength:'<spring:message code="maxlength_128"/>'
}
},
submitHandler: function(form){
var is_level_wrong=errorShow();
if(!is_level_wrong){
return false;
$(".errorShow").show();
}
errorShow();
loading('<spring:message code="submitting"/>');
form.submit();
},
@@ -258,7 +264,7 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
<div class="col-md-4">
<form:input path="itemCode" htmlEscape="false" maxlength="50" class="form-control"/>
<form:input path="itemCode" htmlEscape="false" maxlength="60" class="form-control"/>
</div>
</div>
<div class="form-group">
@@ -286,7 +292,7 @@
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
<button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
</div>
</div>

2
src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
View File

@@ -149,7 +149,7 @@
</select>
</div>
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='item_code'></spring:message>" type="text">
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='item_code'></spring:message>" type="text" maxlength="60">
</div>

25
src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
View File

@@ -108,10 +108,12 @@
},
'itemCode':{
required:true,
remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}'
remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}',
maxlength:64
},
'itemValue':{
required:true
required:true,
maxlength:64
},
'itemType':{
typeSame:true,
@@ -120,6 +122,9 @@
'isLeaf':{
leafChange:true
//leafHasTree:true
},
'itemDesc':{
maxlength:128
}
},
@@ -129,10 +134,12 @@
},
'itemCode':{
required:'<spring:message code="required"/>',
remote:'<spring:message code="repeat"/>'
remote:'<spring:message code="repeat"/>',
maxlength:'<spring:message code="maxlength_64"/>'
},
'itemValue':{
required:'<spring:message code="required"/>'
required:'<spring:message code="required"/>',
maxlength:'<spring:message code="maxlength_64"/>'
},
'itemType':{
typeSame:'<spring:message code="typeSame"/>',
@@ -141,7 +148,11 @@
'isLeaf':{
leafChange:'<spring:message code="leafChange"/>'
//leafHasTree:'该配置上级为根节点，不得设为叶子节点'
}
},
'itemDesc':{
maxlength:'<spring:message code="maxlength_128"/>'
}
},
submitHandler: function(form){
@@ -225,7 +236,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="itemCode"/>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
<div class="col-md-4">
<form:input path="itemCode" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
@@ -260,7 +271,7 @@
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
<button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
</div>
</div>

2
src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
View File

@@ -152,7 +152,7 @@
</select>
</div>
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='item_code'></spring:message>" type="text">
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='item_code'></spring:message>" type="text" maxlength="60">
</div>
</div>

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

@@ -8,7 +8,7 @@
<script type="text/javascript">
$(document).ready(function() {
jQuery.validator.addMethod("maxValue", function(value, element) {
return value >=0&&value<210000000;
return value >=0&&value<2100000000;
}, "请填写正确的协议id");
//校验叶子节点无上级不得选为叶子节点
jQuery.validator.addMethod("leafHasTree",function(value,element){
@@ -46,38 +46,47 @@
specServiceId:{
required:true,
digits:true,
maxValue: true,
max: 2100000000,
remote:'${ctx}/specific/specificServiceCfg/isIdRepeat?oldId=${specificServiceCfg.specServiceId}'
},
specServiceName:{
required:true
required:true,
maxlength:64
},
groupId:{
digits:true,
maxValue:true
max:2100000000
},
isLeaf:{
leafHasTree:true,
//leafHasTree:true,
leafChange:true
},
specServiceDesc:{
maxlength:64
}
},
messages: {
specServiceId:{
required:'请填写协议ID',
digits:"请填写整数数字",
maxValue: "请填写正确的协议ID(0~210000000)",
remote:'该协议ID已存在'
required:'<spring:message code="required"/>',
digits:'<spring:message code="input_integer"/>',
max: '<spring:message code="input_integer"/>',
remote:'<spring:message code="repeat"/>'
},
specServiceName:{
required:'请填写协议名称'
required:'<spring:message code="required"/>',
maxlength:'<spring:message code="maxlength_64"/>'
},
groupId:{
digits:'请填写整数数值',
maxValue:'请填写正确的分组Id(0~210000000)'
digits:'<spring:message code="input_integer"/>',
max:'<spring:message code="input_integer"/>'
},
isLeaf:{
leafHasTree:'该配置上级为根节点，不得设为叶子节点',
leafChange:'该配置包含下级配置，不得改为叶子节点'
//leafHasTree:'该配置上级为根节点，不得设为叶子节点',
leafChange:'<spring:message code="leafChange"/>'
},
specServiceDesc:{
maxlength:'<spring:message code="maxlength_64"/>'
}
},
@@ -122,7 +131,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><shiro:hasPermission name="sys:menu:edit">${not empty specificServiceCfg.specServiceId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<i class="fa fa-gift"></i><c:if test="${not empty specificServiceCfg.specServiceId}"><spring:message code='edit'/></c:if><c:if test="${empty specificServiceCfg.specServiceId}"><spring:message code='add'/></c:if></div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -144,7 +153,8 @@
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4">
<sys:treeselect id="specificServiceCfg" name="parent.specServiceId" value="${specificServiceCfg.parent.specServiceId}" labelName="parent.specServiceName" labelValue="${specificServiceCfg.parent.specServiceName eq '根节点'?'根节点':fns:getBySpecServiceId(specificServiceCfg.parent.specServiceId).specServiceName}"
<c:set var="fatherName"><spring:message code="root_node"/></c:set>
<sys:treeselect id="specificServiceCfg" name="parent.specServiceId" value="${specificServiceCfg.parent.specServiceId}" labelName="parent.specServiceName" labelValue="${specificServiceCfg.parent.specServiceName eq 'root_node'?fatherName:fns:getBySpecServiceId(specificServiceCfg.parent.specServiceId).specServiceName}"
title="菜单" url="/specific/specificServiceCfg/treeData" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>
</div>
</div>
@@ -170,8 +180,10 @@
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4">
<form:select path="isLeaf" class="form-control">
<form:options items="${fns:getDictList('INT_YES_NO')}" itemLabel="<spring:message code="itemValue"/>" itemValue="itemCode" htmlEscape="false"/>
</form:select>
<c:forEach items="${fns:getDictList('INT_YES_NO')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
</div>
</div>
<div class="form-group">
@@ -183,7 +195,7 @@
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
<shiro:hasPermission name="specific:service:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
</div>
</div>

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

@@ -17,20 +17,14 @@
处理全选、全取消
**/
function selectAll(){
//alert($("#selAll").prop("checked"));
if($("#selAll").prop("checked")){
//$("#treeTable").find(":checkbox[name='check']").attr("checked","checked");
//$("#treeTable").find(":checkbox[name='check']").each(function(){
$("input[name='check']:checkbox").each(function(){
$(this).prop("checked",true);
});
}else{
//$("#treeTable").find(":checkbox[name='check']").attr("checked",false);
//$("#treeTable").find(":checkbox[name='check']").each(function(){
$("input[name='check']:checkbox").each(function(){
//$(this).attr("checked",false);
$(this).removeProp("checked");
});
}
@@ -47,9 +41,9 @@
}
});
if(mulitId!=""){
confirmx('您确认要执行该操作？', url+"?mulitId="+mulitId);
confirmx("<spring:message code='confirm_message'/>", url+"?mulitId="+mulitId);
}else{
alert("至少选择一条数据记录");
alert("<spring:message code='one_more'/>");
}
}
function casec(){
@@ -57,10 +51,12 @@
if(isNaN($("#intype").val())){
$("#showError").show();
return false;
}else{
}else if($("#intype").val()>2100000000){
$("#showError").show();
return false;
}else{
$("#showError").hide();
//alert(11);
return true;
return true;
}
}else{
$("#showError").hide();
@@ -70,7 +66,6 @@
//查询
function page(n,s){
//$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/specific/specificServiceCfg/list");
@@ -115,10 +110,12 @@
<body>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="specific:service:edit">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/specific/specificServiceCfg/form'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message>配置</button>
<spring:message code="add"></spring:message><spring:message code="configuration"></spring:message></button>
</shiro:hasPermission>
</div>
<h3 class="page-title">
@@ -153,7 +150,7 @@
<option value="groupId"><spring:message code="group_id"/></option>
</select>
</div>
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='input_protocol_id'/>" type="text" onchange="casec()">
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='input_protocol_id'/>" type="text" onchange="casec()" maxlength="60">
</div>
@@ -163,18 +160,22 @@
</div>
<div class="pull-left">
<shiro:hasPermission name="specific:service:view">
<button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
</shiro:hasPermission>
<button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<shiro:hasPermission name="specific:service:edit">
<button type="button" class="btn btn-default" onclick="cmd('${ctx}/specific/specificServiceCfg/form')">
<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> <spring:message code="delete"/></button>
</shiro:hasPermission>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title="<spring:message code='custom_columns'/>" href="javascript:;">
<i class="icon-wrench"></i>
@@ -240,8 +241,7 @@
<th><spring:message code="group_id"/></th>
<th><spring:message code="is_leaf"/></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>
</tr>
</thead>
<tbody>
<c:forEach items="${list}" var="specificServiceCfg" varStatus="ss">
@@ -252,7 +252,7 @@
<td title="${specificServiceCfg.specServiceName}">${specificServiceCfg.specServiceName}</td>
<td title="${specificServiceCfg.specServiceDesc}">${fns:abbr(specificServiceCfg.specServiceDesc,15)}</td>
<td>${specificServiceCfg.groupId }</td>
<td>${fns:getDictLabel("SYS_YES_NO",specificServiceCfg.isLeaf,"0")}</td>
<td><spring:message code="${fns:getDictLabel('INT_YES_NO',specificServiceCfg.isLeaf,'0')}"></spring:message></td>
<td><fmt:formatDate value="${specificServiceCfg.opTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<%-- <td>
<div class="btn-group btn-xs">

2
src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
View File

@@ -453,7 +453,7 @@ function sjfdsj(){
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit" /></button></shiro:hasPermission>
<shiro:hasPermission name="specific:serviceIp:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit" /></button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"> <spring:message code="cancel" /></button>
</div>
</div>