diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 5c7b33fbe..79f2a8f02 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -162,7 +162,7 @@ turning_page=It is turning to the page login_timeout=No login or login timeout,please login again,Thank you! captcha_error=captcha error enter_captcha=Please enter the captcha -input=please input +input=please input input_title=please input title all_states=all states filter=filter @@ -278,4 +278,12 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== \ No newline at end of file +#==========guankongbaimingdan end===================== +#==========tedingfuwu begin===================== +protocol_id=protocol ID +protocol_name=protocol name +group_id=group ID +input_protocol_id=please enter protocol ID +input_integer=please enter integer +protocol_desc=protocol description +#==========tedingfuwu end===================== \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 1d61153f8..abebceb7a 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -146,7 +146,7 @@ task_time=task time #==========message begin===================== -required=This field is required\uff01 +required=This field is required! select=Please select date_list=Date List confirm_message=Are you sure? @@ -162,7 +162,7 @@ turning_page=It is turning to the page login_timeout=No login or login timeout,please login again,Thank you! captcha_error=captcha error enter_captcha=Please enter the captcha -input=please input +input=please input input_title=please input title all_states=all states filter=filter @@ -173,6 +173,12 @@ has_approved=It has been approved and can not be operated on ! hasnot_approved=It has not been approved and can not be operated on ! check_one=choose one please ! one_more=please choose at least one ! +custom_columns=custom columns +maxlength_64=The maxlength is 64! +maxlength_128=The maxlength is 128! +maxlength_256=The maxlength is 256! +maxlength_512=The maxlength is 512! +maxlength_4000=The maxlength is 4000! #==========message end===================== #==========yewuliexingguanli begin===================== @@ -272,4 +278,12 @@ case_insensitive_nohex=case insensitive and no hex case_sensitive_nohex=case sensitive and no hex area_effect_id=area effect id ip_type=ip type -#==========guankongbaimingdan end===================== \ No newline at end of file +#==========guankongbaimingdan end===================== +#==========tedingfuwu begin===================== +protocol_id=protocol ID +protocol_name=protocol name +group_id=group ID +input_protocol_id=please enter protocol ID +input_integer=please enter integer +protocol_desc=protocol description +#==========tedingfuwu end===================== \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index a50c12ec3..0988255a7 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -181,7 +181,7 @@ maxlength_4000=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f4000\ #==========message end===================== #==========yewuliexingguanli begin===================== -all=\u5168\u90E8 +all=\u5168\u90e8 act=\u52a8\u4f5c block=\u963b\u65ad monitor=\u76d1\u6d4b @@ -277,4 +277,12 @@ case_insensitive_nohex=\u5927\u5c0f\u5199\u4e0d\u654f\u611f\uff0c\u4e14\u975eHEX case_sensitive_nohex=\u5927\u5c0f\u5199\u654f\u611f\uff0c\u4e14\u975eHEX area_effect_id=\u533a\u57df\u751f\u6548id ip_type=ip\u7c7b\u578b -#==========guankongbaimingdan end===================== \ No newline at end of file +#==========guankongbaimingdan end===================== +#==========tedingfuwu begin===================== +protocol_id=\u534f\u8baeID +protocol_name=\u534f\u8bae\u540d\u79f0 +group_id=maat\u7aef\u914d\u7f6e\u5206\u7ec4ID +input_protocol_id=\u8bf7\u8f93\u5165\u534f\u8baeID +input_integer=\u8bf7\u8f93\u5165\u6574\u6570 +protocol_desc=\u534f\u8bae\u63cf\u8ff0 +#==========tedingfuwu end===================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index 4b4efbf58..9931e7eb3 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -158,7 +158,6 @@ - @@ -176,7 +175,6 @@ - ${taskInfo.id } ${taskInfo.taskName } ${taskInfo.taskOrg } @@ -222,7 +220,7 @@ page(); }); - $("#taskName").attr("placeholder"," "+""); + $("#taskName").attr("placeholder",""+""); //全选及取消 $("#checkAll").change(function(){ if($("#checkAll").prop("checked")){ diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index c434d1a18..9e1d840b3 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -149,19 +149,19 @@
- +
- +
- +
@@ -175,7 +175,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp index 65c5597d9..2c5db4ad0 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp @@ -98,7 +98,7 @@ filterActionInit(); $("#seltype").change(function(){ $("#intype").val(""); - $("#intype").attr("placeholder","请输入"+$(this).find("option:selected").text()); + $("#intype").attr("placeholder",""+$(this).find("option:selected").text()); $("#intype").attr("name",$(this).find("option:selected").val()); $("#showError").hide(); }); @@ -148,12 +148,12 @@
- +
@@ -161,21 +161,21 @@
- +
@@ -191,14 +191,14 @@
- +
" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
- +
- - + +
@@ -235,13 +235,13 @@ - 序号 - 协议ID - 协议名称 - 协议描述 - maat端配置分组id + + + + + - 操作时间 + <%-- --%> @@ -249,7 +249,7 @@ - ${specificServiceCfg.showSequence} +<%-- ${specificServiceCfg.showSequence} --%> ${specificServiceCfg.specServiceId} ${specificServiceCfg.specServiceName} ${fns:abbr(specificServiceCfg.specServiceDesc,15)}