bug修复

doc/个人安全绩效等功能.txt

@@ -0,0 +1,3 @@
+1.事故隐患界面增加无图片导出excel（支持一次性导出1000条）
+2.增加应急预案的上传
+3.安全绩效下的个人安全绩效统计数字可点击链接查看

safesite/templates/drill.html

@@ -67,6 +67,7 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("drill")
         }
         $('#yltable').datagrid({ url: 'ylhandle', queryParams: queryParams });
         $("#searchylff").form('clear');

safesite/templates/examtest.html

@@ -45,6 +45,8 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("examtest")
+            
         }
         $('#kstable').datagrid({url:'api/examtest',queryParams:queryParams});
     })

safesite/templates/index.html

@@ -193,13 +193,18 @@
                 onSelect: function (title) {
                     var allTabs = $('#tt').tabs('tabs');
                     var selectTab = $('#tt').tabs('getSelected');
+                    var ecludetitles = ['个人安全数据']
+                    var stitle = selectTab.panel('options').title
+                    // if(ecludetitles.indexOf(stitle)!=-1){
+                        
+                    // }else{
+                    //     selectTab.panel('refresh')
+                    // }
                     for (var i = 0; i < allTabs.length; i++) {
-                        if (allTabs[i]) {
+                        if(ecludetitles.indexOf(allTabs[i].panel('options').title)!=-1){
-                            var ecludetitles = ['个人安全数据']
+                            break
-                            if(ecludetitles.indexOf(allTabs[i].panel('options').title)!=-1){
+                        }
-                                return
+                            if (allTabs[i].panel('options').title != stitle) {
-                            }
-                            if (allTabs[i].panel('options').title != selectTab.panel('options').title) {
                                 $('#tt').tabs('update', {
                                     tab: allTabs[i],
                                     options: {
@@ -207,7 +212,6 @@
                                     }
                                 });
                             }
-                        }
 
                     }
                     //selectTab.panel('refresh')

safesite/templates/inspect.html

@@ -71,6 +71,7 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("inspect")
         }
         $('#xjtable').datagrid({ url: 'api/inspect', queryParams: queryParams });
         $("#searchxjff").form('clear');

safesite/templates/inspectitem.html

@@ -40,6 +40,7 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("inspectitem")
         }
         $('#ycitemtable').datagrid({url:'api/inspectitem',queryParams:queryParams});
         $("#searchxjff").form('clear');

safesite/templates/miss.html

@@ -55,6 +55,7 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("miss")
         }
         $('#wstable').datagrid({url:'api/miss',queryParams:queryParams});
         $("#searchwsff").form('clear');

safesite/templates/operation.html

@@ -53,6 +53,7 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("operation")
         }
         $('#zytable').datagrid({url:'api/operation',queryParams:queryParams});
         $.get('getdickey?dicclass=33&a=combobox',function(data){

safesite/templates/personalp.html

@@ -283,8 +283,8 @@
         if ($('#tt').tabs('exists', title)) {
             sessionStorage.setItem(k1, JSON.stringify(myquerydata))
             $('#tt').tabs('select', title);
-            var tab = $('#tt').tabs('getSelected');
+            // var tab = $('#tt').tabs('getSelected');
-                    tab.panel('refresh');
+            //         tab.panel('refresh');
         } else {
             $('#tt').tabs('add', {
                 title: title,

safesite/templates/safecert.html

@@ -34,6 +34,7 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("safecert")
         }
         $('#aqzstable').datagrid({url:'api/safecert',queryParams:queryParams});
     })

safesite/templates/socert.html

@@ -46,6 +46,7 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("socert")
         }
         $('#tzzstable').datagrid({url:'api/socert',queryParams:queryParams});
     })

safesite/templates/suggest.html

@@ -57,6 +57,7 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("suggest")
         }
         $('#jytable').datagrid({url:'api/suggest',queryParams:queryParams});
         $("#searchjyff").form('clear');

safesite/templates/train.html

@@ -65,6 +65,7 @@
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("train")
         }
         $('#pxtable').datagrid({ url: 'pxhandle', queryParams: queryParams });
         $("#searchpxff").form('clear');

safesite/templates/trouble.html

@@ -86,11 +86,11 @@
     $(function () {
         // var option = $('#main').attr('value')
         var searchStr = sessionStorage.getItem("trouble");
-        
         var queryParams = {'a':'listall'}
         if(searchStr){
             var lls = JSON.parse(searchStr)
             queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("trouble")
         }
         $('#yhtable').datagrid({ url: 'troublehandle', queryParams: queryParams });
         $("#searchyhff").form('clear');