Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
===================================================================
diff -u -r26537 -r26631
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js (.../deviceInterfaceForm.js) (revision 26537)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js (.../deviceInterfaceForm.js) (revision 26631)
@@ -238,7 +238,8 @@
waitMsg : '正在加载数据,请稍候',
success : function(form, action) {
top.Ext.getCmp("oldDeviceId").setValue(action.result.data.deviceId);
- if(action.result.data.deviceBrand == XINHUA && action.result.data.interfaceType == ''){
+ if((action.result.data.deviceBrand == XINHUA || action.result.data.deviceBrand == GETINGE)
+ && action.result.data.interfaceType == ''){
top.Ext.getCmp("interfaceType").setValue(SHAREFOLDER);
}
onDeviceBrandChange();
@@ -308,6 +309,12 @@
})
showCmt('deviceModelWrap','deviceModel',true,xinhuaModelComboStore);
showCmt('interfaceTypeWrap','interfaceType',true,interfaceTypeComboStore);
+ }else if(deviceBrand == GETINGE){
+ var interfaceTypeComboStore = new Ext.data.SimpleStore({
+ fields : [ 'value' ],
+ data : [[SHAREFOLDER],[FTP]]
+ })
+ showCmt('interfaceTypeWrap','interfaceType',true,interfaceTypeComboStore);
}else{
// top.Ext.getCmp('deviceIdWrap').hide();
// top.Ext.getCmp('portWrap').hide();
Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
===================================================================
diff -u -r26620 -r26631
--- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 26620)
+++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 26631)
@@ -462,6 +462,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1627,7 +1658,7 @@
- 0 0/5 * * * ?
+ 0 0/1 * * * ?