diff --git a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java index e995a0877..76d6d8c20 100644 --- a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java +++ b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java @@ -29,8 +29,6 @@ import com.nis.web.security.UserUtils; @RequestMapping("${adminPath}/systemService") public class SystemServiceController extends BaseController { - //TODO 异常处理 - @ModelAttribute public SystemServiceInfo get(Long id) { if (!StringUtil.isEmpty(id)){ @@ -119,9 +117,14 @@ public class SystemServiceController extends BaseController { @RequestMapping(value = "delete") public String delete(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { systemServiceService.deleteService(systemServiceInfo); - Page page = systemServiceService.findPage(new Page(request, response, 1), systemServiceInfo); - model.addAttribute("page", page); - addMessage(model, "删除成功"); + try { + Page page = systemServiceService.findPage(new Page(request, response, 1), systemServiceInfo); + model.addAttribute("page", page); + addMessage(model, "删除成功"); + } catch (Exception e) { + addMessage(model, "删除失败:" + e.getMessage()); + e.printStackTrace(); + } return "/systemService/list"; } diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp index 03ed0d6e5..90a456523 100644 --- a/src/main/webapp/WEB-INF/views/systemService/form.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp @@ -29,20 +29,20 @@ }, messages: { 'serviceName':{ - required:'必填项' + required:'' }, 'serviceId':{ - required:'必填项', - remote:'重复的serviceId' + required:'', + remote:''+'serviceId' }, 'action':{ - required:'必填项' + required:'' }, 'serviceType':{ - required:'必填项' + required:'' }, 'serviceDesc':{ - required:'必填项' + required:'' } }, submitHandler: function(form){ @@ -57,7 +57,7 @@ } } if (flag) { - loading('正在提交,请稍等...'); + loading('LOADING...'); $("[disabled=disabled]").attr("disabled", false); form.submit(); } else { @@ -67,7 +67,7 @@ }, errorContainer: "#messageBox", errorPlacement: function(error, element) { - $("#messageBox").text("输入有误,请先更正。"); + $("#messageBox").text(""); if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){ error.appendTo(element.parent().parent()); } else { @@ -91,7 +91,7 @@ $("#addBtn").attr("disabled", true); } else if ($(obj).val() == '1') { if ($(".table-list").length > 1) { - alert("单域业务只能关联一个表"); + alert(''); $(obj).val(v); } else if ($(".table-list").length == 1) { $("#addBtn").attr("disabled", true); @@ -102,7 +102,7 @@ $("#addBtn").attr("disabled", false); } else if ($(obj).val() == '3') { if ($(".table-list").length > 1) { - alert("特定服务只能关联一个表"); + alert(''); $(obj).val(v); } else if ($(".table-list").length == 1) { $("#addBtn").attr("disabled", true); @@ -156,25 +156,25 @@ '
' + '' + '' + - '*表名: ' + + '*'+''+': ' + ' ' + - '*表类型: ' + + '*'+''+': ' + ' ' + '' + ' ' + - '*MAAT表名: ' + + '*MAAT '+''+': ' + '' + '
' + '
' + - '*表描述: ' + + '*'+''+': ' + '' + - '' + + '' + '
' + '' ); @@ -200,11 +200,11 @@

- 系统业务管理 +

@@ -212,7 +212,7 @@
- 详情
+
@@ -224,46 +224,46 @@
- +
- +
- 请选择 - 阻断 - 监测 - 封堵白名单 - 监测白名单 - 封堵监测白名单 - 灰名单 + + + + + + +
- +
- 请选择 - 单域 - 多域 - 特定服务 + + + +
- +
- - + +
@@ -272,28 +272,28 @@ - *表名: + *: - *表类型: + *: - *MAAT表名: + *MAAT :
- *表描述: + *: - +
@@ -301,14 +301,14 @@
- +
- +
diff --git a/src/main/webapp/static/pages/css/systemService.css b/src/main/webapp/static/pages/css/systemService.css index c53ec48d8..c11781ad7 100644 --- a/src/main/webapp/static/pages/css/systemService.css +++ b/src/main/webapp/static/pages/css/systemService.css @@ -20,12 +20,7 @@ select, input { /* form */ .child-input { - width: 160px !important; - display: inline !important; - margin: 6px 5px 6px 5px; -} -.child-input-desc { - width: 320px !important; + width: 50% !important; display: inline !important; margin: 6px 5px 6px 5px; }