Index: ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboardsConfig.js =================================================================== diff -u -r38639 -r39193 --- ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboardsConfig.js (.../realTimeDashboardsConfig.js) (revision 38639) +++ ssts-web/src/main/webapp/disinfectsystem/config/demo/realTimeDashboardsConfig.js (.../realTimeDashboardsConfig.js) (revision 39193) @@ -1,43 +1,48 @@ -//注释说明:模块最多显示9个,左边0-3个,中间0-3个,右边0-3个,超过3个也只会显示前3个 -/** - * 目前已有的模块内容包括: - * nowTime:当前时间; - * onlineUserAmount:在线人数; - * urgentAmount:加急物品数量; - * operationReservationSummary:手术预约汇总(今日手术预约信息); - * deviceusagesummary:设备使用情况汇总; - * tousseSummary:器械包汇总(今日器械包处理量); - * foreignTousseSummary:外来器械包汇总; - * workloadSummary:工作量汇总(今日工作量统计); - * urgentGoodsSummary:加急物品汇总功能; - * urgentGoodsDetails:加急物品明细追溯模式; - * foreignTousseSummary_SpecifyPeriod:外来器械包汇总(仅查询指定周末申请单模式); - */ -/** - * 字段含义: - * dataSources:显示的模块; - * title: 模块标题; - * width: 模块宽度,用百分比表示,最大值100,为0时不显示; - * height: 模块高度,用百分比表示,最大值100,为0时不显示; - */ -/** - * 特殊字段:仅个别项目使用 - * type:在线人数(gyey为2,其他默认为1) - */ - -var realTimeDashboardsConfig = { +var realTimeDashboardsConfig = { //左边显示的模块 columnLeft: { width: 20, items: [{ - dataSources: 'onlineUserAmount', - title: '', - height: 15, - type: 2 - }, { - dataSources: 'deviceUsageSummary', - title: '今日设备使用情况', - height: 72 + dataSources: 'urgentGoodsDetails', + title: '今日加急物品处理汇总', + height: 43, + headers: [{ + header: "物品名称", + dataIndex: 'tousseName', + width: '25%', + align: 'left' + }, { + header: "加急待处理(包)", + dataIndex: 'tiUrgentAmount', + width: '15%', + align: 'center' + }, { + header: "当前申请", + dataIndex: 'notRecycledUrgentAmount', + width: '12%', + align: 'center' + }, { + header: "当前已回收", + dataIndex: 'recyUrgentAmount', + width: '12%', + align: 'center' + }, { + header: "当前已装配", + dataIndex: 'packAmount', + width: '12%', + align: 'center' + }, { + header: "当前已灭菌", + dataIndex: 'steMount', + width: '12%', + align: 'center' + }, { + header: "已发货", + dataIndex: 'invoiceAmount', + width: '12%', + color: '#ffff00', + align: 'center' + }]; }] }, //中间显示的模块 @@ -50,7 +55,70 @@ }, { dataSources: 'foreignTousseSummary', title: '今日外来器械包汇总', - height: 43 + height: 43, + headers: [{ + header: "全部数量", + xAxisData: [{ + name: '申请', + dataIndex: 'foreignApplyAmount', + color: '#46afab' + }, { + name: '回收', + dataIndex: 'sumForeignRecycledAmount', + color: '#049391' + }, { + name: '清洗消毒', + dataIndex: 'sumForeignWashedAmount', + color: '#146f8e' + }, { + name: '装配管理', + dataIndex: 'sumForeignPackedAmount', + color: '#2c3e7e' + }, { + name: '灭菌管理', + dataIndex: 'sumForeignSterilizationedAmount', + color: '#545a96' + }, { + name: '发货', + dataIndex: 'sumForeignInvoicedAmount', + color: '#5d5ef6' + }, { + name: '签收', + dataIndex: 'sumForeignSignedAmount', + color: '#f98a42' + }] + }, { + header: "已处理", + xAxisData: [{ + name: '申请', + dataIndex: 'foreignApplyAmount', + color: '#e99b29' + }, { + name: '回收', + dataIndex: 'foreignRecycledAmount', + color: '#9a5037' + }, { + name: '清洗消毒', + dataIndex: 'foreignWashedAmount', + color: '#923f49' + }, { + name: '装配管理', + dataIndex: 'foreignPackedAmount', + color: '#f98a42' + }, { + name: '灭菌管理', + dataIndex: 'foreignSterilizationedAmount', + color: '#5a59a5' + }, { + name: '发货', + dataIndex: 'foreignInvoicedAmount', + color: '#f2a229' + }, { + name: '签收', + dataIndex: 'foreignSignedAmount', + color: '#e98352' + }] + }] }] }, //右边显示的模块 @@ -63,11 +131,55 @@ }, { dataSources: 'urgentGoodsSummary', title: '待发货加急物品列表', - height: 30 + height: 30, + headers: [{ + header: "物品名称", + dataIndex: 'tousseName', + width: '50%', + align: 'left' + }, { + header: "加急级别", + dataIndex: 'name', + width: '25%', + align: 'center' + }, { + header: "加急数量", + dataIndex: 'urgentAmount', + width: '25%', + align: 'center' + }] }, { dataSources: 'workloadSummary', title: '今日工作量统计', - height: 40 + height: 40, + headers: [{ + name: '申请', + dataIndex: 'applyAmount' + }, { + name: '回收', + dataIndex: 'recycledAmount' + }, { + name: '清点', + dataIndex: 'inventoryEdAmount' + }, { + name: '清洗', + dataIndex: 'washedAmount' + }, { + name: '装配', + dataIndex: 'packedAmount' + }, { + name: '审核', + dataIndex: 'reviewedAmount' + }, { + name: '灭菌', + dataIndex: 'sterilizationedAmount' + }, { + name: '发货', + dataIndex: 'invoicedAmount' + }, { + name: '签收', + dataIndex: 'signedAmount' + }] }] } } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js =================================================================== diff -u -r39172 -r39193 --- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js (.../index.js) (revision 39172) +++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js (.../index.js) (revision 39193) @@ -709,6 +709,9 @@ return tousseSummaryBox(title); } else if (name == 'foreignTousseSummaryBox') { showForeignTousseSummary = true; + if (headers.length > 0) { + foreignTousseSummarySeriesData = headers + } refreshRateByForeignTousseSummary = refreshRate; foreignTousseSummaryChartType = chartType || 'bar'; return foreignTousseSummaryBox(title); @@ -721,6 +724,9 @@ return onlineUserAmountBox(title, type); } else if (name == 'workloadSummaryBox') { showWorkloadSummary = true; + if (headers.length > 0) { + workloadSummarySeriesData = headers + } refreshRateByWorkloadSummary = refreshRate; return workloadSummaryBox(title); } else if (name == 'urgentGoodsSummaryBox') { Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/realTimeDashboardsConfig.js =================================================================== diff -u -r39172 -r39193 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/realTimeDashboardsConfig.js (.../realTimeDashboardsConfig.js) (revision 39172) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/realTimeDashboardsConfig.js (.../realTimeDashboardsConfig.js) (revision 39193) @@ -1,4 +1,4 @@ -var realTimeDashboardsConfig = { +var realTimeDashboardsConfig = { //中间显示的模块 columnCenter: { width: '50%', @@ -7,7 +7,38 @@ title: '病人出室通知', height: '88%', playVideo: true, - minuteInterval: 30 + minuteInterval: 30, + headers: [{ + header: '病人出室时间', + dataIndex: 'exitTime', + width: '20%', + align: 'center', + color: '#ffff00' + }, { + header: '手术间', + dataIndex: 'operationRoom', + width: '20%', + align: 'center', + color: '#ffff00' + }, { + header: '手术台次', + dataIndex: 'operationTableNum', + width: '20%', + align: 'center', + color: '#ffff00' + }, { + header: '手术名称', + dataIndex: 'operation', + width: '20%', + align: 'center', + color: '#ffff00' + }, { + header: '手术医生', + dataIndex: 'doctorName', + width: '20%', + align: 'center', + color: '#ffff00' + }] }] } } \ No newline at end of file