Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboardsConfig.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboardsConfig.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboardsConfig.js (revision 38635) @@ -0,0 +1,130 @@ +//注释说明：模块最多显示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 = { + //左边显示的模块 + columnLeft: { + width: 23, + items: [{ + dataSources: 'urgentAmount', + title: '', + height: 12 + }, { + dataSources: 'deviceUsageSummary', + title: '本日设备使用情况', + height: 74, + headers: [{ + header: "设备名称", + dataIndex: 'name', + width: '75%', + align: 'left' + }, { + header: "当前状态", + dataIndex: 'status', + width: '25%', + align: 'center' + }] + }] + }, + //中间显示的模块 + columnCenter: { + width: 54, + items: [{ + dataSources: 'tousseSummary', + title: '今日器械包汇总', + height: 43, + headers: [{ + header: "待处理", + xAxisData: [{ + name: '回收清点', + dataIndex: 'toBeRecycledAmount', + color: '#2289ff' + }, { + name: '清洗消毒', + dataIndex: 'tobeWashAmount', + color: '#4077f6' + }, { + name: '装配管理', + dataIndex: 'toBePackAmount', + color: '#5d5ef6' + }, { + name: '灭菌管理', + dataIndex: 'toBeSterilizationAmount', + color: '#6557de' + }, { + name: '发货计划', + dataIndex: 'toBeInvoiceAmount', + color: '#8c70f8' + }] + }, { + header: "已处理", + xAxisData: [{ + name: '回收清点', + dataIndex: 'recycledAmount', + color: '#f9de50' + }, { + name: '清洗消毒', + dataIndex: 'washedAmount', + color: '#ffb028' + }, { + name: '装配管理', + dataIndex: 'packedAmount', + color: '#f2a229' + }, { + name: '灭菌管理', + dataIndex: 'sterilizationedAmount', + color: '#f98a42' + }, { + name: '发货计划', + dataIndex: 'invoicedAmount', + color: '#e98352' + }] + }] + }, { + dataSources: 'foreignTousseSummary', + title: '今日外来器械包汇总', + height: 43 + }] + }, + //右边显示的模块 + columnRight: { + width: 23, + items: [{ + dataSources: 'nowTime', + title: '', + height: 15 + }, { + dataSources: 'onlineUserAmount', + title: '在线人数', + height: 30 + }, { + dataSources: 'workloadSummary', + title: '今日工作量统计', + height: 40 + }] + } +} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js =================================================================== diff -u -r38633 -r38635 --- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js (.../index.js) (revision 38633) +++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js (.../index.js) (revision 38635) @@ -106,11 +106,11 @@ var sumSterilizationAmount = toBeSterilizationAmount + sterilizationedAmount; var sumInvoiceAmount = toBeInvoiceAmount + invoicedAmount; var resultObj = { - toBeRecycledAmount:toBeRecycledAmount, - tobeWashAmount:tobeWashAmount, - toBePackAmount:toBePackAmount, - toBeSterilizationAmount:toBeSterilizationAmount, - toBeInvoiceAmount:toBeInvoiceAmount, + toBeRecycledAmount: toBeRecycledAmount, + tobeWashAmount: tobeWashAmount, + toBePackAmount: toBePackAmount, + toBeSterilizationAmount: toBeSterilizationAmount, + toBeInvoiceAmount: toBeInvoiceAmount, sumApplyAmount: sumApplyAmount, sumWashedAmount: sumWashedAmount, sumPackAmount: sumPackAmount, @@ -815,8 +815,7 @@ html += ''; html += ''; } else { - html += '
'; - html += '

'; + html += '
'; html += ''; html += '今日已处理物品'; html += ''; Index: ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/css/index.css =================================================================== diff -u -r38632 -r38635 --- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/css/index.css (.../index.css) (revision 38632) +++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/css/index.css (.../index.css) (revision 38635) @@ -646,19 +646,15 @@ } } -.urgentAmount .urgentAmount, -.urgentAmount .noUrgent { +.noUrgent { display: none; -} - -.urgentAmount .noUrgent { align-items: center; } -.urgentAmount .noUrgent span { +.noUrgent span { font-size: 1.2rem; } -.urgentAmount .noUrgent h4 { +.noUrgent h4 { margin-bottom: 0; } \ No newline at end of file Fisheye: Tag 38635 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/js/index.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 38635 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/index.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/images/loading.gif =================================================================== diff -u -r35069 -r38635 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/fonts/icomoon.eot =================================================================== diff -u -r35069 -r38635 Binary files differ Fisheye: Tag 38635 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/js/bg.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 38635 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/css/index.css'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/images/line.png =================================================================== diff -u -r35069 -r38635 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/css/DISPLAY FREE TFB.ttf =================================================================== diff -u -r35124 -r38635 Binary files differ Fisheye: Tag 38635 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/js/echarts.min.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 38635 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/js/jquery.min.js'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/fonts/icomoon.woff =================================================================== diff -u -r35069 -r38635 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/images/logo.png =================================================================== diff -u -r35069 -r38635 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/images/rect.png =================================================================== diff -u -r35069 -r38635 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/fonts/icomoon.ttf =================================================================== diff -u -r35069 -r38635 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/images/border.png =================================================================== diff -u -r35069 -r38635 Binary files differ Fisheye: Tag 38635 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/fonts/icomoon.svg'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 38635 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/fonts/icomoon.css'. Fisheye: No comparison available. Pass `N' to diff?