Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java =================================================================== diff -u -r12332 -r13970 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java (.../QualityMonitoringConfigAction.java) (revision 12332) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java (.../QualityMonitoringConfigAction.java) (revision 13970) @@ -203,6 +203,15 @@ String jsonStr = ""; qualityMonitoringItemsList = qualityMonitoringConfigManager .getQualityMonitoringConfigByOrgcode(type, orgcode,selectAll); + QualityMonitoringConfig qm = new QualityMonitoringConfig(); + qm.setName("无"); + if(qualityMonitoringItemsList == null) + { + qualityMonitoringItemsList = new ArrayList(); + qualityMonitoringItemsList.add(qm); + }else{ + qualityMonitoringItemsList.add(qm); + } if (qualityMonitoringItemsList != null) { for (QualityMonitoringConfig qualityMonitoringItems : qualityMonitoringItemsList) { jsonStr += "[ '" + qualityMonitoringItems.getName() + "'],"; Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js =================================================================== diff -u -r13863 -r13970 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js (.../qualitymonitoringForm.js) (revision 13863) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js (.../qualitymonitoringForm.js) (revision 13970) @@ -241,6 +241,10 @@ } function addQualityMonitoringItem(configName){ + // 质量监测添加‘无’这个项. + if(configName == '无'){ + return ; + } Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/qualityMonitoringConfigAction!getQualityMonitoringConfigByName.do', params : {name : configName},