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:
chenjinsong
2018-03-09 10:50:53 +08:00
parent 43de1a2b12
commit 4834354c06
4 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/systemService/SystemServiceController.java
View File

@@ -41,7 +41,7 @@ public class SystemServiceController extends BaseController {
@RequiresPermissions("system:service:view") @RequiresPermissions("system:service:view")
@RequestMapping(value = "list") @RequestMapping(value = "list")
public String list(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { public String list(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) {
Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 1), systemServiceInfo); Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 30), systemServiceInfo);
model.addAttribute("page", page); model.addAttribute("page", page);
return "/systemService/list"; return "/systemService/list";
} }

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

@@ -88,6 +88,12 @@
} }
}); });
window.onload = function() {
$("[data-id=serviceType]").click(function() {
now = $("#serviceType").val();
});
}
function changeType(v, obj) { function changeType(v, obj) {
if ($(obj).val() == '') { if ($(obj).val() == '') {
$("#addBtn").attr("disabled", true); $("#addBtn").attr("disabled", true);
@@ -164,7 +170,7 @@
'<div class="table-item">' + '<div class="table-item">' +
'<span class="child-label col-md-3"><font color="red">*</font>'+'<spring:message code="table_type"/>'+':</span> ' + '<span class="child-label col-md-3"><font color="red">*</font>'+'<spring:message code="table_type"/>'+':</span> ' +
'<span> ' + '<span> ' +
'<select class="child-required child-input" name="tableType" onchange="autoServiceId()"> ' + '<select class="child-required2 selectpicker select2" name="tableType" onchange="autoServiceId()"> ' +
'<option value="">'+'<spring:message code="select"/>'+'</option>' + '<option value="">'+'<spring:message code="select"/>'+'</option>' +
'<option value="1">IP</option>' + '<option value="1">IP</option>' +
'<option value="2">'+'<spring:message code="string"/>'+'</option>' + '<option value="2">'+'<spring:message code="string"/>'+'</option>' +
@@ -184,7 +190,7 @@
'</div>' + '</div>' +
'</div>' '</div>'
); );
$("[name=tableType]").selectpicker('refresh');
if ($("#serviceType").val() == '1' || $("#serviceType").val() == '3') { if ($("#serviceType").val() == '1' || $("#serviceType").val() == '3') {
$("#addBtn").attr("disabled", true); $("#addBtn").attr("disabled", true);
} }
@@ -239,7 +245,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="act"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="act"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:select id="action" path="action" class="required form-control" onchange="autoServiceId()"> <form:select id="action" path="action" class="required form-control selectpicker select2" onchange="autoServiceId()">
<form:option value=""><spring:message code="select"/></form:option> <form:option value=""><spring:message code="select"/></form:option>
<form:option value="1"><spring:message code="block"/></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="2"><spring:message code="monitor"/></form:option>
@@ -254,7 +260,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="type"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="type"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:select id="serviceType" path="serviceType" class="required form-control" onclick="now=this.value" onchange="changeType(now, this)"> <form:select id="serviceType" path="serviceType" class="required form-control selectpicker select2" onchange="changeType(now, this)">
<form:option value=""><spring:message code="select"/></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="1"><spring:message code="single_domain"/></form:option>
<form:option value="2"><spring:message code="multi_domain"/></form:option> <form:option value="2"><spring:message code="multi_domain"/></form:option>
@@ -284,7 +290,7 @@
<div class="table-item"> <div class="table-item">
<span class="child-label col-md-3"><font color="red">*</font><spring:message code="table_type"/>:</span> <span class="child-label col-md-3"><font color="red">*</font><spring:message code="table_type"/>:</span>
<span> <span>
<select class="child-required child-input" name="tableType"> <select class="child-required2 selectpicker select2" name="tableType">
<option value=""><spring:message code="select"/></option> <option value=""><spring:message code="select"/></option>
<option value="1" <c:if test="${serviceConfigInfo.tableType eq 1}">selected="selected"</c:if>>IP</option> <option value="1" <c:if test="${serviceConfigInfo.tableType eq 1}">selected="selected"</c:if>>IP</option>
<option value="2" <c:if test="${serviceConfigInfo.tableType eq 2}">selected="selected"</c:if>><spring:message code="string"/></option> <option value="2" <c:if test="${serviceConfigInfo.tableType eq 2}">selected="selected"</c:if>><spring:message code="string"/></option>

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

@@ -3,7 +3,7 @@
<html> <html>
<head> <head>
<title>系统业务类型管理列表</title> <title>系统业务类型管理列表</title>
<link href="${pageContext.request.contextPath}/static/pages/css/systemService.css" rel="stylesheet" type="text/css"/> <%-- <link href="${pageContext.request.contextPath}/static/pages/css/systemService.css" rel="stylesheet" type="text/css"/> --%>
</head> </head>
<body> <body>
@@ -36,29 +36,24 @@ function deleteService(id) {
<h3 class="page-title"> <h3 class="page-title">
<spring:message code="sysService_manage"></spring:message> <spring:message code="sysService_manage"></spring:message>
<small><spring:message code="date_list"/></small>
</h3> </h3>
<h5 class="page-header"></h5>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="portlet box blue"> <div class="portlet">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
</div>
</div>
<div class="portlet-body"> <div class="portlet-body">
<sys:message content="${message}"/> <div class="row">
<form:form id="searchForm" modelAttribute="systemServiceInfo" method="post"> <sys:message content="${message}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo }"/> <form:form id="searchForm" modelAttribute="systemServiceInfo" method="post" class="form-search">
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize }"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo }"/>
<input id="serviceId" name="id" type="hidden"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize }"/>
<div class="row search-table"> <input id="serviceId" name="id" type="hidden"/>
<div class="col-md-12"> <div class="col-md-12">
<span class="search-item" class="input-small"> <div class="pull-left">
<span><spring:message code="act"/> :</span> <form:select path="action" class="selectpicker select2 input-small">
<form:select path="action"> <form:option value=""><spring:message code="act"/></form:option>
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="1"><spring:message code="block"/></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="2"><spring:message code="monitor"/></form:option>
<form:option value="5"><spring:message code="block_white_list"/></form:option> <form:option value="5"><spring:message code="block_white_list"/></form:option>
@@ -66,36 +61,29 @@ function deleteService(id) {
<form:option value="7"><spring:message code="block_monitor_white_list"/></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:option value="8"><spring:message code="grey_list"/></form:option>
</form:select> </form:select>
</span> </div>
<div class="pull-left">
<span class="search-item" class="input-small"> <form:select path="serviceType" class="selectpicker select2 input-small">
<span><spring:message code="type"/> :</span> <form:option value=""><spring:message code="type"/></form:option>
<form:select path="serviceType">
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="1"><spring:message code="single_domain"/></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="2"><spring:message code="multi_domain"/></form:option>
<form:option value="3"><spring:message code="special_service"/></form:option> <form:option value="3"><spring:message code="special_service"/></form:option>
</form:select> </form:select>
</span> </div>
<div class="pull-left">
<span class="search-item"> <input name="serviceName" class="form-control input-medium" placeholder="<spring:message code="service_name"/>" value="${systemServiceInfo.serviceName }"/>
<span><spring:message code="service_name"/> :</span> </div>
<form:input path="serviceName" htmlEscape="false" class="input-small"/> <div class="pull-left">
</span> <input name="serviceId" class="form-control input-medium" placeholder="<spring:message code="service_id"/>" value="${systemServiceInfo.serviceId }"/>
</div>
<span class="search-item"> <div class="pull-left">
<span><spring:message code="service_id"/> :</span> <button type="submit" onclick="return page();" class="btn btn-default">
<form:input path="serviceId" htmlEscape="false" class="input-small"/>
</span>
<span class="search-item">
<button type="submit" onclick="return page();" class="btn btn-default btn-sm">
<i class="fa fa-edit"></i> <spring:message code="search"></spring:message> <i class="fa fa-edit"></i> <spring:message code="search"></spring:message>
</button> </button>
</span> </div>
</div> </div>
</div> </form:form>
</form:form> </div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-bordered"> <table class="table table-bordered">
@@ -105,7 +93,7 @@ function deleteService(id) {
<th style="width:8%"><spring:message code="service_id"/></th> <th style="width:8%"><spring:message code="service_id"/></th>
<th><spring:message code="act"/></th> <th><spring:message code="act"/></th>
<th><spring:message code="type"/></th> <th><spring:message code="type"/></th>
<th><spring:message code="creator_id"></spring:message></th> <th><spring:message code="creator"></spring:message></th>
<th style="width:15%"><spring:message code="create_time"></spring:message></th> <th style="width:15%"><spring:message code="create_time"></spring:message></th>
<th><spring:message code="desc"></spring:message></th> <th><spring:message code="desc"></spring:message></th>
<th><spring:message code="operation"/></th> <th><spring:message code="operation"/></th>

17
src/main/webapp/static/pages/css/systemService.css
View File

@@ -34,13 +34,9 @@ select, input {
font-size: 12px; font-size: 12px;
padding-left: 6px; padding-left: 6px;
} }
.datatable-index { .child-required2 {
width: 14px; color: #e02222;
display: inline-block; font-size: 12px;
}
#datatables select {
height: 34px;
vertical-align: middle;
} }
.del-button { .del-button {
float: right; float: right;
@@ -54,3 +50,10 @@ select, input {
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.btn-group.bootstrap-select.child-required2.select2 {
height: 34px;
width: 50% !important;
margin-left: 5px;
margin-top: 6px;
margin-bottom: 6px;
}