Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r40971 -r41104 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 40971) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 41104) @@ -809,6 +809,7 @@ {hidden :SSTS_SterilizationRecordInfoReport,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationEffectMonitorReport,text:"灭菌效果监测结果报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationEffectMonitorView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableCSSDNursingQualityControlReport,text:"护理质量质控指标报表",href:WWWROOT+'/disinfectsystem/reportforms/qualityControlReportView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enableCSSDNursingQualityControlSummaryReport,text:"护理质量质控汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/cssdNursingQualityControlSummaryReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashAndDisinfectRecordInfoReport,text:"清洗情况报表",href:WWWROOT+'/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableTousseOverloadReport,text:"器械包实际负载组合统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseOverLoad.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableTousseMorrowSend,text:"器械包次日下送率统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseMorrowSend.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/menu/menuconfigure.js =================================================================== diff -u -r40972 -r41104 --- ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 40972) +++ ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 41104) @@ -624,7 +624,8 @@ {hidden :!sstsConfig.enableTousseOverloadReport,text:"器械包实际负载组合统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseOverLoad.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableTousseMorrowSend,text:"器械包次日下送率统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseMorrowSend.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableCSSDNursingQualityControlReport,text:"护理质量质控指标报表",href:WWWROOT+'/disinfectsystem/reportforms/qualityControlReportView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enableCSSDNursingQualityControlSummaryReport,text:"护理质量质控汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/cssdNursingQualityControlSummaryReportView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.showSterilizerQualityReport,text:"灭菌物品质量监测统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizerQuality.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.showUnqualifiedPretreatmentReport,text:"预处理不合格报表",href:WWWROOT+'/disinfectsystem/reportforms/unqualifiedPretreatmentReport.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationOmitReport,text:'灭菌遗漏检查表',href:WWWROOT+'/disinfectsystem/reportforms/sterilizationOmitReport.jsp',hrefTarget:linkTarget,leaf:true} Index: ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js =================================================================== diff -u -r40972 -r41104 --- ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js (.../config.js) (revision 40972) +++ ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js (.../config.js) (revision 41104) @@ -297,6 +297,8 @@ enableCSSDNursingQualityControlReport:true, //明细核算月报表增加可扩展查询项 enableExtendedQueryItemsOfDetailedAccountingMonthlyReport:["sterilizationProgram"], + //启用消毒供应中心护理质量质控汇总报表 + enableCSSDNursingQualityControlSummaryReport:true, //提取诊疗号的正则表达式 regExpForExtractingClinicNumber:"\"PatNO\":\"(.*?)\"}", //供应室数据隔离模块 Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/cssdNursingQualityControlSummaryReportView.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/reportforms/cssdNursingQualityControlSummaryReportView.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/cssdNursingQualityControlSummaryReportView.js (revision 41104) @@ -0,0 +1,666 @@ + +var myMask; +var formWindow; +var titleColumnArr = ['一级指标', '二级指标', '目标值', '去年同期', '上季度', '本季度', '浮动']; + +function setSecondaryIndicatorOfCSSDNQCS() { + var qualityControlIndicatorTypeControllerStore = new top.Ext.data.Store({ + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/disinfectSystem/baseData/qualityControlIndicatorTypeController/getSecondaryIndicatorOfCSSDNQCSList.mhtml', + method: 'POST' + }), + reader: new Ext.data.JsonReader({ + totalProperty: 'totalCount', + root: 'data' + }, [ + { name: 'id', mapping: 'id' }, + { name: 'name', mapping: 'name' }, + { name: 'qualityControlIndicatorTypeId', mapping: 'qualityControlIndicatorTypeId' }, + { name: 'qualityControlIndicatorTypeName', mapping: 'qualityControlIndicatorTypeName' } + ]) + }); + qualityControlIndicatorTypeControllerStore.load(); + + //质检指标 + var qualityControlIndicatorTypeStore = new Ext.data.Store({ + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/disinfectSystem/baseData/qualityControlIndicatorTypeController/loadQualityControlIndicatorTypeList.mhtml', + method: 'POST' + }), + reader: new Ext.data.JsonReader({ + root: 'data.list', + totalProperty: 'data.count' + }, [ + { name: 'id' }, + { name: 'name' } + ]) + }); + + var cm = new top.Ext.grid.ColumnModel([{ + header: '二级指标', + width: 120, + dataIndex: 'name' + }, { + header: '关联质检指标类', + width: 120, + dataIndex: 'qualityControlIndicatorTypeName', + editor: new top.Ext.form.ComboBox({ + xtype: 'combo', + valueField: 'name', + displayField: 'name', + matchFieldWidth: false, + store: qualityControlIndicatorTypeStore, + forceSelection: false, + lazyInit: true, + triggerAction: 'all', + hideTrigger: false, + separator: ';', + typeAhead: false, + editable: false, + allowBlank: true, + anchor: '95%', + listeners: { + select: function (combo, record, index) { + var records = top.Ext.getCmp('qualityControlIndicatorTypeControllerGrid').getSelectionModel().getSelections(); + if (records[0]) { + records[0].set('qualityControlIndicatorTypeId', record.data.id) + } + } + } + }) + }]); + + var formObj = new top.Ext.FormPanel({ + frame: true, + labelAlign: 'right', + labelSeparator: '：', + bodyStyle: 'padding:5px 5px 0px 5px', + autoWidth: true, + autoHeight: true, + autoScroll: true, + items: [{ + layout: 'column', + items: [{ + columnWidth: 1, + layout: 'form', + items: [ + new top.Ext.grid.EditorGridPanel({ + id: 'qualityControlIndicatorTypeControllerGrid', + store: qualityControlIndicatorTypeControllerStore, + cm: cm, + height: 240, + isCheckboxSelectionModel: true, + frame: false, + viewConfig: { + forceFit: true + }, + selModel: new top.Ext.grid.RowSelectionModel({ + singleSelect: false + }), + bodyStyle: 'border:1px solid #afd7af', + anchor: '100%' + }) + ] + }] + }], + buttons: [{ + id: 'saveBtn', + text: '确定', + handler: function () { + var arr = []; + for (var i = 0; i < qualityControlIndicatorTypeControllerStore.getCount(); i++) { + var record = qualityControlIndicatorTypeControllerStore.getAt(i); + if (record.data.qualityControlIndicatorTypeId !== '') { + arr.push({ + id: record.data.id, + name: record.data.name, + qualityControlIndicatorTypeId: record.data.qualityControlIndicatorTypeId + }) + } + } + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/baseData/qualityControlIndicatorTypeController/saveSecondaryIndicatorOfCSSDNQCS.mhtml', + async: false, + params: { + saveDtos: JSON.stringify(arr) + }, + success: function (response) { + var result = Ext.decode(response.responseText); + showResult(result.message); + }, + failure: function (response, options) { + showResult(response.responseText); + } + }); + } + }, { + id: 'cancleBtn', + text: '取消', + handler: function () { + formWindow.close(); + } + }] + }); + + formWindow = new top.Ext.Window({ + layout: 'fit', + title: '二级指标关联设置', + width: 620, + modal: true, + autoHeight: true, + border: false, + plain: true, + items: [formObj] + }); + formWindow.show(); +} + +function getTableHtml(result) { + var html = "

" + result.parametMap.title + "

"; + html += "

质量指标统计同比、环比情况表：

"; + html += ""; + html += ""; + html += ''; + for (var i = 0; i < titleColumnArr.length; i++) { + html += getHeadTd(titleColumnArr[i], 100, 1, 1); + } + html += ''; + html += ""; + html += ""; + html += getTableBodyHtml(result); + html += ""; + html += "
"; + return html; +} + +//获取表内容的html +function getTableBodyHtml(result) { + var lastQuarterWash = result.parametMap.lastQuarterWash || []; + var thisQuarterWash = result.parametMap.thisQuarterWash || []; + var thisQuarterPack = result.parametMap.thisQuarterPack || []; + var html = ''; + var data = result.data || []; + var seriesData1 = []; + var seriesData2 = []; + data.forEach(function (item, index) { + html += ''; + if (index == 0) { + html += getBodyTd('消毒供应中心四项质量指标', 4, 1); + } + html += getBodyTd(item.secondaryIndicator, 1, 1); + html += getBodyTd(item.targetValue, 1, 1); + html += getBodyTd(item.samePeriodLastYear, 1, 1); + html += getBodyTd(item.lastQuarter, 1, 1); + html += getBodyTd(item.thisQuarter, 1, 1); + html += getBodyTd(item.floatingValue, 1, 1); + html += ''; + if (item.secondaryIndicator == '器械清洗合格率') { + seriesData1 = [parseFloat(item.targetValue), parseFloat(item.samePeriodLastYear), parseFloat(item.lastQuarter), parseFloat(item.thisQuarter)]; + } else if (item.secondaryIndicator == '器械包装合格率') { + seriesData2 = [parseFloat(item.targetValue), parseFloat(item.samePeriodLastYear), parseFloat(item.lastQuarter), parseFloat(item.thisQuarter)]; + } + }); + if (seriesData1.length > 0) { + createChartsForLine('器械清洗合格率', seriesData1, '1-1'); + } + if (lastQuarterWash.length > 0 && thisQuarterWash.length > 0) { + createChartsForBar('近两季度器械返洗情况柱状图', lastQuarterWash, thisQuarterWash, '1-2'); + } + if (thisQuarterWash.length > 0) { + var year = Ext.getCmp('year').getRawValue(); + var quarter = Ext.getCmp('quarter').getRawValue(); + createChartsForBarAndLine(year + quarter + '器械返洗器械柏拉图', thisQuarterWash, '1-3'); + } + if (seriesData2.length > 0) { + createChartsForLine('器械包装合格率', seriesData2, '1-4'); + } + if (thisQuarterPack.length > 0) { + createChartsForBarAndLine('器械包装不合格柏拉图', thisQuarterPack, '1-5'); + } + return html; +} + +//获取表头的td +function getHeadTd(name, width, rowspan, colspan) { + var html = '' + name + ''; + return html; +} + +//获取表格的td +function getBodyTd(value, rowspan, colspan, background) { + var html = '' + value + ''; + return html; +} + +function echartsToImg(myechart, id) { + setTimeout(function () { + if (document.getElementById('thisIframe').contentWindow.document.getElementById('img-' + id)) { + var img = new Image(); + img.src = myechart.getDataURL({ + type: "jpg", + backgroundColor: "#fff" + }); + document.getElementById('thisIframe').contentWindow.document.getElementById('img-' + id).innerHTML = img; + } else { + var newDiv = document.createElement('div'); + newDiv.id = 'img-' + id; + var img = new Image(); + img.src = myechart.getDataURL({ + type: "jpg", + backgroundColor: "#fff" + }); + newDiv.style.textAlign = 'center'; + newDiv.appendChild(img) + document.getElementById('thisIframe').contentWindow.document.getElementById('imgBox').appendChild(newDiv) + } + }, 1000); +} + +function createChartsForLine(title, seriesData, id) { + var option = { + title: { + text: title, + left: 'center' + }, + xAxis: { + type: 'category', + data: ['目标值', '去年同期', '上季度', '本季度'] + }, + grid: { + left: '3%', + right: '4%', + bottom: '3%', + containLabel: true + }, + yAxis: { + type: 'value', + min: 0, + axisLabel: { + formatter: '{value}' + '%' + } + }, + series: [{ + data: seriesData, + label: { + show: true, + position: 'top', + formatter: '{c} %' + }, + type: 'line' + }] + }; + if (!document.getElementById('thisIframe').contentWindow.document.getElementById('echarts' + id)) { + var newDiv = document.createElement('div'); + newDiv.id = 'echarts' + id; + newDiv.className = 'echarts'; + document.getElementById('thisIframe').contentWindow.document.getElementById('echarts').appendChild(newDiv); + } + myechart = echarts.init(document.getElementById('thisIframe').contentWindow.document.getElementById('echarts' + id)); + myechart.setOption(option); + echartsToImg(myechart, id); +} + +function createChartsForBar(title, lastQuarterWash, thisQuarterWash, id) { + var xAxisData = []; + var lastQuarterWashData = []; + var thisQuarterWashData = []; + lastQuarterWash.forEach(function (item) { + var qName = item.qName; + var amount = item.amount; + xAxisData.push(qName); + lastQuarterWashData.push(amount); + }) + thisQuarterWash.forEach(function (item) { + var amount = item.amount; + thisQuarterWashData.push(amount); + }) + var series = [{ + name: '上季度', + type: 'bar', + itemStyle: { + normal: { + label: { + show: true, + position: 'top' + } + } + }, + barWidth: '20%', + data: lastQuarterWashData + }, { + name: '本季度', + type: 'bar', + itemStyle: { + normal: { + label: { + show: true, + position: 'top' + } + } + }, + barWidth: '20%', + data: thisQuarterWashData + }] + var option = { + title: { + text: title, + left: 'center' + }, + color: ['#ED7D31', '#3398DB'], + xAxis: { + type: 'category', + data: xAxisData + }, + grid: { + left: '3%', + right: '4%', + bottom: '5%', + containLabel: true + }, + legend: { + y: 'top', + top: 30, + x: 'center', + data: ['上季度', '本季度'] + }, + yAxis: { + type: 'value' + }, + series: series + }; + if (!document.getElementById('thisIframe').contentWindow.document.getElementById('echarts' + id)) { + var newDiv = document.createElement('div'); + newDiv.id = 'echarts' + id; + newDiv.className = 'echarts'; + document.getElementById('thisIframe').contentWindow.document.getElementById('echarts').appendChild(newDiv); + } + myechart = echarts.init(document.getElementById('thisIframe').contentWindow.document.getElementById('echarts' + id)); + myechart.setOption(option); + echartsToImg(myechart, id); +} + +function createChartsForBarAndLine(title, thisQuarterWash, id) { + var xAxisData = []; + var thisQuarterWashData = []; + var rateData = []; + thisQuarterWash.forEach(function (item) { + var qName = item.qName; + var amount = item.amount; + var rate = item.rate; + xAxisData.push(qName); + thisQuarterWashData.push(amount); + rateData.push(parseFloat(rate)); + }) + var option = { + title: { + text: title, + left: 'center' + }, + color: ['#3398DB', '#ED7D31'], + legend: { + y: 'top', + top: 30, + x: 'center', + data: ['数量', '累计百分比'] + }, + xAxis: [{ + type: 'category', + data: xAxisData + }, { + type: 'category', + show: false, + boundaryGap: false, + data: xAxisData + }], + yAxis: [{ + type: 'value', + splitLine: false + }, { + type: 'value', + axisLabel: { + formatter: '{value} %' + }, + splitLine: false + }], + series: [{ + name: '数量', + type: 'bar', + barWidth: '20%', + barCategoryGap: '0%', + itemStyle: { + normal: { + barBorderWidth: 1, + barBorderRadius: 2, + label: { + show: true, + position: 'top' + } + } + }, + data: thisQuarterWashData + }, { + name: '累计百分比', + type: 'line', + xAxisIndex: 1, + yAxisIndex: 1, + data: rateData + }] + }; + + if (!document.getElementById('thisIframe').contentWindow.document.getElementById('echarts' + id)) { + var newDiv = document.createElement('div'); + newDiv.id = 'echarts' + id; + newDiv.className = 'echarts'; + document.getElementById('thisIframe').contentWindow.document.getElementById('echarts').appendChild(newDiv); + } + myechart = echarts.init(document.getElementById('thisIframe').contentWindow.document.getElementById('echarts' + id)); + myechart.setOption(option); + echartsToImg(myechart, id); +} + +function reloadReport() { + var year = Ext.getCmp('year').getRawValue(); + var quarter = Ext.getCmp('quarter').getRawValue(); + var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue(); + if (querySupplyRoom.indexOf(ALL) == 0) { + querySupplyRoom = ""; + } + var url = WWWROOT + '/jasperreports/jasperreportsAction!queryDataSourceList.do'; + var params = { + querySupplyRoom: querySupplyRoom, + reportName: 'cssdNursingQualityControlSummaryReport', + year: year, + quarter: quarter + } + myMask = new Ext.LoadMask(Ext.getBody(), { + msg: '正在加载，请稍候！', + removeMask: true + }); + myMask.show(); + + Ext.Ajax.request({ + url: url, + async: false, + params: params, + success: function (response) { + var result = Ext.decode(response.responseText); + var tableHtml = getTableHtml(result); + + document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML = tableHtml; + document.getElementById('thisIframe').contentWindow.document.getElementById('echarts').style.display = 'block'; + myMask.hide(); + }, + failure: function (response, options) { + showResult(response.responseText); + } + }); +} + +Ext.onReady(function () { + Ext.QuickTips.init(); + + var quarterStore = new Ext.data.SimpleStore({ + fields: ['value'], + data: [['第1季度'], ['第2季度'], ['第3季度'], ['第4季度']] + }); + + var supplyRoomStore = getSupplyRoomStore('querySupplyRoom'); + + var form = new Ext.form.FormPanel({ + title: '护理质量质控汇总报表', + region: 'north', + labelAlign: 'right', + buttonAlign: 'center', + collapsible: true, + collapseMode: 'mini', + split: true, + border: 0, + frame: true, + bodyStyle: 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px; + height: 115, + items: [{ + layout: 'column', + height: 60, + labelWidth: 80, + items: [{ + columnWidth: .2, + layout: 'form', + items: [ + new Ext.ux.MonthField({ + id: 'year', + name: 'year', + fieldLabel: '年份', + readOnly: true, + format: 'Y', + anchor: '95%', + value: new Date() + })] + }, { + columnWidth: .25, + layout: 'form', + items: [{ + xtype: 'combo', + fieldLabel: '季度', + id: 'quarter', + name: 'quarter', + valueField: 'value', + displayField: 'value', + store: quarterStore, + editable: false, + forceSelection: true, + mode: 'local', + value: '第1季度', + triggerAction: 'all', + allowBlank: false, + anchor: '95%' + }] + }, { + columnWidth: .25, + layout: 'form', + items: [{ + xtype: 'multiSelect', + fieldLabel: '选择供应室', + id: 'querySupplyRoom', + name: 'querySupplyRoom', + valueField: 'departCode', + displayField: 'name', + minChars: 0, + allowBlank: true, + editable: false, + store: supplyRoomStore, + forceSelection: false, + mode: 'local', + triggerAction: 'all', + lazyInit: true, + typeAhead: false, + anchor: '95%', + listeners: { + select: function (combo, record, index) { + //1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择 + if (record.get('departCode') == ALL) { + if (record.get('checked')) { + combo.selectAll(); + } else { + combo.deselectAll(); + } + } + + //2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择 + var selectAll = true; + combo.store.each(function (record) { + if (record.get('departCode') != ALL && !record.get(this.checkField)) { + selectAll = false; + return; + } + }, combo); + + var all = combo.store.getAt(0); + if (selectAll) { + all.set(combo.checkField, true); + } else { + all.set(combo.checkField, false); + } + combo.setValue(combo.getCheckedValue()); + } + } + }] + }] + }], + buttons: [{ + xtype: 'button', + text: '查询', + minWidth: 70, + iconCls: 'icon_search', + handler: function () { + reloadReport(); + } + }, { + xtype: 'button', + text: '重置', + minWidth: 70, + iconCls: 'icon_set', + handler: function () { + Ext.getCmp('year').setValue(new Date()); + Ext.getCmp('quarter').setValue("第1季度"); + Ext.getCmp('querySupplyRoom').setValue(""); + } + }, { + xtype: 'button', + text: '设置二级指标', + iconCls: 'icon_set', + handler: function () { + setSecondaryIndicatorOfCSSDNQCS(); + } + }] + }); + + var reportForm = new Ext.Panel({ + frame: false,//渲染面板 + autoScroll: true,//自动显示滚动条 + collapsible: true,//允许展开和收缩 + bodyPadding: 5, + tbar: [{ + text: '导出word文档', + handler: function () { + var html = document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML; + if (html !== '') { + document.getElementById('thisIframe').contentWindow.document.getElementById('exportToWord').click(); + } else { + showResult('请先查询数据后再导出'); + } + } + }], + html: '' + }); + + var viewport = new Ext.Viewport({ + layout: 'border', + items: [form, { + id: 'reportPanel', + region: 'center', + margins: '0 0 0 0', + layout: 'fit', + items: reportForm + }] + }); +}); \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/cssdNursingQualityControlSummaryReportView.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/reportforms/cssdNursingQualityControlSummaryReportView.jsp (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/cssdNursingQualityControlSummaryReportView.jsp (revision 41104) @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=UTF-8"%> +<%@page import="java.util.Date"%> +<%@page import="java.text.SimpleDateFormat"%> +<%@ include file="/common/taglibs.jsp"%> +<% + SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd"); + request.setAttribute("newDate", dateFormat.format(new Date())); + %> + + + +<%@ include file="/common/includeExtJsAndCss.jsp"%> + + + + + +护理质量质控汇总报表 + + + + + + + + + \ No newline at end of file Index: ssts-web/src/main/webapp/homepage/exportMonitorData.jsp =================================================================== diff -u -r40969 -r41104 --- ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 40969) +++ ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 41104) @@ -33,15 +33,17 @@ width: auto; white-space: pre-wrap; } - #echarts,#echarts2 { - width: 1200px !important; + .echarts { + width: 1000px !important; height: 500px !important; margin: 0 auto; - display: none; } - #echarts2 { - margin-top: 20px; + .echarts { + margin-bottom: 20px; } + #echarts,#echarts2 { + display: none; + } #ToolBar { position: fixed; bottom: 0px; @@ -91,12 +93,14 @@ -
-
+
+
+ +