Index: ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.js
===================================================================
diff -u -r13269 -r13557
--- ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.js	(.../modifyExitLoginTime.js)	(revision 13269)
+++ ssts-web/src/main/webapp/personalSetting/modifyExitLoginTime.js	(.../modifyExitLoginTime.js)	(revision 13557)
@@ -7,39 +7,53 @@
 		data : [ ['10'],['60'],['120'],['180'],['240'],['300'],['360'],['480'],['600'],['720'],['840'] ]
 	});
     
+    var takePhotoStore = new Ext.data.SimpleStore( {
+		fields : ['value','fontText'],
+		data : [['0','否'], ['1','是']]
+	});
+    
     var formObj = new Ext.FormPanel({
         labelAlign: 'left',
         frame:true,
         labelSeparator:'：',
         title: 'PDA设置',
         bodyStyle:'padding:5px 5px 0px 25px',
         width: 400,
-        labelWidth:80,
+        labelWidth:180,
         items: [{
-			xtype : "fieldset",
-			title : '登录超时时间设置',
-			layout:'column',
-			autoHeight : true,
-			items : [{
-				layout : 'form',
-				columnWidth :  0.6,
-				labelWidth : 100,
-				items : [{	
-					xtype : 'combo',
-					fieldLabel : '超时时间(秒)',
-					id : 'exitLoginTime',
-					name : 'exitLoginTime',
-					valueField : 'value',
-					displayField : 'value',
-					store:timeStore,
-					regex: /^\d+$/,
-					regexText:'只能输入数字',
-					mode:'local',
-					width : 180,
-					editable:true,
-					triggerAction : 'all',
-					anchor : '100%'
-				}]
+			layout : 'form',
+			//columnWidth :  0.6,
+			labelWidth : 170,
+			items : [{	
+				xtype : 'combo',
+				fieldLabel : '超时时间(秒)',
+				id : 'exitLoginTime',
+				name : 'exitLoginTime',
+				valueField : 'value',
+				displayField : 'value',
+				store:timeStore,
+				regex: /^\d+$/,
+				regexText:'只能输入数字',
+				mode:'local',
+				width : 180,
+				editable:true,
+				triggerAction : 'all',
+				anchor : '100%'
+			},{
+				xtype : 'combo',
+				fieldLabel : '灭菌完成和失败是否上传图片',
+				id : 'takePhoto',
+				name : 'takePhoto',
+				width : 180,
+				valueField : 'value',
+				displayField : 'fontText',
+				store : takePhotoStore,
+				forceSelection : true,
+				mode : 'local',
+				editable:false,
+				triggerAction : 'all',
+				anchor : '100%',
+				readOnly : true
 			}]
 		}],
 
@@ -63,6 +77,7 @@
 			success : function(response, options) {
 				var obj = Ext.decode(response.responseText);
 				Ext.getCmp('exitLoginTime').setRawValue(obj.exitLoginTime);
+				Ext.getCmp('takePhoto').setValue(obj.takePhoto);
 			},
 			failure : function(response, options) {
 				showResult(response.responseText);
@@ -72,9 +87,11 @@
     
     function save(){
     	var exitLoginTime = Ext.getCmp("exitLoginTime").getRawValue();
+    	var takePhoto = Ext.getCmp("takePhoto").getValue();
     	
     	formObj.form.submit({
-            url:WWWROOT+'/disinfectSystem/mobileClientSettingAction!save.do?exitLoginTime=' + exitLoginTime,
+            url:WWWROOT+'/disinfectSystem/mobileClientSettingAction!save.do?exitLoginTime=' + exitLoginTime 
+            + '&takePhoto='+takePhoto,
             method:'POST',
             waitMsg:'正在更新，请稍候',
             waitTitle:'更新设置',