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:
zhangshilin
2018-03-28 08:44:49 +08:00
parent 379d1e9011 e3d8a491b1
commit 7f1cbee49b
67 changed files with 2897 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>

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

@@ -4,7 +4,7 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>

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

@@ -4,7 +4,7 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>

10
src/main/webapp/WEB-INF/tags/sys/iconselect.tag
View File

@@ -3,12 +3,12 @@
<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
<%@ attribute name="name" type="java.lang.String" required="true" description="输入框名称"%>
<%@ attribute name="value" type="java.lang.String" required="true" description="输入框值"%>
<i id="${id}Icon" class="icon-${not empty value?value:' hide'}"></i>&nbsp;<label id="${id}IconLabel">${not empty value?value:'无'}</label>&nbsp;
<input id="${id}" name="${name}" type="hidden" value="${value}"/><a id="${id}Button" href="javascript:" class="btn">选择</a>&nbsp;&nbsp;
<i id="${id}Icon" class="icon-${not empty value?value:' hide'}"></i>&nbsp;<label id="${id}IconLabel">${not empty value?value:'null'}</label>&nbsp;
<input id="${id}" name="${name}" type="hidden" value="${value}"/><a id="${id}Button" href="javascript:" class="btn"><spring:message code='select'/></a>&nbsp;&nbsp;
<script type="text/javascript">
$("#${id}Button").click(function(){
top.$.jBox.open("iframe:${ctx}/tag/iconselect?value="+$("#${id}").val(), "选择图标", 700, $(top.document).height()-180, {
buttons:{"确定":"ok", "清除":"clear", "关闭":true}, submit:function(v, h, f){
top.$.jBox.open("iframe:${ctx}/tag/iconselect?value="+$("#${id}").val(), "<spring:message code='select_icon'/>", 700, $(top.document).height()-180, {
buttons:{"<spring:message code='ok'/>":"ok", "<spring:message code='clear'/>":"clear", "<spring:message code='close'/>":true}, submit:function(v, h, f){
if (v=="ok"){
var icon = h.find("iframe")[0].contentWindow.$("#icon").val();
$("#${id}Icon").attr("class", "icon-"+icon);
@@ -16,7 +16,7 @@
$("#${id}").val(icon);
}else if (v=="clear"){
$("#${id}Icon").attr("class", "icon- hide");
$("#${id}IconLabel").text("无");
$("#${id}IconLabel").text("<spring:message code='nothing'/>");
$("#${id}").val("");
}
}, loaded:function(h){

24
src/main/webapp/WEB-INF/tags/sys/treeselect.tag
View File

@@ -24,12 +24,18 @@
<%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
<%@ attribute name="selectDepartment" type="java.lang.String" required="false" description="不允许选择部门,自办部门,转办部门"%>
<%@ attribute name="showParentName" type="java.lang.String" required="false" description="显示父类名称"%>
<div class="input-append">
<div class="input-group">
<input id="${id}Id" name="${name}" class="${cssClass} singleClass" type="hidden" value="${value}" />
<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}" placeholder="${value}"
class="${cssClass}" style="${cssStyle} background-color:transparent"/>
<%-- <a id="${id}Button" href="javascript:" class="btn ${disabled} ${hideBtn ? 'hide' : ''}" style="${smallBtn?'padding:4px 2px;':''}">&nbsp;<i class="icon-search"></i>&nbsp;</a>&nbsp;&nbsp; --%>
<div class="input-group-btn">
<a id="${id}Button" class="btn btn-default btn-search" href="javascript:" class="btn ${disabled} ${hideBtn ? 'hide' : ''}" style="${smallBtn?'padding:4px 2px;':''}"><i class="fa fa-search"></i></a>
</div>
</div>
<script type="text/javascript">
$("#${id}Button, #${id}Name").click(function(){
// 是否限制选择，如果限制，设置为disablegetQueryString d
@@ -38,7 +44,7 @@
}
// 正常打开
top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}", "选择${title}", 320, 420, {
ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"确定":"ok", ${allowClear?"\"清除\":\"clear\", ":""}"关闭":true}, submit:function(v, h, f){
ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"<spring:message code='ok'/>":"ok", ${allowClear?"\"<spring:message code='clear'/>\":\"clear\", ":""}"<spring:message code='close'/>":true}, submit:function(v, h, f){
if (v=="ok"){
var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
var ids = [], names = [], nodes = [];
@@ -52,22 +58,22 @@
continue; // 如果为复选框选择，则过滤掉父节点
}//</c:if><c:if test="${notAllowSelectRoot}">
if (nodes[i].level == 0){
top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
top.$.jBox.tip("<spring:message code='no_root'/>（"+nodes[i].name+"）<spring:message code='reselect'/>");
return false;
}//</c:if><c:if test="${notAllowSelectParent}">
if (nodes[i].isParent){
top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
top.$.jBox.tip("<spring:message code='no_parent'/>（"+nodes[i].name+"）<spring:message code='reselect'/>");
return false;
}//</c:if><c:if test="${not empty module && selectScopeModule}">
if (nodes[i].module == ""){
top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
top.$.jBox.tip("<spring:message code='no_public_model'/>（"+nodes[i].name+"）<spring:message code='reselect'/>");
return false;
}else if (nodes[i].module != "${module}"){
top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
top.$.jBox.tip("<spring:message code='no_outside_column'/>，<spring:message code='reselect'/>");
return false;
}//</c:if><c:if test="${selectDepartment}">
if (nodes[i].name=="请选择下发单位" || nodes[i].name=="部门" ||nodes[i].name=="下发单位"){
top.$.jBox.tip("不能选择节点（"+nodes[i].name+"）请重新选择。");
if (nodes[i].name=="<spring:message code='send_org'/>" || nodes[i].name=="<spring:message code='department'/>" ||nodes[i].name=="<spring:message code='sendind_org'/>"){
top.$.jBox.tip("<spring:message code='no_node'/>（"+nodes[i].name+"）<spring:message code='reselect'/>");
return false;
}//</c:if>
ids.push(nodes[i].id);//<c:if test="${showParentName}">

6
src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
View File

@@ -14,9 +14,6 @@ $(function(){
});
$("#cfgFrom").validate({
rules: {
'cfgDesc':{
required:true
},
'keywords':{
required:true
},
@@ -34,9 +31,6 @@ $(function(){
}
},
messages: {
'cfgDesc':{
required:'<spring:message code="required"/>'
},
'keywords':{
required:'<spring:message code="required"/>'
},

31
src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
View File

@@ -5,6 +5,17 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<script>
$(document).ready(function() {
//搜索框提示语初始化
if("${cfg.keywords}"){
$("#intype").val("${cfg.keywords}");
} else if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
} else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
$("#seltype").change(function(){
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
//筛选功能初始化
filterActionInit();
$("#isAudit").change(function(){
@@ -24,6 +35,8 @@
});
//查询
function page(n,s){
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").submit();
@@ -61,6 +74,8 @@
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<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();" />
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
@@ -81,8 +96,8 @@
<div class="input-group">
<div class="input-group-btn">
<form:select path="" class="selectpicker select2 input-small" >
<form:option value="key_word"><spring:message code="key_word"></spring:message></form:option>
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="keywords"><spring:message code="key_word"></spring:message></form:option>
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
</form:select>
@@ -109,7 +124,7 @@
</div> --%>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<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="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
@@ -248,7 +263,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="seq"/></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th>
@@ -260,18 +275,18 @@
<th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="creator"/></th>
<th><spring:message code="config_time"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th><spring:message code="edit_time"/></th>
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th><spring:message code="audit_time"/></th>
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td>${status.index+1 }</td>
<%-- <td>${status.index+1 }</td> --%>
<td>${cfg.cfgDesc }</td>
<%-- <td>${cfg.district }</td> --%>
<td>${cfg.keywords }</td>

2
src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
View File

@@ -121,7 +121,7 @@
<div class="pull-left">
<button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<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>

6
src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
View File

@@ -62,9 +62,6 @@ $(function(){
});
$("#ipCfgFrom").validate({
rules: {
cfgDesc: {
required: true,
},
ipType: {
required: true,
},
@@ -114,9 +111,6 @@ $(function(){
},
messages: {
cfgDesc: {
required: '<spring:message code="required"/>',
},
ipType: {
required: '<spring:message code="required"/>',
},

31
src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
View File

@@ -5,8 +5,18 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<script>
$(document).ready(function() {
$("seltype").on("click",function(){
alert(2333)
//搜索框提示语初始化
if("${ipCfg.srcIp}"){
$("#intype").val("${ipCfg.srcIp}");
} else if("${ipCfg.dstIp}"){
$("#intype").val("${ipCfg.dstIp}");
} else if("${ipCfg.cfgDesc}"){
$("#intype").val("${ipCfg.cfgDesc}");
} else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
$("#seltype").change(function(){
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
//筛选功能初始化
filterActionInit();
@@ -26,6 +36,7 @@
});
//查询
function page(n,s){
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").submit();
@@ -62,6 +73,8 @@
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<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();" />
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${ipCfg.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
@@ -80,7 +93,7 @@
<div class="input-group">
<div class="input-group-btn">
<form:select path="" class="selectpicker select2 input-small" >
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="srcIp"><spring:message code="client_ip"></spring:message></form:option>
<form:option value="dstIp"><spring:message code="server_ip"></spring:message></form:option>
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
@@ -153,7 +166,7 @@
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<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="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
@@ -300,7 +313,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="seq"/></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th>ip<spring:message code="type"/></th>
<th><spring:message code="client_ip"/></th>
@@ -332,18 +345,18 @@
<th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="creator"/></th>
<th><spring:message code="config_time"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th><spring:message code="edit_time"/></th>
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th><spring:message code="audit_time"/></th>
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list }" var="ipCfg" varStatus="status" step="1">
<tr pId="${status.index}">
<td>${status.index+1 }</td>
<%-- <td>${status.index+1 }</td> --%>
<td>${ipCfg.cfgDesc }</td>
<td>V${ipCfg.ipType }</td>
<td>${ipCfg.srcIp }</td>

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

@@ -68,7 +68,7 @@
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<button type="submit" class="btn btn-circle green"><spring:message code="submit"></spring:message></button>
<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>

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

@@ -175,7 +175,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="request_number"></spring:message></th>
<th><spring:message code="request_organization"></spring:message></th>
<th><spring:message code="request_time"></spring:message></th>
@@ -196,7 +195,6 @@
<c:forEach items="${page.list}" var="requestInfo">
<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.requestOrg }</td>
<td><fmt:formatDate value="${requestInfo.requestTime }" pattern="yyyy-MM-dd"/></td>
@@ -241,7 +239,7 @@
if("${requestInfo.requestContent}"){
$("#intype").val("${requestInfo.requestContent}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
$("#intype").attr("placeholder","<spring:message code='input'/>"+$("#seltype").find("option:selected").text());
}
//筛选功能初始化
filterActionInit();
@@ -251,7 +249,7 @@
});
$("#seltype").change(function(){
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
$("#intype").attr("placeholder","<spring:message code='input'/>"+$(this).find("option:selected").text());
});
//全选及取消
$("#checkAll").change(function(){
@@ -281,7 +279,7 @@
});
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
$("#intype").attr("placeholder","<spring:message code='input'/> "+"<spring:message code='title'/>");
$("#intype").attr("placeholder","<spring:message code='input'/>"+"<spring:message code='title'/>");
}

2
src/main/webapp/WEB-INF/views/cfg/resultPage.jsp
View File

@@ -5,7 +5,7 @@
<title>结果跳转页</title>
<script type="text/javascript">
$(document).ready(function() {
setTimeout("javascript:window.location.href='${ctx}/cfg/${cfgType}/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'",1000);
setTimeout("javascript:window.location.href='${ctx}/cfg/${cfgType}/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}&mainTable=${mainTable}'",1000);
});
</script>
</head>

6
src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
View File

@@ -7,9 +7,6 @@
$(function(){
$("#cfgFrom").validate({
rules: {
'cfgDesc':{
required:true
},
'cfgKeywords':{
required:true
},
@@ -33,9 +30,6 @@ $(function(){
}
},
messages: {
'cfgDesc':{
required:'<spring:message code="required"/>'
},
'cfgKeywords':{
required:'<spring:message code="required"/>'
},

31
src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
View File

@@ -5,6 +5,17 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<script>
$(document).ready(function() {
//搜索框提示语初始化
if("${cfg.cfgKeywords}"){
$("#intype").val("${cfg.cfgKeywords}");
} else if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
} else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
$("#seltype").change(function(){
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
//筛选功能初始化
filterActionInit();
$("#isAudit").change(function(){
@@ -24,6 +35,8 @@
});
//查询
function page(n,s){
$("#intype").attr("name",$("#seltype").val());
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").submit();
@@ -61,6 +74,8 @@
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<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();" />
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
@@ -80,8 +95,8 @@
<div class="input-group">
<div class="input-group-btn">
<form:select path="" class="selectpicker select2 input-small" >
<form:option value="key_word"><spring:message code="key_word"></spring:message></form:option>
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
</form:select>
@@ -110,7 +125,7 @@
</div> --%>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<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="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
@@ -257,7 +272,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="seq"/></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th>
@@ -275,18 +290,18 @@
<th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="creator"/></th>
<th><spring:message code="config_time"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th><spring:message code="edit_time"/></th>
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th><spring:message code="audit_time"/></th>
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
<th><spring:message code="operation"></spring:message></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td>${status.index+1 }</td>
<%-- <td>${status.index+1 }</td> --%>
<td>${cfg.cfgDesc }</td>
<td>${cfg.cfgKeywords }</td>
<td>

28
src/main/webapp/WEB-INF/views/sys/userForm.jsp
View File

@@ -5,6 +5,8 @@
<title>用户管理</title>
<script type="text/javascript">
$(document).ready(function() {
$("#no").focus();
$("#inputForm").validate({
@@ -117,7 +119,7 @@
<form:input path="loginId" htmlEscape="false" maxlength="50" class="required userName form-control"/>
</c:if>
</div>
<span class="help-inline"><font color="red">*</font> </span>
<span class="help-inline"><font color="red">*</font> </span>
</div>
<div class="form-group">
<label class="col-md-3 control-label">归属公司:</label>
@@ -175,8 +177,9 @@
<form:option value="0">普通人员</form:option>
<form:option value="1">管理人员</form:option>
</form:select>
</div>
<span class="help-inline"><font>管理人员需指定身份标识为“管理人员”，否则影响审核流程！</font></span>
</div>
</div>
<div class="form-group">
@@ -191,11 +194,24 @@
<div class="form-group">
<label class="col-md-3 control-label">用户角色:</label>
<div class="col-md-8">
<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required" style="vertical-align:middle;display:inline-block;margin-bottom:4px"/>
<span class="help-inline "><font color="red">*</font> </span>
<div class="mt-checkbox-inline">
<c:forEach items="${allRoles}" var="role">
<label class="mt-checkbox">
<form:checkbox path="roleIdList" value="${role.id }" /> ${role.name }
<span></span>
</label>
</c:forEach>
<span class="help-inline "><font color="red">*</font> </span>
</div>
</div>
</div>
<c:if test="${not empty user.id}">
<div class="form-group">
<label class="col-md-3 control-label">创建时间:</label>
@@ -210,8 +226,8 @@
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>
<button type="submit" class="btn btn-circle green"><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>
<button type="submit" class="btn blue"><spring:message code="submit"></spring:message></button>
<button type="button" class="btn blue btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
</div>
</div>
</div>

99
src/main/webapp/WEB-INF/views/systemService/form.jsp
View File

@@ -9,7 +9,12 @@
<script type="text/javascript">
$(document).ready(function() {
top.window.scrollTo(0, 0);
if ("${systemServiceInfo.id}") {
$("[name=childTableFlag]").val("1");
}
$("#inputForm").validate({
ignore: [],
rules: {
'serviceName':{
required:true
@@ -24,9 +29,11 @@
'serviceType':{
required:true
},
'serviceDesc':{
required:true
'childTableFlag':{
required:true,
checkChild:true
}
},
messages: {
'serviceName':{
@@ -42,30 +49,42 @@
'serviceType':{
required:'<spring:message code="required"/>'
},
'serviceDesc':{
'childTableFlag':{
required:'<spring:message code="required"/>'
}
},
submitHandler: function(form){
$("[for=childTableFlag]").css("display", "none");
/* $("[for=childTableFlag]").css("display", "none");
var flag = true;
var tables = document.getElementsByClassName("child-required");
if (tables.length == 0) {
$("[for=childTableFlag]").text("<spring:message code='required'/>").css("display", "inline");
if (!$("#serviceIdInput").val()) {
$("[for=serviceId]").css("display", "inline");
}
return false;
}
for (var i = 0; i < tables.length; i++) {
if (!tables[i].value || tables[i].value == '') {
$("[for=childTableFlag]").css("display", "inline");
$("[for=childTableFlag]").text("<spring:message code='fill_all'/>").css("display", "inline");
flag = false;
break;
}
}
if (flag) {
loading('LOADING...');
if (!$("#serviceIdInput").val()) {
$("[for=serviceId]").css("display", "inline");
flag = false;
}
if (flag) {*/
$("[disabled=disabled]").attr("disabled", false);
$("#submitBtn").attr("disabled", true);//防止重复提交
form.submit();
} else {
/*} else {
flag = true;
return false;
}
} */
},
errorContainer: "#messageBox",
errorPlacement: function(error, element) {
@@ -78,6 +97,17 @@
}
});
$.validator.addMethod(
"checkChild",
function(value, element, params) {
if (value && value == "1") {
return true;
} else {
return false;
}
},
"<spring:message code='fill_all'/>"
);
changeType($("#serviceType").val(), $("#serviceType"));
//类型、动作不允许修改
@@ -94,6 +124,25 @@
});
}
function childValidate() {
var flag = true;
var c = $(".child-required, .child-required2.selectpicker");
if (c.length == 0) {
return false;
}
c.each(function(){
if (!$(this).val()) {
flag = false;
return false;
}
});
if (flag) {
$("[name=childTableFlag]").val("1");
} else {
$("[name=childTableFlag]").val("0");
}
}
function changeType(v, obj) {
if ($(obj).val() == '') {
$("#addBtn").attr("disabled", true);
@@ -156,6 +205,8 @@
} else {
$("#serviceIdInput").val("");
}
childValidate();
}
function addDatatable() {
@@ -165,7 +216,7 @@
'<input type="hidden" name="sciId" value="0"/>' +
'<input type="hidden" name="sciIsValid" value="1"/>' +
'<span class="child-label col-md-3"><font color="red">*</font>'+'<spring:message code="table_name"/>'+':</span> ' +
'<span><input class="child-required form-control child-input" name="tableName"/></span> ' +
'<span><input class="child-required form-control child-input" onchange="childValidate()" name="tableName"/></span> ' +
'</div>' +
'<div class="table-item">' +
'<span class="child-label col-md-3"><font color="red">*</font>'+'<spring:message code="table_type"/>'+':</span> ' +
@@ -180,11 +231,11 @@
'</div>' +
'<div class="table-item">' +
'<span class="child-label col-md-3"><font color="red">*</font>MAAT '+'<spring:message code="table_name"/>'+':</span> ' +
'<span><input class="child-required form-control child-input" name="maatTable"/></span>' +
'<span><input class="child-required form-control child-input" onchange="childValidate()" name="maatTable"/></span>' +
'</div>' +
'<div class="table-item">' +
'<span class="child-label col-md-3"><font color="red">*</font>'+'<spring:message code="table_des"/>'+':</span> ' +
'<span><input class="child-required form-control child-input" name="tableDesc"/></span>' +
'<span class="child-label col-md-3">' + '<spring:message code="table_des"/>'+':</span> ' +
'<span><input class="form-control child-input" name="tableDesc"/></span>' +
'<button type="button" class="btn btn-danger del-button" onclick="del2(this)">'+'<spring:message code="delete"/>'+'</button>' +
'</div>' +
'</div>'
@@ -193,6 +244,8 @@
if ($("#serviceType").val() == '1' || $("#serviceType").val() == '3') {
$("#addBtn").attr("disabled", true);
}
childValidate();
}
function del(obj) {
@@ -271,12 +324,13 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="datebase_table"/>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="datebase_table"/>:</label>
<div class="col-md-8" id="datatables">
<shiro:hasPermission name="system:service:edit">
<div>
<button id="addBtn" type="button" class="btn btn-default" onclick="addDatatable()"><spring:message code="add"/></button>
<label for="childTableFlag" class="error" style="display:none"><spring:message code="fill_all"/></label>
<input type="hidden" name="childTableFlag" value="${id }"/>
<!-- <label for="childTableFlag" class="error" style="display:none"></label> -->
</div>
</shiro:hasPermission>
<c:forEach items="${systemServiceInfo.serviceConfigInfoList }" var="serviceConfigInfo">
@@ -286,7 +340,7 @@
<input type="hidden" name="sciIsValid" value="1"/>
<span class="child-label col-md-3"><font color="red">*</font><spring:message code="table_name"/>:</span>
<span><input class="child-required form-control child-input" name="tableName" value="${serviceConfigInfo.tableName }"/></span>
<span><input class="child-required form-control child-input" onchange="childValidate()" name="tableName" value="${serviceConfigInfo.tableName }"/></span>
</div>
<div class="table-item">
<span class="child-label col-md-3"><font color="red">*</font><spring:message code="table_type"/>:</span>
@@ -301,11 +355,11 @@
</div>
<div class="table-item">
<span class="child-label col-md-3"><font color="red">*</font>MAAT <spring:message code="table_name"/>:</span>
<span><input class="child-required form-control child-input" name="maatTable" value="${serviceConfigInfo.maatTable }"/></span>
<span><input class="child-required form-control child-input" onchange="childValidate()" name="maatTable" value="${serviceConfigInfo.maatTable }"/></span>
</div>
<div class="table-item">
<span class="child-label col-md-3"><font color="red">*</font><spring:message code="table_des"/>:</span>
<span><input class="child-required form-control child-input" name="tableDesc" value="${serviceConfigInfo.tableDesc }"/></span>
<span class="child-label col-md-3"><spring:message code="table_des"/>:</span>
<span><input class="form-control child-input child-desc" name="tableDesc" value="${serviceConfigInfo.tableDesc }"/></span>
<button type="button" class="btn btn-danger del-button" onclick="del(this)"><spring:message code="delete"/></button>
</div>
@@ -317,14 +371,15 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="service_id"/>:</label>
<div class="col-md-4">
<input id="serviceIdInput" class="required form-control" name="serviceId" value="${systemServiceInfo.serviceId }" readonly="readonly">
<input id="serviceIdInput" class="form-control" name="serviceId" value="${systemServiceInfo.serviceId }" readonly="readonly">
<label for="serviceId" class="error" style="display:none"><spring:message code="required"/></label>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="describe"/>:</label>
<label class="col-md-3 control-label"><spring:message code="describe"/>:</label>
<div class="col-md-4">
<form:textarea path="serviceDesc" htmlEscape="false" class="required form-control"/>
<form:textarea path="serviceDesc" htmlEscape="false" class="form-control"/>
</div>
</div>

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

@@ -29,6 +29,14 @@ function deleteService(id) {
}
}
}
function checkNum(obj) {
var reg = /^[0-9]*$/;
if (!reg.test(obj.value)) {
top.$.jBox.tip("请输入数字");
obj.value=obj.value.replace(/[^\d]/g,'');
}
}
</script>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
@@ -78,7 +86,7 @@ function deleteService(id) {
<input name="serviceName" class="form-control input-medium" placeholder="<spring:message code="service_name"/>" value="${systemServiceInfo.serviceName }"/>
</div>
<div class="pull-left">
<input name="serviceId" class="form-control input-medium" placeholder="<spring:message code="service_id"/>" value="${systemServiceInfo.serviceId }"/>
<input name="serviceId" class="form-control input-medium" placeholder="<spring:message code="service_id"/>" value="${systemServiceInfo.serviceId }" onkeyup="checkNum(this)"/>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
@@ -119,7 +127,7 @@ function deleteService(id) {
<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>${ssi.creator.name }</td>
<td><fmt:formatDate value="${ssi.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${ssi.serviceDesc }</td>
<td>

41
src/main/webapp/static/global/css/components.css
View File

@@ -5065,9 +5065,10 @@ Form Layouts
.control-label .required,
.form-group .required {
color: #e02222;
/* color: #e02222;
font-size: 12px;
padding-left: 2px; }
padding-left: 2px; */
}
.form {
padding: 0 !important; }
@@ -6156,36 +6157,12 @@ Customized Bootstrap Labels
h6 .label {
font-size: 75%; }
/* Labels variants */
.label-default {
background-color: #bac3d0; }
.label-default[href]:hover, .label-default[href]:focus {
background-color: #9ca8bb; }
.label-primary {
background-color: #337ab7; }
.label-primary[href]:hover, .label-primary[href]:focus {
background-color: #286090; }
.label-success {
background-color: #36c6d3; }
.label-success[href]:hover, .label-success[href]:focus {
background-color: #27a4b0; }
.label-info {
background-color: #659be0; }
.label-info[href]:hover, .label-info[href]:focus {
background-color: #3a80d7; }
.label-warning {
background-color: #F1C40F; }
.label-warning[href]:hover, .label-warning[href]:focus {
background-color: #c29d0b; }
.label-danger {
background-color: #ed6b75; }
.label-danger[href]:hover, .label-danger[href]:focus {
background-color: #e73d4a; }
/* Labels variants */
.label-warning {
background-color: #e6911a; }
.label-warning[href]:hover, .label-warning[href]:focus {
background-color: #c88220; }
/***
Iconic labels