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-06 11:50:34 +08:00
parent 80bf284a1e 752f59b360
commit e9acb15078
44 changed files with 1438 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/include/header.jsp
View File

@@ -60,4 +60,6 @@
<script src="${pageContext.request.contextPath}/static/layouts/layout/scripts/layout.js" type="text/javascript"></script>
<!-- END THEME LAYOUT SCRIPTS -->
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>

36
src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp → src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

@@ -13,7 +13,7 @@
type:'post',
async:true,
cache:false,
url:'${ctx}/configuration/serviceDictInfo/ajaxItemType',
url:'${ctx}/basics/serviceDictInfo/ajaxItemType',
data:{parent:parent},
success:function(data){
$("#itemType option").each(function(){
@@ -32,7 +32,7 @@
$.ajax({
type:'post',
async:false,
url:'${ctx}/configuration/serviceDictInfo/ajaxType',
url:'${ctx}/basics/serviceDictInfo/ajaxType',
data:{parent:$("#serviceDictInfoId").val(),child:$("#itemType option:selected").val()},
success:function(data){
flag=data;
@@ -46,7 +46,7 @@
$.ajax({
type:'post',
async:false,
url:'${ctx}/configuration/serviceDictInfo/ajaxChildrenType',
url:'${ctx}/basics/serviceDictInfo/ajaxChildrenType',
data:{parent:"${serviceDictInfo.serviceDictId}",newItemType:$("#itemType option:selected").val()},
success:function(data){
flag=data;
@@ -60,7 +60,7 @@
$.ajax({
type:'post',
async:false,
url:'${ctx}/configuration/serviceDictInfo/ajaxLeafChange',
url:'${ctx}/basics/serviceDictInfo/ajaxLeafChange',
data:{parent:"${serviceDictInfo.serviceDictId}",newIsLeaf:$("#isLeaf option:selected").val()},
success:function(data){
flag=data;
@@ -75,14 +75,14 @@
$.ajax({
type:'post',
async:false,
url:'${ctx}/configuration/serviceDictInfo/ajaxLeafHasTree',
url:'${ctx}/basics/serviceDictInfo/ajaxLeafHasTree',
data:{serviceDictId:"${serviceDictInfo.serviceDictId}",newIsLeaf:$("#isLeaf option:selected").val(),parentId:$("#serviceDictInfoId").val()},
success:function(data){
flag=data;
}
});
return flag;
},"该配置无上级，不得设为叶子节点");
},"该配置上级为根节点，不得设为叶子节点");
@@ -90,12 +90,6 @@
$("#inputForm").validate({
//需验证 item_code item_value
rules: {
'itemCode':{
required:true,
digits:true,
codeNumber:true,
remote:"${ctx}/configuration/serviceDictInfo/isItemCodeRepeat?oldItemCode=${serviceDictInfo.itemCode}"
},
'itemValue':{
required:true
},
@@ -110,12 +104,6 @@
},
messages: {
'itemCode':{
required:'编码必须填写',
digits:'请填写整数值',
codeNumber:'请填写合适的数值（0~200000000）',
remote:"该配置编码已存在"
},
'itemValue':{
required:'编码对应值必须填写'
},
@@ -125,7 +113,7 @@
},
'isLeaf':{
leafChange:'该配置包含下级配置，不得改为叶子节点',
leafHasTree:'该配置无上级，不得设为叶子节点'
leafHasTree:'该配置上级为根节点，不得设为叶子节点'
}
},
@@ -182,14 +170,14 @@
<div class="form-body">
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
<form:hidden path="serviceDictId"/>
<sys:message content="${message}"/>
<div class="form-group">
<label class="col-md-3 control-label">上级配置:</label>
<div class="col-md-4">
<sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq '无上级'?'无上级':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
title="菜单" url="/configuration/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/>
<sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/>
</div>
</div>
<div class="form-group">
@@ -208,12 +196,12 @@
</select>
</div>
</div>
<div class="form-group">
<%-- <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>配置编码:</label>
<div class="col-md-4">
<form:input path="itemCode" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
</div> --%>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label>
<div class="col-md-4">

4
src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp → src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp
View File

@@ -35,13 +35,13 @@
<div class="form-body">
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="serviceDictId"/>
<sys:message content="${message}"/>
<div class="form-group">
<label class="col-md-3 control-label">上级配置:</label>
<div class="col-md-4">
<input value="${serviceDictInfo.parent.serviceDictId == 0?'无上级':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
<input value="${serviceDictInfo.parent.serviceDictId == 0?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
</div>
</div>
<div class="form-group">

18
src/main/webapp/WEB-INF/views/cfg/serviceDictInfoSearchList.jsp → src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
View File

@@ -16,7 +16,7 @@
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}");
$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
$("#searchForm").submit();
return false;
}
@@ -24,7 +24,7 @@
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}");
$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
$("#searchForm").submit();
return false;
}
@@ -37,9 +37,9 @@
</head>
<body>
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/configuration/serviceDictInfo/form?itType=${itType}'">新增配置</button>
onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'">新增配置</button>
</div>
<h3 class="page-title">
@@ -58,7 +58,7 @@
<div class="row" >
<div class="col-md-12">
<sys:message content="${message}"/>
<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/searchList?itType=${itType}" 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}"/>
<div class="col-md-12">
@@ -91,7 +91,7 @@
<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${page.list}" var="serviceDictInfo">
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
<td>${serviceDictInfo.itemCode}</td>
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
<td>${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
</shiro:hasPermission>
</ul>

18
src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp → src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
View File

@@ -16,7 +16,7 @@
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/list?itType=${itType}");
$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/list?itType=${itType}");
$("#searchForm").submit();
return false;
}
@@ -24,7 +24,7 @@
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}");
$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
$("#searchForm").submit();
return false;
}
@@ -37,9 +37,9 @@
</head>
<body>
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/configuration/serviceDictInfo/form?itType=${itType}'">新增配置</button>
onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'">新增配置</button>
</div>
<h3 class="page-title">
@@ -58,7 +58,7 @@
<div class="row" >
<div class="col-md-12">
<sys:message content="${message}"/>
<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/searchList?itType=${itType}" 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}"/>
<div class="col-md-12">
@@ -91,7 +91,7 @@
<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${list}" var="serviceDictInfo">
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
<td>${serviceDictInfo.itemCode}</td>
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
<td>${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
<li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
</shiro:hasPermission>
</ul>

36
src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp → src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
View File

@@ -13,7 +13,7 @@
type:'post',
async:true,
cache:false,
url:'${ctx}/configuration/sysDictInfo/ajaxItemType',
url:'${ctx}/basics/sysDictInfo/ajaxItemType',
data:{parent:parent},
success:function(data){
$("#itemType option").each(function(){
@@ -32,7 +32,7 @@
$.ajax({
type:'post',
async:false,
url:'${ctx}/configuration/sysDictInfo/ajaxType',
url:'${ctx}/basics/sysDictInfo/ajaxType',
data:{parent:$("#sysDictInfoId").val(),child:$("#itemType option:selected").val()},
success:function(data){
flag=data;
@@ -46,7 +46,7 @@
$.ajax({
type:'post',
async:false,
url:'${ctx}/configuration/sysDictInfo/ajaxChildrenType',
url:'${ctx}/basics/sysDictInfo/ajaxChildrenType',
data:{parent:"${sysDictInfo.sysDictId}",newItemType:$("#itemType option:selected").val()},
success:function(data){
flag=data;
@@ -60,7 +60,7 @@
$.ajax({
type:'post',
async:false,
url:'${ctx}/configuration/sysDictInfo/ajaxLeafChange',
url:'${ctx}/basics/sysDictInfo/ajaxLeafChange',
data:{parent:"${sysDictInfo.sysDictId}",newIsLeaf:$("#isLeaf option:selected").val()},
success:function(data){
flag=data;
@@ -75,14 +75,14 @@
$.ajax({
type:'post',
async:false,
url:'${ctx}/configuration/sysDictInfo/ajaxLeafHasTree',
url:'${ctx}/basics/sysDictInfo/ajaxLeafHasTree',
data:{sysDictId:"${sysDictInfo.sysDictId}",newIsLeaf:$("#isLeaf option:selected").val(),parentId:$("#sysDictInfoId").val()},
success:function(data){
flag=data;
}
});
return flag;
},"该配置无上级，不得设为叶子节点");
},"该配置上级为根节点，不得设为叶子节点");
@@ -90,12 +90,6 @@
$("#inputForm").validate({
//需验证 item_code item_value
rules: {
'itemCode':{
required:true,
digits:true,
codeNumber:true,
remote:"${ctx}/configuration/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}"
},
'itemValue':{
required:true
},
@@ -110,12 +104,6 @@
},
messages: {
'itemCode':{
required:'编码必须填写',
digits:'请填写整数值',
codeNumber:'请填写合适的数值（0~200000000）',
remote:"该配置编码已存在"
},
'itemValue':{
required:'编码对应值必须填写'
},
@@ -125,7 +113,7 @@
},
'isLeaf':{
leafChange:'该配置包含下级配置，不得改为叶子节点',
leafHasTree:'该配置无上级，不得设为叶子节点'
leafHasTree:'该配置上级为根节点，不得设为叶子节点'
}
},
@@ -182,14 +170,14 @@
<div class="form-body">
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
<form:hidden path="sysDictId"/>
<sys:message content="${message}"/>
<div class="form-group">
<label class="col-md-3 control-label">上级配置:</label>
<div class="col-md-4">
<sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.itemValue eq '无上级'?'无上级':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}"
title="菜单" url="/configuration/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
<sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}"
title="菜单" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
</div>
</div>
<div class="form-group">
@@ -208,12 +196,12 @@
</select>
</div>
</div>
<div class="form-group">
<%-- <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>配置编码:</label>
<div class="col-md-4">
<form:input path="itemCode" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
</div> --%>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label>
<div class="col-md-4">

4
src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp → src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp
View File

@@ -35,13 +35,13 @@
<div class="form-body">
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="sysDictId"/>
<sys:message content="${message}"/>
<div class="form-group">
<label class="col-md-3 control-label">上级配置:</label>
<div class="col-md-4">
<input value="${sysDictInfo.parent.sysDictId == 0?'无上级':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
<input value="${sysDictInfo.parent.sysDictId == 0?'根节点':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
</div>
</div>
<div class="form-group">

18
src/main/webapp/WEB-INF/views/cfg/sysDictInfoSearchList.jsp → src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
View File

@@ -16,7 +16,7 @@
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}");
$("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
$("#searchForm").submit();
return false;
}
@@ -24,7 +24,7 @@
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}");
$("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
$("#searchForm").submit();
return false;
}
@@ -37,9 +37,9 @@
</head>
<body>
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/configuration/sysDictInfo/form?itType=${itType}'">新增配置</button>
onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">新增配置</button>
</div>
<h3 class="page-title">
@@ -58,7 +58,7 @@
<div class="row" >
<div class="col-md-12">
<sys:message content="${message}"/>
<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/searchList?itType=${itType}" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/searchList?itType=${itType}" 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}"/>
<div class="col-md-12">
@@ -91,7 +91,7 @@
<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${page.list}" var="sysDictInfo">
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
<td>${sysDictInfo.itemCode}</td>
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
</shiro:hasPermission>
</ul>

18
src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp → src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
View File

@@ -16,7 +16,7 @@
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/list?itType=${itType}");
$("#searchForm").attr("action","${ctx}/basics/sysDictInfo/list?itType=${itType}");
$("#searchForm").submit();
return false;
}
@@ -24,7 +24,7 @@
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}");
$("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
$("#searchForm").submit();
return false;
}
@@ -37,9 +37,9 @@
</head>
<body>
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/configuration/sysDictInfo/form?itType=${itType}'">新增配置</button>
onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">新增配置</button>
</div>
<h3 class="page-title">
@@ -58,7 +58,7 @@
<div class="row" >
<div class="col-md-12">
<sys:message content="${message}"/>
<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/searchList?itType=${itType}" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/searchList?itType=${itType}" 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}"/>
<div class="col-md-12">
@@ -91,7 +91,7 @@
<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${list}" var="sysDictInfo">
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
<td>${sysDictInfo.itemCode}</td>
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
@@ -108,12 +108,12 @@
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
<li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
</shiro:hasPermission>
</ul>

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

@@ -7,18 +7,18 @@
</head>
<body>
<div class="content">
<div class="page-content">
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="update_request"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add_request"/></c:if></div>
<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="edit"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add"/></c:if></div>
</div>
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form:form action="${ctx}/cfg/request/saveOrUpdate" class="form-horizontal" id="inputForm" method="post" >
<form:form action="${ctx}/cfg/request/saveOrUpdate" modelAttribute="requestInfo" class="form-horizontal" id="inputForm" method="post" >
<sys:message content="${message}"/>
<input type="hidden" name="id" value="${requestInfo.id}"/>
<div class="form-body">
@@ -47,12 +47,23 @@
<input type="text" class="form-control" name="requestTitle" value="${requestInfo.requestTitle}">
</div>
</div>
<div class="form-group last">
<label class="col-md-3 control-label"><th><spring:message code="content"></spring:message>:</label>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="content"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control" name="requestContent" value="${requestInfo.requestContent}">
</div>
</div>
<div class="form-group last">
<label class="col-md-3 control-label"><th><spring:message code="special_task"/>:</label>
<div class="col-md-4">
<form:select path="taskId" class="selectpicker select2">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${taskInfos}" var="taskInfo">
<form:option value="${taskInfo.id}">${taskInfo.taskName}</form:option>
</c:forEach>
</form:select>
</div>
</div>
</div>
<div class="form-actions">
<div class="row">

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

@@ -8,15 +8,15 @@
<body>
<div class="content">
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/request/list'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add_request"></spring:message></button>
onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add"></spring:message></button>
</div>
<h3 class="page-title">
来函管理
<spring:message code="requestInfo"></spring:message>
</h3>
<div class="row">
@@ -24,7 +24,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="request_number"></spring:message>
<i class="fa fa-cogs"></i><spring:message code="date_list"/>
</div>
</div>
<div class="portlet-body">
@@ -35,19 +35,20 @@
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
<spring:message code="state"/> : <form:select path="isAudit" class="select2">
<form:option value=""></form:option>
<form:option value=""><spring:message code="select"></spring:message></form:option>
<form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
</form:select>
<select id="seltype">
<option value=""><spring:message code="select"></spring:message></option>
<option value="requestTitle"><spring:message code="title"></spring:message></option>
<option value="requestNumber"><spring:message code="request_number"></spring:message></option>
<option value="requestContent"><spring:message code="task"></spring:message></option>
<option value="requestContent"><spring:message code="content"></spring:message></option>
</select> <input id="intype">
<form:select id="timeType" name="timeType" path="timeType">
<%-- <form:option value=""></form:option> --%>
<form:select path="timeType">
<form:option value=""><spring:message code="select"></spring:message></form:option>
<form:option value="requestTime"><spring:message code="request_time"></spring:message></form:option>
<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
</form:select>
@@ -79,6 +80,7 @@
<th><spring:message code="operate_time"></spring:message></th>
<th><spring:message code="title"></spring:message></th>
<th><spring:message code="content"></spring:message></th>
<th><spring:message code="special_task"></spring:message></th>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
@@ -110,6 +112,7 @@
</td>
<td>${requestInfo.requestTitle }</td>
<td>${requestInfo.requestContent }</td>
<td>${requestInfo.taskName }</td>
<td>
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
@@ -117,12 +120,12 @@
<!-- 审核未通过可修改 -->
<c:choose>
<c:when test="${requestInfo.isAudit eq '1'}">
<li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="cancel"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li>
</c:when>
<c:otherwise>
<li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="approved"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="update_request"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="delete"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="examine"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
</c:otherwise>
</c:choose>
</ul>

136
src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp
View File

@@ -1,136 +0,0 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title>标签配置信息</title>
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
$("#treeTable").treeTable({expandLevel : 3}).show();
});
//查询
function page(n,s){
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/markList");
$("#searchForm").submit();
return false;
}
function page2(n,s){
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchMarkList");
$("#searchForm").submit();
return false;
}
</script>
<style type="text/css">
.dropdown-menu {
min-width: 70px;
}
</style>
</head>
<body>
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/serviceDictInfo/markList'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/configuration/serviceDictInfo/markForm'">新增配置</button>
</div>
<h3 class="page-title">
标签配置管理
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i>标签配置列表
</div>
</div>
<div class="portlet-body">
<div class="row" >
<div class="col-md-12">
<sys:message content="${message}"/>
<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/searchMarkList" 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}"/>
<div class="col-md-12">
<label class="search-lable">值：</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemValue}"/>
<label class="search-lable">编码：</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemCode}"/>
<label class="search-lable">数据类型：</label> <select id="itemType" name="itemType" >
<option selected="selected"></option>
<c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
<c:if test="${dict.itemCode eq '3'}">
<c:if test="${dict.itemCode eq serviceDictInfo.itemType}">
<option value="${serviceDictInfo.itemType}" selected="selected">${dict.itemValue}</option>
</c:if>
<c:if test="${dict.itemCode ne serviceDictInfo.itemType}">
<option value="${dict.itemCode}">${dict.itemValue}</option>
</c:if>
</c:if>
</c:forEach>
</select>
<spring:message code="begin_date"></spring:message> : <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
<spring:message code="end_date"></spring:message> : <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
<button type="button" class="btn btn-default btn-sm" onclick="return page2()">
<i class="fa fa-edit"></i> <spring:message code="search"></spring:message>
</button>
</div>
</form:form>
<table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${list}" var="serviceDictInfo">
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/configuration/serviceDictInfo/markForm?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
<td>${serviceDictInfo.itemCode}</td>
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
<td>${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
<td>${fns:getDictLabel("SYS_YES_NO",serviceDictInfo.isLeaf,"0")}</td>
<td><c:if test="${serviceDictInfo.serviceDictCreator != null}">
${fns:getUserById(serviceDictInfo.serviceDictCreator.id).name}
</c:if></td>
<td><fmt:formatDate value="${serviceDictInfo.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td><c:if test="${serviceDictInfo.serviceDictEditor != null}">
${fns:getUserById(serviceDictInfo.serviceDictEditor.id).name}
</c:if></td>
<td><fmt:formatDate value="${serviceDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>
<div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
<ul class="dropdown-menu btn-xs">
<li><a href="${ctx}/configuration/serviceDictInfo/markForm?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">查看</a></li>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/serviceDictInfo/markForm?serviceDictId=${serviceDictInfo.serviceDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要修改吗？', this.href)">修改</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/configuration/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要删除吗？', this.href)">删除</a></li>
</shiro:hasPermission>
</ul>
</div>
</td>
</tr>
</c:forEach></tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="page">${page}</div>
</body>
</html>

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

@@ -47,10 +47,10 @@
<img src="${pageContext.request.contextPath}/static/pages/img/photo.jpg" class="login-avatar"> </div>
<form id="loginForm" class="login-form pull-left" action="${pageContext.request.contextPath }/login" method="post">
<div class="form-group">
<input id="username" name="username" type="text" class="form-control placeholder-no-fix " value="${username}" placeholder="请填写登录账号"/>
<input id="username" name="username" type="text" class="form-control placeholder-no-fix " value="${username}" placeholder="<spring:message code='fill_loginName'/>"/>
</div>
<div class="form-group">
<input type="password" class="form-control placeholder-no-fix " id="password" name="password" placeholder="请填写登录密码"/>
<input type="password" class="form-control placeholder-no-fix " id="password" name="password" placeholder="<spring:message code='fill_loginPassWord'/>"/>
</div>
<%-- <c:if test="${not empty isValidateCodeLogin or isValidateCodeLogin==true}">

66
src/main/webapp/WEB-INF/views/systemService/list.jsp
View File

@@ -18,7 +18,7 @@ function page(n,s){
function deleteService(id) {
if (id) {
if (confirm("确认删除?")) {
if (confirm("<spring:message code='confirm_message'/>")) {
$("#serviceId").val(id);
$("#searchForm").attr("action","${ctx}/systemService/delete");
$("#searchForm").submit();
@@ -30,12 +30,12 @@ function deleteService(id) {
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/systemService/list'"><spring:message code="refresh"></spring:message></button>
<shiro:hasPermission name="system:service:view">
<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/systemService/systemServiceform'">新增</button>
<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/systemService/systemServiceform'"><spring:message code="add"></spring:message></button>
</shiro:hasPermission>
</div>
<h3 class="page-title">
系统业务管理
<spring:message code="sysService_manage"></spring:message>
</h3>
<div class="row">
@@ -43,7 +43,7 @@ function deleteService(id) {
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i>列表
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
</div>
</div>
@@ -56,35 +56,35 @@ function deleteService(id) {
<div class="row search-table">
<div class="col-md-12">
<span class="search-item" class="input-small">
<span>动作 :</span>
<span><spring:message code="act"/> :</span>
<form:select path="action">
<form:option value="">请选择</form:option>
<form:option value="1">阻断</form:option>
<form:option value="2">监测</form:option>
<form:option value="5">封堵白名单</form:option>
<form:option value="6">监测白名单</form:option>
<form:option value="7">封堵监测白名单</form:option>
<form:option value="8">灰名单</form:option>
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="1"><spring:message code="block"/></form:option>
<form:option value="2"><spring:message code="monitor"/></form:option>
<form:option value="5"><spring:message code="block_white_list"/></form:option>
<form:option value="6"><spring:message code="monitor"/></form:option>
<form:option value="7"><spring:message code="block_monitor_white_list"/></form:option>
<form:option value="8"><spring:message code="grey_list"/></form:option>
</form:select>
</span>
<span class="search-item" class="input-small">
<span>类型 :</span>
<span><spring:message code="type"/> :</span>
<form:select path="serviceType">
<form:option value="">请选择</form:option>
<form:option value="1">单域</form:option>
<form:option value="2">多域</form:option>
<form:option value="3">特定服务</form:option>
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="1"><spring:message code="single_domain"/></form:option>
<form:option value="2"><spring:message code="multi_domain"/></form:option>
<form:option value="3"><spring:message code="special_service"/></form:option>
</form:select>
</span>
<span class="search-item">
<span>业务名称 :</span>
<span><spring:message code="service_name"/> :</span>
<form:input path="serviceName" htmlEscape="false" class="input-small"/>
</span>
<span class="search-item">
<span>业务ID :</span>
<span><spring:message code="service_id"/> :</span>
<form:input path="serviceId" htmlEscape="false" class="input-small"/>
</span>
@@ -101,14 +101,14 @@ function deleteService(id) {
<table class="table table-bordered">
<thead>
<tr>
<th>业务名称</th>
<th style="width:8%">业务ID</th>
<th>动作</th>
<th>类型</th>
<th><spring:message code="service_name"/></th>
<th style="width:8%"><spring:message code="service_id"/></th>
<th><spring:message code="act"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="creator_id"></spring:message></th>
<th style="width:15%"><spring:message code="create_time"></spring:message></th>
<th><spring:message code="desc"></spring:message></th>
<th>操作</th>
<th><spring:message code="operation"/></th>
</tr>
</thead>
<tbody>
@@ -117,17 +117,17 @@ function deleteService(id) {
<td>${ssi.serviceName }</td>
<td>${ssi.serviceId }</td>
<td>
<c:if test="${1 eq ssi.action }">阻断</c:if>
<c:if test="${2 eq ssi.action }">监测</c:if>
<c:if test="${5 eq ssi.action }">封堵白名单</c:if>
<c:if test="${6 eq ssi.action }">监测白名单</c:if>
<c:if test="${7 eq ssi.action }">封堵监测白名单</c:if>
<c:if test="${8 eq ssi.action }">灰名单</c:if>
<c:if test="${1 eq ssi.action }"><spring:message code="block"/></c:if>
<c:if test="${2 eq ssi.action }"><spring:message code="monitor"/></c:if>
<c:if test="${5 eq ssi.action }"><spring:message code="block_white_list"/></c:if>
<c:if test="${6 eq ssi.action }"><spring:message code="monitor_white_list"/></c:if>
<c:if test="${7 eq ssi.action }"><spring:message code="block_monitor_white_list"/></c:if>
<c:if test="${8 eq ssi.action }"><spring:message code="grey_list"/></c:if>
</td>
<td>
<c:if test="${1 eq ssi.serviceType }">单域</c:if>
<c:if test="${2 eq ssi.serviceType }">多域</c:if>
<c:if test="${3 eq ssi.serviceType }">特定服务</c:if>
<c:if test="${1 eq ssi.serviceType }"><spring:message code="single_domain"/></c:if>
<c:if test="${2 eq ssi.serviceType }"><spring:message code="multi_domain"/></c:if>
<c:if test="${3 eq ssi.serviceType }"><spring:message code="special_service"/></c:if>
</td>
<td>${ssi.creator.loginId }</td>
<td><fmt:formatDate value="${ssi.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>