Index: ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js =================================================================== diff -u -r38635 -r38643 --- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js (.../index.js) (revision 38635) +++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js (.../index.js) (revision 38643) @@ -11,6 +11,16 @@ var showForeignTousseSummarySpecifyPeriod = false; var tousseSummaryChartType = ''; var foreignTousseSummaryChartType = ''; +var refreshRateByOnlineUserAmount = 0; +var refreshRateByUrgentAmount = 0; +var refreshRateByOperationReservationSummary = 0; +var refreshRateByDeviceUsageSummary = 0; +var refreshRateByTousseSummary = 0; +var refreshRateByForeignTousseSummary = 0; +var refreshRateByWorkloadSummary = 0; +var refreshRateByUrgentGoodsSummary = 0; +var refreshRateByUrgentGoodsDetails = 0; +var refreshRateByForeignTousseSummarySpecifyPeriod = 0; //当前时间 var m = 0; @@ -544,13 +554,22 @@ var type = realTimeDashboardsObj.type || 1; var headers = realTimeDashboardsObj.headers || []; var chartType = realTimeDashboardsObj.chartType; + var refreshRate = 0; + if (dashboardsRefreshFrequency && dashboardsRefreshFrequency > 0) { + refreshRate = dashboardsRefreshFrequency * 60 * 1000; + } + if (realTimeDashboardsObj.refreshRate && realTimeDashboardsObj.refreshRate > 0) { + refreshRate = realTimeDashboardsObj.refreshRate * 60 * 1000; + } var name = realTimeDashboardsObj.dataSources + 'Box'; - title = title || ''; + if (name == 'urgentAmountBox') { showUrgentAmount = true; + refreshRateByUrgentAmount = refreshRate; return urgentAmountBox(title); } else if (name == 'operationReservationSummaryBox') { showOperationReservationSummary = true; + refreshRateByOperationReservationSummary = refreshRate; if (height > 25) { return operationReservationSummaryBox(title, 1); } else { @@ -561,41 +580,49 @@ if (headers.length > 0) { deviceUsageSummaryHeaders = headers } + refreshRateByDeviceUsageSummary = refreshRate; return deviceUsageSummaryBox(title); } else if (name == 'tousseSummaryBox') { showTousseSummary = true; if (headers.length > 0) { tousseSummarySeriesData = headers } + refreshRateByTousseSummary = refreshRate; tousseSummaryChartType = chartType || 'bar'; return tousseSummaryBox(title); } else if (name == 'foreignTousseSummaryBox') { showForeignTousseSummary = true; + refreshRateByForeignTousseSummary = refreshRate; foreignTousseSummaryChartType = chartType || 'bar'; return foreignTousseSummaryBox(title); } else if (name == 'nowTimeBox') { showNowTime = true; return nowTimeBox(title); } else if (name == 'onlineUserAmountBox') { showOnlineUserAmount = true; + refreshRateByOnlineUserAmount = refreshRate; return onlineUserAmountBox(title, type); } else if (name == 'workloadSummaryBox') { showWorkloadSummary = true; + refreshRateByWorkloadSummary = refreshRate; return workloadSummaryBox(title); } else if (name == 'urgentGoodsSummaryBox') { showUrgentGoodsSummary = true; if (headers.length > 0) { urgentGoodsSummaryHeaders = headers } + refreshRateByUrgentGoodsSummary = refreshRate; return urgentGoodsSummaryBox(title); } else if (name == 'urgentGoodsDetailsBox') { showUrgentGoodsDetails = true; if (headers.length > 0) { urgentGoodsDetailsHeaders = headers } + refreshRateByUrgentGoodsDetails = refreshRate; return urgentGoodsDetailsBox(title); } else if (name == 'foreignTousseSummary_SpecifyPeriodBox') { showForeignTousseSummarySpecifyPeriod = true; + refreshRateByForeignTousseSummarySpecifyPeriod = refreshRate; foreignTousseSummaryChartType = chartType || 'bar'; return foreignTousseSummarySpecifyPeriodBox(title); } @@ -639,12 +666,14 @@ var title = realTimeDashboardsConfig.columnLeft.items[i].title; var height = realTimeDashboardsConfig.columnLeft.items[i].height; var type = realTimeDashboardsConfig.columnLeft.items[i].type; + var refreshRate = realTimeDashboardsConfig.columnLeft.items[i].refreshRate; var headers = realTimeDashboardsConfig.columnLeft.items[i].headers || []; var realTimeDashboardsObj = { dataSources: dataSources, title: title, height: height, type: type, + refreshRate: refreshRate, headers: headers } if (height > 0) { @@ -670,12 +699,14 @@ var title = realTimeDashboardsConfig.columnCenter.items[i].title; var height = realTimeDashboardsConfig.columnCenter.items[i].height; var type = realTimeDashboardsConfig.columnCenter.items[i].type; + var refreshRate = realTimeDashboardsConfig.columnCenter.items[i].refreshRate; var headers = realTimeDashboardsConfig.columnCenter.items[i].headers || []; var realTimeDashboardsObj = { dataSources: dataSources, title: title, height: height, type: type, + refreshRate: refreshRate, headers: headers } if (height > 0) { @@ -701,12 +732,14 @@ var title = realTimeDashboardsConfig.columnRight.items[i].title; var height = realTimeDashboardsConfig.columnRight.items[i].height; var type = realTimeDashboardsConfig.columnRight.items[i].type; + var refreshRate = realTimeDashboardsConfig.columnRight.items[i].refreshRate; var headers = realTimeDashboardsConfig.columnRight.items[i].headers || []; var realTimeDashboardsObj = { dataSources: dataSources, title: title, height: height, type: type, + refreshRate: refreshRate, headers: headers } if (height > 0) { @@ -730,64 +763,82 @@ //在线人数 if (showOnlineUserAmount) { getFirstSupplyRoomConfigOnlineUserDate(); + if (refreshRateByOnlineUserAmount > 0) { + setInterval(getFirstSupplyRoomConfigOnlineUserDate, refreshRateByOnlineUserAmount); + } } //加急数量 if (showUrgentAmount) { getUrgentAmountDate(); + if (refreshRateByUrgentAmount > 0) { + setInterval(getUrgentAmountDate, refreshRateByUrgentAmount); + } } //器械包汇总(今日器械包处理量) if (showTousseSummary) { getTousseSummaryData(); + if (refreshRateByTousseSummary > 0) { + setInterval(getTousseSummaryData, refreshRateByTousseSummary); + } } //外来器械包汇总 if (showForeignTousseSummary) { - setTimeout(function () { - getForeignTousseSummaryData(); - }, 1000); + getForeignTousseSummaryData(); + if (refreshRateByForeignTousseSummary > 0) { + setInterval(getForeignTousseSummaryData, refreshRateByForeignTousseSummary); + } } //工作量汇总(今日工作量统计) if (showWorkloadSummary) { - setTimeout(function () { - getWorkloadSummaryData(); - }, 1100); + getWorkloadSummaryData(); + if (refreshRateByWorkloadSummary > 0) { + setInterval(getWorkloadSummaryData, refreshRateByWorkloadSummary); + } } //设备使用情况汇总 if (showDeviceUsageSummary) { getDeviceUsageSummaryData(); + if (refreshRateByDeviceUsageSummary > 0) { + setInterval(getDeviceUsageSummaryData, refreshRateByDeviceUsageSummary); + } } //手术预约汇总(今日手术预约信息) if (showOperationReservationSummary) { getOperationReservation(); + if (refreshRateByOperationReservationSummary > 0) { + setInterval(getDeviceUsageSummaryData, refreshRateByOperationReservationSummary); + } } //加急物品汇总 if (showUrgentGoodsSummary) { - setTimeout(function () { - getUrgentGoodsSummarData(); - }, 1200); + getUrgentGoodsSummarData(); + if (refreshRateByUrgentGoodsSummary > 0) { + setInterval(getUrgentGoodsSummarData, refreshRateByUrgentGoodsSummary); + } } //加急物品明细追溯模式 if (showUrgentGoodsDetails) { - setTimeout(function () { - getUrgentGoodsDetailsData(); - }, 1300); + getUrgentGoodsDetailsData(); + if (refreshRateByUrgentGoodsDetails > 0) { + setInterval(getUrgentGoodsDetailsData, refreshRateByUrgentGoodsDetails); + } } //外来器械包汇总(仅查询指定周末申请单模式) if (showForeignTousseSummarySpecifyPeriod) { - setTimeout(function () { - getForeignTousseSummarySpecifyPeriodData(); - }, 1400); + getForeignTousseSummarySpecifyPeriodData(); + if (refreshRateByForeignTousseSummarySpecifyPeriod > 0) { + setInterval(getForeignTousseSummarySpecifyPeriodData, refreshRateByForeignTousseSummarySpecifyPeriod); + } } - - //$(".loading").fadeOut(); })(); //加急数量模块 @@ -981,16 +1032,6 @@ return html; } -function initToTime() { - var time = 1 * 60 * 1000; - if (dashboardsRefreshFrequency && dashboardsRefreshFrequency > 0) { - time = dashboardsRefreshFrequency * 60 * 1000; - } - setTimeout(function () { - initToTime(); - }, time); -} - function fillZero(str) { var realNum; if (str < 10) {