Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/realTimeDashboards/css/index.css
===================================================================
diff -u -r35172 -r35412
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/realTimeDashboards/css/index.css (.../index.css) (revision 35172)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/realTimeDashboards/css/index.css (.../index.css) (revision 35412)
@@ -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/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r35411 -r35412
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 35411)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 35412)
@@ -1215,8 +1215,8 @@
items: [{
xtype: 'numberfield',
fieldLabel: '数据实时看板待处理查询周期',
- id: 'noOperationTime3',
- name: 'noOperationTime3',
+ id: 'dashboardsQueryCycle',
+ name: 'dashboardsQueryCycle',
minValue:0,
value:7,
allowNegative: false,
@@ -3472,13 +3472,13 @@
var dashboardsRefreshFrequency = ''
var dashboardsScreenSaver = ''
var noOperationTime = ''
- var noOperationTime3 = '';
+ var dashboardsQueryCycle = '';
if(!SSTS_RealTimeDashboards){
dashboardsRefreshFrequency = Ext.getCmp("dashboardsRefreshFrequency").getValue();
dashboardsScreenSaver = Ext.getCmp("dashboardsScreenSaver").getValue();
noOperationTime = Ext.getCmp("noOperationTime").getValue();
- noOperationTime3 = Ext.getCmp("noOperationTime3").getValue();
+ dashboardsQueryCycle = Ext.getCmp("dashboardsQueryCycle").getValue();
}
var myMask = new Ext.LoadMask(Ext.getBody(), { msg: "正在保存..." });
@@ -3576,7 +3576,7 @@
isEnableTousseUnReturnWarn:isEnableTousseUnReturnWarn,
dashboardsRefreshFrequency:dashboardsRefreshFrequency,
noOperationTime:noOperationTime,
- noOperationTime3:noOperationTime3,
+ dashboardsQueryCycle:dashboardsQueryCycle,
dashboardsScreenSaver:dashboardsScreenSaver,
receiptor: receiptor //自动签收发货单的签收人名字
},
@@ -3857,8 +3857,8 @@
if(supplyRoomConfig.noOperationTime){
Ext.getCmp('noOperationTime').setValue(supplyRoomConfig.noOperationTime);
}
- if(supplyRoomConfig.noOperationTime3){
- Ext.getCmp('noOperationTime3').setValue(supplyRoomConfig.noOperationTime3);
+ if(supplyRoomConfig.dashboardsQueryCycle){
+ Ext.getCmp('dashboardsQueryCycle').setValue(supplyRoomConfig.dashboardsQueryCycle);
}
var isFtOnlyImplantConvert = (supplyRoomConfig.isFtOnlyImplantConvert == true || supplyRoomConfig.isFtOnlyImplantConvert == 'true')?'是':'否';
Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/realTimeDashboards/js/index.js
===================================================================
diff -u -r35172 -r35412
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/realTimeDashboards/js/index.js (.../index.js) (revision 35172)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/realTimeDashboards/js/index.js (.../index.js) (revision 35412)
@@ -242,6 +242,58 @@
myechart.setOption(option);
}
+function createChartsForPie(dom, scheduledAmount, finishedAmount) {
+ var myechart = echarts.init($(dom)[0]);
+ var sum = parseInt(scheduledAmount) + parseInt(finishedAmount);
+ var series = [
+ {
+ type: 'pie',
+ radius: ['40%', '80%'],
+ data: [
+ { value: finishedAmount, name: '已完成' },
+ { value: scheduledAmount, name: '已安排' }
+ ],
+ label: {
+ normal: {
+ show: true,
+ color: '#4c4a4a',
+ formatter: '{value|{c}}\n{name|{b}}',
+ rich: {
+ name: {
+ fontSize: 20,
+ fontFamily: "微软雅黑",
+ color: '#fff'
+ },
+ value: {
+ fontFamily: "微软雅黑",
+ fontSize: 20,
+ color: '#f0f0f0',
+ lineHeight: 50
+ },
+ }
+ }
+ }
+ }
+ ]
+ var option = {
+ color: ['#93CF76', '#73C0DE'],
+ graphic: [{ //环形图中间添加文字
+ type: 'text', //通过不同top值可以设置上下显示
+ left: '41%',
+ top: '45%',
+ style: {
+ text: sum + '\n今日总台数',
+ textAlign: 'center',
+ fill: '#fff', //文字的颜色
+ fontSize: 14,
+ lineHeight: 50
+ }
+ }],
+ series: series
+ }
+ myechart.setOption(option);
+}
+
function createChartsForLine(dom, xAxisData, seriesData) {
var myechart = echarts.init($(dom)[0]);
var xAxisData1 = xAxisData;
@@ -342,6 +394,7 @@
function init() {
getFirstSupplyRoomConfigOnlineUserDate();
getEquipmentData();
+ getOperationReservation();
getRealTimeBulletinBoardWorkloadData();
}
@@ -383,13 +436,28 @@
}
}
$('#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 finishedAmount = result.finishedAmount || 0;
+ createChartsForPie('#pie', scheduledAmount, finishedAmount)
+ }
+ })
+}
+
//获取数据看板工作量
function getRealTimeBulletinBoardWorkloadData() {
var url = WWWROOT + '/jasperreports/jasperreportsAction!getRealTimeBulletinBoardWorkloadData.do';