gfwleak/nms-nmsweb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改英文翻译

Browse Source 
2.优化任务列表显示
This commit is contained in:
chenjinsong
2018-11-15 11:52:22 +08:00
parent 88d197628a
commit bc1d69ad5f
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WebRoot/i18n/globalMessages_en_US.properties
View File

@@ -2419,7 +2419,7 @@ acnti.message.selectUsergroupDefault=Please select a user group
acnti.text.parentMissionId=Original Task ID acnti.text.parentMissionId=Original Task ID
acnti.text.upgradeTime=Upgrade Time acnti.text.upgradeTime=Upgrade Time
acnti.text.commandName=Command Name acnti.text.commandName=Command Name
acnti.text.commandDesc=Command Content&nbsp;&nbsp;&nbsp;&nbsp;<br/>or&nbsp;&nbsp;See&nbsp;&nbsp; acnti.text.commandDesc=Command Content&nbsp;&nbsp;&nbsp;&nbsp;<br/>or&nbsp;&nbsp;Parameters&nbsp;&nbsp;
acnti.text.addOperation=Add Operation acnti.text.addOperation=Add Operation
acnti.text.missionDesc=Task Description acnti.text.missionDesc=Task Description
acnti.text.users=Contacts acnti.text.users=Contacts
@@ -2518,7 +2518,7 @@ acsnti.text.selectUserGroup=Please select a user group
acsnti.text.upgrade_date=Upgrade Time acsnti.text.upgrade_date=Upgrade Time
acsnti.text.parentMissionId=Original Task ID acsnti.text.parentMissionId=Original Task ID
acsnti.text.commandEName=Command Name acsnti.text.commandEName=Command Name
acsnti.text.commandComments=Command Content&nbsp;&nbsp;&nbsp;&nbsp;<br/>or&nbsp;&nbsp;See&nbsp;&nbsp; acsnti.text.commandComments=Command Content&nbsp;&nbsp;&nbsp;&nbsp;<br/>or&nbsp;&nbsp;Parameters&nbsp;&nbsp;
acsnti.text.addOperation=Add Operation acsnti.text.addOperation=Add Operation
acsnti.text.missionDesc=Task Description acsnti.text.missionDesc=Task Description
acsnti.text.users=Contacts acsnti.text.users=Contacts
@@ -2580,7 +2580,7 @@ asnti.button.back=Back
asnti.message.commandType1=NC native support command asnti.message.commandType1=NC native support command
asnti.message.commandType2=Executable command asnti.message.commandType2=Executable command
asnti.message.selectCommandNameDefault=Please select a command name asnti.message.selectCommandNameDefault=Please select a command name
asnti.text.commandDesc=Command Content&nbsp;&nbsp;&nbsp;&nbsp;<br/>or&nbsp;&nbsp;See&nbsp;&nbsp; asnti.text.commandDesc=Command Content&nbsp;&nbsp;&nbsp;&nbsp;<br/>or&nbsp;&nbsp;Parameters&nbsp;&nbsp;
asnti.text.addPushFile=Adding a Push File asnti.text.addPushFile=Adding a Push File
asnti.message.addPushFile=The total size of the file must be less than 100MB asnti.message.addPushFile=The total size of the file must be less than 100MB
asnti.text.addOperation=Add Operation asnti.text.addOperation=Add Operation
@@ -3102,7 +3102,7 @@ anti.message.commandType1=NC native support command
anti.message.commandType2=Executable command anti.message.commandType2=Executable command
anti.text.commandexeName=Command Name anti.text.commandexeName=Command Name
anti.message.commandNameSelect=Please select the command name anti.message.commandNameSelect=Please select the command name
anti.text.commandDesc=Command Content&nbsp;&nbsp;&nbsp;&nbsp;<br/>or&nbsp;&nbsp;See&nbsp;&nbsp; anti.text.commandDesc=Command Content&nbsp;&nbsp;&nbsp;&nbsp;<br/>or&nbsp;&nbsp;Parameters&nbsp;&nbsp;
anti.text.addPushFile=Add push File anti.text.addPushFile=Add push File
anti.message.addPushFile=The total size of the file must be less than 100MB anti.message.addPushFile=The total size of the file must be less than 100MB
anti.text.addOperation=Add Operation anti.text.addOperation=Add Operation

2
WebRoot/page/system/nmstaskmanager/nmstaskInfoList.jsp
View File

@@ -555,7 +555,6 @@
<c:set var="tdClass" value="color_3" /> <c:set var="tdClass" value="color_3" />
<c:set var="tdClassR" value="color_6" /> <c:set var="tdClassR" value="color_6" />
</c:if> </c:if>
<c:if test="${missionstatetable.missionState ne -1}">
<tr> <tr>
<td class="${tdClass }" nowrap="nowrap" > <td class="${tdClass }" nowrap="nowrap" >
<input type="hidden" id="yxbz${missionstatetable.missionId }" name="yxbz${missionstatetable.missionId }" value="${missionstatetable.missionState}" /> <input type="hidden" id="yxbz${missionstatetable.missionId }" name="yxbz${missionstatetable.missionId }" value="${missionstatetable.missionState}" />
@@ -635,7 +634,6 @@
<td class="${tdClass }" nowrap="nowrap">${missionstatetable.userIdName}</td> <td class="${tdClass }" nowrap="nowrap">${missionstatetable.userIdName}</td>
<td class="${tdClassR }" nowrap="nowrap"><fmt:formatDate value="${missionstatetable.createTime}" type="both" /></td> <td class="${tdClassR }" nowrap="nowrap"><fmt:formatDate value="${missionstatetable.createTime}" type="both" /></td>
</tr> </tr>
</c:if>
<c:set var="index" value="${index + 1}" /> <c:set var="index" value="${index + 1}" />
</c:forEach> </c:forEach>
</c:when> </c:when>

1
src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java
View File

@@ -4062,6 +4062,7 @@ public class NmsTaskManagerAction extends BaseAction {
+ this.getUserID() + "')= 0 " + this.getUserID() + "')= 0 "
+ " and instr(t.lookUserIds,to_char(t.userId))= 0) or (t.isLook ='0' and t.lookUserIds is null))"; + " and instr(t.lookUserIds,to_char(t.userId))= 0) or (t.isLook ='0' and t.lookUserIds is null))";
} }
hql += " and t.missionState!=-1";
hql += " order by t.createTime desc"; hql += " order by t.createTime desc";
page = this.commonService.findByPage(hql, pageNo, this.getPageSize()); page = this.commonService.findByPage(hql, pageNo, this.getPageSize());
missionstateTableList = (List<MissionStateTable>) page.getResult(); missionstateTableList = (List<MissionStateTable>) page.getResult();