Merge remote-tracking branch 'origin/dev' into dev

2018-10-18 16:09:12 +08:00
parent 3ddf0a2666 e39b9161c1
commit 1239920b9c
28 changed files with 1925 additions and 1584 deletions
--- a/WebRoot/i18n/globalMessages_en_US.properties
+++ b/WebRoot/i18n/globalMessages_en_US.properties
@@ -22,7 +22,7 @@ main.message.info=The following tasks completed
 main.text.logout=Exit
 main.text.systemSelect=View Switch
 main.text.welcome=Hello!
-main.text.systemName=Current Business System
+main.text.systemName=Current View
 main.message.I3=The browser does not support inline frames or is configured not to display inline frames.

 #middle.jsp page
@@ -67,10 +67,10 @@ sie.text.BoardError=Board Error Message
 sie.text.portError=Port Error Message

 #systemSelect.jsp page
-systemSelect.message.title=Network Management System_Business System Selection
+systemSelect.message.title=Network Management System_View Selection
 systemSelect.font.style1=Microsoft Black
 systemSelect.message.loginSuccess=Login Successful
-systemSelect.message.system=Business System
+systemSelect.message.system=View

 #page.jsp
 page.message.inputnum = Please enter the number
@@ -116,7 +116,7 @@ actsi.text.oidFont=OID is illegal. The format is as follows: OID: 1.3.6.1.2.1.1
 actsi.text.ctypeName.exception1=Please enter a length less than 64 characters
 actsi.text.tableNameFont.exception=Please enter a length less than 21 characters
 actsi.text.ctypeName.exception2=Please enter letters and numbers
-actsi.button.back=Return
+actsi.button.back=Back
 actsi.text.addCheckType=Add Monitoring Category
 actsi.text.tableDesc=Table Description
 actsi.text.viewPrivilege=View Permissions
@@ -214,7 +214,7 @@ ctsl.button.update=Modify
 ctsl.button.createTable=Generate Data Table
 ctsl.button.stop=Disabled
 ctsl.button.start=Enabled
-ctsl.button.back=Return
+ctsl.button.back=Back
 ctsl.text.index=Serial Number
 ctsl.text.detecationType=Monitoring Category
 ctsl.text.tableName=Table Name
@@ -243,7 +243,7 @@ uctsi.error.tabHasSpecialChar=There are special characters in the corresponding
 uctsi.error.tabHasZh=The corresponding database table exists in Chinese, please re-enter
 uctsi.message.usergroup=User Group
 uctsi.error.OIDFont=OID is illegal. The format is as follows: OID: 1.3.6.1.2.1.1
-uctsi.button.back=Return
+uctsi.button.back=Back
 uctsi.text.updateDetecationType=Modify Monitoring Category
 uctsi.text.checkTypeName=Monitoring Category
 uctsi.text.tableComments=Table Description
@@ -329,7 +329,7 @@ ucts.button.back=Back
 ################################################## #######
 #detailWarninginfo.jsp page
 dwi.message.title=Alert Details
-dwi.button.back=Return
+dwi.button.back=Back
 dwi.message.warningInfo=Alarm Information
 dwi.text.processIdenName=Setting Name
 dwi.text.nodeIp=Node IP
@@ -377,7 +377,7 @@ dclwl.text.timeoutDetecFilter=Filter Supercycle Monitoring
 dclwl.message.no=No
 dclwl.message.yes=Yes
 dclwl.message.export=Export
-dclwl.button.back=Return
+dclwl.button.back=Back
 dclwl.text.index=Serial Number
 dclwl.text.checkWay=Monitoring Method
 dclwl.text.tryTimes=Attempts
@@ -422,7 +422,7 @@ dwl.text.timeoutDetecFilter=Filtering Supercycle Monitoring
 dwl.message.no=No
 dwl.message.yes=Yes
 dwl.button.export=Export
-dwl.button.back=Return
+dwl.button.back=Back
 dwl.text.index=Serial Number
 dwl.text.checkWay=Monitoring Method
 dwl.text.persistTime=Duration
@@ -450,7 +450,7 @@ dwlc.message.passive=Passive
 ################################################## ######
 #detailMonitor.jsp page
 dm.message.title=Monitoring Data Details
-dm.button.back=Return
+dm.button.back=Back
 dm.text.detecationInfo=Monitoring Data Details
 dm.text.processIdenName=Setting Name
 dm.text.nodeIp=Node IP
@@ -561,7 +561,7 @@ dil.text.status=Status
 dil.message.statusDefault=Please Select
 dil.message.normal=Normal
 dil.message.abnormal=Exception
-dil.button.back=Return
+dil.button.back=Back
 dil.text.nodeIp=Node IP
 dil.text.checkType=Monitoring Category
 dil.text.checkTypeName=Setting Name
@@ -622,7 +622,7 @@ dspmi.message.updateTheMark=Modify this tag here
 dspmi.text.startTime=Start Time
 dspmi.text.endTime=End Time
 dspmi.message.defaultMsg=Tip: When no start and end time is selected, the default query date data
-dspmi.button.back=Return
+dspmi.button.back=Back
 dspmi.text.noRecord=No Record
 dspmi.textnoClassify=Classification ID is empty
 dspmi.button.clearSelected=Clear Selection
@@ -894,7 +894,7 @@ prl.text.processIdenName=Setting Name
 prl.message.processIdenName=Please enter the setting name
 prl.button.add=Add
 prl.button.update=Modify
-prl.button.back=Return
+prl.button.back=Back
 prl.text.index=Serial Number
 prl.text.checkGap=Monitoring Interval (Minutes)
 prl.text.filedName=Alarm Field
@@ -930,8 +930,8 @@ upr.message.markerFiledDefault=Please Select
 upr.text.marker=Filter ID
 upr.message.marker=Multiple flags used | Split; Content is empty, no filtering
 upr.text.policeEmergent=Urgent
-upr.message.emergency=Emergency
-upr.message.nonEmergency=Non-emergency
+upr.message.emergent=Emergency
+upr.message.nonEmergent=Non-emergency
 upr.text.policeLevel=Alarm Level
 upr.text.policeValue=Alarm Threshold
 upr.text.policeUnit=Alarm Threshold Unit
@@ -941,7 +941,7 @@ upr.text.policeShowInfo=Alarm Information
 upr.message.policeShowInfo=Content is less than 200 characters
 upr.button.submit=Submit
 upr.button.reset=Reset
-upr.button.back=Return
+upr.button.back=Back

 #WebRoot directory
 #page directory
@@ -1157,7 +1157,7 @@ adsi.button.reset=Reset

 #detailDetecSetInfo.jsp page
 ddsi.message.title=Monitoring Settings Details
-ddsi.button.back=Return
+ddsi.button.back=Back
 ddsi.text.title=Monitoring Settings Details
 ddsi.text.processIdenName=Setting Name
 ddsi.text.processIden=Setting ID
@@ -1355,7 +1355,7 @@ mkil.button.cancel=Cancel
 #addDefaultsInfo.jsp page
 adi.message.title=Add Default Information
 adi.text.title=Default Value Configuration
-adi.text.system=Business System
+adi.text.system=View
 adi.message.selectDefault=Please Select
 adi.text.missionType=Task Type
 adi.text.nodeGroup=Node Groups
@@ -1380,7 +1380,7 @@ dil.message.faild=The operation failed!
 dil.text.missionName=Configuration Name
 dil.text.missionType=Business Type
 dil.text.selectDefault=Please Select
-dil.text.system=Business System
+dil.text.system=View
 dil.text.nodeGroup=Node Groups
 dil.text.index=Serial Number
 dil.text.opration=Operation
@@ -1390,7 +1390,7 @@ dil.text.viewRecord=View Details
 #examineDefaultsInfo1.jsp page
 edi1.message.title=Add Default Information
 edi1.text.title=Default Value Configuration
-edi1.text.systemName=Business System
+edi1.text.systemName=View
 edi1.text.missionType=Task Type
 edi1.text.nodeGroup=Node Group
 edi1.text.missionTypeName=Task Type Name
@@ -1411,7 +1411,7 @@ edi1.text.filterKeyword=Filter Keywords
 #examineDefaultsInfo2.jsp page
 edi2.text.addDefaultInfoTitle=Add Default Information
 edi2.text.title=Default Value Configuration
-edi2.text.systemName=Business System
+edi2.text.systemName=View
 edi2.message.selectDefault=Please Select
 edi2.text.missionType=Task Type
 edi2.text.nodeGroup=Node Groups
@@ -1450,13 +1450,13 @@ udi.message.upperlayer=Please Select
 #smipleMission directory
 ################################################## #####
 #addmissionInfo.jsp page
-ami.message.selectSystem=Please select the business system
+ami.message.selectSystem=Please select the view
 ami.message.selectMK=Please select module
 ami.text.upFile=Upgrade File
 ami.message.filePath=Please select the configuration file
 ami.message.sets=Please select a configuration item
 ami.text.title=System Module Upgrade
-ami.text.systemName=Business System
+ami.text.systemName=View
 ami.message.selectDefault=Please Select
 ami.text.module=Module
 ami.text.deployedNodeGroup=Deployed Node Group
@@ -1533,7 +1533,7 @@ msil.text.createDate=Created
 msil.text.to=To
 msil.text.missionState=Task Status
 msil.message.selectDefault=Please select
-msil.text.systemName=Business System
+msil.text.systemName=View
 msil.text.nodeGroup=Node Groups
 msil.text.viewLevel=View Permissions
 msil.text.index=Serial Number
@@ -1560,7 +1560,7 @@ msil.message.noRecord=No Record
 api.message.title=Add Tool Information
 api.message.name=Name cannot be empty.
 api.message.myFile=The tool cannot be empty. Please select.
-api.button.back=Return
+api.button.back=Back
 api.text.title=Add Tool Information
 api.text.name=Tool Name
 api.text.myFile=Tools
@@ -1794,7 +1794,7 @@ uri.text.roomCols=Computer Room Columns
 uri.message.roomRows=The number of room lines need to be less than or equal to
 uri.message.roomCols=The number of columns in the equipment room must be less than or equal to
 uri.message.roomIspn=There is an illegal character in the room number. Please enter it again!
-uri.button.back=Return
+uri.button.back=Back
 uri.text.title=Basic Information of Computer Room
 uri.text.index=Number
 uri.text.rows=Number of rows
@@ -1943,7 +1943,7 @@ dbi.text.title=View Brand
 dbi.text.brandName=Brand Name
 dbi.text.brandOid=Brand OID
 dbi.text.brandDesc=Brand Description
-dbi.button.back=Return
+dbi.button.back=Back

 #updateBrandInfo.jsp page
 ubi.message.addBrandInfoTitle=Add brand information
@@ -2076,7 +2076,7 @@ cdp.text.movePosition=Move the position of the selected area
 cdp.text.setHeigh=Adjust the height of the selected area
 cdp.text.setWiedth=Adjust the width of the selected area
 cdp.button.add=Submit
-cdp.button.back=Return
+cdp.button.back=Back

 #detailBrandInfo.jsp page
 dtbi.message.title=Add Brand Information
@@ -2234,7 +2234,7 @@ ads.text.showNum=Show Serial Number
 ads.text.delayTime=Delay Time
 ads.text.MkformError=Type code or type name already exists, please re-enter!
 ads.text.MkformException=Abnormal Operation!
-ads.button.back=Return
+ads.button.back=Back
 ads.text.title=New type data dictionary source data
 ads.text.delayTime1=Delay Time (Minutes)
 ads.button.add=Submit
@@ -2266,7 +2266,7 @@ dict.text.noRecord=No Record
 #dictionarySourceList.jsp page
 dsl.message.title=Data Dictionary Source Data
 dsl.button.add=Add
-dsl.button.back=Return
+dsl.button.back=Back
 dsl.text.index=Serial Number
 dsl.text.typeCode=Type Code
 dsl.text.typeValue=Type Name
@@ -2280,7 +2280,7 @@ dsl.text.noRecord=No Record

 #updateDetDataConSet.jsp page
 uddc.message.title=Modify monitoring data list filter
-uddc.button.back=Return
+uddc.button.back=Back
 uddc.text.title=Modify Monitoring Data Filter Settings
 uddc.text.menuName=Menu Name
 uddc.text.policeEmergent=Urgent
@@ -2349,7 +2349,7 @@ eid.message.unresolved=Unresolved
 eid.message.recovered=Recovered
 eid.text.yhmc=Solution
 eid.text.stateUpdateTime=Time To Resolve
-eid.button.back=Return
+eid.button.back=Back

 #nmsErrorInfoList.jsp page
 neil.message.title=Exception Information List
@@ -2403,11 +2403,11 @@ acnti.message.missionDesc=The task description cannot be greater than 100
 acnti.message.notNull=Cannot be empty
 acnti.message.mlmc=Please select the command name
 acnti.message.nodeLock=Specify result node reverse operation Node group and node cannot be modified
-acnti.button.back=Return
+acnti.button.back=Back
 acnti.text.title=Add Reverse Task
 acnti.text.missionType=Task Type
 acnti.text.upgrade=Upgrade Deployment
-acnti.text.systemIdName=Business System
+acnti.text.systemIdName=View
 acnti.text.missionName=Task Name
 acnti.text.nodeGroup=Section&nbsp;&nbsp;point&nbsp;&nbsp;Group
 acnti.button.select=Select
@@ -2506,7 +2506,7 @@ acsnti.button.back=Back
 acsnti.text.title=Add Reverse Similar Tasks
 acsnti.text.missionType=Task Type
 acsnti.text.upgrade=Upgrade Deployment
-acsnti.text.systemName=Business System
+acsnti.text.systemName=View
 acsnti.text.missionName=Task Name
 acsnti.text.nodeGroups=Section&nbsp;&nbsp;point&nbsp;&nbsp;Group
 acsnti.button.select=Select
@@ -2564,7 +2564,7 @@ asnti.text.missionType=Task Type
 asnti.message.missionType1=File Push
 asnti.message.missionType4=Command Execution
 asnti.message.missionType6=Upgrade Deployment
-asnti.text.systemIdName=Business System
+asnti.text.systemIdName=View
 asnti.text.missionName=Task Name
 asnti.text.nodeGroup=Section&nbsp;&nbsp;point&nbsp;&nbsp;Group
 asnti.button.select=Select
@@ -2740,7 +2740,7 @@ cmd.text.title=Upgrade Deployment - Reverse Task Results View
 cmd.text.missionName=Task Name
 cmd.text.missionType=Task Type
 cmd.text.upgrade=Upgrade Deployment - Reverse Task
-cmd.text.systemIdName=Business System
+cmd.text.systemIdName=View
 cmd.text.nodeGroup=Node Group
 cmd.text.excuNode=Executive Node
 cmd.text.addUser=Create User
@@ -2831,7 +2831,7 @@ mspm1.text.missionName=Task Name
 mspm1.text.missionType=Task Type
 mspm1.message.missionType1=File Push
 mspm1.message.missionType2=Get Non-streaming Text Data
-mspm1.text.systemIdName=Business System
+mspm1.text.systemIdName=View
 mspm1.text.nodeListName=Node Group
 mspm1.text.excNode=Executive Node
 mspm1.text.fileName=Push File
@@ -2852,7 +2852,7 @@ mspm2.text.missionName=Task Name
 mspm2.text.missionType=Task Type
 mspm2.message.missionType1=File Push
 mspm2.message.missionType2=Get Non-stream Text Data
-mspm2.text.systemIdName=Business System
+mspm2.text.systemIdName=View
 mspm2.text.filePath=File
 mspm2.text.missionDesc=Task Description
 mspm2.text.viewLevel=View Permissions
@@ -2887,7 +2887,7 @@ mspm3.message.getNonStream=Get Non-stream Text Data
 mspm3.message.getStream=Streaming Text Data Acquisition
 mspm3.message.commandExcute=Command Execution
 mspm3.message.shellRegist=Shell Registration
-mspm3.text.systemIdName=Business System
+mspm3.text.systemIdName=View
 mspm3.text.filePath=Files
 mspm3.text.missionDesc=Task Description
 mspm3.text.viewLevel=View Permissions
@@ -2921,7 +2921,7 @@ mspm3.button.exportFaildNode=Failed Node Export

 #missionstateparameter4.jsp page
 mspm4.message.title=Command Execution - Task Results View
-mspm4.button.back=Return
+mspm4.button.back=Back
 mspm4.text.title=Command Execution - Task Results View
 mspm4.text.missionName=Task Name
 mspm4.text.missionType=Task Type
@@ -2931,7 +2931,7 @@ mspm4.message.getStream=Get non-streaming text data
 mspm4.message.commandExcute=Command Execution
 mspm4.message.shellRegist=Shell Registration
 mspm4.message.upgrade=Upgrade Deployment
-mspm4.text.systemIdName=Business System
+mspm4.text.systemIdName=View
 mspm4.text.nodeListName=Node Group
 mspm4.text.excuNode=Executive Node
 mspm4.text.addUser=Create User
@@ -2967,7 +2967,7 @@ mspm5.message.getNonStream=Get Non-stream Text Data
 mspm5.message.getStream=Streaming Text Data Acquisition
 mspm5.message.commandExcute=Command Execution
 mspm5.message.shellRegist=Shell Registration
-mspm5.text.systemIdName=Business System
+mspm5.text.systemIdName=View
 mspm5.text.commandFlag=Call Flag
 mspm5.text.missionDesc=Task Description
 mspm5.text.viewLevel=View Permissions
@@ -3000,7 +3000,7 @@ mspm6.message.getStream=Streaming Text Data Acquisition
 mspm6.message.commandExcute=Command Execution
 mspm6.message.shellRegist=Shell Registration
 mspm6.message.upgrade=Upgrade Deployment
-mspm6.text.systemIdName=Business System
+mspm6.text.systemIdName=View
 mspm6.text.nodeListName=Node Group
 mspm6.text.excuNode=Execution Node
 mspm6.text.addUser=Create User
@@ -3089,7 +3089,7 @@ anti.text.missionType=Task Type
 anti.message.filePush=File Push
 anti.message.commandExcute=Command Execution
 anti.message.upgrade=Upgrade Deployment
-anti.text.systemName=Business System
+anti.text.systemName=View
 anti.text.missionName=Task Name
 anti.text.nodeGroup=Section&nbsp;&nbsp;point&nbsp;&nbsp;Group
 anti.button.select=Select
@@ -3152,8 +3152,8 @@ entip1.text.title=Modify Task Information
 entip1.text.missionName=Task Name
 entip1.text.missionType=Task Type
 entip1.text.filePush=File Push
-entip1.text.selectSystem=Select Business System
-entip1.message.selectSystem=Please select a business system
+entip1.text.selectSystem=Select View
+entip1.message.selectSystem=Please select a view
 entip1.text.pushNodeGroup=Push Node Group
 entip1.text.pushMissionDesc=Push Task Description
 entip1.text.viewLevel=View Permissions
@@ -3178,8 +3178,8 @@ entip2.text.addmissionInfo=Add Task Information
 entip2.text.missionName=Task Name
 entip2.text.missionType=Task Type
 entip2.text.getDate=Get Non-streaming Text Data
-entip2.text.System=Select Business System
-entip2.text.selectSystem=Please select the business system
+entip2.text.System=Select View
+entip2.text.selectSystem=Please select the view
 entip2.text.groupId=Non-stream Node Group
 entip2.text.missionDesc=Non-flow Task Description
 entip2.text.viewLevel=View Permissions
@@ -3271,7 +3271,7 @@ mrl.button.reverseFaildNodes=Failed Node Reverse
 mrl.button.reverseAllNodes=All Reverse
 mrl.button.exportXLS=Query Result Export
 mrl.button.batchDownLoadFile=Bulk Download Backfiles
-mrl.button.back=Return
+mrl.button.back=Back
 mrl.text.nodeIp=Node IP
 mrl.text.returnResult=Execution Result
 mrl.text.resultCause=Results Reason
@@ -3310,7 +3310,7 @@ mrlchild.text.totalChart=Overall Ratio
 mrs.message.title=Command Execution - Task Results View
 mrs.message.brower=The browser does not support inline frames or is configured not to display inline frames.
 mrs.button.exportXls=Failure Result Export
-mrs.button.back=Return
+mrs.button.back=Back
 mrs.message.filePush=File Push
 mrs.message.getNonStream=Get Non-streaming Text Data
 mrs.message.getStream=Streaming Text Data Acquisition
@@ -3383,7 +3383,7 @@ ntil.message.missionType6=Upgrade Deployment
 ntil.text.operation=Operation
 ntil.text.isLoop=Periodic Tasks
 ntil.text.missionStateDesc=Task Status Description
-ntil.text.systemId=Business System
+ntil.text.systemId=View
 ntil.text.userGroup=User Group
 ntil.text.viewLevel=View Permissions
 ntil.text.user=Created By
@@ -3471,7 +3471,7 @@ ntilp.message.missionType4=Command Execution
 ntilp.message.missionType6=Upgrade Deployment
 ntilp.button.exportXls=Export
 ntilp.text.missionStateDesc=Task Status Description
-ntilp.text.systemId=Business System
+ntilp.text.systemId=View
 ntilp.text.userGroup=User Group
 ntilp.text.viewLevel=View Permissions
 ntilp.text.createUser=Created By
@@ -3602,13 +3602,13 @@ agi.message.jsFormException=Abnormal Operation!
 agi.text.jsmc=User Group Name
 agi.message.jsmc=There is a special character in the user group name. Please enter it again.
 agi.message.sys=Please select a system for this user group!
-agi.button.back=Return
+agi.button.back=Back
 agi.text.title=Add User Group Information
 agi.text.jsms=User Group Description
 agi.text.state=State
 agi.text.using=Valid
 agi.text.selectSys=Select accessible system
-agi.text.systemList=Business System List
+agi.text.systemList=View List
 agi.button.submit=Submit
 agi.button.reset=Reset

@@ -3627,7 +3627,7 @@ ggrp.text.state=Status
 ggrp.message.state0=Active
 ggrp.message.state1=Invalid
 ggrp.text.systemId=Select Accessible System
-ggrp.text.systemList=Business System List
+ggrp.text.systemList=View List
 ggrp.button.submit=Submit
 ggrp.button.reset=Reset

@@ -3669,14 +3669,14 @@ vgp.message.state0=Active
 vgp.message.state1=Invalid
 vgp.text.userGroupDesc=User Group Description
 vgp.text.systemId=Accessible System
-vgp.message.systemId=NMS Business System
+vgp.message.systemId=NMS View
 vgp.text.userGroupInfo=All User Information Under User Group
 Bgp.message.brower=The browser does not support inline frames or is configured not to display inline frames.


 #viewgrouppermissionForGuide.jsp page
 vgpmfg.message.title=View User Group Information
-vgpmfg.button.back=Return
+vgpmfg.button.back=Back
 vgpmfg.text.title=User Group Basic Information
 vgpmfg.text.usergroup=User Group Name
 vgpmfg.text.state=Status
@@ -3684,7 +3684,7 @@ vgpmfg.message.state0=Active
 vgpmfg.message.state1=Invalid
 vgpmfg.text.userGroupDesc=User Group Description
 vgpmfg.text.systemId=Accessible System
-vgpmfg.message.systemId=NMS Business System
+vgpmfg.message.systemId=NMS View
 vgpmfg.text.userGroupInfo=All User Information In The User Group
 vgpmfg.message.brower=The browser does not support inline frames or is configured not to display inline frames.

@@ -3718,8 +3718,8 @@ aei.message.MkformError=Error code already exists. Please re-enter!
 aei.message.MkformException=Abnormal operation!
 aei.button.back=Back
 aei.text.title=New Trouble Database Information
-aei.text.systeId=Business System
-aei.message.systeId=Please select a business system
+aei.text.systeId=View
+aei.message.systeId=Please select a view
 aei.text.troubleDescr=Error Description
 aei.button.submit=Submit
 aei.button.reset=Reset
@@ -3810,7 +3810,7 @@ aui.text.userGroupId=User Group ID
 aui.text.userGroup=User Group Name
 aui.button.submit=Submit
 aui.button.reset=Reset
-aui.button.back=Return
+aui.button.back=Back

 #configJsMKGnInfo.jsp page
 cjsmkgi.message.title=Role permission configuration
@@ -3871,7 +3871,7 @@ fmup.text.yhmc=User Name
 fmup.message.yhmm=The password must be at least 8 bits long
 fmup.button.submit=Submit
 fmup.button.reset=Reset
-fmup.button.back=Return
+fmup.button.back=Back

 #jsInfoList.jsp page
 jsil.message.title=Role Information
@@ -3939,8 +3939,8 @@ uei.message.systemId=Please select the system
 uei.button.back=Back
 uei.text.title=Modify Fault Library Information
 uei.text.troubleCode=Trouble Code
-uei.text.systemId=Business System
-uei.message.system=Please select a business system
+uei.text.systemId=View
+uei.message.system=Please select a view
 uei.text.troubleDescr=Error Description
 uei.text.troubleState=Status
 uei.message.troubleState0=Active
@@ -3955,7 +3955,7 @@ ujsi.text.jsmc=Role Name
 ujsi.message.jsmc=There are special characters in the role name. Please enter again.
 ujsi.message.mk=Please select a module for this role!
 ujsi.message.jsExists=This role name already exists
-ujsi.button.back=Return
+ujsi.button.back=Back
 ujsi.text.title=Modify Role Information
 ujsi.text.jsms=Action Description
 ujsi.text.state=Status
@@ -4006,7 +4006,7 @@ uu.message.email=E-mail format is incorrect, please re-enter
 uu.message.js=Please select at least one character!
 uu.message.yhz=Please select at least one user group!
 uu.message.bm=Please select at least one department!
-uu.button.back=Return
+uu.button.back=Back
 uu.text.title=Modify User Information
 uu.text.baseInfo=User Basic Information
 uu.text.yhbh=Username
@@ -4057,7 +4057,7 @@ uup.text.yhmm=User Password
 uup.text.confirm=Confirm Password
 uup.message.confirm=The password and confirmation password are different. Please re-enter!
 uup.message.yhmc=User Name
-uup.button.back=Return
+uup.button.back=Back
 uup.text.title=Modify Password Information
 uup.message.password=The password must be at least 8 bits long
 uup.text.submit=Submit
@@ -4228,14 +4228,14 @@ uni.text.back=Back
 #addNodegroupInfo.jsp page
 angi.message.title=Add Node Group Information
 angi.text.groupName=Group Name
-angi.text.systemId=Business System
+angi.text.systemId=View
 angi.message.noGroupBelong=You do not belong to any user group, no permission to add this type of node group!
 angi.message.groupSelect=Please select user group!
 angi.text.title=Node Group Basic Information
 angi.text.groupType=Group Type
 angi.message.groupType0=Normal
 angi.message.groupType1=Temp
-angi.message.systemId=Please select a business system
+angi.message.systemId=Please select a view
 angi.text.isValid=Has Taken Effect
 angi.message.valid=Effective
 angi.message.invalid=Expiration
@@ -4308,14 +4308,14 @@ ngil.text.noRecord=No Record
 #updateNodegroupInfo.jsp page
 ungi.message.title=Modify Node Group Information
 ungi.text.groupName=Group Name
-ungi.text.systemId=Business System
+ungi.text.systemId=View
 ungi.message.noGroupBelong=You do not belong to any user group. You do not have permission to modify this node group!
 ungi.message.selectGroup=Please select user group!
 ungi.text.title=Node Group Basic Information
 ungi.text.groupType=Group Type
 ungi.message.groupType0=Normal
 ungi.message.groupType1=Temp
-ungi.message.systemId=Please select a business system
+ungi.message.systemId=Please select a view
 ungi.text.isValid=Has Taken Effect
 ungi.message.valid=Effective
 ungi.message.inValid=Expired
@@ -4328,7 +4328,7 @@ ungi.message.usergroup=Please select a user group
 ungi.text.groupDesc=Group Description
 ungi.button.submit=Submit
 ungi.button.reset=Reset
-ungi.button.back=Return
+ungi.button.back=Back

 #WebRoot directory
 #page directory
@@ -4350,7 +4350,7 @@ addNodeInfo.message.nodeGroup=This node group has the same IP
 addNodeInfo.message.nodeIp=Node IP already exists
 addNodeInfo.message.selectDefault=Please select
 addNodeInfo.message.nodeUType=Node thickness (U bit), please enter the number!
-addNodeInfo.button.back=Return
+addNodeInfo.button.back=Back
 addNodeInfo.text.title=Add Node Information
 addNodeInfo.text.nodeType=Node Type
 addNodeInfo.message.nodeType0=Server
@@ -4371,7 +4371,7 @@ addNodeInfo.button.reset=Reset
 dni.message.title=Node Information
 dni.message.nodeType0=No relevant data was collected
 dni.message.nodeType1=This node has no data for the switch
-dni.button.back=Return
+dni.button.back=Back
 dni.text.title=Node System Information
 dni.text.hostName=Host Name
 dni.text.operateSystem=Operating System
@@ -4412,7 +4412,7 @@ nodeInfo.button.downloadExample=Download Template
 nodeInfo.text.importXls=Import Excel
 nodeInfo.button.importXls=Import
 nodeInfo.button.showDiv=Export
-nodeInfo.button.back=Return
+nodeInfo.button.back=Back
 nodeInfo.button.add=Add
 nodeInfo.text.nodeIp=Node IP
 nodeInfo.message.nodeIp=Please enter node IP
@@ -4522,7 +4522,7 @@ nginfo.message.selectParent=Please select a parent node group in the menu!
 nginfo.message.addSubNode=Add child node group information
 nginfo.text.addSubNode=Group Name
 nginfo.message.inputGroupName=There are special characters in the group name, please re-enter
-nginfo.text.systemId=Business System
+nginfo.text.systemId=View
 nginfo.message.startNodeGroup1=Please select at least one row!
 nginfo.message.startNodeGroup2=Included effective node groups, please reselect!
 nginfo.message.startNodeGroup3=An attempt was made to enable a node group whose parent node group is invalid, so it cannot be started. Please reselect!
@@ -4552,7 +4552,7 @@ nginfo.text.groupName=Group Name
 nginfo.text.groupType=Group Type
 nginfo.message.groupType0=Normal
 nginfo.message.groupType1=Temp
-nginfo.message.systemId=Please select a business system
+nginfo.message.systemId=Please select a view
 nginfo.text.isValid=Has Taken Effect
 nginfo.message.isValid1=Effective
 nginfo.message.isValid0=Invalid
@@ -4616,7 +4616,7 @@ asi.message.delete=Delete
 asi.message.ipRepeat=IP Cross-repeat
 asi.message.ipRepeat.and=And
 asi.message.ipRepeat.with=With
-asi.button.back=Return
+asi.button.back=Back
 asi.text.title=Adding Server Information
 asi.text.configIp=Configuration Manage IP
 asi.message.configIp=Configure IP
@@ -4628,8 +4628,8 @@ asi.button.submit=Submit
 asi.button.reset=Reset

 #detailserverinfo.jsp page
-dsi.message.title=Add Business System Information
-dsi.button.back=Return
+dsi.message.title=Add View Information
+dsi.button.back=Back
 dsi.text.title=Server Information
 dsi.text.serverName=Server Name
 dsi.text.serverDesc=Server Description
@@ -4644,8 +4644,8 @@ serverinfo.message.title=DataController Management
 serverinfo.message.success=Operation successful!
 serverinfo.message.faild=Operation failed!
 serverinfo.message.selectOne=Please select a row!
-serverinfo.message.includeStop=Contains disabled business systems. Please reselect!
-serverinfo.message.includeStart=Contains enabled business systems. Please reselect!
+serverinfo.message.includeStop=Contains disabled views. Please reselect!
+serverinfo.message.includeStart=Contains enabled views. Please reselect!
 serverinfo.message.inputInfo=Input is a special character, please re-enter!
 serverinfo.message.selectFile=Please select the imported file
 serverinfo.message.selectFileType=Please select the correct import file type
@@ -4692,7 +4692,7 @@ upserver.message.delete=Delete
 upserver.message.ipRepeat=IP Cross-replication
 upserver.message.ipRepeat.and=And
 upserver.message.ipRepeat.with=With
-upserver.button.back=Return
+upserver.button.back=Back
 upserver.text.title=Modify Server Information
 upserver.text.serverState=Server Status
 upserver.text.configIp=Configuration Manage IP
@@ -4710,7 +4710,7 @@ upserver.button.reset=Reset
 #systemManage directory
 ################################################## ###################
 #addSystemInfo.jsp page
-addsysinfo.message.title=Add Business System Information
+addsysinfo.message.title=Add View Information
 addsysinfo.message.sysExists=The system already exists. Please re-enter!
 addsysinfo.message.faild=Abnormal operation!
 addsysinfo.text.systemName=System Name
@@ -4718,8 +4718,8 @@ addsysinfo.text.systemDesc=System Description
 addsysinfo.text.systemIp=Register IP
 addsysinfo.text.systemPort=Register Port
 addsysinfo.message.systemName=There are special characters in the system name. Please re-enter it.
-addsysinfo.button.back=Return
-addsysinfo.text.title=Add Business System Information
+addsysinfo.button.back=Back
+addsysinfo.text.title=Add View Information
 addsysinfo.text.isMaster=Master/Subsystem
 addsysinfo.text.master=Main Control System
 addsysinfo.text.slave=Subsystem
@@ -4733,7 +4733,7 @@ addsysinfo.text.reset=Reset
 #detailSystemInfo.jsp page
 detailsys.message.title=Network Management System
 detailsys.button.back=Back
-detailsys.text.title=Business System Basic Information
+detailsys.text.title=View Basic Information
 detailsys.text.systemName=System Name
 detailsys.text.systemDesc=System Description
 detailsys.text.systemCreatetime=Add time
@@ -4741,12 +4741,12 @@ detailsys.text.systemState=System State
 detailsys.message.systemState0=Enabled
 detailsys.message.systemState1=Disabled
 detailsys.text.isMaster=(Master/Child) System
-addsysinfo.text.sysUserGroup=User Group under Business System
+addsysinfo.text.sysUserGroup=User Group under View
 addsysinfo.text.openAll=Open All
 addsysinfo.text.closeAll=Close all
-addsysinfo.message.showTipMsg=user group: A set of users who have permission to operate related functions of the business system. Users in the same user group have all rights of the user group. A user group can belong to multiple business systems, and a business system can also contain multiple user groups.
+addsysinfo.message.showTipMsg=user group: A set of users who have permission to operate related functions of the view. Users in the same user group have all rights of the user group. A user group can belong to multiple views, and a view can also contain multiple user groups.
 addsysinfo.message.brower=The browser does not support inline frames or is configured not to display inline frames.
-addsysinfo.message.showTipMsg2=Node group: Each node of a business system is grouped according to certain features, such as function and region, each node group contains N nodes, each node can belong to multiple node groups, but one node group can not belong to multiple systems.
+addsysinfo.message.showTipMsg2=Node group: Each node of a view is grouped according to certain features, such as function and region, each node group contains N nodes, each node can belong to multiple node groups, but one node group can not belong to multiple systems.

 #groupNodeList.jsp page
 gnl.message.title=Node information under node group
@@ -4783,12 +4783,12 @@ gulfg.message.isVaild1=Invalid
 gulfg.text.noRecord=No Record

 #systemInfoList.jsp page
-sysinfolist.message.title=Business System Management
+sysinfolist.message.title=View Management
 sysinfolist.message.success=Operation is successful!
 sysinfolist.message.faild=Operation failed!
 sysinfolist.message.selectOne=Please select a row record!
-sysinfolist.message.includeStop=Contains disabled business systems. Please reselect!
-sysinfolist.message.includeStart=Contains enabled business systems. Please reselect!
+sysinfolist.message.includeStop=Contains disabled views. Please reselect!
+sysinfolist.message.includeStart=Contains enabled views. Please reselect!
 sysinfolist.message.inputInfo=Enter special characters, please re-enter!
 sysinfolist.message.warning=Business system operation completed. Continue to maintain data?
 sysinfolist.message.hint=Tip
@@ -4808,14 +4808,14 @@ sysinfolist.text.noRecord=No Record


 #updateSystemInfo.jsp page
-upsysinfo.message.title=Modify Business System Information
+upsysinfo.message.title=Modify View Information
 upsysinfo.message.repeat=The system already exists. Please re-enter!
 upsysinfo.message.faild=Abnormal operation!
 upsysinfo.text.systemName=System Name
 upsysinfo.text.systemDesc=System Description
 upsysinfo.message.systemName=There are special characters in the system name. Please re-enter it.
-upsysinfo.button.back=Return
-upsysinfo.text.title=Modify Business System Information
+upsysinfo.button.back=Back
+upsysinfo.text.title=Modify View Information
 upsysinfo.text.isMaster=Master/Subsystem
 upsysinfo.text.master=Main Control System
 upsysinfo.text.slave=Subsystem
@@ -4853,6 +4853,8 @@ check_type_info.dpSlotEntry.CHECK_TYPE_NAME1=DP Device Board Slot
 check_type_info.cpu.CHECK_TYPE_NAME1=CPU Monitoring
 check_type_info.dpBoardStatusEntry.CHECK_TYPE_NAME1=DP Board Temperature
 check_type_info.process.CHECK_TYPE_NAME1=Process Monitoring
+check_type_info.checktype100015.CHECK_TYPE_NAME1=Business Process Statistics
+
 #data_police_relation
 #Tue Apr 17 17:37:19 CST 2018
 data_police_relation.2.POLICE_SHOW_INFO=Service Node NC is not available
@@ -5040,6 +5042,15 @@ metadata.ifInDiscards.filed_comments=Inbound Dropped Packets
 metadata.dpSlotRunTimes.filed_comments=Time The Device Board Was Running
 metadata.RX_DROP_PERC.filed_comments=Receiving Packet Loss Rate
 metadata.CPU_NAME.filed_comments=CPU ID
+metadata.module.filed_comments=The process belongs to the business process
+metadata.pid.filed_comments=Process Of No.
+metadata.cpupct.filed_comments=CPU Percentage
+metadata.mempct.filed_comments=Percentage of memory consumption
+metadata.prostatus.filed_comments=Process Status
+metadata.propriority.filed_comments=Process Scheduling Priorities
+metadata.lstart.filed_comments=Process Start Time
+metadata.iscritical.filed_comments=Have key logs been generated recently
+
 #nms_error_code
 #Tue Apr 17 18:07:46 CST 2018
 nms_error_code.DeamonNotExist.error_name=Daemon Does Not Exist
@@ -5172,6 +5183,9 @@ type_table.1.type_name=NC Report Active Alarm Information
 type_table.4.type_name=Whether The System Uses Mail
 type_table.8.type_name=Whether The Hard Disk Is Writable
 type_table.2.type_desc=Handshaking Monitoring Is Reachable
+type_table.10.type_name=Whether the system is used for department management
+type_table.10.type_desc=Deptflag: 0 enabled;1 disabled
+
 #xt_js_jbxx
 #Tue Apr 17 18:17:01 CST 2018
 xt_js_jbxx.224.jsmc=Configuration Manager
@@ -5186,6 +5200,8 @@ xt_js_jbxx.225.jsms=Responsible Data View (For Operation And Maintenance)
 xt_js_jbxx.3.jsms=Testers Use
 xt_js_jbxx.1.jsmc=Administrator
 xt_js_jbxx.21.jsms=View Only Information Permissions
+xt_js_jbxx.nationRole.jsms=National center user role authority, with data display, configuration management, authority management authority
+xt_js_jbxx.regionRole.jsms=Sub-central user role authorization with data display authority
 #xt_mk_jbxx
 #Tue Apr 17 18:20:41 CST 2018
 xt_mk_jbxx.361.mkmc=Port State Configuration
@@ -5243,7 +5259,7 @@ xt_mk_jbxx.542.mkmc=Tool Management
 xt_mk_jbxx.9.mkmc=Parameter Configuration
 xt_mk_jbxx.546.mkmc=Download Attachments
 xt_mk_jbxx.261.mkms=Original Alarm Data
-xt_mk_jbxx.275.mkms=Business System Management
+xt_mk_jbxx.275.mkms=View Management
 xt_mk_jbxx.285.mkms=Topology Display
 xt_mk_jbxx.267.mkms=Configuration Management
 xt_mk_jbxx.269.mkms=Configure Monitoring Settings Information
@@ -5255,7 +5271,7 @@ xt_mk_jbxx.273.mkmc=Room Configuration
 xt_mk_jbxx.263.mkmc=Anomaly Network Element
 xt_mk_jbxx.293.mkmc=Offline
 xt_mk_jbxx.283.mkmc=Modify Personal Information
-xt_mk_jbxx.275.mkmc=Business System Configuration
+xt_mk_jbxx.275.mkmc=View Configuration
 xt_mk_jbxx.501.mkms=Display configuration level alarm information, including server and network element
 xt_mk_jbxx.521.mkms=Set filtering conditions (alarm level, emergency) for the business logic topology, alarm information, abnormal server, abnormal network element, and system warning information menu
 xt_mk_jbxx.541.mkms=Upload And Download Management Plugins
@@ -5289,7 +5305,7 @@ xt_mk_jbxx.245.mkms=Add 2
 xt_mk_jbxx.141.mkmc=Node Group Display
 xt_mk_jbxx.267.mkmc=Configuration Management
 xt_mk_jbxx.67.mkms=Enable Scheduled Tasks
-xt_mk_jbxx.23.mkms=View and operate all business systems
+xt_mk_jbxx.23.mkms=View and operate all views
 xt_mk_jbxx.2.mkms=User/User Group/Role Permissions Configuration
 xt_mk_jbxx.50.mkms=Monitoring Related Settings
 xt_mk_jbxx.34.mkms=Add A New Node Group
@@ -5308,7 +5324,7 @@ xt_mk_jbxx.68.mkms=Add A New Reverse Task
 xt_mk_jbxx.121.mkms=Network Element Graphical Configuration
 xt_mk_jbxx.40.mkms=Add Subnode Group
 xt_mk_jbxx.316.mkmc=Task Configuration Wizard
-xt_mk_jbxx.24.mkms=New Business System
+xt_mk_jbxx.24.mkms=New View
 xt_mk_jbxx.51.mkms=Add Monitoring Settings
 xt_mk_jbxx.46.mkmc=OID Dictionary Management
 xt_mk_jbxx.35.mkms=Modify Node Group
@@ -5321,7 +5337,7 @@ xt_mk_jbxx.68.mkmc=Add Reverse
 xt_mk_jbxx.121.mkmc=Network element graphical configuration
 xt_mk_jbxx.40.mkmc=Add Subnode Group
 xt_mk_jbxx.321.mkmc=Exception Device
-xt_mk_jbxx.3.mkmc=Business System
+xt_mk_jbxx.3.mkmc=View
 xt_mk_jbxx.19.mkmc=Role Management
 xt_mk_jbxx.58.mkms=Set Monitoring Category
 xt_mk_jbxx.62.mkmc=Alarm Data
@@ -5347,7 +5363,7 @@ xt_mk_jbxx.63.mkmc=Task Management
 xt_mk_jbxx.286.mkmc=3D Machine Room Display
 xt_mk_jbxx.42.mkms=Modify Node Group
 xt_mk_jbxx.431.mkms=New Module Management
-xt_mk_jbxx.26.mkms=Deactivate Business System
+xt_mk_jbxx.26.mkms=Deactivate View
 xt_mk_jbxx.561.mkmc=Brand Management
 xt_mk_jbxx.242.mkms=New Device Model
 xt_mk_jbxx.53.mkms=Alarm Settings
@@ -5362,7 +5378,7 @@ xt_mk_jbxx.265.mkms=Show the alarm exception information of each node
 xt_mk_jbxx.161.mkmc=Configuration Management
 xt_mk_jbxx.64.mkmc=Task Copy
 xt_mk_jbxx.43.mkms=Node Management
-xt_mk_jbxx.27.mkms=Enable Business System
+xt_mk_jbxx.27.mkms=Enable View
 xt_mk_jbxx.6.mkms=NMS Task Management
 xt_mk_jbxx.70.mkms=Additional Machine Room
 xt_mk_jbxx.49.mkmc=NE Monitoring Information
@@ -5400,7 +5416,7 @@ CheckTypeSetAction.downloadExample.title.monitorTypeName=Monitoring Category Nam
 CheckTypeSetAction.downloadExample.title.remark=Remarks
 CheckTypeSetAction.downloadExample.title.mapTable=Corresponding Database Table (Required)
 CheckTypeSetAction.downloadExample.title.tableDesc=Table Description
-CheckTypeSetAction.downloadExample.title.viewPrivilage=View Permissions (Mandatory Fill in 1, issuer view; 2 publisher group, need to select group; 3 all personnel in the system view, current business system; 4, no limit)
+CheckTypeSetAction.downloadExample.title.viewPrivilage=View Permissions (Mandatory Fill in 1, issuer view; 2 publisher group, need to select group; 3 all personnel in the system view, current view; 4, no limit)
 CheckTypeSetAction.downloadExample.title.userGroup=User Group
 CheckTypeSetAction.downloadExample.title.snmpMonitor=SNMP Monitoring (Required 0: Yes ;2: No; Please fill in OID when it is 0)
 CheckTypeSetAction.downloadExample.sheet=Monitoring Category Management Information Sheet
@@ -5491,7 +5507,7 @@ DetectionSetAction.downloadExample.title.setId=Set ID (Required)
 DetectionSetAction.downloadExample.title.monitorCategory=Monitoring Category (Required)
 DetectionSetAction.downloadExample.title.nodeGroupRange=Node Group Range (Example: 1 or 1, 2, 3)
 DetectionSetAction.downloadExample.title.nodeIpRange=Node IP Range (For Example: 1, 2, 3)
-DetectionSetAction.downloadExample.title.viewLevel=View Permissions (1 required, publisher view; 2 Publisher's group, need to select the group; all personnel within 3 system view, the current business system within; 4, unlimited)
+DetectionSetAction.downloadExample.title.viewLevel=View Permissions (1 required, publisher view; 2 Publisher's group, need to select the group; all personnel within 3 system view, the current view within; 4, unlimited)
 DetectionSetAction.downloadExample.title.userGroup=Creator Where The User Group
 DetectionSetAction.downloadExample.title.monitorFirstTime=To Monitor The Implementation Of The First Time (Format: 2012-12-12 18:18:18)
 DetectionSetAction.downloadExample.title.monitorDate=Monitoring Data Interval (Minutes) (Required ,Must greater than or equal to 5 minutes)
@@ -5881,7 +5897,7 @@ NmsTaskManagerAction.executeAction.title.missionType=Task Type
 NmsTaskManagerAction.executeAction.title.isLoop=Cycle Task
 NmsTaskManagerAction.executeAction.title.missionState=Task Status
 NmsTaskManagerAction.executeAction.title.missionStateDesc=Sask Status Description
-NmsTaskManagerAction.executeAction.title.system=Business System
+NmsTaskManagerAction.executeAction.title.system=View
 NmsTaskManagerAction.executeAction.title.userGroup=User Group
 NmsTaskManagerAction.executeAction.title.viewPrivilige=View Permission
 NmsTaskManagerAction.executeAction.title.creater=Created By
@@ -6542,7 +6558,7 @@ DeviceBrandManageAction.impDevicesByExcel.deviceManageValidateFaild=Device manag


 #GuideManageAction.java
-GuideManageAction.getUserMk.systemManage=Business System Management
+GuideManageAction.getUserMk.systemManage=View Management
 GuideManageAction.getUserMk.usergroupManage=User Group Management
 GuideManageAction.getUserMk.roomManage=Room Management
 GuideManageAction.getUserMk.boxManage=Enclosure Management
@@ -6610,10 +6626,10 @@ SysPopedomManageAction.addJsInfo.userInfoImportErr=This user information import


 #SystemManageAction.java
-SystemManageAction.ajaxCheck.addSysValidateErr=Add Business System Configuration Check Exception
+SystemManageAction.ajaxCheck.addSysValidateErr=Add View Configuration Check Exception
 SystemManageAction.ajaxCheck.faild=Operation failed
 SystemManageAction.ajaxCheck.success=Operation successful
-SystemManageAction.ajaxCheck.sysConfigValidateFaild=Verify the business system configuration failed
+SystemManageAction.ajaxCheck.sysConfigValidateFaild=Verify the view configuration failed
 SystemManageAction.ajaxCheck.invalid=Invalid
 SystemManageAction.ajaxCheck.user=Users

@@ -6657,7 +6673,7 @@ LoginAction.checkPwdState.userIsNotExists=This user does not exist or is invalid
 LoginAction.checkPwdState.userInfoErr=This user information is abnormal!
 LoginAction.checkPwdState.faild=Operation failed
 LoginAction.checkPwdState.success=Operation successful
-LoginAction.checkPwdState.selectSys=Please re-select the login business system!
+LoginAction.checkPwdState.selectSys=Please re-select the login view!
 LoginAction.checkPwdState.out=Logout
 LoginAction.checkPwdState.sessionNoInfo=No person information was obtained from the session
 LoginAction.checkPwdState.sessionOutTime=session may have expired
@@ -7029,7 +7045,7 @@ client.TaskReqHandle.sourceOrTargetIsNull=The source or destination file is empt

 client.TaskResultOper.restart=Restart succeeded

-client.TaskReturnHandle.backpass=Return
+client.TaskReturnHandle.backpass=Back
 client.TaskReturnHandle.backFail1=failed, returning file path value is empty
 client.TaskReturnHandle.backFail2=failed, the returned file does not exist

@@ -7384,4 +7400,7 @@ topoManage.topoNodeInfoError=Topo picture cannot be empty
 topoManage.handleSuccessInfo=Operation is successful\uff01
 topoManage.handleErrorInfo=Operation is error!
 topoManage.chooseTopoMessage=Please choose topo picture
-topoManage.TopoNodeMessage=Topo Node Message
+topoManage.TopoNodeMessage=Topo Node Message
+
+xt_mk_jbxx.604.mkmc=Advanced Configuration
+xt_mk_jbxx.604.mkms=Advanced configuration function menu
--- a/WebRoot/i18n/globalMessages_ru_RU.properties
+++ b/WebRoot/i18n/globalMessages_ru_RU.properties
@@ -4856,6 +4856,8 @@ check_type_info.dpSlotEntry.CHECK_TYPE_NAME1=Слот устройства DP
 check_type_info.cpu.CHECK_TYPE_NAME1=Мониторинг CPU
 check_type_info.dpBoardStatusEntry.CHECK_TYPE_NAME1=Температура платы DP
 check_type_info.process.CHECK_TYPE_NAME1=Мониторинг процессов
+check_type_info.checktype100015.CHECK_TYPE_NAME1=
+
 #data_police_relation
 #Tue Apr 17 17:37:19 CST 2018
 data_police_relation.2.POLICE_SHOW_INFO=Сервисный узел NC недоступен
@@ -5047,6 +5049,15 @@ metadata.ifInDiscards.filed_comments=Входящий выброшенный п
 metadata.dpSlotRunTimes.filed_comments=Время работы платы устройства
 metadata.RX_DROP_PERC.filed_comments=Коэффициент потеренных пакетов получения
 metadata.CPU_NAME.filed_comments=Знак cpu
+metadata.module.filed_comments=
+metadata.pid.filed_comments=
+metadata.cpupct.filed_comments=
+metadata.mempct.filed_comments=
+metadata.prostatus.filed_comments=
+metadata.propriority.filed_comments=
+metadata.lstart.filed_comments=
+metadata.iscritical.filed_comments=
+
 #nms_error_code
 #Tue Apr 17 18:07:46 CST 2018
 nms_error_code.DeamonNotExist.error_name=Программа-эмулятор не существует.
@@ -5182,6 +5193,9 @@ type_table.1.type_name=NC активно сообщает о тревоге
 type_table.4.type_name=Использует ли система почту
 type_table.8.type_name=Можно ли записать жесткий диск
 type_table.2.type_desc=Доступен ли контроль рукопожатия
+type_table.10.type_name=
+type_table.10.type_desc=
+
 #xt_js_jbxx
 #Tue Apr 17 18:17:01 CST 2018
 xt_js_jbxx.224.jsmc=Конфигурация управляющими персоналами
@@ -5196,6 +5210,9 @@ xt_js_jbxx.225.jsms=Отвечают за просмотр данных  (для
 xt_js_jbxx.3.jsms=Тестеры используют
 xt_js_jbxx.1.jsmc=Администратор
 xt_js_jbxx.21.jsms=Разрешения только для просмотра информации
+xt_js_jbxx.nationRole.jsms=
+xt_js_jbxx.regionRole.jsms=
+
 #xt_mk_jbxx
 #Tue Apr 17 18:20:41 CST 2018
 xt_mk_jbxx.361.mkmc=Конфигурация состояния порта
@@ -7362,7 +7379,8 @@ topoManage.chooseTopoMessage=Выберите топологию
 topoManage.TopoNodeMessage=Сообщение о узлах топологии


-
+xt_mk_jbxx.604.mkmc=Высшее расположение
+xt_mk_jbxx.604.mkms=Меню высокого уровня



--- a/WebRoot/i18n/globalMessages_zh_CN.properties
+++ b/WebRoot/i18n/globalMessages_zh_CN.properties
@@ -22,7 +22,7 @@ main.message.info=下列任务已完成
 main.text.logout=退出系统
 main.text.systemSelect=系统切换
 main.text.welcome=您好
-main.text.systemName=当前业务系统
+main.text.systemName=当前视图
 main.message.I3=浏览器不支持嵌入式框架，或被配置为不显示嵌入式框架。

 #middle.jsp页面
@@ -67,10 +67,10 @@ sie.text.BoardError=板卡报错信息
 sie.text.portError=端口报错信息

 #systemSelect.jsp页面
-systemSelect.message.title=网络管理系统_业务系统选择
+systemSelect.message.title=网络管理系统_视图选择
 systemSelect.font.style1=微软雅黑
 systemSelect.message.loginSuccess=登录成功
-systemSelect.message.system=业务系统
+systemSelect.message.system=视图

 #WebRoot目录下
 #common目录下
@@ -1359,7 +1359,7 @@ mkil.button.cancel=取消
 #addDefaultsInfo.jsp页面
 adi.message.addDefaultInfoTitle=添加默认值信息
 adi.text.title=默认值配置
-adi.text.system=业务系统
+adi.text.system=视图
 adi.message.selectDefault=请选择
 adi.text.missionType=任务类型
 adi.text.nodeGroup=节点组
@@ -1384,7 +1384,7 @@ dil.message.faild=操作失败！
 dil.text.missionName=配置名称
 dil.text.missionType=业务类型
 dil.text.selectDefault=请选择
-dil.text.system=业务系统
+dil.text.system=视图
 dil.text.nodeGroup=节点组
 dil.text.index=序号
 dil.text.opration=操作
@@ -1394,7 +1394,7 @@ dil.text.viewRecord=查看详情
 #examineDefaultsInfo1.jsp页面
 edi1.message.title=添加默认值信息
 edi1.text.title=默认值配置
-edi1.text.systemName=业务系统
+edi1.text.systemName=视图
 edi1.text.missionType=任务类型
 edi1.text.nodeGroup=节点组
 edi1.text.missionTypeName=任务类型名称
@@ -1415,7 +1415,7 @@ edi1.text.filterKeyword=过滤关键词
 #examineDefaultsInfo2.jsp页面
 edi2.text.title=添加默认值信息
 edi2.text.title=默认值配置
-edi2.text.systemName=业务系统
+edi2.text.systemName=视图
 edi2.message.selectDefault=请选择
 edi2.text.missionType=任务类型
 edi2.text.nodeGroup=节点组
@@ -1454,13 +1454,13 @@ udi.message.upperlayer=请选择
 #smipleMission目录下
 #######################################################
 #addMissionInfo.jsp页面
-ami.message.selectSystem=请选择业务系统
+ami.message.selectSystem=请选择视图
 ami.message.selectMK=请选择模块
 ami.text.upFile=升级文件
 ami.message.filePath=请选择配置文件
 ami.message.sets=请选择配置项
 ami.text.title=系统模块升级
-ami.text.systemName=业务系统
+ami.text.systemName=视图
 ami.message.selectDefault=请选择
 ami.text.module=模块
 ami.text.deployedNodeGroup=部署的节点组
@@ -1537,7 +1537,7 @@ msil.text.createDate=创建时间
 msil.text.to=至
 msil.text.missionState=任务状态
 msil.message.selectDefault=请选择
-msil.text.systemName=业务系统
+msil.text.systemName=视图
 msil.text.nodeGroup=节点组
 msil.text.viewLevel=查看权限
 msil.text.index=序号
@@ -2411,7 +2411,7 @@ acnti.button.back=返回
 acnti.text.title=逆向任务添加
 acnti.text.missionType=任务类型
 acnti.text.upgrade=升级部署
-acnti.text.systemIdName=业务系统
+acnti.text.systemIdName=视图
 acnti.text.missionName=任务名称
 acnti.text.nodeGroup=节&nbsp;&nbsp;点&nbsp;&nbsp;组
 acnti.button.select=选择
@@ -2510,7 +2510,7 @@ acsnti.button.back=返回
 acsnti.text.title=逆向相似任务添加
 acsnti.text.missionType=任务类型
 acsnti.text.upgrade=升级部署
-acsnti.text.systemName=业务系统
+acsnti.text.systemName=视图
 acsnti.text.missionName=任务名称
 acsnti.text.nodeGroups=节&nbsp;&nbsp;点&nbsp;&nbsp;组
 acsnti.button.select=选择
@@ -2568,7 +2568,7 @@ asnti.text.missionType=任务类型
 asnti.message.missionType1=文件推送
 asnti.message.missionType4=命令执行
 asnti.message.missionType6=升级部署
-asnti.text.systemIdName=业务系统
+asnti.text.systemIdName=视图
 asnti.text.missionName=任务名称
 asnti.text.nodeGroup=节&nbsp;&nbsp;点&nbsp;&nbsp;组
 asnti.text.charsTooLong=任务描述字数不能大于100
@@ -2744,7 +2744,7 @@ cmd.text.title=升级部署-逆向任务结果查看
 cmd.text.missionName=任务名称
 cmd.text.missionType=任务类型
 cmd.text.upgrade=升级部署-逆向任务
-cmd.text.systemIdName=业务系统
+cmd.text.systemIdName=视图
 cmd.text.nodeGroup=节点组
 cmd.text.excuNode=执行节点
 cmd.text.addUser=创建用户
@@ -2835,7 +2835,7 @@ mspm1.text.missionName=任务名称
 mspm1.text.missionType=任务类型
 mspm1.message.missionType1=文件推送
 mspm1.message.missionType2=非流文本数据获取
-mspm1.text.systemIdName=业务系统
+mspm1.text.systemIdName=视图
 mspm1.text.nodeListName=节点组
 mspm1.text.excNode=执行节点
 mspm1.text.fileName=推送文件
@@ -2856,7 +2856,7 @@ mspm2.text.missionName=任务名称
 mspm2.text.missionType=任务类型
 mspm2.message.missionType1=文件推送
 mspm2.message.missionType2=非流文本数据获取
-mspm2.text.systemIdName=业务系统
+mspm2.text.systemIdName=视图
 mspm2.text.filePath=文件
 mspm2.text.missionDesc=任务描述
 mspm2.text.viewLevel=查看权限
@@ -2891,7 +2891,7 @@ mspm3.message.getNonStream=非流文本数据获取
 mspm3.message.getStream=流文本数据获取
 mspm3.message.commandExcute=命令执行
 mspm3.message.shellRegist=shell注册
-mspm3.text.systemIdName=业务系统
+mspm3.text.systemIdName=视图
 mspm3.text.filePath=文件
 mspm3.text.missionDesc=任务描述
 mspm3.text.viewLevel=查看权限
@@ -2935,7 +2935,7 @@ mspm4.message.getStream=流文本数据获取
 mspm4.message.commandExcute=命令执行
 mspm4.message.shellRegist=shell注册
 mspm4.message.upgrade=升级部署
-mspm4.text.systemIdName=业务系统
+mspm4.text.systemIdName=视图
 mspm4.text.nodeListName=节点组
 mspm4.text.excuNode=执行节点
 mspm4.text.addUser=创建用户
@@ -2971,7 +2971,7 @@ mspm5.message.getNonStream=非流文本数据获取
 mspm5.message.getStream=流文本数据获取
 mspm5.message.commandExcute=命令执行
 mspm5.message.shellRegist=shell注册
-mspm5.text.systemIdName=业务系统
+mspm5.text.systemIdName=视图
 mspm5.text.commandFlag=调用标志
 mspm5.text.missionDesc=任务描述
 mspm5.text.viewLevel=查看权限
@@ -3004,7 +3004,7 @@ mspm6.message.getStream=流文本数据获取
 mspm6.message.commandExcute=命令执行
 mspm6.message.shellRegist=shell注册
 mspm6.message.upgrade=升级部署
-mspm6.text.systemIdName=业务系统
+mspm6.text.systemIdName=视图
 mspm6.text.nodeListName=节点组
 mspm6.text.excuNode=执行节点
 mspm6.text.addUser=创建用户
@@ -3093,7 +3093,7 @@ anti.text.missionType=任务类型
 anti.message.filePush=文件推送
 anti.message.commandExcute=命令执行
 anti.message.upgrade=升级部署
-anti.text.systemName=业务系统
+anti.text.systemName=视图
 anti.text.missionName=任务名称
 anti.text.nodeGroup=节&nbsp;&nbsp;点&nbsp;&nbsp;组
 anti.button.select=选择
@@ -3156,8 +3156,8 @@ entip1.text.title=修改任务信息
 entip1.text.missionName=任务名称
 entip1.text.missionType=任务类型
 entip1.text.filePush=文件推送
-entip1.text.selectSystem=选择业务系统
-entip1.message.selectSystem=请选择业务系统
+entip1.text.selectSystem=选择视图
+entip1.message.selectSystem=请选择视图
 entip1.text.pushNodeGroup=推送节点组
 entip1.text.pushMissionDesc=推送任务描述
 entip1.text.viewLevel=查看权限
@@ -3182,8 +3182,8 @@ entip2.text.addMissionInfo=添加任务信息
 entip2.text.missionName=任务名称
 entip2.text.missionType=任务类型
 entip2.text.getDate=非流文本数据获取
-entip2.text.System=选择业务系统
-entip2.text.selectSystem=请选择业务系统
+entip2.text.System=选择视图
+entip2.text.selectSystem=请选择视图
 entip2.text.groupId=非流节点组
 entip2.text.missionDesc=非流任务描述
 entip2.text.viewLevel=查看权限
@@ -3384,7 +3384,7 @@ ntil.message.missionType6=升级部署
 ntil.text.operation=操作
 ntil.text.isLoop=是否周期任务
 ntil.text.missionStateDesc=任务状态描述
-ntil.text.systemId=业务系统
+ntil.text.systemId=视图
 ntil.text.userGroup=用户组
 ntil.text.viewLevel=查看权限
 ntil.text.user=创建人
@@ -3472,7 +3472,7 @@ ntilp.message.missionType4=命令执行
 ntilp.message.missionType6=升级部署
 ntilp.button.exportXls=导出
 ntilp.text.missionStateDesc=任务状态描述
-ntilp.text.systemId=业务系统
+ntilp.text.systemId=视图
 ntilp.text.userGroup=用户组
 ntilp.text.viewLevel=查看权限
 ntilp.text.createUser=创建人
@@ -3609,7 +3609,7 @@ agi.text.jsms=用户组描述
 agi.text.state=状态
 agi.text.using=有效
 agi.text.selectSys=选择可访问系统
-agi.text.systemList=业务系统列表
+agi.text.systemList=视图列表
 agi.button.submit=提交
 agi.button.reset=重置

@@ -3628,7 +3628,7 @@ ggrp.text.state=状态
 ggrp.message.state0=有效
 ggrp.message.state1=无效
 ggrp.text.systemId=选择可访问系统
-ggrp.text.systemList=业务系统列表
+ggrp.text.systemList=视图列表
 ggrp.button.submit=提交
 ggrp.button.reset=重置

@@ -3670,7 +3670,7 @@ vgp.message.state0=有效
 vgp.message.state1=无效
 vgp.text.userGroupDesc=用户组描述
 vgp.text.systemId=可访问系统
-vgp.message.systemId=NMS业务系统
+vgp.message.systemId=NMS视图
 vgp.text.userGroupInfo=用户组下的所有用户信息
 bgp.message.brower=浏览器不支持嵌入式框架，或被配置为不显示嵌入式框架。

@@ -3685,7 +3685,7 @@ vgpmfg.message.state0=有效
 vgpmfg.message.state1=无效
 vgpmfg.text.userGroupDesc=用户组描述
 vgpmfg.text.systemId=可访问系统
-vgpmfg.message.systemId=NMS业务系统
+vgpmfg.message.systemId=NMS视图
 vgpmfg.text.userGroupInfo=用户组下的所有用户信息
 vgpmfg.message.brower=浏览器不支持嵌入式框架，或被配置为不显示嵌入式框架。

@@ -3719,8 +3719,8 @@ aei.message.MkformError=故障代码已存在，请重新输入！
 aei.message.MkformException=操作异常！
 aei.button.back=返回
 aei.text.title=新增故障库信息
-aei.text.systeId=业务系统
-aei.message.systeId=请选择业务系统
+aei.text.systeId=视图
+aei.message.systeId=请选择视图
 aei.text.troubleDescr=故障描述
 aei.button.submit=提交
 aei.button.reset=重置
@@ -3940,8 +3940,8 @@ uei.message.systemId=请选择系统
 uei.button.back=返回
 uei.text.title=修改故障库信息
 uei.text.troubleCode=故障代码
-uei.text.systemId=业务系统
-uei.message.system=请选择业务系统
+uei.text.systemId=视图
+uei.message.system=请选择视图
 uei.text.troubleDescr=故障描述
 uei.text.troubleState=状态
 uei.message.troubleState0=有效
@@ -4229,14 +4229,14 @@ uni.text.back=返回
 #addNodegroupInfo.jsp页面
 angi.message.title=添加节点组信息
 angi.text.groupName=组名称
-angi.text.systemId=业务系统
+angi.text.systemId=视图
 angi.message.noGroupBelong=您不属于任一用户组，无权限新增该类节点组！
 angi.message.groupSelect=请选择用户组！
 angi.text.title=节点组基本信息
 angi.text.groupType=组类型
 angi.message.groupType0=常态
 angi.message.groupType1=临时
-angi.message.systemId=请选择业务系统
+angi.message.systemId=请选择视图
 angi.text.isValid=是否生效
 angi.message.valid=生效
 angi.message.invalid=失效
@@ -4309,14 +4309,14 @@ ngil.text.noRecord=没有记录
 #updateNodegroupInfo.jsp页面
 ungi.message.title=修改节点组信息
 ungi.text.groupName=组名称
-ungi.text.systemId=业务系统
+ungi.text.systemId=视图
 ungi.message.noGroupBelong=您不属于任一用户组，无权限修改该类节点组！
 ungi.message.selectGroup=请选择用户组！
 ungi.text.title=节点组基本信息
 ungi.text.groupType=组类型
 ungi.message.groupType0=常态
 ungi.message.groupType1=临时
-ungi.message.systemId=请选择业务系统
+ungi.message.systemId=请选择视图
 ungi.text.isValid=是否生效
 ungi.message.valid=生效
 ungi.message.invalid=失效
@@ -4523,7 +4523,7 @@ nginfo.message.selectParent=请在菜单中选择一项作为父节点组！
 nginfo.message.addSubNode=新增子节点组信息
 nginfo.text.addSubNode=组名称
 nginfo.message.inputGroupName=组名称存在特殊字符，请重新输入
-nginfo.text.systemId=业务系统
+nginfo.text.systemId=视图
 nginfo.message.startNodeGroup1=请至少选择一行记录！
 nginfo.message.startNodeGroup2=包含生效的节点组，请重新选择！
 nginfo.message.startNodeGroup3=试图启用其父级节点组无效的节点组，故无法启动，请重新选择！
@@ -4553,7 +4553,7 @@ nginfo.text.groupName=组名称
 nginfo.text.groupType=组类型
 nginfo.message.groupType0=常态
 nginfo.message.groupType1=临时
-nginfo.message.systemId=请选择业务系统
+nginfo.message.systemId=请选择视图
 nginfo.text.isValid=是否生效
 nginfo.message.isValid1=生效
 nginfo.message.isValid0=失效
@@ -4629,7 +4629,7 @@ asi.button.submit=提交
 asi.button.reset=重置

 #detailServerInfo.jsp页面
-dsi.message.title=添加业务系统信息
+dsi.message.title=添加视图信息
 dsi.button.back=返回
 dsi.text.title=服务器信息
 dsi.text.serverName=服务器名称
@@ -4645,8 +4645,8 @@ serverinfo.message.title=DataController管理
 serverinfo.message.success=操作成功！
 serverinfo.message.faild=操作失败！
 serverinfo.message.selectOne=请选择一行记录！
-serverinfo.message.includeStop=包含已停用的业务系统，请重新选择！
-serverinfo.message.includeStart=包含已启用的业务系统，请重新选择！
+serverinfo.message.includeStop=包含已停用的视图，请重新选择！
+serverinfo.message.includeStart=包含已启用的视图，请重新选择！
 serverinfo.message.inputInfo=输入为特殊字符，请重新输入！
 serverinfo.message.selectFile=请选择导入的文件
 serverinfo.message.selectFileType=请选择正确的导入文件类型
@@ -4711,7 +4711,7 @@ upserver.button.reset=重置
 #systemManage目录下
 #####################################################################
 #addSystemInfo.jsp页面
-addsysinfo.message.title=添加业务系统信息
+addsysinfo.message.title=添加视图信息
 addsysinfo.message.sysExists=系统已存在，请重新输入！
 addsysinfo.message.faild=操作异常！
 addsysinfo.text.systemName=系统名称
@@ -4720,7 +4720,7 @@ addsysinfo.text.systemIp=注册IP
 addsysinfo.text.systemPort=注册端口
 addsysinfo.message.systemName=系统名称存在特殊字符，请重新输入
 addsysinfo.button.back=返回
-addsysinfo.text.title=新增业务系统信息
+addsysinfo.text.title=新增视图信息
 addsysinfo.text.isMaster=主控/子系统
 addsysinfo.text.master=主控系统
 addsysinfo.text.slave=子系统
@@ -4734,7 +4734,7 @@ addsysinfo.text.reset=重置
 #detailSystemInfo.jsp页面
 detailsys.message.title=网络管理系统
 detailsys.button.back=返回
-detailsys.text.title=业务系统基本信息
+detailsys.text.title=视图基本信息
 detailsys.text.systemName=系统名称
 detailsys.text.systemDesc=系统描述
 detailsys.text.systemCreatetime=添加时间
@@ -4742,12 +4742,12 @@ detailsys.text.systemState=系统状态
 detailsys.message.systemState0=启用
 detailsys.message.systemState1=停用
 detailsys.text.isMaster=（主控/子）系统
-addsysinfo.text.sysUserGroup=业务系统下的用户组
+addsysinfo.text.sysUserGroup=视图下的用户组
 addsysinfo.text.openAll=打开所有
 addsysinfo.text.closeAll=关闭所有
-addsysinfo.message.showTipMsg=用户组：有权限操作本业务系统的相关功能的用户集合，同一用户组的用户拥有该用户组的所有权限。一个用户组可以属于多个业务系统，一个业务系统也可以包含多个用户组。
+addsysinfo.message.showTipMsg=用户组：有权限操作本视图的相关功能的用户集合，同一用户组的用户拥有该用户组的所有权限。一个用户组可以属于多个视图，一个视图也可以包含多个用户组。
 addsysinfo.message.brower=浏览器不支持嵌入式框架，或被配置为不显示嵌入式框架。
-addsysinfo.message.showTipMsg2=节点组：业务系统的各个组成节点按功能、地域等一定的特点进行分组，每个节点组包含N个节点。每个节点可以属于多个节点组，但是一个节点组不可属于多个系统。
+addsysinfo.message.showTipMsg2=节点组：视图的各个组成节点按功能、地域等一定的特点进行分组，每个节点组包含N个节点。每个节点可以属于多个节点组，但是一个节点组不可属于多个系统。

 #groupNodeList.jsp页面
 gnl.message.title=节点组下的节点信息
@@ -4784,14 +4784,14 @@ gulfg.message.isVaild1=无效
 gulfg.text.noRecord=没有记录

 #systemInfoList.jsp页面
-sysinfolist.message.title=业务系统管理
+sysinfolist.message.title=视图管理
 sysinfolist.message.success=操作成功！
 sysinfolist.message.faild=操作失败！
 sysinfolist.message.selectOne=请选择一行记录！
-sysinfolist.message.includeStop=包含已停用的业务系统，请重新选择！
-sysinfolist.message.includeStart=包含已启用的业务系统，请重新选择！
+sysinfolist.message.includeStop=包含已停用的视图，请重新选择！
+sysinfolist.message.includeStart=包含已启用的视图，请重新选择！
 sysinfolist.message.inputInfo=输入为特殊字符，请重新输入！
-sysinfolist.message.warning=业务系统操作已完成，是否继续维护数据?
+sysinfolist.message.warning=视图操作已完成，是否继续维护数据?
 sysinfolist.message.hint=提示
 sysinfolist.text.systemName=系统名称
 sysinfolist.message.systemName=请输入系统名称
@@ -4809,14 +4809,14 @@ sysinfolist.text.noRecord=没有记录


 #updateSystemInfo.jsp页面
-upsysinfo.message.title=修改业务系统信息
+upsysinfo.message.title=修改视图信息
 upsysinfo.message.repeat=系统已存在，请重新输入！
 upsysinfo.message.faild=操作异常！
 upsysinfo.text.systemName=系统名称
 upsysinfo.text.systemDesc=系统描述
 upsysinfo.message.systemName=系统名称存在特殊字符，请重新输入
 upsysinfo.button.back=返回
-upsysinfo.text.title=修改业务系统信息
+upsysinfo.text.title=修改视图信息
 upsysinfo.text.isMaster=主控/子系统
 upsysinfo.text.master=主控系统
 upsysinfo.text.slave=子系统
@@ -4856,6 +4856,8 @@ check_type_info.dpSlotEntry.CHECK_TYPE_NAME1=DP设备板槽
 check_type_info.cpu.CHECK_TYPE_NAME1=CPU监测
 check_type_info.dpBoardStatusEntry.CHECK_TYPE_NAME1=DP单板温度
 check_type_info.process.CHECK_TYPE_NAME1=进程监测
+check_type_info.checktype100015.CHECK_TYPE_NAME1=业务进程统计信息
+
 #data_police_relation
 #Tue Apr 17 17:37:19 CST 2018
 data_police_relation.2.POLICE_SHOW_INFO=服务节点NC不可用
@@ -5047,6 +5049,15 @@ metadata.ifInDiscards.filed_comments=入站被丢弃的数据包
 metadata.dpSlotRunTimes.filed_comments=设备板子运行的时间
 metadata.RX_DROP_PERC.filed_comments=接收丢包率
 metadata.CPU_NAME.filed_comments=cpu标识
+metadata.module.filed_comments=进程所属业务进程
+metadata.pid.filed_comments=进程号
+metadata.cpupct.filed_comments=cpu占用百分比
+metadata.mempct.filed_comments=内存占用百分比
+metadata.prostatus.filed_comments=进程状态
+metadata.propriority.filed_comments=进程调度优先级
+metadata.lstart.filed_comments=进程启动时间
+metadata.iscritical.filed_comments=最近是否有关键日志产生
+
 #nms_error_code
 #Tue Apr 17 18:07:46 CST 2018
 nms_error_code.DeamonNotExist.error_name=守护进程不存在
@@ -5182,6 +5193,8 @@ type_table.1.type_name=NC是否报主动告警信息
 type_table.4.type_name=系统是否使用邮件
 type_table.8.type_name=硬盘是否可写
 type_table.2.type_desc=握手监测是否可达
+type_table.10.type_name=系统是否使用部门管理
+type_table.10.type_desc=deptflag:0启用；1不启用
 #xt_js_jbxx
 #Tue Apr 17 18:17:01 CST 2018
 xt_js_jbxx.224.jsmc=配置管理人员
@@ -5196,6 +5209,9 @@ xt_js_jbxx.225.jsms=负责数据的查看（针对运维）
 xt_js_jbxx.3.jsms=测试人员使用
 xt_js_jbxx.1.jsmc=管理员
 xt_js_jbxx.21.jsms=只有查看信息权限
+xt_js_jbxx.nationRole.jsms=国家中心用户角色权限，具有数据展示，配置管理，权限管理权限
+xt_js_jbxx.regionRole.jsms=分中心用户角色权限，具有数据展示权限
+
 #xt_mk_jbxx
 #Tue Apr 17 18:20:41 CST 2018
 xt_mk_jbxx.361.mkmc=端口状态配置
@@ -5252,7 +5268,7 @@ xt_mk_jbxx.542.mkmc=工具管理
 xt_mk_jbxx.9.mkmc=参数配置
 xt_mk_jbxx.546.mkmc=下载附件
 xt_mk_jbxx.261.mkms=原告警数据
-xt_mk_jbxx.275.mkms=业务系统管理
+xt_mk_jbxx.275.mkms=视图管理
 xt_mk_jbxx.285.mkms=拓扑图展示
 xt_mk_jbxx.267.mkms=配置管理
 xt_mk_jbxx.269.mkms=配置监测设置信息
@@ -5264,7 +5280,7 @@ xt_mk_jbxx.273.mkmc=机房配置
 xt_mk_jbxx.263.mkmc=异常网元
 xt_mk_jbxx.293.mkmc=下线
 xt_mk_jbxx.283.mkmc=修改个人信息
-xt_mk_jbxx.275.mkmc=业务系统配置
+xt_mk_jbxx.275.mkmc=视图配置
 xt_mk_jbxx.501.mkms=显示配置级别的告警信息，包括服务器和网元
 xt_mk_jbxx.521.mkms=为 业务逻辑拓扑、告警信息、异常服务器、异常网元、系统预警信息菜单 设置过滤条件(告警级别、是否紧急)
 xt_mk_jbxx.541.mkms=管理插件的上传下载
@@ -5291,7 +5307,7 @@ xt_mk_jbxx.245.mkms=新增2
 xt_mk_jbxx.141.mkmc=节点组展示
 xt_mk_jbxx.267.mkmc=配置管理
 xt_mk_jbxx.67.mkms=定时任务启用
-xt_mk_jbxx.23.mkms=查看、操作所有业务系统
+xt_mk_jbxx.23.mkms=查看、操作所有视图
 xt_mk_jbxx.2.mkms=用户/用户组/角色权限配置
 xt_mk_jbxx.50.mkms=监测相关设置
 xt_mk_jbxx.34.mkms=新增节点组
@@ -5310,7 +5326,7 @@ xt_mk_jbxx.68.mkms=新增逆向任务
 xt_mk_jbxx.121.mkms=网元图形化配置
 xt_mk_jbxx.40.mkms=新增子节点组
 xt_mk_jbxx.316.mkmc=任务配置向导
-xt_mk_jbxx.24.mkms=新增业务系统
+xt_mk_jbxx.24.mkms=新增视图
 xt_mk_jbxx.51.mkms=新增监测设置
 xt_mk_jbxx.46.mkmc=OID字典管理
 xt_mk_jbxx.35.mkms=修改节点组
@@ -5323,7 +5339,7 @@ xt_mk_jbxx.68.mkmc=新增逆向
 xt_mk_jbxx.121.mkmc=网元图形化配置
 xt_mk_jbxx.40.mkmc=新增子节点组
 xt_mk_jbxx.321.mkmc=异常设备
-xt_mk_jbxx.3.mkmc=业务系统
+xt_mk_jbxx.3.mkmc=视图
 xt_mk_jbxx.19.mkmc=角色管理
 xt_mk_jbxx.58.mkms=设置监测类别
 xt_mk_jbxx.62.mkmc=告警数据
@@ -5349,7 +5365,7 @@ xt_mk_jbxx.63.mkmc=任务管理
 xt_mk_jbxx.286.mkmc=3D机房展示
 xt_mk_jbxx.42.mkms=修改节点组
 xt_mk_jbxx.431.mkms=新模块管理
-xt_mk_jbxx.26.mkms=停用业务系统
+xt_mk_jbxx.26.mkms=停用视图
 xt_mk_jbxx.561.mkmc=品牌管理
 xt_mk_jbxx.242.mkms=新增设备型号
 xt_mk_jbxx.53.mkms=报警设置
@@ -5364,7 +5380,7 @@ xt_mk_jbxx.265.mkms=展示各节点告警异常信息
 xt_mk_jbxx.161.mkmc=配置管理
 xt_mk_jbxx.64.mkmc=任务拷贝
 xt_mk_jbxx.43.mkms=节点管理
-xt_mk_jbxx.27.mkms=启用业务系统
+xt_mk_jbxx.27.mkms=启用视图
 xt_mk_jbxx.6.mkms=NMS任务管理
 xt_mk_jbxx.70.mkms=新增机房
 xt_mk_jbxx.49.mkmc=网元监测信息
@@ -5407,7 +5423,7 @@ CheckTypeSetAction.downloadExample.title.monitorTypeName=监测类别名称(必
 CheckTypeSetAction.downloadExample.title.remark=备注
 CheckTypeSetAction.downloadExample.title.mapTable=对应数据库表(必填)
 CheckTypeSetAction.downloadExample.title.tableDesc=表描述
-CheckTypeSetAction.downloadExample.title.viewPrivilage=查看权限(必填 1、发布人查看；2发布人所在组，需选择组；3系统内全部人员查看，当前业务系统内；4、无限制)
+CheckTypeSetAction.downloadExample.title.viewPrivilage=查看权限(必填 1、发布人查看；2发布人所在组，需选择组；3系统内全部人员查看，当前视图内；4、无限制)
 CheckTypeSetAction.downloadExample.title.userGroup=用户组
 CheckTypeSetAction.downloadExample.title.snmpMonitor=SNMP监控(必填 0：是；2：否；为0时请填写OID)
 CheckTypeSetAction.downloadExample.sheet=监测类别管理信息表
@@ -5498,7 +5514,7 @@ DetectionSetAction.downloadExample.title.setId=设置标识(必填)
 DetectionSetAction.downloadExample.title.monitorCategory=监测类别(必填)
 DetectionSetAction.downloadExample.title.nodeGroupRange=节点组范围(例：1或1,2,3)
 DetectionSetAction.downloadExample.title.nodeIpRange=节点IP范围(例：1或1,2,3)
-DetectionSetAction.downloadExample.title.viewLevel=查看权限(必填 1、发布人查看；2发布人所在组，需选择组；3系统内全部人员查看，当前业务系统内；4、无限制)
+DetectionSetAction.downloadExample.title.viewLevel=查看权限(必填 1、发布人查看；2发布人所在组，需选择组；3系统内全部人员查看，当前视图内；4、无限制)
 DetectionSetAction.downloadExample.title.userGroup=创建者所在用户组
 DetectionSetAction.downloadExample.title.monitorFirstTime=监测首次执行时间(格式：2012-12-12 18:18:18)
 DetectionSetAction.downloadExample.title.monitorDate=监测数据时间间隔(分钟)(必填 必须大于或等于5分钟)
@@ -5882,7 +5898,7 @@ NmsTaskManagerAction.executeAction.title.missionType=任务类型
 NmsTaskManagerAction.executeAction.title.isLoop=是否周期任务
 NmsTaskManagerAction.executeAction.title.missionState=任务状态
 NmsTaskManagerAction.executeAction.title.missionStateDesc=任务状态描述
-NmsTaskManagerAction.executeAction.title.system=业务系统
+NmsTaskManagerAction.executeAction.title.system=视图
 NmsTaskManagerAction.executeAction.title.userGroup=用户组
 NmsTaskManagerAction.executeAction.title.viewPrivilige=查看权限
 NmsTaskManagerAction.executeAction.title.creater=创建人
@@ -6547,7 +6563,7 @@ DeviceBrandManageAction.impDevicesByExcel.deviceManageValidateFaild=设备管理


 #GuideManageAction.java
-GuideManageAction.getUserMk.systemManage=业务系统管理
+GuideManageAction.getUserMk.systemManage=视图管理
 GuideManageAction.getUserMk.usergroupManage=用户组管理
 GuideManageAction.getUserMk.roomManage=机房管理
 GuideManageAction.getUserMk.boxManage=机柜管理
@@ -6614,10 +6630,10 @@ SysPopedomManageAction.addJsInfo.exists=已存在
 SysPopedomManageAction.addJsInfo.userInfoImportErr=该用户信息导入异常

 #SystemManageAction.java
-SystemManageAction.ajaxCheck.addSysValidateErr=添加业务系统配置校验异常
+SystemManageAction.ajaxCheck.addSysValidateErr=添加视图配置校验异常
 SystemManageAction.ajaxCheck.faild=操作失败
 SystemManageAction.ajaxCheck.success=操作成功
-SystemManageAction.ajaxCheck.sysConfigValidateFaild=校验业务系统配置失败
+SystemManageAction.ajaxCheck.sysConfigValidateFaild=校验视图配置失败
 SystemManageAction.ajaxCheck.invalid=无效
 SystemManageAction.ajaxCheck.user=用户

@@ -6661,7 +6677,7 @@ LoginAction.checkPwdState.userIsNotExists=此用户不存在或已无效
 LoginAction.checkPwdState.userInfoErr=此用户信息异常！
 LoginAction.checkPwdState.faild=操作失败
 LoginAction.checkPwdState.success=操作成功
-LoginAction.checkPwdState.selectSys=请重新选择登陆的业务系统！
+LoginAction.checkPwdState.selectSys=请重新选择登陆的视图！
 LoginAction.checkPwdState.out=登出
 LoginAction.checkPwdState.sessionNoInfo=从session中没有取得人员信息
 LoginAction.checkPwdState.sessionOutTime=session可能已过期
@@ -7374,7 +7390,7 @@ js.jquery.topology.no=编号

 #topoManageIndex.jsp页面
 topoManage.topoInformation=拓扑图信息
-topoManage.system=业务系统
+topoManage.system=视图
 topoManage.topoPicture=拓扑图
 topoManage.topoNodeName=Topo Node 名称
 topoManage.topoNodeType=Topo Node 类型
@@ -7391,3 +7407,6 @@ topoManage.handleErrorInfo=操作失败

 topoManage.chooseTopoMessage=请选择topo图
 topoManage.TopoNodeMessage=topo图节点信息
+
+xt_mk_jbxx.604.mkmc=高级配置
+xt_mk_jbxx.604.mkms=高级配置功能菜单
--- a/WebRoot/js/onmouse.js
+++ b/WebRoot/js/onmouse.js
--- a/WebRoot/main.jsp
+++ b/WebRoot/main.jsp
--- a/WebRoot/page/detection/detecWarning/detecConfLevelWarningList.jsp
+++ b/WebRoot/page/detection/detecWarning/detecConfLevelWarningList.jsp
@@ -327,13 +327,13 @@
 		}
 	}
 	function ieBrowser(){
-		if($.browser.msie){
+		/* if($.browser.msie){
 			if($.browser.version.split('.')[0]<=7){
 				return false;
 			}else{
 				return true;//ie8+
 			}
-		}
+		} */
 	}

 	//程辉 2013-5-8 新增 导出当前页
--- a/WebRoot/page/detection/monitorData/monitorInfoListNewTopo.jsp
+++ b/WebRoot/page/detection/monitorData/monitorInfoListNewTopo.jsp
@@ -168,7 +168,6 @@
 }
 </style>
 		<script type="text/javascript">	
-		 parent.setDivTitle('${nodeGroupName}');
     //页面5分钟刷新一次
 		var interval;
 		$(function(){
--- a/WebRoot/page/show/nodeGroup/newShowTopo.jsp
+++ b/WebRoot/page/show/nodeGroup/newShowTopo.jsp
@@ -46,23 +46,6 @@
 	<div>
 		<canvas  id="canvas" style="background-color:#FAFAFA; border:1px solid #444;display:block"></canvas>
 	</div>
-	<div id="nodeList" closed="true">
-		<!-- 1为禁止查询，2为可以联想查询  此开关同main.jsp-->
-		<input type="hidden" id="lianxiangStatus" value="2" />
-		<!--<span id="title" class="color_3_tip"
-			style="width: 100%;  display: none; text-align: center;"></span>-->
-		<div id="title" class="color_3_tip" style="height: 20px;text-align: center;line-height: 20px">i18n_st.text.policy_n81i</div>
-		<iframe id="I4" name="I4" height="30%" width="100%" border="0"
-			style="background: #FFFFFF; display: none;" frameborder="0" src=""
-			scrolling="no">
-			i18n_st.message.frameInfo_n81i
-		</iframe>
-		<hr id="hr" />
-		<iframe id="I5" name="I5" height="100%" width="100%" border="0"
-			style="background: #FFFFFF;" frameborder="0" src="" scrolling="no">
-			i18n_st.message.frameInfo_n81i
-		</iframe>
-	</div>
 	
 	<!-- <div id="nodeList" closed="true">
 		1为禁止查询，2为可以联想查询  此开关同main.jsp
@@ -319,37 +302,52 @@ function newFlexionalLink(nodeA, nodeZ, text, dashedPattern,direction){
 	
 	$(function(){
 		 //告警节点列表初始化
-		$("#nodeList").dialog({
+		/* $("#nodeList").dialog({
 			title:"i18n_st.nodeList.title_n81i",
 			resizable:true,
 			width:1024,
 			height:600
 		});	
-		 console.log("123213213213")
+		 console.log("123213213213") */
 	})

 	
-	function getDetectInfo(id,type,showStatus){
-		//根据类型的不同 判断节点或节点组的查询条件
-		var url ="<c:url value='/detection/monitorData.do?action=query&nodeType=1&requestType=newTopo&nodeGroupId="+id+"'/>";
-		var url2="<c:url value='/detection/monitorData.do?action=queryEmergentDetail&nodeType=1&requestType=topo&nodeGroupId="+id+"'/>";
-		if(type==2){
-			url ="<c:url value='/detection/monitorData.do?action=query&nodeType=2&requestType=newTopo&nodeId="+id+"'/>";
-			url2="<c:url value='/detection/monitorData.do?action=queryEmergentDetail&nodeType=2&requestType=topo&nodeId="+id+"'/>";
-		}
+function getDetectInfo(id,type,showStatus){
+	//根据类型的不同 判断节点或节点组的查询条件
+	var url ="<c:url value='/detection/monitorData.do?action=query&nodeType=1&requestType=newTopo&nodeGroupId="+id+"'/>";
+	var url2="<c:url value='/detection/monitorData.do?action=queryEmergentDetail&nodeType=1&requestType=topo&nodeGroupId="+id+"'/>";
+	if(type==2){
+		url ="<c:url value='/detection/monitorData.do?action=query&nodeType=2&requestType=newTopo&nodeId="+id+"'/>";
+		url2="<c:url value='/detection/monitorData.do?action=queryEmergentDetail&nodeType=2&requestType=topo&nodeId="+id+"'/>";
+	}
+	
 	//异常情况，显示紧急告警列表，否则不显示
 	if(showStatus == 1){
-		$("#title").show();
-		$("#I4").show();
-		$("#hr").show();
-		$("#I4").attr("src",url2);
+		//$("#title").show();
+		top.$("#I4").show();
+		top.$("#hr").show();
+		top.$("#I4").attr("src",url2);
 	}else{
-		$("#title").hide();
-		$("#I4").hide();
-		$("#hr").hide();
+		//$("#title").hide();
+		top.$("#I4").hide();
+		top.$("#hr").hide();
 	}
-
-	$("#I5").attr("src",url);//由于所有数据列表不会出现隐藏的情况，所以标题的确定就有I5来负责
+	top.$("#I5").attr("src",url);//由于所有数据列表不会出现隐藏的情况，所以标题的确定就有I5来负责
+	
+	var thisheight = $(document).height()*0.9;
+	var thiswidth = $(document).width()*0.9;
+	parent.layer.open({
+		type: 1,
+		title: "i18n_st.text.policy_n81i",
+		area:[thiswidth + 'px', thisheight + 'px'],
+		shade: 0.6,
+		closeBtn: 1,
+		maxmin:true,
+		content: top.$("#nodeList"),
+		cancel: function(index, layero){ 
+			top.$("#I4").removeAttr("src");
+		}    
+	}); 
 	
 }

--- a/WebRoot/page/show/show3DRoom.jsp
+++ b/WebRoot/page/show/show3DRoom.jsp
@@ -143,7 +143,8 @@ body {
 					var selector = "#"+nodeid;
 					var alramInfo = $(selector).val();
 					showMsg(alramInfo,event);
-				}).mouseout(function(){
+				})
+				$(node).mouseleave(function(){
 					this.animate({"fill-opacity":1},800);
 					hideMsg();
 				})
@@ -179,11 +180,11 @@ body {
 	     	if(key == 0){
 	     	var inf="";
 	     		var a = infos[key];
-	     		if(a.length>13){
+	     		if(a.length>25){
 		     		for(var i = 0 ;i <a.length;i++){
-			     		if(i%13==0&&i!=0){
+			     		 if(i%25==0&&i!=0){
 			     			inf = inf + "<br/>";
-			     		}
+			     		} 
 		     			inf = inf + a.charAt(i);
 		     		}
 	     		}else{
@@ -191,11 +192,23 @@ body {
 	     		}
 	     		info+="<span style='font-weight: bold;'>"+inf+"</span><br/><br/>";
 	     	}else{
-	     		info+=infos[key]+"<br/>";
+	     		var a=infos[key];
+	     		if(a.length>25){
+	     			var tem="";
+	     			for(var i =0;i<a.length;i++){
+	     				if(i%25==0&&i!=0){
+	     					tem=tem+"<br/>"
+	     				}
+	     				tem=tem+a.charAt(i);
+	     			}
+	     			info+=tem;
+	     		}else{
+		     		info+=infos[key]+"<br/>";
+	     		}
 	     	}
 	     	
 	     }
-	     with (oSon){  
+	    with (oSon){
 		      innerHTML = info;  
 		      style.display = "block";  
 			if(navigator.userAgent.indexOf("MSIE")>0) {  
@@ -207,8 +220,16 @@ body {
 		        y = e.clientY;
 				  style.left = x + window.document.body.scrollLeft-200 ;  
 			      style.top =  y + window.document.body.scrollTop-50;  
+   			}else if(navigator.userAgent.indexOf("Chrome")>0){
+   				var e = event ? event : window.event;
+		        x = e.clientX;
+		        y = e.clientY;
+				  style.left = x + window.document.body.scrollLeft-200 ;  
+			      style.top =  y + window.document.body.scrollTop-50;
   			}		      
-	     	}  
+	     }  
+	     	
+	    
    	} 
 		
 		function hideMsg(){
--- a/WebRoot/page/show/showNodeRoom.jsp
+++ b/WebRoot/page/show/showNodeRoom.jsp
@@ -25,6 +25,8 @@
 			type="text/css"></link>
 		<script type="text/javascript"
 			src="<c:url value='/js/jquery-easyui-1.1.2/jquery.easyui.min.js' />"></script>
+		<script type="text/javascript"
+			src="<c:url value='/js/jquery-easyui-1.1.2/layer.js' />"></script>
 		<style>
 body {
 	background-image: url("${pageContext.request.contextPath}/images/show/bg.jpg");
@@ -162,7 +164,7 @@ body {
 		 				var position = row+""+col;
 		 				var roomColor = "#CCCCCC";
 		 				var boxBgImg = boxImg;//机柜背景图片
-		 				var boxTitle = "i18n_snr.message.boxTitle1 _n81i";
+		 				var boxTitle = "i18n_snr.message.boxTitle1_n81i";
 		 				if(nodeBoxs[position]!=undefined){
 		 					roomColor = "#A3C09F";//机柜正常常绿色
 		 					if(nodeBoxs[position].alarm){
@@ -196,7 +198,10 @@ body {
 		 					//	var param = this.attr("text");
 			 					var nodeid = this.id;
 			 					var selector = "#"+nodeid;
-								var param = $(selector).val();		 						
+								var param = $(selector).val();		
+								loading = window.top.layer.load(1, {
+									shade: [0.1,'black'] //0.1透明度的白色背景
+								}); 						
 		 						getNodeBox(param);
 		 					});
 		 				}
@@ -212,7 +217,7 @@ body {
 			}
 		})
 		
-		function getNodeBox(param){
+		/*function getNodeBox(param){
 			var params=param.split(",");
 			$.ajax({
 					type:"post",
@@ -224,9 +229,9 @@ body {
 						 if(textStatus == "success" && (data!= null && data!= "" )){
 						 	$("#nodeBoxs").html("");
 							 var t =$("#nodeBox").dialog("options").title;
-						 	$("#nodeBox").dialog("setTitle", params[1]);
+							$("#nodeBox").dialog("setTitle", params[1]);
 						 	$("#nodeBox").dialog("open"); 
-						 	
+						 
 						 	var length = $(data).length;
 						 	var raphaelBox = Raphael("nodeBoxs",boxWidth,boxHeight);
 						 	//raphaelBox.rect(0,0,boxWidth,boxHeight).attr({'stroke-width':1,stroke: "#FFFFFF", fill: "#FBFBEA"});
@@ -334,10 +339,161 @@ body {
 						 }
 					}
 				})
+		}*/
+		function getNodeBox(param){
+			var params=param.split(",");
+			$.ajax({
+					type:"post",
+					dataType:'json',
+					url:"<c:url value='/nodePosition/topoShow.do?action=getNodeBox'/>",
+					data:params[0],
+					async:true,
+					 success:function (data,textStatus){
+					 	if(textStatus == "success" && (data!= null && data!= "" )){
+						 	window.top.$("#nodeBoxs").html("");
+						 	var length = $(data).length;
+						 	var raphaelBox = window.top.Raphael("nodeBoxs",boxWidth,boxHeight);
+						 	//raphaelBox.rect(0,0,boxWidth,boxHeight).attr({'stroke-width':1,stroke: "#FFFFFF", fill: "#FBFBEA"});
+						 	//边框设置
+						 	var subBoxStartX=20;
+						 	var subBoxStartY=10;
+						 	var footHeight = 30;
+						 	var subBoxGap = 3;
+						 	raphaelBox.image(boxTopImg,0,0,204,subBoxStartY);
+						 	raphaelBox.image(boxLeftImg,0,subBoxStartY,subBoxStartX,boxHeight);
+						 	raphaelBox.image(boxRightImg,boxWidth-20,subBoxStartY,subBoxStartX,boxHeight);
+						 	raphaelBox.image(boxFootImg,0,boxHeight-footHeight,204,footHeight);
+						 	//每个子U为的大小设置
+						 	var subHeight = (boxHeight-subBoxStartY-footHeight)/length-subBoxGap;
+						 	var subWidth = boxWidth - 2*subBoxStartX;
+						 	var index=-1;//控制占多个U位的处理；
+						 	var nodeIndex=0;//在机柜展示中显示节点机所在的序号
+						 	$(data).each(function(i,item){
+						 		if(index >= i){
+						 			return true;
+						 		}
+						 		//item.nodeposition
+						 		var subBoxY = subBoxStartY+i*(subHeight+subBoxGap);
+						 		var newHeight = subHeight;
+						 		if(item.nodeSeqId != "0" && item.nodeTable != null){
+						 			
+						 			var title="";//设置节点的提升信息
+						 			var param="";//设置单击事件的传参
+						 			if(item.nodeTable != null){
+						 				title = "i18n_snr.message.nodeTableTitle.nodeIp_n81i："+item.nodeTable.nodeIp+"\ni18n_snr.message.nodeTableTitle.nodeName_n81i："+item.nodeTable.nodeName
+						 						+"\ni18n_snr.message.nodeTableTitle.nodeU_n81i："+item.nodeTable.nodeUType+"\ni18n_snr.message.nodeTableTitle.startU_n81i："+item.nodeTable.nodeBeginUType;
+						 				param = "&seqList="+item.nodeTable.seqId;
+						 				
+						 				//占多个U位的处理
+						 				var UNum = Number(item.nodeTable.nodeUType);
+						 				if( UNum>1){
+						 					newHeight = UNum*subHeight+(UNum-1)*subBoxGap;
+						 					index = i+UNum-1;
+						 				}
+						 			}
+						 			//alert(item.nodeTable.nodeName+"------"+item.groupNode+"---"+item.nodeTable.alarm);
+						 			var subColor="#80B167";//绿色
+						 			//是本节点组的显示（红色or绿色） 非本节点组显示灰色
+						 			if(item.groupNode){
+						 				if(item.nodeTable.alarm){//节点如果异常则显示红色
+						 					subColor="#FF0000";
+						 				}
+						 			}else{
+						 				subColor="#939393";//灰色
+						 			}
+						 			
+						 			//只有告警节点才可以单击显示告警信息
+						 			if(item.groupNode &&item.nodeTable.alarm){
+						 			//节点如果异常则显示红色
+						 				var node = raphaelBox.rect(subBoxStartX,subBoxY,subWidth,newHeight).attr({stroke: "#CEDBEF",'stroke-width':0.1,title:title,text:param, fill: subColor});
+						 				node.id = "u"+i;
+						 				window.top.$("#nodeBoxs").append("<input type='hidden' id="+node.id+" value=''>");
+						 				$("input[id="+node.id+"]").val(param);
+								 			node.click(function(){
+							   				//	var param = this.attr("text");
+							   					var selector= "#"+this.id;
+							   					var param = $(selector).val();
+							   					var nodeip = item.nodeTable.nodeIp;
+							   					var nodeType = item.nodeTable.nodeType;
+							   					getAlarmInfo(param,nodeip,nodeType);
+											}).mouseover(function(){
+												this.animate({"stroke-width":2},100);
+											}).mouseout(function(){
+												this.animate({"stroke-width":0.1},100);
+											});
+						 			}else{
+						 				raphaelBox.rect(subBoxStartX,subBoxY,subWidth,newHeight).attr({stroke: "#CEDBEF",'stroke-width':0.1,title:title,text:param, fill: subColor})
+								 			.mouseover(function(){
+												this.animate({"stroke-width":2},100);
+											}).mouseout(function(){
+												this.animate({"stroke-width":0.1},100);
+											});
+						 			}
+						 			
+						 			//写节点机在机柜中的序号,放入数组中
+						 			if(item.groupNode){
+						 				nodeIndex++;
+						 				nodeIndexs[nodeIndex]={"x":subBoxStartX-5,"y":subBoxY+5};
+						 			}
+						 			
+						 		}else{
+						 			var title="i18n_snr.message.UBit_n81i"+item.nodeposition;
+						 			raphaelBox.rect(subBoxStartX,subBoxY,subWidth,newHeight).attr({stroke: "#CEDBEF",'stroke-width':0.1,title:title, fill: "#ffffff"})
+						 			.mouseover(function(){
+										this.animate({"stroke-width":2},100);
+									}).mouseout(function(){
+										this.animate({"stroke-width":0.1},100);
+									});
+						 		}
+						 	});
+						 	
+						 	//写节点机在机柜中的序号
+						 	var nodeShowInd = 0;
+						 	for(var i = 1;i<=nodeIndex;i++){
+						 		if(nodeIndexs[i] != null &&nodeIndexs[i] != ""){
+						 			nodeShowInd++;
+						 			raphaelBox.text(nodeIndexs[i].x,nodeIndexs[i].y,nodeShowInd).attr({'font-size':12,fill:"#000000"});
+						 		}
+						 	}
+						 	window.top.layer.close(loading);
+						 	window.top.layer.open({
+						 		type: 1,
+						 		title: params[1],
+						 		area:['206px', ''],
+						 		scrollbar: true,
+						 		content: window.top.$("#nodeBoxs")
+						 	})
+						 }
+					}
+				})
 		}
 		
 		
 		function getAlarmInfo(param,nodeip,nodeType){
+			if(nodeType== 0){
+				var url ="<c:url value='/detection/detectionWarning.do?action=query&ip="+nodeip+"&levelAlarm=1"+param+"+&type=3Droom'/>";
+			}else if(nodeType == 1){
+				var url ="<c:url value='/detection/detectionWarning.do?action=queryNE&ip="+nodeip+"&levelAlarm=1"+param+"+&type=3Droom'/>";
+			}
+			var thisheight = $(document).height()*0.9;
+			var thiswidth = $(document).width()*0.9;
+			window.top.layer.open({
+		 		type: 1,
+		 		area: [thiswidth + 'px', thisheight + 'px'],
+		 		scrollbar: true,
+		 		maxmin: true,
+		 		content: window.top.$("#alarmInfo")
+		 	})
+			window.top.$("#I6").html("");
+			window.top.$("#I6").attr("src",url);
+			window.top.$("#I6").load(function(){
+				var main = window.top.$("#I6");
+				main.height("100%");
+				main.width("100%");
+			});
+		}
+		
+		/* function getAlarmInfo(param,nodeip,nodeType){
 			if(nodeType== 0){
 				var url ="<c:url value='/detection/detectionWarning.do?action=query&ip="+nodeip+"&levelAlarm=1"+param+"+&type=3Droom'/>";
 			}else if(nodeType == 1){
@@ -346,7 +502,7 @@ body {
 			$("#I3").html("");
 			$("#I3").attr("src",url);
 			$("#alarmInfo").dialog("open");
-		}
+		} */
 		</script>

 	</head>
--- a/src/com/nms/servlet/auto/run/AutoRunForSocketServerServlet.java
+++ b/src/com/nms/servlet/auto/run/AutoRunForSocketServerServlet.java
@@ -110,21 +110,24 @@ public class AutoRunForSocketServerServlet extends HttpServlet implements Servle
 			}});
 		System.out.println(port+">>SSL通讯监听 已启动");
 		
-		
-		//nms上报
-		String intervalStr = BaseAction.rb.getString("nms.report.interval");
-		//nms上报间隔
-		long interval = StringUtil.isBlank(intervalStr) ? 300000 : Long.parseLong(intervalStr)*1000;
-		//nms初次上报延时
-		long now = new Date().getTime();
-		long initInterval = 0l;
-		if(now%interval > 0) {
-			initInterval = interval-(now%interval);
+		String openStr = BaseAction.rb.getString("nms.report.open");
+		boolean open = StringUtil.isBlank(openStr) ? false : ("1".equals(openStr) ? true : false);
+		if (open) {
+			//nms上报
+			String intervalStr = BaseAction.rb.getString("nms.report.interval");
+			//nms上报间隔
+			long interval = StringUtil.isBlank(intervalStr) ? 300000 : Long.parseLong(intervalStr)*1000;
+			//nms初次上报延时
+			long now = new Date().getTime();
+			long initInterval = 0l;
+			if(now%interval > 0) {
+				initInterval = interval-(now%interval);
+			}
+			
+			ThreadPoolCommon.scheduled.scheduleAtFixedRate(new NmsStatusThread(), initInterval, interval, TimeUnit.MILLISECONDS);
+			ThreadPoolCommon.scheduled.scheduleAtFixedRate(new NmsRuleThread(), initInterval, interval, TimeUnit.MILLISECONDS);
+			ThreadPoolCommon.scheduled.scheduleAtFixedRate(new NmsPortThread(), initInterval, interval, TimeUnit.MILLISECONDS);
 		}
-		
-		ThreadPoolCommon.scheduled.scheduleAtFixedRate(new NmsStatusThread(), initInterval, interval, TimeUnit.MILLISECONDS);
-		ThreadPoolCommon.scheduled.scheduleAtFixedRate(new NmsRuleThread(), initInterval, interval, TimeUnit.MILLISECONDS);
-		ThreadPoolCommon.scheduled.scheduleAtFixedRate(new NmsPortThread(), initInterval, interval, TimeUnit.MILLISECONDS);
 	}
 	
 }
--- a/src/com/nms/thread/NmsPortThread.java
+++ b/src/com/nms/thread/NmsPortThread.java
@@ -2,10 +2,14 @@ package com.nms.thread;

 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;

+import net.sf.json.JSONObject;
 import nis.nms.util.BaseAction;
 import nis.nms.util.ConnectionOracle;
+import nis.nms.util.HttpClientUtil;

 import org.apache.log4j.Logger;

@@ -30,7 +34,34 @@ public class NmsPortThread implements Runnable {
 		try {
 			connection = ConnectionOracle.getConnection();
 			NmsReportService service = new NmsReportService(connection);
-			//ArrayList<Map<String, String>> nmsRuleInfo = service.getNmsPortInfo(nowLong, nowLong-interval);
+			ArrayList<Map<String, String>> nmsPortInfo = service.getNmsPortInfo(nowLong, nowLong-interval);
+			if (nmsPortInfo != null && nmsPortInfo.size() > 0) {
+				
+				Map<String, List<Map<String, String>>> data = new HashMap<String, List<Map<String, String>>>();
+				List<Map<String, String>> results = new ArrayList<Map<String, String>>();
+				
+				for (Map<String, String> info : nmsPortInfo) {
+					Map<String, String> result = new HashMap<String, String>();
+					result.put("port", info.get("ifindex"));
+					result.put("nodeName", info.get("node_name"));
+					result.put("nodeIp", info.get("node_ip"));
+					result.put("portDesc", info.get("IFDESCR"));
+					result.put("bandwidth", info.get("IFSPEED"));
+					result.put("inoctets", info.get("IFINOCTETS"));
+					result.put("outoctets", info.get("IFOUTOCTETS"));
+					result.put("inoctetsSpeed", info.get("INOCTETSSPEED"));
+					result.put("outoctetsSpeed", info.get("OUTOCTETSSPEED"));
+					result.put("inpktsSpeed", info.get("INPKTSSPEED"));
+					result.put("outpktsSpeed", info.get("OUTPKTSSPEED"));
+					result.put("recvTime", info.get("DATA_CHECK_TIME"));
+					results.add(result);
+				}
+				data.put("trafficNetflowPortInfoList", results);
+				HttpClientUtil httpUtil = new HttpClientUtil();
+				JSONObject fromObject = JSONObject.fromObject(data);
+				
+				httpUtil.post(BaseAction.rb.getString("nms.port.url"), fromObject.toString());
+			}
 		} catch (Exception e) {
 			logger.error(e);
 		} finally {
--- a/src/com/nms/thread/NmsRuleThread.java
+++ b/src/com/nms/thread/NmsRuleThread.java
@@ -2,11 +2,15 @@ package com.nms.thread;

 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;

+import net.sf.json.JSONObject;
 import nis.nms.util.BaseAction;
 import nis.nms.util.ConnectionOracle;
 import nis.nms.util.DateUtil;
+import nis.nms.util.HttpClientUtil;

 import org.apache.log4j.Logger;

@@ -31,7 +35,40 @@ public class NmsRuleThread implements Runnable {
 		try {
 			connection = ConnectionOracle.getConnection();
 			NmsReportService service = new NmsReportService(connection);
-			//ArrayList<Map<String, String>> nmsRuleInfo = service.getNmsRuleInfo(nowLong, nowLong-interval);
+			ArrayList<Map<String, String>> nmsRuleInfo = service.getNmsRuleInfo(nowLong, nowLong-interval);
+			if (nmsRuleInfo != null && nmsRuleInfo.size() > 0) {
+				
+				Map<String, List<Map<String, String>>> data = new HashMap<String, List<Map<String, String>>>();
+				List<Map<String, String>> results = new ArrayList<Map<String, String>>();
+				
+				for (Map<String, String> info : nmsRuleInfo) {
+					Map<String, String> result = new HashMap<String, String>();
+					result.put("detectionInfoId", info.get("detection_info_id"));
+					result.put("serviceIndex", info.get("ServiceIndex"));
+					result.put("serviceCode", info.get("ServiceCode"));
+					result.put("serviceDesc", info.get("ServiceDesc"));
+					result.put("agedTime", info.get("agedTime"));
+					result.put("clientNum", info.get("ClientNum"));
+					result.put("refluxPort", info.get("RefluxPort"));
+					result.put("ruleNumber", info.get("RuleNumber"));
+					result.put("usedRuleNum", info.get("usedRuleNum"));
+					result.put("leftRuleNum", info.get("leftRuleNum"));
+					result.put("hitTotalNum", info.get("HitTotalNum"));
+					result.put("detectionedState", info.get("DETECTIONED_STATE"));
+					result.put("seqId", info.get("SEQ_ID"));
+					result.put("detectionSetInfoId", info.get("DETECTION_SET_INFO_ID"));
+					result.put("dataCheckTime", info.get("data_check_time"));
+					result.put("dataArriveTime", info.get("data_arrive_time"));
+					result.put("dataCheckTimeDigital", info.get("data_check_time_digital"));
+					result.put("dataArriveTimeDigital", info.get("data_arrive_time_digital"));
+					results.add(result);
+				}
+				data.put("nmsDiRuleList", results);
+				HttpClientUtil httpUtil = new HttpClientUtil();
+				JSONObject fromObject = JSONObject.fromObject(data);
+				
+				httpUtil.post(BaseAction.rb.getString("nms.rule.url"), fromObject.toString());
+			}
 		} catch (Exception e) {
 			logger.error(e);
 		} finally {
--- a/src/com/nms/thread/service/NmsReportService.java
+++ b/src/com/nms/thread/service/NmsReportService.java
@@ -41,12 +41,13 @@ public class NmsReportService {
 	}
 	
 	public ArrayList<Map<String, String>> getNmsRuleInfo(Long end, Long start) {
-		String sql = "SELECT nt.node_ip, dr.ServiceIndex, dr.ServiceCode, dr.ServiceDesc, dr.agedTime, dr.ClientNum, dr.RefluxPort, dr.RuleNumber, dr.usedRuleNum, dr.leftRuleNum, dr.HitTotalNum, dr.DETECTIONED_STATE "
+		//end=1539073880004l, start=1539073579984l
+		String sql = "SELECT dr.detection_info_id, dr.ServiceIndex, dr.ServiceCode, dr.ServiceDesc, dr.agedTime, dr.ClientNum, dr.RefluxPort, dr.RuleNumber, dr.usedRuleNum, dr.leftRuleNum, dr.HitTotalNum, dr.DETECTIONED_STATE, dr.SEQ_ID, dr.DETECTION_SET_INFO_ID, dr.data_check_time, dr.data_arrive_time, dr.data_check_time_digital, dr.data_arrive_time_digital "
 				+ "FROM di_rule dr "
 				+ "LEFT JOIN node_table nt ON nt.seq_id=dr.seq_id "
 				+ "WHERE nt.node_state=0 AND dr.data_check_time_digital<" + end + " AND dr.data_check_time_digital>=" + start;
 		ArrayList<String> fields = new ArrayList<String>();
-		fields.add("node_ip");
+		fields.add("detection_info_id");
 		fields.add("ServiceIndex");
 		fields.add("ServiceCode");
 		fields.add("ServiceDesc");
@@ -58,6 +59,12 @@ public class NmsReportService {
 		fields.add("leftRuleNum");
 		fields.add("HitTotalNum");
 		fields.add("DETECTIONED_STATE");
+		fields.add("SEQ_ID");
+		fields.add("DETECTION_SET_INFO_ID");
+		fields.add("data_check_time");
+		fields.add("data_arrive_time");
+		fields.add("data_check_time_digital");
+		fields.add("data_arrive_time_digital");
 		
 		try {
 			 ArrayList<Map<String, String>> dbSelect = dao.dbSelect(sql, fields);
@@ -69,12 +76,24 @@ public class NmsReportService {
 	}
 	
 	public ArrayList<Map<String, String>> getNmsPortInfo(Long end, Long start) {
-		String sql = "SELECT nt.node_ip, ds.* "
+		//end=1539073220004l,start=1539064699984l
+		String sql = "SELECT nt.node_ip, nt.node_name, ds.ifindex, ds.IFDESCR, ds.IFSPEED, ds.IFINOCTETS, ds.IFOUTOCTETS,ds.INOCTETSSPEED,ds.INPKTSSPEED,ds.OUTOCTETSSPEED, ds.OUTPKTSSPEED, ds.DATA_CHECK_TIME  "
 				+ "FROM di_switchport ds "
-				+ "LEFT JOIN node_table nt ON nt.seq_id=ds.seq_id"
+				+ "LEFT JOIN node_table nt ON nt.seq_id=ds.seq_id "
 				+ "WHERE nt.node_state=0 AND ds.data_check_time_digital<" + end + " AND ds.data_check_time_digital>=" + start;
 		ArrayList<String> fields = new ArrayList<String>();
 		fields.add("node_ip");
+		fields.add("node_name");
+		fields.add("ifindex");
+		fields.add("IFDESCR");
+		fields.add("IFSPEED");
+		fields.add("IFINOCTETS");
+		fields.add("IFOUTOCTETS");
+		fields.add("INOCTETSSPEED");
+		fields.add("INPKTSSPEED");
+		fields.add("OUTOCTETSSPEED");
+		fields.add("OUTPKTSSPEED");
+		fields.add("DATA_CHECK_TIME");
 		
 		try {
 			ArrayList<Map<String, String>> dbSelect = dao.dbSelect(sql, fields);
--- a/src/conf/myconfig.properties
+++ b/src/conf/myconfig.properties
@@ -87,7 +87,11 @@ nation.role.jsbh=224

 dept.mk.id=280

+#1:open  0:close
+nms.report.open=1
 #unit:s
 nms.report.interval=20
 nms.status.setId=7
-nms.status.url=http\://10.0.6.242\:8080/galaxy/service/nms/v1/saveServerStatus
+nms.status.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/saveServerStatus
+nms.port.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/rafficNetflowPortInfo
+nms.rule.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/saveNmsDiRule
--- a/src/nis/nms/util/BaseAction.java
+++ b/src/nis/nms/util/BaseAction.java
@@ -260,10 +260,11 @@ public abstract  class  BaseAction extends ActionSupport implements Serializable
 	 * @return
 	 */
 	public boolean getAdminMark(){
-		if(StringUtils.isNotEmpty(rb.getString("common.admin.mark")) && getUser()!=null){
-			if(rb.getString("common.admin.mark").equals(getUser().getYhbh()) 
+		XtYhJbxx user =getUser1();
+		if(StringUtils.isNotEmpty(rb.getString("common.admin.mark")) && user!=null){
+			if(rb.getString("common.admin.mark").equals(getUser1().getYhbh()) 
 					|| getSystemID().equals(-1L)
-					||"admin".equalsIgnoreCase(getUser().getYhbh())){
+					||"admin".equalsIgnoreCase(getUser1().getYhbh())){
 				return true;
 			}else return false;
 		}else
@@ -430,6 +431,11 @@ public abstract  class  BaseAction extends ActionSupport implements Serializable
 		XtYhJbxx user = (XtYhJbxx)session.getAttribute(Constant.SESSION_CZY_NAME);
 		return user;
 	}
+	public XtYhJbxx getUser1(){ 
+		HttpSession session = getRequest().getSession(true);
+		XtYhJbxx user = (XtYhJbxx)session.getAttribute(Constant.SESSION_CZY_NAME);
+		return user;
+	}
 	public String getExp(List list,String name,String tem,List... lists) {
 	    InputStream in = null;
 	    OutputStream out = null;
--- a/src/nis/nms/util/HttpClientUtil.java
+++ b/src/nis/nms/util/HttpClientUtil.java
@@ -66,7 +66,8 @@ public class HttpClientUtil {
     */  
    public String post(String url, String json) throws ClientProtocolException, IOException{  
        //实例化httpClient  
-    	logger.info("发送post请求：" + url + ":::" + json);
+    	logger.info("发送post请求：" + url);
+    	logger.debug("发送post请求：" + url + ":::" + json);
        CloseableHttpClient httpclient = HttpClients.createDefault();  
        //实例化post方法  
        HttpPost httpPost = new HttpPost(url);   
@@ -80,7 +81,8 @@ public class HttpClientUtil {
        //执行post方法  
        response = httpclient.execute(httpPost);  
        content = EntityUtils.toString(response.getEntity(), "utf-8");
-        logger.info("post请求结束：" + response.getStatusLine().getStatusCode() + ":::" + content);
+        logger.info("post请求结束：" + response.getStatusLine().getStatusCode());
+        logger.debug("post请求结束：" + response.getStatusLine().getStatusCode() + ":::" + content);
        return content;  
    }  
 }
--- a/src/nis/nms/web/actions/detection/CheckTypeSetAction.java
+++ b/src/nis/nms/web/actions/detection/CheckTypeSetAction.java
@@ -687,10 +687,10 @@ public class CheckTypeSetAction extends BaseAction {
 				//执行添加字段
 				this.commonService.updateBatchBySql(sqlString.toString());
 			}
-			commonService.commit();
+			
 			//与NMSServer通信
 			this.sendCheckTypeId(checkTypeInfo.getId()+"",commonService);
-			
+			commonService.commit();
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error(e.getStackTrace());
--- a/src/nis/nms/web/actions/detection/DetectionSetAction.java
+++ b/src/nis/nms/web/actions/detection/DetectionSetAction.java
@@ -804,9 +804,10 @@ public class DetectionSetAction extends BaseAction {
 			// 将更新操作写到操作日志中
 			this.addDBOperationRpt(commonService, "detection_Set_Info",
 					"INSERT", detectionSetInfo.getId());
-			commonService.commit();
+			
 			// 用来实现即时向客户端发送配置信息
 			sendSetInfo(null, detectionSetInfo, commonService);
+			commonService.commit();
 		} catch (Exception e) {
 			e.printStackTrace();
 			commonService.rollback();
@@ -1249,7 +1250,6 @@ public class DetectionSetAction extends BaseAction {
 					}
 					errBuffer.append(getI18nText("i18n_DetectionSetAction.downloadExample.rangRepeat_n81i"));
 				}
-				
 			}
 			// 判断数据是否存在
 			list = this.commonService
@@ -1337,6 +1337,17 @@ public class DetectionSetAction extends BaseAction {
 								.getGroupId());
 				detectionSetInfo.setNodegroup(ng);
 			}
+			
+			if ((detectionSetInfo.getNodeIpsId() == null||"".equals(detectionSetInfo.getNodeGroupsId()))
+					&&(detectionSetInfo.getNodeIpsId()==null|| "".equals(detectionSetInfo.getNodeIpsId()))) {//节点组和节点都为空
+				detectionSetInfo.setNodeGroupsId(null);
+				detectionSetInfo.setNodeIpsId(null);
+			} else if ((detectionSetInfo.getNodeGroupsId() != null
+					&& !"".equals(detectionSetInfo.getNodeGroupsId()))
+					&&(detectionSetInfo.getNodeIpsId()==null|| "".equals(detectionSetInfo.getNodeIpsId()))) {//节点组不为空，节点为空
+				detectionSetInfo.setNodeIpsId(null);
+			}
+			
 			detectionSetInfo.setNodeIp(detectionSetInfo.getNodeIpsName());
 			detectionSetInfo.setDetectionSetState("1");
 			detectionSetInfo.setCreateUserId(this.getUserID());
@@ -1345,7 +1356,7 @@ public class DetectionSetAction extends BaseAction {
 			// 将更新操作写到操作日志中
 			this.addDBOperationRpt(commonService, "detection_Set_Info",
 					"INSERT", detectionSetInfo.getId());
-			commonService.commit();
+			
 			// 保存并更新上传的脚本文件
 			saveScriptFile(myFile, detectionSetInfo);
 			
@@ -1364,7 +1375,7 @@ public class DetectionSetAction extends BaseAction {
 				outHtmlString("<script type=\"text/javascript\">alert('i18n_DetectionSetAction.downloadExample.success_n81i');this.location='detectionSet.do?action=query&pageNo="
 						+ pageNo + "&pageSize=" + pageSize + "'</script>");
 			}
-			
+			commonService.commit();
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error(e.getStackTrace());
@@ -1846,7 +1857,7 @@ public class DetectionSetAction extends BaseAction {
 				// 将更新操作写到操作日志中
 				this.addDBOperationRpt(commonService, "detection_Set_Info",
 						"UPDATE", setInfo.getId());
-				commonService.commit();
+				
 				// 保存并更新上传的脚本文件
 				saveScriptFile(myFile, detectionSetInfo);
 				
@@ -1859,12 +1870,14 @@ public class DetectionSetAction extends BaseAction {
 			
 			outHtmlString("<script type=\"text/javascript\">alert('i18n_DetectionSetAction.downloadExample.success_n81i');this.location='detectionSet.do?action=query&pIden="+pIden+"&ctn="+ctn+"&ip="+ip+"&pageNo="
 					+ pageNo + "&pageSize=" + pageSize + "'</script>");
+			commonService.commit();
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error(e.getStackTrace());
 			commonService.rollback();
 			outHtmlString("<script type=\"text/javascript\">alert('i18n_DetectionSetAction.downloadExample.faild_n81i');this.location='detectionSet.do?action=query&pIden="+pIden+"&ctn="+ctn+"&ip="+ip+"&pageNo="
 					+ pageNo + "&pageSize=" + pageSize + "'</script>");
+			
 		}

 	}
@@ -2102,7 +2115,7 @@ public class DetectionSetAction extends BaseAction {
 						
 						//将更新操作写到操作日志中
 						this.addDBOperationRpt(commonService, "detection_set_info", "UPDATE", ds.getId());
-						commonService.commit();
+						
 						// 用来实现即时向客户端发送配置信息
 						sendSetInfo(dsOld, ds, commonService);
 					}
@@ -2112,6 +2125,7 @@ public class DetectionSetAction extends BaseAction {
 			
 			outHtmlString("<script type=\"text/javascript\">alert('i18n_DetectionSetAction.downloadExample.success_n81i');this.location='detectionSet.do?action=query&pageNo="
 					+ pageNo + "&pageSize=" + pageSize + "'</script>");
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			logger.error(e.getStackTrace());
@@ -2165,7 +2179,7 @@ public class DetectionSetAction extends BaseAction {
 						
 						//将更新操作写到操作日志中
 						this.addDBOperationRpt(commonService, "detection_set_info", "UPDATE", ds.getId());
-						commonService.commit();
+						
 						
 						// 用来实现即时向客户端发送脚本文件
 						sendPluginFile(dsOld, ds, myFile, commonService);
@@ -2177,6 +2191,7 @@ public class DetectionSetAction extends BaseAction {
 			
 			outHtmlString("<script type=\"text/javascript\">alert('i18n_DetectionSetAction.downloadExample.success_n81i');this.location='detectionSet.do?action=query&pageNo="
 					+ pageNo + "&pageSize=" + pageSize + "'</script>");
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			logger.error(e.getStackTrace());
--- a/src/nis/nms/web/actions/detection/MetaDataSetAction.java
+++ b/src/nis/nms/web/actions/detection/MetaDataSetAction.java
@@ -330,9 +330,9 @@ public class MetaDataSetAction extends BaseAction {
 			}else{
 				outHtmlString("<script type=\"text/javascript\">alert('i18n_MetaDataSetAction.queryCheckTypeSource.success_n81i');this.location='metaDataSet.do?action=oppAdd&typeids="+checkTypeInfo.getId()+"'</script>");
 			}
-			commonService.commit();
 			//与NMSServer通信
 			this.sendCheckTypeId(typeInfo.getId()+"",commonService);
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
--- a/src/nis/nms/web/actions/detection/MonitorDataAction.java
+++ b/src/nis/nms/web/actions/detection/MonitorDataAction.java
@@ -3852,7 +3852,7 @@ public class MonitorDataAction extends BaseAction {
 					String nmsClientStr = objs[index2] == null ? "" : objs[index2].toString();
 					String state = "";
 					int initK = 1;// 默认第一个为握手监测，其它监测从1开始取
-					if (!getI18nText("i18n_MonitorDataAction.emportCurrentXlsAbnormalSet.shakehands_n81i").equals(nmsClientStr) && StringUtils.isNotBlank(ip)) {// 如果ip没有握手监测，则从数据库中进行查询
+					if (!"i18n_check_type_info.NMSClient.CHECK_TYPE_NAME1_n81i".equals(nmsClientStr) && StringUtils.isNotBlank(ip)) {// 如果ip没有握手监测，则从数据库中进行查询
 						String sql = "select din.detectioned_state" + " from DETECTION_INFO_NEW din  "
 								+ " left join DETECTION_SET_INFO dsi on din.detection_set_info_id = dsi.id"
 								+ " left join check_type_info cti on dsi.check_type_id = cti.id"
--- a/src/nis/nms/web/actions/detection/PoliceSetAction.java
+++ b/src/nis/nms/web/actions/detection/PoliceSetAction.java
@@ -248,6 +248,7 @@ public class PoliceSetAction extends BaseAction {
 			this.commonService.save(dataPoliceRelation);
 			// 将更新操作写到操作日志中
 			this.addDBOperationRpt(commonService,"data_police_relation", "INSERT", dataPoliceRelation.getId());
+			sendSetInfo(null,dsi,commonService);
 			commonService.commit();
 		    outHtmlString("<script type=\"text/javascript\">alert('i18n_PoliceSetAction.queryPoliceSetInfo.success_n81i');this.location='policeSet.do?action=query&pIden="+pIden+"&ctn="+ctn+"&ip="+ip+"&pageNo="+pageNo+"&pageSize="+pageSize+"&setId="+setId+"'</script>");
 		} catch (Exception e) {
@@ -256,7 +257,7 @@ public class PoliceSetAction extends BaseAction {
 			logger.error(e.getStackTrace());
 			outHtmlString("<script type=\"text/javascript\">alert('i18n_PoliceSetAction.queryPoliceSetInfo.faild_n81i');this.location='policeSet.do?action=query&pIden="+pIden+"&ctn="+ctn+"&ip="+ip+"&pageNo="+pageNo+"&pageSize="+pageSize+"&setId="+setId+"'</script>");
 		}
-		sendSetInfo(null,dsi,commonService);
+		
 	}

 	public String openUpdatePoliceSet() {
@@ -313,7 +314,7 @@ public class PoliceSetAction extends BaseAction {
 			dpRelation.setMarker(dataPoliceRelation.getMarker());
 			dpRelation.setMarkerFiledId(dataPoliceRelation.getMarkerFiledId());
 			this.commonService.update(dpRelation);
-			commonService.commit();
+			
 			// 将更新操作写到操作日志中
 			this.addDBOperationRpt(commonService,"data_police_relation", "UPDATE", dpRelation.getId());
 			sendSetInfo(null,ds,commonService);
@@ -324,6 +325,7 @@ public class PoliceSetAction extends BaseAction {
 			
 			String str = "<script type=\"text/javascript\">alert('i18n_PoliceSetAction.queryPoliceSetInfo.success_n81i');this.location='policeSet.do?action=query&pIden="+pIden+"&ctn="+ctn+"&ip="+ip+"&pageNo="+pageNo+"&pageSize="+pageSize+setIdStr+"'</script>";
 			outHtmlString(str);
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
--- a/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java
+++ b/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java
@@ -572,7 +572,7 @@ public class NmsTaskManagerAction extends BaseAction {
 				}
 			}

-			String[] title = { getI18nText("i18n_NmsTaskManagerAction.executeAction.title.missionName _n81i"), 
+			String[] title = { getI18nText("i18n_NmsTaskManagerAction.executeAction.title.missionName_n81i"), 
 								getI18nText("i18n_NmsTaskManagerAction.executeAction.title.missionType_n81i"), 
 								getI18nText("i18n_NmsTaskManagerAction.executeAction.title.isLoop_n81i"),
 								getI18nText("i18n_NmsTaskManagerAction.executeAction.title.missionState_n81i"), 
@@ -743,7 +743,7 @@ public class NmsTaskManagerAction extends BaseAction {
 				}
 			}

-			String[] title = { getI18nText("i18n_NmsTaskManagerAction.executeAction.title.missionName _n81i"), 
+			String[] title = { getI18nText("i18n_NmsTaskManagerAction.executeAction.title.missionName_n81i"), 
 					getI18nText("i18n_NmsTaskManagerAction.executeAction.title.missionType_n81i"), 
 					getI18nText("i18n_NmsTaskManagerAction.executeAction.title.isLoop_n81i"),
 					getI18nText("i18n_NmsTaskManagerAction.executeAction.title.missionState_n81i"), 
@@ -2381,7 +2381,7 @@ public class NmsTaskManagerAction extends BaseAction {

 					// 将更新操作写到操作日志中
 					this.addDBOperationRpt(commonService, "mission_state_table", "UPDATE", pid[i]);
-					commonService.commit();
+					
 					sendMissionInfoId(pid[i], 0l, commonService);
 					// sendMissionInfoId(missionstatetable.getMissionId(),1l);
 				}
@@ -2393,7 +2393,7 @@ public class NmsTaskManagerAction extends BaseAction {
 						+ "this.location='nmsTaskManager.do?action=query&pageNo=" + pageNo + "&pageSize=" + pageSize
 						+ "'</script>");
 			}
-			
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			outHtmlString("<script type=\"text/javascript\">alert('i18n_NmsTaskManagerAction.executeAction.faild_n81i');"
@@ -4250,8 +4250,8 @@ public class NmsTaskManagerAction extends BaseAction {
 			default:
 				break;
 			}
-			commonService.commit();
 			sendMissionInfoId(stateTable.getMissionId(), 0l, commonService);
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
@@ -4702,7 +4702,6 @@ public class NmsTaskManagerAction extends BaseAction {
 						missionstatetable.getMissionId());
 				// sendInfo(missionstatetable.getMissionId(),0l,new
 				// File(fileName));
-				commonService.commit();
 				logger.debug("开始发送任务信息，任务id：" + missionstatetable.getMissionId());
 				sendMissionInfoId(missionstatetable.getMissionId(), 0l, commonService);
 			}
@@ -4717,7 +4716,7 @@ public class NmsTaskManagerAction extends BaseAction {
 				outHtmlString(
 						"<script type=\"text/javascript\">alert('i18n_NmsTaskManagerAction.executeAction.success_n81i');this.location='nmsTaskManager.do?action=query'</script>");
 			}
-			
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
--- a/src/nis/nms/web/actions/nodeGroupManage/NodeGroupManageAction.java
+++ b/src/nis/nms/web/actions/nodeGroupManage/NodeGroupManageAction.java
@@ -399,12 +399,12 @@ public class NodeGroupManageAction extends BaseAction {
 			
 			//将添加操作写到操作日志中
 			this.addDBOperationRpt(commonService, "nodegroup_table", "INSERT", nodegroupTable.getGroupId());
-			commonService.commit();
+			
 			// 用来实现即时向客户端发送脚本文件
 			this.sendPluginFile(nodegroupTable.getGroupId(), null,commonService);
 						
 			this.sendNodeAndGroupId(nodegroupTable.getGroupId(), null,commonService);//通知NMSServer更新节点组的监控信息
-			
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
@@ -886,7 +886,7 @@ public class NodeGroupManageAction extends BaseAction {
 			
 			//将添加操作写到操作日志中
 			this.addDBOperationRpt(commonService, "nodegroup_table", "INSERT", nodeGroup.getGroupId());
-			commonService.commit();
+			
 			// 用来实现即时向客户端发送脚本文件
 			this.sendPluginFile(nodeGroup.getGroupId(), null,commonService);
 			
@@ -900,7 +900,7 @@ public class NodeGroupManageAction extends BaseAction {
 			}else{
 				this.outHtmlString("<script>alert('i18n_NodeGroupManageAction.downloadExample.success_n81i');this.location='nodeGroupManage!execute.do?action=queryNodeGroupInfo&showStopNGroup="+showStopNGroup+"'</script>");
 			}
-			
+			commonService.commit();
 		}catch (Exception e){
 			commonService.rollback();
 			logger.error(e.getStackTrace());
@@ -975,7 +975,7 @@ public class NodeGroupManageAction extends BaseAction {
 				
 				//将更新操作写到操作日志中
 				this.addDBOperationRpt(commonService, "nodegroup_table", "UPDATE", nodeGroup.getGroupId());
-				commonService.commit();
+				
 				this.outHtmlString("<script>alert('i18n_NodeGroupManageAction.downloadExample.success_n81i');this.location='nodeGroupManage!execute.do?action=queryNodeGroupInfo&showStopNGroup="+showStopNGroup+"'</script>");
 			}
 			if(flag){
@@ -985,7 +985,7 @@ public class NodeGroupManageAction extends BaseAction {
 				this.sendNodeAndGroupId(group.getGroupId(), null,commonService);	//通知NMSServer更新节点组的监控信息
 				this.getRequest().setAttribute("MSG","2");
 			}
-			
+			commonService.commit();
 		}catch (Exception e){
 			commonService.rollback();
 			logger.error(e.getStackTrace());
@@ -1241,7 +1241,7 @@ public class NodeGroupManageAction extends BaseAction {
 				String sqlCondition = "where NODE_ID in (" + allIds + ")";
 				//将更新操作写到操作日志中
 				this.addDBOperationRpt(commonService, sqlCondition, "NODE_TABLE");
-				commonService.commit();
+				
 				//通知NMSServer更新节点组的监控信息
 				for(String str : leafNodeGroupArray){
 					// 用来实现即时向客户端发送脚本文件
@@ -1250,7 +1250,7 @@ public class NodeGroupManageAction extends BaseAction {
 					this.sendNodeAndGroupId(Long.valueOf(str), null,commonService);
 				}
 			}
-			
+			commonService.commit();
 			//this.outHtmlString("<script>alert('操作成功！');this.location='"+path+"/nodeGroupManage/nodeGroupManage.do?action=queryNodeGroupInfo'</script>");
 		} catch (Exception e) {
 			commonService.rollback();
--- a/src/nis/nms/web/actions/nodeGroupManage/NodeManageAction.java
+++ b/src/nis/nms/web/actions/nodeGroupManage/NodeManageAction.java
@@ -615,7 +615,7 @@ public class NodeManageAction extends BaseAction {
 					// 将添加操作写到操作日志中
 					this.addDBOperationRpt(commonService, "node_table",
 							"INSERT", nodeTable.getNodeId());
-					commonService.commit();
+					
 					if (new Long(1).equals(group.getIsValid())) { // 节点组有效
 						
 						// 用来实现即时向客户端发送脚本文件
@@ -643,7 +643,7 @@ public class NodeManageAction extends BaseAction {
 						.outHtmlString("<script>alert('i18n_NodeManageAction.addNodeInfo.nodeHadIp_n81i');history.back();</script>");
 				return;
 			}
-			
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
@@ -1138,7 +1138,7 @@ public class NodeManageAction extends BaseAction {
 					// 将更新操作写到操作日志中
 					this.addDBOperationRpt(commonService, "node_table",
 							"UPDATE", nodeTable.getNodeId());
-					commonService.commit();
+					
 					if (flag) {
 						// 用来实现即时向客户端发送脚本文件
 						this.sendPluginFile(nt.getGroupId(), nt
@@ -1159,6 +1159,7 @@ public class NodeManageAction extends BaseAction {
 						.outHtmlString("<script>alert('i18n_NodeManageAction.addNodeInfo.nodeHadIp_n81i');history.back();</script>");
 				return;
 			}
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
@@ -1186,7 +1187,7 @@ public class NodeManageAction extends BaseAction {
 				// 将更新操作写到操作日志中
 				this.addDBOperationRpt(commonService, "node_table", "UPDATE",
 						nd.getNodeId());
-				commonService.commit();
+				
 				NodegroupTable group = (NodegroupTable) this.commonService.get(
 						NodegroupTable.class, nd.getGroupId());
 				if (new Long(1).equals(group.getIsValid())) { // 节点组有效
@@ -1205,7 +1206,7 @@ public class NodeManageAction extends BaseAction {
 				// this.outHtmlString("<script
 				// type=\"text/javascript\">alert('操作成功');this.location='nodeManage.do?action=query&nodeGroupId="+group.getGroupId()+"&isValid="+group.getIsValid()+"'</script>");
 			}
-			
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
@@ -1225,7 +1226,7 @@ public class NodeManageAction extends BaseAction {
 			// 将更新操作写到操作日志中
 			this.addDBOperationRpt(commonService, "node_table", "UPDATE",
 					nodeId);
-			commonService.commit();
+			
 			NodeTable nd = (NodeTable) this.commonService.get(NodeTable.class,
 					nodeId);
 			NodegroupTable group = (NodegroupTable) this.commonService.get(
@@ -1244,7 +1245,7 @@ public class NodeManageAction extends BaseAction {
 			this
 					.outHtmlString("<script type=\"text/javascript\">alert('i18n_NodeManageAction.addNodeInfo.success_n81i');this.location='nodeManage.do?action=query&nodeGroupId="
 							+ mkid + "&isValid=" + isValid + "&showStopNGroup=" + showStopNGroup + "&nodeIpVo="+nodeIpVo+"&nodeNameVo="+nodeNameVo+ "'</script>");
-			
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
--- a/src/nis/nms/web/actions/nodePosition/TopoShowAction.java
+++ b/src/nis/nms/web/actions/nodePosition/TopoShowAction.java
@@ -134,23 +134,23 @@ public class TopoShowAction extends BaseAction
 				if(this.getAdminMark()){
 					sql = "SELECT * from ("
 							+ "select count(distinct nt.node_id) from detection_info_new diw left join node_table nt on diw.seq_id = nt.seq_id "
-							+ "where diw.DETECTIONED_STATE<>1 AND diw.police_emergent=0 and diw.DETECTION_SET_INFO_ID in "
+							+ "where diw.DETECTIONED_STATE<>1 AND diw.police_emergent=0 and diw.VALID=1 and diw.DETECTION_SET_INFO_ID in "
 							+ "(select dst.ID from DETECTION_SET_INFO dst where dst.DETECTION_SET_STATE=1) and nt.NODE_STATE = 0 "
 							+ "and nt.node_group_id in ("+gids+")" 
 							+ ") alramNode,"
 							+ "(SELECT count(DISTINCT t.node_ip) from node_table t WHERE "
 							+ " t.node_group_id= " + nodegroupTable.getGroupId()
-							+ ") allNode";
+							+ " and node_state=0 ) allNode";
 				}else{
 					sql = "SELECT * from ("
 							+ "select count(distinct nt.node_id) from detection_info_new diw left join node_table nt on diw.seq_id = nt.seq_id "
-							+ "where diw.DETECTIONED_STATE<>1 AND diw.police_emergent=0 and diw.DETECTION_SET_INFO_ID in "
+							+ "where diw.DETECTIONED_STATE<>1 AND diw.police_emergent=0 and diw.VALID=1 and diw.DETECTION_SET_INFO_ID in "
 							+ "(select dst.ID from DETECTION_SET_INFO dst where dst.DETECTION_SET_STATE=1) and nt.NODE_STATE = 0 "
 							+ "and nt.node_group_id in ("+gids+")" 
 							+ ") alramNode,"
 							+ "(SELECT count(DISTINCT t.node_ip) from node_table t WHERE t.system_id="
 							+ getSystemID() + " AND t.node_group_id= " + nodegroupTable.getGroupId()
-							+ ")allNode";
+							+ " and node_state=0 )allNode";
 				}
 				
 				List countList = commonService.executeSQL(sql);
@@ -411,10 +411,13 @@ public class TopoShowAction extends BaseAction
 							String sql = null;
 							if(this.getAdminMark()){
 								sql = "select count(diw.seq_Id) from detection_info_new diw where diw.DETECTIONED_STATE<>1 AND diw.police_emergent=0  and diw.seq_id = "
-										+ seqId;
+										+ seqId
+										+" and diw.VALID=1 "
+										+ " and diw.DETECTION_SET_INFO_ID in (select dst.ID from DETECTION_SET_INFO dst where dst.DETECTION_SET_STATE=1 ) ";
 							}else{
 								sql = "select count(diw.seq_Id) from detection_info_new diw where diw.DETECTIONED_STATE<>1 AND diw.police_emergent=0  and diw.seq_id = "
 										+ seqId
+										+" and diw.VALID=1 "
 										+ " and diw.DETECTION_SET_INFO_ID in (select dst.ID from DETECTION_SET_INFO dst where dst.DETECTION_SET_STATE=1 "
 										+ " and ("
 										+ "dst.VIEW_LEVEL=4 "//无限制
--- a/src/nis/nms/web/actions/serverManager/ServerManagerAction.java
+++ b/src/nis/nms/web/actions/serverManager/ServerManagerAction.java
@@ -648,13 +648,13 @@ public class ServerManagerAction extends BaseAction {
 						//将更新操作写到操作日志中
 						this.addDBOperationRpt(commonService, "Server_Table", "UPDATE", st.getId());
 						ServerTable serverTable = (ServerTable) commonService.get(ServerTable.class, ids[i]);
-						commonService.commit();
+						
 						//将DC变更发送到DC
 						this.sendDataControllerReset(ids[i], serverTable.getServerIp(), commonService);
 					}	
 				}
 			}
-			
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
@@ -682,13 +682,13 @@ public class ServerManagerAction extends BaseAction {
 						//将更新操作写到操作日志中
 						this.addDBOperationRpt(commonService, "Server_Table", "UPDATE", st.getId());
 						ServerTable serverTable = (ServerTable) commonService.get(ServerTable.class, ids[i]);
-						commonService.commit();
+						
 						//将DC变更发送到DC
 						this.sendDataControllerReset(ids[i], serverTable.getServerIp(), commonService);
 					}	
 				}
 			}
-			
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
@@ -797,9 +797,10 @@ public class ServerManagerAction extends BaseAction {
 					}
 				}
 			}
-			commonService.commit();
+			
 			//将DC变更发送到DC
 			this.sendDataControllerReset(serverTable.getId(), serverTable.getServerIp(), commonService);
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			e.printStackTrace();
--- a/src/nis/nms/web/actions/sysManage/DataDictionaryAction.java
+++ b/src/nis/nms/web/actions/sysManage/DataDictionaryAction.java
@@ -328,7 +328,7 @@ public class DataDictionaryAction extends BaseAction {
 				String sql="update xt_mk_jbxx set zxbz=? where id=?";
 				this.commonService.updateBySql(sql, deptflag,Constants.DEPT_MK_ID);
 			}
-			commonService.commit();
+			
 			//改变是否显示主动告警的启用状态时，需要和各个nc通信：SHOW_AUTO_ALARM_FLAG
 			if(nbt.getTypeIdentity().toLowerCase().equals(Constants.SHOW_AUTO_ALARM_FLAG.toLowerCase())
 					&& typeTable.getTypeState()!=oldState) {
@@ -339,7 +339,7 @@ public class DataDictionaryAction extends BaseAction {
 			}
 			
 			outHtmlString("<script type=\"text/javascript\">alert('i18n_DataDictionaryAction.queryDictionary.success_n81i');this.location='dataDictionary.do?action=query&pageNo="+pageNo+"&pageSize="+pageSize+"'</script>");
-			
+			commonService.commit();
 		} catch (Exception e) {
 			commonService.rollback();
 			logger.error("Update failed",e);