Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/realTimeDashboards/css/index.css
===================================================================
diff -u -r37947 -r37959
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/realTimeDashboards/css/index.css (.../index.css) (revision 37947)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/realTimeDashboards/css/index.css (.../index.css) (revision 37959)
@@ -106,7 +106,7 @@
}
.columnLeft_1 {
- height: 11%
+ height: 13%
}
.columnLeft_1 .inner {
@@ -128,37 +128,41 @@
}
.columnLeft_2 {
- height: 75%;
+ height: 30%;
}
-.columnLeft_2 .inner {
+.columnLeft_3 {
+ height: 42%;
+}
+
+.columnLeft_3 .inner {
padding: 1rem 0;
display: flex;
flex-direction: column;
}
-.columnLeft_2 .inner h3 {
+.columnLeft_3 .inner h3 {
margin-left: 1.5rem;
margin-bottom: 1rem;
}
-.columnLeft_2 .tabs {
+.columnLeft_3 .tabs {
padding: 0 1.5rem;
margin-bottom: 0.75rem;
}
-.columnLeft_2 .tabs a {
+.columnLeft_3 .tabs a {
color: #fff;
font-size: 0.75rem;
padding: 0 1.125rem;
}
-.columnLeft_2 .content {
+.columnLeft_3 .content {
flex: 1;
position: relative;
}
-.columnLeft_2 .head {
+.columnLeft_3 .head {
background: rgba(255, 255, 255, 0.1);
font-size: 0.583rem;
padding: 0.5rem 1.5rem;
@@ -168,26 +172,26 @@
line-height: 1.05;
}
-.columnLeft_2 .col:nth-child(1) {
+.columnLeft_3 .col:nth-child(1) {
width: 11.6rem;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
-.columnLeft_2 .col:nth-child(2) {
+.columnLeft_3 .col:nth-child(2) {
width: 3.2rem;
}
-.columnLeft_2 .marquee-view {
+.columnLeft_3 .marquee-view {
position: absolute;
top: 1.6rem;
bottom: 0;
width: 100%;
overflow: hidden;
}
-.columnLeft_2 .row {
+.columnLeft_3 .row {
line-height: 1.05;
padding: 0.5rem 1.5rem;
color: #fff;
@@ -197,22 +201,22 @@
justify-content: space-between;
}
-.columnLeft_2 .row:hover {
+.columnLeft_3 .row:hover {
color: #68d8ff;
background: rgba(255, 255, 255, 0.1);
}
-.columnLeft_2 .row:hover .icon-dot {
+.columnLeft_3 .row:hover .icon-dot {
opacity: 1;
}
-.columnLeft_2 .icon-dot {
+.columnLeft_3 .icon-dot {
position: absolute;
left: 0.64rem;
opacity: 0;
}
-.columnLeft_2 .marquee-view {
+.columnLeft_3 .marquee-view {
position: absolute;
top: 1.6rem;
bottom: 0;
@@ -230,13 +234,13 @@
}
/* 调用动画 */
-.columnLeft_2 .marquee {
+.columnLeft_3 .marquee {
/* //infinite永久调用动画 */
animation: row 20s linear infinite;
}
/*鼠标划入 停止动画 */
-.columnLeft_2 .marquee:hover {
+.columnLeft_3 .marquee:hover {
animation-play-state: paused;
}
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/realTimeDashboards/js/index.js
===================================================================
diff -u -r37947 -r37959
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/realTimeDashboards/js/index.js (.../index.js) (revision 37947)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/realTimeDashboards/js/index.js (.../index.js) (revision 37959)
@@ -102,6 +102,13 @@
}
}
var option = {
+ title: {
+ text: '',
+ subtext: '单位(包)',
+ subtextStyle: {
+ color: '#fff'
+ }
+ },
// 工具提示
tooltip: {
// 触发类型 经过轴触发axis 经过轴触发item
@@ -242,10 +249,61 @@
myechart.setOption(option);
}
+function createChartsForPie(dom, value, title) {
+ var color = '';
+ if (title == '总台数') {
+ color = '#5FAAFF';
+ } else if (title == '已安排') {
+ color = '#5FCCFF';
+ } else if (title == '已完成') {
+ color = '#5FEEFF';
+ } else if (title == '未完成') {
+ color = '#F2C4C4';
+ }
+ var myechart = echarts.init($(dom)[0]);
+ var series = [
+ {
+ type: 'pie',
+ radius: ['80%', '100%'],
+ label: {
+ show: false,
+ position: 'center'
+ },
+ data: [
+ { value: value, name: title },
+ ]
+ }
+ ]
+ var option = {
+ color: [color, color],
+ graphic: [{ //环形图中间添加文字
+ type: 'text', //通过不同top值可以设置上下显示
+ left: '38%',
+ top: '38%',
+ style: {
+ text: value + '\n' + title,
+ textAlign: 'center',
+ fill: '#fff', //文字的颜色
+ fontSize: 16,
+ lineHeight: 60
+ }
+ }],
+ 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: {
@@ -340,8 +398,13 @@
}
function init() {
+ //在线人数
getFirstSupplyRoomConfigOnlineUserDate();
+ //设备使用情况
getEquipmentData();
+ //今日手术预约信息
+ getOperationReservation();
+ //获取数据看板工作量
getRealTimeBulletinBoardWorkloadData();
}
@@ -383,20 +446,42 @@
}
}
$('#equipment').html(html)
- if (result.data.length < 15) {
+ if (result.data.length < 8) {
$('#equipment').removeClass('marquee');
}
}
})
}
+//今日手术预约信息
+function getOperationReservation() {
+ var url = WWWROOT + '/disinfectsystem/operationReservationAction!findTodayOperationReservatonAmount.do';
+ $.ajax({
+ type: 'post',
+ dataType: 'json',
+ url: url,
+ success: function (result) {
+ var scheduledAmount = result.scheduledAmount || 0;//已安排
+ var applicationAmount = result.applicationAmount || 0;//已申请
+ var finishedAmount = result.finishedAmount || 0;//已完成
+ var sumAmount = scheduledAmount + applicationAmount + finishedAmount;
+ var notFinishedAmount = sumAmount - finishedAmount;//未完成
+ createChartsForPie('#pieForSumAmount', sumAmount, '总台数');
+ createChartsForPie('#pieForScheduledAmount', scheduledAmount, '已安排');
+ createChartsForPie('#pieForFinishedAmount', finishedAmount, '已完成');
+ createChartsForPie('#pieForCancelAmount', notFinishedAmount, '未完成');
+ }
+ })
+}
+
//获取数据看板工作量
function getRealTimeBulletinBoardWorkloadData() {
var url = WWWROOT + '/jasperreports/jasperreportsAction!getRealTimeBulletinBoardWorkloadData.do';
$.ajax({
type: 'post',
dataType: 'json',
url: url,
+ timeout: 300000,
success: function (result) {
var invoicedUrgentAmount = result.data.invoicedUrgentAmount;
var toBeInvoiceUrgentAmount = result.data.toBeInvoiceUrgentAmount;
@@ -419,6 +504,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,21 +527,21 @@
var sterilizationedAmount = result.data.sterilizationedAmount || 0;
var invoicedAmount = result.data.invoicedAmount || 0;
var signedAmount = result.data.signedAmount || 0;
- /************************ 外来器械包汇总 开始*********************/
+ /************************ 今日外来器械包汇总 开始*********************/
var xAxisData2 = ['申请', '回收', '清洗消毒', '装配管理', '灭菌管理', '发货', '签收'];
var seriesData2 = [{
- name: '待处理',
+ name: '总数量',
color: ['#46afab', '#049391', '#146f8e', '#2c3e7e', '#545a96'],
- data: [foreignApplyAmount, foreignToBeRecycledAmount, foreignTobeWashAmount, foreignToBePackAmount, foreignToBeSterilizationAmount, foreignToBeInvoiceAmount, foreignToBeSignAmount]
+ data: [foreignApplyAmount, sumForeignRecycledAmount, sumForeignWashedAmount, sumForeignPackedAmount, 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);
- /************************ 外来器械包汇总 结束*********************/
+ /************************ 今日外来器械包汇总 结束*********************/
/************************ 本日工作量 开始*************************/
var xAxisData1 = ['申请', '回收', '清点', '清洗', '装配', '审核', '灭菌', '发货', '签收'];
@@ -470,7 +562,6 @@
data: [recycledAmount, washedAmount, packedAmount, sterilizationedAmount, invoicedAmount]
}];
var legendData3 = ['待处理', '已处理'];
- var colorData = ['#87cefa', '#FBA923'];
createChartsForColunm('#histogramChart', xAxisData3, seriesData3, legendData3)
/************************ 器械包处理量 结束***********************/
$(".loading").fadeOut()
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/realTimeDashboards/index.jsp
===================================================================
diff -u -r37947 -r37959
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/realTimeDashboards/index.jsp (.../index.jsp) (revision 37947)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/realTimeDashboards/index.jsp (.../index.jsp) (revision 37959)
@@ -25,6 +25,36 @@
+
数据加载中，请稍后...
@@ -63,21 +93,32 @@
+
+
+