From ec78647436210a61a683805f26a801a2d29cf9a9 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Wed, 4 Jul 2018 10:41:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8F=9C=E5=8D=95=E3=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=9B=BD=E9=99=85=E5=8C=96=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=96=B9=E5=BC=8F=E9=BB=98=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?=E5=AD=90=E4=B8=B2=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 8 +++++--- src/main/resources/messages/message_ru.properties | 8 +++++--- .../resources/messages/message_zh_CN.properties | 2 ++ .../webapp/WEB-INF/include/form/stringInfo.jsp | 2 +- .../webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp | 2 +- src/main/webapp/WEB-INF/views/sys/menuForm.jsp | 6 ------ src/main/webapp/WEB-INF/views/sys/roleForm.jsp | 14 ++++---------- src/main/webapp/WEB-INF/views/sys/roleList.jsp | 11 +---------- 8 files changed, 19 insertions(+), 34 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 89d4bf8b6..39fed64ef 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -490,7 +490,7 @@ role_permission=role permission task_allot=task allot role_type_title=activiti\u67093\u79CD\u9884\u5B9A\u4E49\u7684\u7EC4\u7C7B\u578B\:security-role,assignment,user \u5982\u679C\u4F7F\u7528Activiti Explorer,\u9700\u8981security-role\u624D\u80FD\u770B\u5230manage\u9875\u7B7E,\u9700\u8981assignment\u624D\u80FDclaim\u4EFB\u52A1 role_type_info=workflow group user type(task allocation:assignment,management role:security-role,ordinary role:user) -data_range_info=in special cases,\u8BBE\u7F6E\u4E3A"\u6309\u660E\u7EC6\u8BBE\u7F6E",\u53EF\u8FDB\u884C\u8DE8\u673A\u6784\u6388\u6743 +data_range_info=in special cases permission_list=permission list area_name=area name area_code=area code @@ -515,6 +515,8 @@ selected_clear_success=selected staff clear success! cancel_clear=cancel clear! sure_clear=clear role_no_new=role dont have new staff! +role_unique=role name is exist +role_error_info=input error #==========xitongguanli end====================== #===============multiole cfg start==================== optional=optional @@ -706,8 +708,8 @@ min_ttl=min ttl max_ttl=max ttl ttl_unit=unit/s res_group_num=response number -policy_number_value_valid=\u7B56\u7565\u53F7\u503C\u53EA\u80FD\u4E3A0\uFF0C\u6216\u5927\u4E8E100 -policy_number_value_unique=\u7B56\u7565\u53F7\u5DF2\u5B58\u5728 +policy_number_value_valid=policy number must be 0 or greater than 100 +policy_number_value_unique=policy number is exist #=============about Maintenance========= #=============some validation=========== line=line %s diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 2d9f610b5..5d9276714 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -476,7 +476,7 @@ role_permission=role permission task_allot=task allot role_type_title=activiti\u67093\u79CD\u9884\u5B9A\u4E49\u7684\u7EC4\u7C7B\u578B\:security-role,assignment,user \u5982\u679C\u4F7F\u7528Activiti Explorer,\u9700\u8981security-role\u624D\u80FD\u770B\u5230manage\u9875\u7B7E,\u9700\u8981assignment\u624D\u80FDclaim\u4EFB\u52A1 role_type_info=workflow group user type(task allocation:assignment,management role:security-role,ordinary role:user) -data_range_info=in special cases,\u8BBE\u7F6E\u4E3A"\u6309\u660E\u7EC6\u8BBE\u7F6E",\u53EF\u8FDB\u884C\u8DE8\u673A\u6784\u6388\u6743 +data_range_info=in special cases permission_list=permission list area_name=area name area_code=area code @@ -501,6 +501,8 @@ selected_clear_success=selected staff clear success! cancel_clear=cancel clear! sure_clear=clear role_no_new=role dont have new staff! +role_unique=role name is exist +role_error_info=input error #==========xitongguanli end====================== #===============multiole cfg start==================== optional=optional @@ -690,8 +692,8 @@ min_ttl=min ttl max_ttl=max ttl ttl_unit=unit/s res_group_num=response number -policy_number_value_valid=\u7B56\u7565\u53F7\u503C\u53EA\u80FD\u4E3A0\uFF0C\u6216\u5927\u4E8E100 -policy_number_value_unique=\u7B56\u7565\u53F7\u5DF2\u5B58\u5728 +policy_number_value_valid=policy number must be 0 or greater than 100 +policy_number_value_unique=policy number is exist #=============about Maintenance========= #=============some validation=========== line=line %s diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 3eac10dd2..bfd7eced1 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -517,6 +517,8 @@ selected_clear_success=\u5DF2\u9009\u4EBA\u5458\u6E05\u9664\u6210\u529F\uFF01 cancel_clear=\u53D6\u6D88\u6E05\u9664\u64CD\u4F5C\uFF01 sure_clear=\u6E05\u9664\u786E\u8BA4 role_no_new=\u89D2\u8272\u672A\u5206\u914D\u65B0\u6210\u5458\uFF01 +role_unique=\u89D2\u8272\u540D\u79F0\u5DF2\u5B58\u5728 +role_error_info=\u8F93\u5165\u6709\u8BEF\uFF0C\u8BF7\u5148\u66F4\u6B63\u3002 #==========xitongguanli end====================== #===============multiole cfg start==================== optional=\u53EF\u9009 diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp index 682157db6..d0c93067d 100644 --- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -53,7 +53,7 @@
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index dabef58e2..17df2e780 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -226,7 +226,7 @@ var delContent=function(contentClassName,addBtnClassName){
diff --git a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp index 62b70dc5a..9febc57e8 100644 --- a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp @@ -46,12 +46,6 @@
${not empty menu.id?'修改':'添加'}
-
- - - - -
diff --git a/src/main/webapp/WEB-INF/views/sys/roleForm.jsp b/src/main/webapp/WEB-INF/views/sys/roleForm.jsp index 1ca54abe9..063e7576b 100644 --- a/src/main/webapp/WEB-INF/views/sys/roleForm.jsp +++ b/src/main/webapp/WEB-INF/views/sys/roleForm.jsp @@ -16,7 +16,7 @@ name: {remote: "${ctx}/sys/role/checkName?oldName=" + encodeURIComponent("${role.name}")} }, messages: { - name: {remote: "角色名已存在"} + name: {remote: ""} }, submitHandler: function(form){ var ids = [], nodes = tree.getCheckedNodes(true); @@ -25,12 +25,12 @@ } $("#menuIds").val(ids); - loading('正在提交，请稍等...'); + loading('onloading...'); form.submit(); }, 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 { @@ -78,7 +78,7 @@

- +

@@ -87,12 +87,6 @@
-
- - - - -
diff --git a/src/main/webapp/WEB-INF/views/sys/roleList.jsp b/src/main/webapp/WEB-INF/views/sys/roleList.jsp index c8b6aa6e1..255a4ab28 100644 --- a/src/main/webapp/WEB-INF/views/sys/roleList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/roleList.jsp @@ -9,7 +9,6 @@
-
- -
@@ -56,7 +47,7 @@ ${fns:getDictLabel('SYS_DATA_SCOPE',role.dataScope,'无')} ${fns:abbr(role.remark,30)} - + <%-- --%> ？', this.href)">