Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r34481 -r34487
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34481)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34487)
@@ -3,11 +3,6 @@
 var wwidth = window.screen.width;
 var openReturnValue = "";
 var webCtxRoot = '';
-//空闲一段时间后没任何操作，强制用户退出系统
-var pageTimer = [];  // 计时器数组
-var min = 60 * 1000;
-var sessionTimeout = 480;
-var interval = 1 * min;
 
 
 /**
@@ -302,11 +297,6 @@
 function keyOnclick(e) {
     var keyNum;
     try {
-        var isStartTimeOut = sessionStorage.getItem('isStartTimeOut');
-        if (isStartTimeOut == true || isStartTimeOut == 'true') {
-            clearInterval(pageTimer[0]);
-            sessionStorage.setItem('timer', sessionTimeout * min);
-        }
         if (bPageModified == true) {
             return;
         }
@@ -319,18 +309,9 @@
         if (keyNum != 13 && keyNum != 9) {
             bPageModified = true;
         }
-
     } catch (e) { }
 }
 
-function keyOnMove() {
-    var isStartTimeOut = sessionStorage.getItem('isStartTimeOut');
-    if (isStartTimeOut == true || isStartTimeOut == 'true') {
-        clearInterval(pageTimer[0]);
-        sessionStorage.setItem('timer', sessionTimeout * min);
-    }
-}
-
 function closeSelf() {
     window.close();
 }
@@ -1368,10 +1349,8 @@
 */
 document.onkeydown = keyOnclick; // IE
 
-document.onmousemove = keyOnMove;
 
 
-
 //屏蔽鼠标右键结束
 
 
@@ -4833,7 +4812,7 @@
         modal: true,
         resizable: false,
         buttonAlign: 'center',
-        id: 'wangEditorWin',
+        id:'wangEditorWin',
         items: [{
             xtype: "panel",
             html: "<iframe src='" + url + "' id='wangEditorIframe' scrolling='yes' frameborder=0 width=985 height=600></iframe>"
@@ -4876,7 +4855,7 @@
 }
 
 //预览富文本内容
-function previewWangEditor(title, id) {
+function previewWangEditor(title,id) {
     var url = WWWROOT + '/common/previewWangEditor.jsp?id=' + id;
     openModalWindowForExt(url, {}, title + '配包注意事项', 1000, 550);
 }
@@ -4910,7 +4889,7 @@
             hidden: false,
             handler: function () {
                 var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
-                sessionStorage.setItem('hiddenNote', hiddenNote)
+                sessionStorage.setItem('hiddenNote',hiddenNote)
                 previewWangEditor(title);
             }
         }, {
@@ -4920,7 +4899,7 @@
                 var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
                 Ext.Ajax.request({
                     url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!saveTousseDefinitionNote.do',
-                    params: {
+                    params: { 
                         id: id,
                         note: hiddenNote
                     },
@@ -4941,7 +4920,7 @@
                 var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
                 Ext.Ajax.request({
                     url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!saveTousseDefinitionNote.do',
-                    params: {
+                    params: { 
                         id: id,
                         note: hiddenNote
                     },
@@ -4965,43 +4944,22 @@
         }]
     })
     win.show();
-    if (id) {
+    if(id){
         Ext.Ajax.request({
-            url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinitionNote.do',
-            params: {
-                id: id
+            url :  WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinitionNote.do',
+            params: { 
+                id:id
             },
             success: function (response, options) {
                 var result = Ext.decode(response.responseText);
                 if (result.success) {
                     var text;
-                    if (result.data && result.data.note) {
+                    if(result.data && result.data.note){
                         text = result.data.note;
                     }
                     top.Ext.getCmp('hiddenNote').setValue(text);
                 }
             }
         });
     }
-}
-
-function setIntervalFunction(sstsConfig) {
-    sessionStorage.setItem('timer', sessionTimeout * min);
-    if (sstsConfig && sstsConfig.loginSecurirtyConfig && sstsConfig.loginSecurirtyConfig.sessionTimeout) {
-        sessionTimeout = parseInt(sstsConfig.loginSecurirtyConfig.sessionTimeout);
-        interval = sessionTimeout * min / 10;
-    }
-    setTimeoutFun();
-}
-
-function setTimeoutFun() {
-    pageTimer[0] = setInterval(function () {
-        var time = sessionStorage.getItem('timer');
-        sessionStorage.setItem('timer', time - interval);
-        sessionStorage.setItem('isStartTimeOut', true);
-        if (sessionStorage.getItem('timer') <= 0) {
-            sessionStorage.removeItem('timer');
-            logout("${ctx}");
-        }
-    }, interval)
 }
\ No newline at end of file