Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r40581 -r40749
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 40581)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 40749)
@@ -621,6 +621,15 @@
$Id('parm_s_queryCurDay').value = "today";
}
+ //GDSFYBJY-21:刷新
+ tbar.push('-', {
+ text: '刷新',
+ iconCls: 'btn_ext_refresh1',
+ handler: function () {
+ grid.dwrReload();
+ }
+ })
+
grid = new Ext.ux.ForgonPageGrid({
title: '清洗消毒记录',
tbar: tbar,
@@ -789,4 +798,7 @@
//SZYK-34:针对设备运行结束后提醒功能的改进
showPromptUploadDeviceParameterPicture('washAndDisinfect');
+
+ //GDSFYBJY-21:页面自动刷新周期
+ pageAutoRefreshCycleUtil('washAndDisinfectView', grid);
});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
===================================================================
diff -u -r40581 -r40749
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 40581)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 40749)
@@ -29,6 +29,7 @@
+
Index: ssts-web/src/main/webapp/js/commonUtils.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/js/commonUtils.js (revision 0)
+++ ssts-web/src/main/webapp/js/commonUtils.js (revision 40749)
@@ -0,0 +1,28 @@
+//GDSFYBJY-21:页面自动刷新周期
+function pageAutoRefreshCycleUtil(functionalModule, grid) {
+ var pageAutoRefreshCycle = sstsConfig.pageAutoRefreshCycle || [];
+ var time = 0;
+ if (pageAutoRefreshCycle.length > 0) {
+ for (var k = 0; k < pageAutoRefreshCycle.length; k++) {
+ if (pageAutoRefreshCycle[k].functionalModule == functionalModule) {
+ time = pageAutoRefreshCycle[k].time;
+ break;
+ }
+ }
+ }
+ if (time > 0) {
+ setInterval(function () {
+ var text = top.document.getElementById('card_box').getElementsByClassName('tabs')[0].getElementsByClassName('tabs-selected')[0].getElementsByTagName('span')[0].innerText;
+ if (text == '高级视图') {
+ var href = top.document.getElementById('iframe_enterpriseView').contentWindow.document.getElementById('mainFrame').contentWindow.location.href;
+ if (href !== '' && href.indexOf(functionalModule) >= 0) {
+ grid.dwrReload();
+ }
+ } else if (text == '外来器械申请' && functionalModule == 'foreignTousseApplicationView') {
+ grid.dwrReload();
+ } else if (text == '清洗消毒' && functionalModule == 'washAndDisinfectView') {
+ grid.dwrReload();
+ }
+ }, time * 1000)
+ }
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r40578 -r40749
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 40578)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 40749)
@@ -197,6 +197,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r40679 -r40749
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 40679)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 40749)
@@ -1187,6 +1187,15 @@
items: tbarItems
});
+ //GDSFYBJY-21:刷新
+ tbar.push('-', {
+ text: '刷新',
+ iconCls: 'btn_ext_refresh1',
+ handler: function () {
+ grid.dwrReload();
+ }
+ })
+
grid = new Ext.ux.ForgonPageGrid({
title: entityName + '列表',
tbar: tbar,
@@ -1326,6 +1335,9 @@
items: grid
}]
});
+
+ //GDSFYBJY-21:页面自动刷新周期
+ pageAutoRefreshCycleUtil('foreignTousseApplicationView', grid);
});
//KSDQDYRMYY-24:添加审核功能