Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/css/index.css =================================================================== diff -u -r35169 -r36122 --- ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/css/index.css (.../index.css) (revision 35169) +++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/css/index.css (.../index.css) (revision 36122) @@ -127,38 +127,45 @@ color: #4c9bfd; } -.columnLeft_2 { +.columnLeft_2, +.columnRight_2 { height: 75%; } -.columnLeft_2 .inner { +.columnLeft_2 .inner, +.columnRight_2 .inner { padding: 1rem 0; display: flex; flex-direction: column; } -.columnLeft_2 .inner h3 { +.columnLeft_2 .inner h3, +.columnRight_2 .inner h3 { margin-left: 1.5rem; margin-bottom: 1rem; } -.columnLeft_2 .tabs { +.columnLeft_2 .tabs, +.columnRight_2 .tabs { padding: 0 1.5rem; margin-bottom: 0.75rem; } -.columnLeft_2 .tabs a { +.columnLeft_2 .tabs a, +.columnRight_2 .tabs a { color: #fff; font-size: 0.75rem; padding: 0 1.125rem; } -.columnLeft_2 .content { +.columnLeft_2 .content, +.columnRight_2 .content { flex: 1; position: relative; } -.columnLeft_2 .head { +.columnLeft_2 .head, +.columnRight_2 .head { background: rgba(255, 255, 255, 0.1); font-size: 0.583rem; padding: 0.5rem 1.5rem; @@ -168,26 +175,37 @@ line-height: 1.05; } -.columnLeft_2 .col:nth-child(1) { - width: 11.6rem; +.columnLeft_2 .col:nth-child(1), +.columnRight_2 .col:nth-child(1) { + width: 7.4rem; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } -.columnLeft_2 .col:nth-child(2) { +.columnLeft_2 .col:nth-child(2), +.columnRight_2 .col:nth-child(2) { width: 3.2rem; + text-align: center; } -.columnLeft_2 .marquee-view { +.columnLeft_2 .col:nth-child(3), +.columnRight_2 .col:nth-child(3) { + width: 4.2rem; + text-align: right; +} + +.columnLeft_2 .marquee-view, +.columnRight_2 .marquee-view { position: absolute; top: 1.6rem; bottom: 0; width: 100%; overflow: hidden; } -.columnLeft_2 .row { +.columnLeft_2 .row, +.columnRight_2 .row { line-height: 1.05; padding: 0.5rem 1.5rem; color: #fff; @@ -197,29 +215,24 @@ justify-content: space-between; } -.columnLeft_2 .row:hover { +.columnLeft_2 .row:hover, +.columnRight_2 .row:hover { color: #68d8ff; background: rgba(255, 255, 255, 0.1); } -.columnLeft_2 .row:hover .icon-dot { +.columnLeft_2 .row:hover .icon-dot, +.columnRight_2 .row:hover .icon-dot { opacity: 1; } -.columnLeft_2 .icon-dot { +.columnLeft_2 .icon-dot, +.columnRight_2 .icon-dot { position: absolute; left: 0.64rem; opacity: 0; } -.columnLeft_2 .marquee-view { - position: absolute; - top: 1.6rem; - bottom: 0; - width: 100%; - overflow: hidden; -} - /* ------------------------------------------------------------动画 */ @keyframes row { 0% {} @@ -230,13 +243,15 @@ } /* 调用动画 */ -.columnLeft_2 .marquee { +.columnLeft_2 .marquee, +.columnRight_2 .marquee { /* //infinite永久调用动画 */ animation: row 20s linear infinite; } /*鼠标划入 停止动画 */ -.columnLeft_2 .marquee:hover { +.columnLeft_2 .marquee:hover, +.columnRight_2 .marquee:hover { animation-play-state: paused; } @@ -352,11 +367,11 @@ } .columnRight_2 { - height: 30%; + height: 32%; } .columnRight_3 { - height: 42%; + height: 40%; } .sales { @@ -673,10 +688,10 @@ align-items: center; } -.columnLeft_1 .noUrgent span{ +.columnLeft_1 .noUrgent span { font-size: 1.2rem; } -.columnLeft_1 .noUrgent h4{ +.columnLeft_1 .noUrgent h4 { margin-bottom: 0; } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/images/user.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/index.jsp =================================================================== diff -u -r35170 -r36122 --- ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/index.jsp (.../index.jsp) (revision 35170) +++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/index.jsp (.../index.jsp) (revision 36122) @@ -32,43 +32,20 @@
-
-

0

- - - 今日已处理物品 - +
+ + 在线人数：
-
-

0

- - - 待处理加急物品 - -
-
-

0

- - - 已处理加急物品 - -
-
- - - 今日已处理物品 - -

0

-
-

本日设备使用情况

+

今日设备使用情况

设备名称 当前状态 + 预计结束时间
@@ -82,15 +59,15 @@
-

今日器械包处理量

+

今日器械包汇总

-

外来器械包汇总

+

今日外来器械包汇总

@@ -111,15 +88,24 @@
-

在线人数

-
-
-
+

待发货加急物品列表

+
+
+ 物品名称 + 加急级别 + 加急数量 +
+
+
+ +
+
+
-

本日工作量统计

+

今日工作量统计

Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/js/index.js =================================================================== diff -u -r35169 -r36122 --- ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/js/index.js (.../index.js) (revision 35169) +++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/js/index.js (.../index.js) (revision 36122) @@ -102,6 +102,13 @@ } } var option = { + title: { + text: '', + subtext: '单位(包)', + subtextStyle: { + color: '#fff' + } + }, // 工具提示 tooltip: { // 触发类型 经过轴触发axis 经过轴触发item @@ -184,68 +191,17 @@ myechart.setOption(option); } -function createChartsForGauge(dom, onlineUserAmount, userAmount) { - var myechart = echarts.init($(dom)[0]); - var series = [ - { - type: 'gauge', //类型：仪表盘图 - name: '当前在线', - title: { - offsetCenter: [0, '120%'], - color: "#fff", - fontSize: 16, - }, - center: ['50%', '45%'], //仪表盘图的中心点相对于dom容器的位置 - detail: { - formatter: '{value} / ' + userAmount, - offsetCenter: [0, 0], - color: "#FFF", - fontSize: 18 - }, - data: [{ - value: onlineUserAmount, //此处要改数据 - name: '当前在线 / 人员总数' - }], - radius: '80%', //环形的大小 - clockwise: true, - axisLine: { - show: true, - lineStyle: { - color: [ - [onlineUserAmount / userAmount, '#1A8FC5'], //占总数的30.25%，即value/100，颜色为'#1A8FC5' - [1, '#fefefe'] //基底大圈比例为1，颜色为'#E1E8EE'， - ], - width: 10, //环形的粗细 - } - }, - splitLine: { - show: false //不显示分隔线 - }, - axisTick: { - show: false //不显示仪表盘刻度 - }, - axisLabel: { - show: false - }, - pointer: { - show: false //不显示仪表盘指针 - } - } - ] - var option = { - tooltip: { - formatter: '{a}
{b} : {c}%' - }, - color: ['#53f1f2', '#4ebefd'], - series: series - } - myechart.setOption(option); -} - function createChartsForLine(dom, xAxisData, seriesData) { var myechart = echarts.init($(dom)[0]); var xAxisData1 = xAxisData; var option = { + title: { + text: ' ', + subtext: '单位(包)', + subtextStyle: { + color: '#fff' + } + }, tooltip: { trigger: 'axis', axisPointer: { @@ -355,7 +311,7 @@ success: function (result) { var userAmount = result.data.userAmount; var onlineUserAmount = result.data.onlineUserAmount; - createChartsForGauge('#gauge', onlineUserAmount, userAmount); + $('#onlineUserAmount').html(onlineUserAmount) } }) } @@ -378,6 +334,7 @@ } html += '' + result.data[i].name + ''; html += '' + result.data[i].status + ''; + html += '' + (result.data[i].dateStr || "") + ''; html += ''; html += '
'; } @@ -398,12 +355,6 @@ dataType: 'json', url: url, success: function (result) { - var invoicedUrgentAmount = result.data.invoicedUrgentAmount; - var toBeInvoiceUrgentAmount = result.data.toBeInvoiceUrgentAmount; - var invoicedAmount = result.data.invoicedAmount; - $('#invoicedUrgentAmount').html(invoicedUrgentAmount) - $('#toBeInvoiceUrgentAmount').html(toBeInvoiceUrgentAmount) - $('#invoicedAmount').html(invoicedAmount); //待处理 外来器械 var foreignToBeRecycledAmount = result.data.foreignToBeRecycledAmount || 0; var foreignTobeWashAmount = result.data.foreignTobeWashAmount || 0; @@ -419,6 +370,13 @@ var foreignSterilizationedAmount = result.data.foreignSterilizationedAmount || 0; var foreignInvoicedAmount = result.data.foreignInvoicedAmount || 0; var foreignSignedAmount = result.data.foreignSignedAmount || 0; + //总数量 外来器械 + var sumForeignRecycledAmount = foreignToBeRecycledAmount + foreignRecycledAmount; + var sumForeignWashedAmount = foreignTobeWashAmount + foreignWashedAmount; + var sumForeignPackedAmount = foreignToBePackAmount + foreignPackedAmount; + var sumForeignSterilizationedAmount = foreignToBeSterilizationAmount + foreignSterilizationedAmount; + var sumForeignInvoicedAmount = foreignToBeInvoiceAmount + foreignInvoicedAmount; + var sumForeignSignedAmount = foreignSignedAmount + foreignToBeSignAmount; //待处理 器械包处理量 var toBeRecycledAmount = result.data.toBeRecycledAmount || 0; var tobeWashAmount = result.data.tobeWashAmount || 0; @@ -435,19 +393,26 @@ var sterilizationedAmount = result.data.sterilizationedAmount || 0; var invoicedAmount = result.data.invoicedAmount || 0; var signedAmount = result.data.signedAmount || 0; + //总数量 器械包处理量 + var sumApplyAmount = toBeRecycledAmount + recycledAmount; + var sumWashedAmount = tobeWashAmount + washedAmount; + var sumPackAmount = toBePackAmount + packedAmount; + var sumSterilizationAmount = toBeSterilizationAmount + sterilizationedAmount; + var sumInvoiceAmount = toBeInvoiceAmount + invoicedAmount; + /************************ 外来器械包汇总 开始*********************/ var xAxisData2 = ['申请', '回收', '清洗消毒', '装配管理', '灭菌管理', '发货', '签收']; var seriesData2 = [{ - name: '待处理', + name: '全部物品', color: ['#46afab', '#049391', '#146f8e', '#2c3e7e', '#545a96'], - data: [foreignApplyAmount, foreignToBeRecycledAmount, foreignTobeWashAmount, foreignToBePackAmount, foreignToBeSterilizationAmount, foreignToBeInvoiceAmount, foreignToBeSignAmount] + data: [sumForeignRecycledAmount, sumForeignWashedAmount, sumForeignPackedAmount, sumForeignSterilizationedAmount, sumForeignSterilizationedAmount, sumForeignInvoicedAmount, sumForeignSignedAmount] }, { name: '已处理', color: ['#e99b29', '#9a5037', '#923f49', '#353281', '#5a59a5'], data: [foreignApplyAmount, foreignRecycledAmount, foreignWashedAmount, foreignPackedAmount, foreignSterilizationedAmount, foreignInvoicedAmount, foreignSignedAmount] }]; - var legendData2 = ['待处理', '已处理']; + var legendData2 = ['全部物品', '已处理']; createChartsForColunm('#histogramChart2', xAxisData2, seriesData2, legendData2); /************************ 外来器械包汇总 结束*********************/ @@ -460,19 +425,38 @@ /************************ 器械包处理量 开始***********************/ var xAxisData3 = ['回收清点', '清洗消毒', '装配管理', '灭菌管理', '发货计划']; var seriesData3 = [{ - name: '待处理', + name: '全部物品', color: ['#2289ff', '#4077f6', '#5d5ef6', '#6557de', '#8c70f8'], - data: [toBeRecycledAmount, tobeWashAmount, toBePackAmount, toBeSterilizationAmount, toBeInvoiceAmount] + data: [sumApplyAmount, sumWashedAmount, sumPackAmount, sumSterilizationAmount, sumInvoiceAmount] }, { name: '已处理', color: ['#f9de50', '#ffb028', '#f2a229', '#f98a42', '#e98352'], data: [recycledAmount, washedAmount, packedAmount, sterilizationedAmount, invoicedAmount] }]; - var legendData3 = ['待处理', '已处理']; + var legendData3 = ['全部物品', '已处理']; var colorData = ['#87cefa', '#FBA923']; createChartsForColunm('#histogramChart', xAxisData3, seriesData3, legendData3) /************************ 器械包处理量 结束***********************/ + + /************************ 加急物品列表 开始***********************/ + var toBeInvoiceUrgentSum = result.data.toBeInvoiceUrgentSum || []; + if(toBeInvoiceUrgentSum.length > 0){ + var html = ''; + for (var i = 0; i < toBeInvoiceUrgentSum.length; i++) { + html += '
'; + html += '' + toBeInvoiceUrgentSum[i].tousseName + ''; + html += '' + toBeInvoiceUrgentSum[i].name + ''; + html += '' + toBeInvoiceUrgentSum[i].urgentAmount + ''; + html += ''; + html += '
'; + } + $('#urgentSum').html(html) + if (toBeInvoiceUrgentSum.length < 6) { + $('#urgentSum').removeClass('marquee'); + } + } + /************************ 加急物品列表 结束***********************/ $(".loading").fadeOut() } })