Index: ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js
===================================================================
diff -u -r38627 -r38632
--- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js	(.../index.js)	(revision 38627)
+++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js	(.../index.js)	(revision 38632)
@@ -9,58 +9,8 @@
 var showUrgentGoodsSummary = false;
 var showUrgentGoodsDetails = false;
 var showForeignTousseSummarySpecifyPeriod = false;
-var deviceUsageSummaryHeaders = [{
-    header: "设备名称",
-    dataIndex: 'name',
-    width: '75%',
-    align: 'left'
-}, {
-    header: "当前状态",
-    dataIndex: 'status',
-    width: '25%',
-    align: 'center'
-}];
-var urgentGoodsSummaryHeaders = [{
-    header: "物品名称",
-    dataIndex: 'tousseName'
-}, {
-    header: "加急级别",
-    dataIndex: 'name'
-}, {
-    header: "加急数量",
-    dataIndex: 'urgentAmount'
-}];
-var urgentGoodsDetailsHeaders = [{
-    header: "物品名称",
-    dataIndex: 'tousseName',
-    width: '25%',
-    align: 'left'
-}, {
-    header: "申请",
-    dataIndex: 'totalAmount',
-    width: '15%',
-    align: 'center'
-}, {
-    header: "已回收",
-    dataIndex: 'recyUrgentAmount',
-    width: '15%',
-    align: 'center'
-}, {
-    header: "已装配",
-    dataIndex: 'packAmount',
-    width: '15%',
-    align: 'center'
-}, {
-    header: "已灭菌",
-    dataIndex: 'steMount',
-    width: '15%',
-    align: 'center'
-}, {
-    header: "已发货",
-    dataIndex: 'invoiceAmount',
-    width: '15%',
-    align: 'center'
-}];
+var tousseSummaryChartType = '';
+var foreignTousseSummaryChartType = '';
 
 //当前时间
 var m = 0;
@@ -155,19 +105,43 @@
                 var sumPackAmount = toBePackAmount + packedAmount;
                 var sumSterilizationAmount = toBeSterilizationAmount + sterilizationedAmount;
                 var sumInvoiceAmount = toBeInvoiceAmount + invoicedAmount;
+                var resultObj = {
+                    sumApplyAmount: sumApplyAmount,
+                    sumWashedAmount: sumWashedAmount,
+                    sumPackAmount: sumPackAmount,
+                    sumSterilizationAmount: sumSterilizationAmount,
+                    sumInvoiceAmount: sumInvoiceAmount,
+                    recycledAmount: recycledAmount,
+                    washedAmount: washedAmount,
+                    packedAmount: packedAmount,
+                    sterilizationedAmount: sterilizationedAmount,
+                    invoicedAmount: invoicedAmount
+                }
 
-                var xAxisData = ['回收清点', '清洗消毒', '装配管理', '灭菌管理', '发货计划'];
-                var legendData = ['全部物品', '已处理'];
-                var seriesData = [{
-                    name: '全部物品',
-                    color: ['#2289ff', '#4077f6', '#5d5ef6', '#6557de', '#8c70f8'],
-                    data: [sumApplyAmount, sumWashedAmount, sumPackAmount, sumSterilizationAmount, sumInvoiceAmount]
-                },
-                {
-                    name: '已处理',
-                    color: ['#f9de50', '#ffb028', '#f2a229', '#f98a42', '#e98352'],
-                    data: [recycledAmount, washedAmount, packedAmount, sterilizationedAmount, invoicedAmount]
-                }];
+                var legendData = [];
+                var xAxisData = [];
+                var seriesData = [];
+                for (var i = 0; i < tousseSummarySeriesData.length; i++) {
+                    legendData.push(tousseSummarySeriesData[i].header);
+                    var colors = [];
+                    var datas = [];
+                    if (tousseSummarySeriesData[i].xAxisData.length > 0) {
+                        for (var j = 0; j < tousseSummarySeriesData[i].xAxisData.length; j++) {
+                            var item = tousseSummarySeriesData[i].xAxisData[j];
+                            if (xAxisData.indexOf(item.name) == -1) {
+                                xAxisData.push(item.name);
+                            }
+                            colors.push(item.color);
+                            datas.push(resultObj[item.dataIndex])
+                        }
+                    }
+                    seriesData.push({
+                        name: tousseSummarySeriesData[i].header,
+                        chartType: tousseSummaryChartType,
+                        color: colors,
+                        data: datas
+                    })
+                }
                 createChartsForColunm('#tousseSummary', xAxisData, seriesData, legendData);
             }
         }
@@ -210,18 +184,46 @@
                 var sumForeignInvoicedAmount = foreignToBeInvoiceAmount + foreignInvoicedAmount;
                 var sumForeignSignedAmount = foreignSignedAmount + foreignToBeSignAmount;
 
-                var xAxisData = ['申请', '回收', '清洗消毒', '装配管理', '灭菌管理', '发货', '签收'];
-                var seriesData = [{
-                    name: '总数量',
-                    color: ['#46afab', '#049391', '#146f8e', '#2c3e7e', '#545a96'],
-                    data: [foreignApplyAmount, sumForeignRecycledAmount, sumForeignWashedAmount, sumForeignPackedAmount, sumForeignSterilizationedAmount, sumForeignInvoicedAmount, sumForeignSignedAmount]
-                },
-                {
-                    name: '已处理',
-                    color: ['#e99b29', '#9a5037', '#923f49', '#353281', '#5a59a5'],
-                    data: [foreignApplyAmount, foreignRecycledAmount, foreignWashedAmount, foreignPackedAmount, foreignSterilizationedAmount, foreignInvoicedAmount, foreignSignedAmount]
-                }];
-                var legendData = ['总数量', '已处理'];
+                var resultObj = {
+                    foreignApplyAmount: foreignApplyAmount,
+                    sumForeignRecycledAmount: sumForeignRecycledAmount,
+                    sumForeignWashedAmount: sumForeignWashedAmount,
+                    sumForeignPackedAmount: sumForeignPackedAmount,
+                    sumForeignSterilizationedAmount: sumForeignSterilizationedAmount,
+                    sumForeignInvoicedAmount: sumForeignInvoicedAmount,
+                    sumForeignSignedAmount: sumForeignSignedAmount,
+                    foreignRecycledAmount: foreignRecycledAmount,
+                    foreignWashedAmount: foreignWashedAmount,
+                    foreignPackedAmount: foreignPackedAmount,
+                    foreignSterilizationedAmount: foreignSterilizationedAmount,
+                    foreignInvoicedAmount: foreignInvoicedAmount,
+                    foreignSignedAmount: foreignSignedAmount
+                }
+
+                var legendData = [];
+                var xAxisData = [];
+                var seriesData = [];
+                for (var i = 0; i < foreignTousseSummarySeriesData.length; i++) {
+                    legendData.push(foreignTousseSummarySeriesData[i].header);
+                    var colors = [];
+                    var datas = [];
+                    if (foreignTousseSummarySeriesData[i].xAxisData.length > 0) {
+                        for (var j = 0; j < foreignTousseSummarySeriesData[i].xAxisData.length; j++) {
+                            var item = foreignTousseSummarySeriesData[i].xAxisData[j];
+                            if (xAxisData.indexOf(item.name) == -1) {
+                                xAxisData.push(item.name);
+                            }
+                            colors.push(item.color);
+                            datas.push(resultObj[item.dataIndex])
+                        }
+                    }
+                    seriesData.push({
+                        name: foreignTousseSummarySeriesData[i].header,
+                        chartType: foreignTousseSummaryChartType,
+                        color: colors,
+                        data: datas
+                    })
+                }
                 createChartsForColunm('#foreignTousseSummary', xAxisData, seriesData, legendData);
             }
         }
@@ -251,8 +253,27 @@
                 var invoicedAmount = result.message.invoicedAmount || 0;
                 var signedAmount = result.message.signedAmount || 0;
 
-                var xAxisData = ['申请', '回收', '清点', '清洗', '装配', '审核', '灭菌', '发货', '签收'];
-                var seriesData = [applyAmount, recycledAmount, inventoryEdAmount, washedAmount, packedAmount, reviewedAmount, sterilizationedAmount, invoicedAmount, signedAmount];
+                var resultObj = {
+                    applyAmount: applyAmount,
+                    recycledAmount: recycledAmount,
+                    inventoryEdAmount: inventoryEdAmount,
+                    washedAmount: washedAmount,
+                    packedAmount: packedAmount,
+                    reviewedAmount: reviewedAmount,
+                    sterilizationedAmount: sterilizationedAmount,
+                    invoicedAmount: invoicedAmount,
+                    signedAmount: signedAmount
+                }
+
+                var xAxisData = [];
+                var seriesData = [];
+                for (var i = 0; i < workloadSummarySeriesData.length; i++) {
+                    var item = workloadSummarySeriesData[i];
+                    if (xAxisData.indexOf(item.name) == -1) {
+                        xAxisData.push(item.name);
+                        seriesData.push(resultObj[item.dataIndex]);
+                    }
+                }
                 createChartsForLine('#workloadSummary', xAxisData, seriesData);
             }
         }
@@ -275,7 +296,7 @@
             if (result.message.length > 0) {
                 html += '<div class="head">';
                 for (var k = 0; k < deviceUsageSummaryHeaders.length; k++) {
-                    html += '<span class="col"  style="width:' + deviceUsageSummaryHeaders[k].width + ';text-align:' + deviceUsageSummaryHeaders[k].align + '">' + deviceUsageSummaryHeaders[k].header + '</span>';
+                    html += '<span class="col" style="width:' + deviceUsageSummaryHeaders[k].width + ';text-align:' + deviceUsageSummaryHeaders[k].align + '">' + deviceUsageSummaryHeaders[k].header + '</span>';
                 }
                 html += '</div>';
                 html += '<div class="marquee-view">';
@@ -291,7 +312,7 @@
                         html += '<div class="row">';
                     }
                     for (var k = 0; k < deviceUsageSummaryHeaders.length; k++) {
-                        html += '<span class="col"  style="width:' + deviceUsageSummaryHeaders[k].width + ';text-align:' + deviceUsageSummaryHeaders[k].align + '">' + (result.message[i][deviceUsageSummaryHeaders[k].dataIndex] || '') + '</span>';
+                        html += '<span class="col" style="width:' + deviceUsageSummaryHeaders[k].width + ';text-align:' + deviceUsageSummaryHeaders[k].align + '">' + (result.message[i][deviceUsageSummaryHeaders[k].dataIndex] || '') + '</span>';
                     }
                     html += '<span class="icon-dot"></span>';
                     html += '</div>';
@@ -341,7 +362,7 @@
                 var html = '';
                 html += '<div class="head">';
                 for (var k = 0; k < urgentGoodsSummaryHeaders.length; k++) {
-                    html += '<span class="col">' + urgentGoodsSummaryHeaders[k].header + '</span>';
+                    html += '<span class="col" style="width:' + urgentGoodsSummaryHeaders[k].width + ';text-align:' + urgentGoodsSummaryHeaders[k].align + '">' + urgentGoodsSummaryHeaders[k].header + '</span>';
                 }
                 html += '</div>';
                 html += '<div class="marquee-view">';
@@ -354,7 +375,7 @@
                     for (var i = 0; i < data.length; i++) {
                         html += '<div class="row" style="color: ' + data[i].colorCode + '">';
                         for (var k = 0; k < urgentGoodsSummaryHeaders.length; k++) {
-                            html += '<span class="col">' + (data[i][urgentGoodsSummaryHeaders[k].dataIndex] || '') + '</span>';
+                            html += '<span class="col" style="width:' + urgentGoodsSummaryHeaders[k].width + ';text-align:' + urgentGoodsSummaryHeaders[k].align + '">' + (data[i][urgentGoodsSummaryHeaders[k].dataIndex] || '') + '</span>';
                         }
                         html += '<span class="icon-dot"></span>';
                         html += '</div>';
@@ -459,18 +480,47 @@
                 //待处理申请单数
                 var toBeInvoicePlanAmount = result.message.toBeInvoicePlanAmount || 0;
 
-                var xAxisData = ['申请', '回收', '清洗消毒', '装配管理', '灭菌管理', '发货', '签收'];
-                var seriesData = [{
-                    name: '总数量',
-                    color: ['#46afab', '#049391', '#146f8e', '#2c3e7e', '#545a96'],
-                    data: [foreignApplyAmount, sumForeignRecycledAmount, sumForeignWashedAmount, sumForeignPackedAmount, sumForeignSterilizationedAmount, sumForeignInvoicedAmount, sumForeignSignedAmount]
-                },
-                {
-                    name: '已处理',
-                    color: ['#e99b29', '#9a5037', '#923f49', '#353281', '#5a59a5'],
-                    data: [foreignApplyAmount, foreignRecycledAmount, foreignWashedAmount, foreignPackedAmount, foreignSterilizationedAmount, foreignInvoicedAmount, foreignSignedAmount]
-                }];
-                var legendData = ['总数量', '已处理'];
+                var resultObj = {
+                    foreignApplyAmount: foreignApplyAmount,
+                    sumForeignRecycledAmount: sumForeignRecycledAmount,
+                    sumForeignWashedAmount: sumForeignWashedAmount,
+                    sumForeignPackedAmount: sumForeignPackedAmount,
+                    sumForeignSterilizationedAmount: sumForeignSterilizationedAmount,
+                    sumForeignInvoicedAmount: sumForeignInvoicedAmount,
+                    sumForeignSignedAmount: sumForeignSignedAmount,
+                    foreignRecycledAmount: foreignRecycledAmount,
+                    foreignWashedAmount: foreignWashedAmount,
+                    foreignPackedAmount: foreignPackedAmount,
+                    foreignSterilizationedAmount: foreignSterilizationedAmount,
+                    foreignInvoicedAmount: foreignInvoicedAmount,
+                    foreignSignedAmount: foreignSignedAmount
+                }
+
+                var legendData = [];
+                var xAxisData = [];
+                var seriesData = [];
+                for (var i = 0; i < foreignTousseSummarySeriesData.length; i++) {
+                    legendData.push(foreignTousseSummarySeriesData[i].header);
+                    var colors = [];
+                    var datas = [];
+                    if (foreignTousseSummarySeriesData[i].xAxisData.length > 0) {
+                        for (var j = 0; j < foreignTousseSummarySeriesData[i].xAxisData.length; j++) {
+                            var item = foreignTousseSummarySeriesData[i].xAxisData[j];
+                            if (xAxisData.indexOf(item.name) == -1) {
+                                xAxisData.push(item.name);
+                            }
+                            colors.push(item.color);
+                            datas.push(resultObj[item.dataIndex])
+                        }
+                    }
+                    seriesData.push({
+                        name: foreignTousseSummarySeriesData[i].header,
+                        chartType: foreignTousseSummaryChartType,
+                        color: colors,
+                        data: datas
+                    })
+                }
+
                 createChartsForColunm('#foreignTousseSummarySpecifyPeriod', xAxisData, seriesData, legendData);
                 $('#invoiceAmountID').text(invoiceAmount);
                 $('#invoicePlanAmountID').text(invoicePlanAmount);
@@ -488,6 +538,7 @@
     var height = realTimeDashboardsObj.height || 0;
     var type = realTimeDashboardsObj.type || 1;
     var headers = realTimeDashboardsObj.headers || [];
+    var chartType = realTimeDashboardsObj.chartType;
     var name = realTimeDashboardsObj.dataSources + 'Box';
     title = title || '';
     if (name == 'urgentAmountBox') {
@@ -502,13 +553,20 @@
         }
     } else if (name == 'deviceUsageSummaryBox') {
         showDeviceUsageSummary = true;
-        deviceUsageSummaryHeaders = headers
+        if (headers.length > 0) {
+            deviceUsageSummaryHeaders = headers
+        }
         return deviceUsageSummaryBox(title);
     } else if (name == 'tousseSummaryBox') {
         showTousseSummary = true;
+        if (headers.length > 0) {
+            tousseSummarySeriesData = headers
+        }
+        tousseSummaryChartType = chartType || 'bar';
         return tousseSummaryBox(title);
     } else if (name == 'foreignTousseSummaryBox') {
         showForeignTousseSummary = true;
+        foreignTousseSummaryChartType = chartType || 'bar';
         return foreignTousseSummaryBox(title);
     } else if (name == 'nowTimeBox') {
         showNowTime = true;
@@ -521,13 +579,19 @@
         return workloadSummaryBox(title);
     } else if (name == 'urgentGoodsSummaryBox') {
         showUrgentGoodsSummary = true;
-        urgentGoodsSummaryHeaders = headers
+        if (headers.length > 0) {
+            urgentGoodsSummaryHeaders = headers
+        }
         return urgentGoodsSummaryBox(title);
     } else if (name == 'urgentGoodsDetailsBox') {
         showUrgentGoodsDetails = true;
+        if (headers.length > 0) {
+            urgentGoodsDetailsHeaders = headers
+        }
         return urgentGoodsDetailsBox(title);
     } else if (name == 'foreignTousseSummary_SpecifyPeriodBox') {
         showForeignTousseSummarySpecifyPeriod = true;
+        foreignTousseSummaryChartType = chartType || 'bar';
         return foreignTousseSummarySpecifyPeriodBox(title);
     }
 }
@@ -718,7 +782,7 @@
         }, 1400);
     }
 
-    $(".loading").fadeOut();
+    //$(".loading").fadeOut();
 })();
 
 //加急数量模块
@@ -813,8 +877,11 @@
     html += '<div class="inner">';
     html += '<h3>' + title + '</h3>';
     html += '<div class="content" id="deviceUsageSummaryBox">';
+    html += '<div class="loading">';
+    html += '<div class="loadbox"> <img src="images/loading.gif"> 数据加载中，请稍后... </div>';
     html += '</div>';
     html += '</div>';
+    html += '</div>';
     return html;
 }
 
@@ -824,9 +891,13 @@
     html += '<div class="inner">';
     html += '<h3>' + title + '</h3>';
     html += '<div class="chart">';
-    html += '<div class="bar" id="tousseSummary"></div>';
+    html += '<div class="bar" id="tousseSummary">';
+    html += '<div class="loading">';
+    html += '<div class="loadbox"> <img src="images/loading.gif"> 数据加载中，请稍后... </div>';
     html += '</div>';
     html += '</div>';
+    html += '</div>';
+    html += '</div>';
     return html;
 }
 
@@ -836,9 +907,13 @@
     html += '<div class="inner">';
     html += '<h3>' + title + '</h3>';
     html += '<div class="chart">';
-    html += '<div class="bar" id="foreignTousseSummary"></div>';
+    html += '<div class="bar" id="foreignTousseSummary">';
+    html += '<div class="loading">';
+    html += '<div class="loadbox"> <img src="images/loading.gif"> 数据加载中，请稍后... </div>';
     html += '</div>';
     html += '</div>';
+    html += '</div>';
+    html += '</div>';
     return html;
 }
 
@@ -848,9 +923,13 @@
     html += '<div class="inner">';
     html += '<h3>' + title + '</h3>';
     html += '<div class="chart" style="position: relative;">';
-    html += '<div class="bar" id="workloadSummary" style="height: 14rem"></div>';
+    html += '<div class="bar" id="workloadSummary" style="height: 14rem">';
+    html += '<div class="loading">';
+    html += '<div class="loadbox"> <img src="images/loading.gif"> 数据加载中，请稍后... </div>';
     html += '</div>';
     html += '</div>';
+    html += '</div>';
+    html += '</div>';
     return html;
 }
 
@@ -860,8 +939,11 @@
     html += '<div class="inner">';
     html += '<h3>' + title + '</h3>';
     html += '<div class="content" id="urgentGoodsSummary">';
+    html += '<div class="loading">';
+    html += '<div class="loadbox"> <img src="images/loading.gif"> 数据加载中，请稍后... </div>';
     html += '</div>';
     html += '</div>';
+    html += '</div>';
     return html;
 }
 
@@ -871,8 +953,11 @@
     html += '<div class="inner">';
     html += '<div style="display: flex;justify-content: space-between;"><h3 style="margin-right:10px">' + title + '</h3><h2>加急总包数<br/><span id="invoicePlanUrgentAmountID">0</span></h2><h2>加急发放包数<br/><span id="sendOutUrgentAmountID">0</span></h2><h2>加急待发放包数<br/><span id="toBeSendOutUrgentAmountID">0</span></h2></div>';
     html += '<div class="content" id="urgentGoodsDetails">';
+    html += '<div class="loading">';
+    html += '<div class="loadbox"> <img src="images/loading.gif"> 数据加载中，请稍后... </div>';
     html += '</div>';
     html += '</div>';
+    html += '</div>';
     return html;
 }
 
@@ -882,9 +967,13 @@
     html += '<div class="inner">';
     html += '<div style="display: flex;justify-content: space-between;"><h3 style="margin-right:10px">' + title + '</h3><h2>申请单总数<br/><span id="invoiceAmountID">0</span></h2><h2>已发货申请单数<br/><span id="invoicePlanAmountID">0</span></h2><h2>已回收申请单数<br/><span id="recyAmountID">0</span></h2><h2>待处理申请单数<br/><span id="toBeInvoicePlanAmountID">0</span></h2></div>';
     html += '<div class="chart">';
-    html += '<div class="bar" id="foreignTousseSummarySpecifyPeriod"></div>';
+    html += '<div class="bar" id="foreignTousseSummarySpecifyPeriod">';
+    html += '<div class="loading">';
+    html += '<div class="loadbox"> <img src="images/loading.gif"> 数据加载中，请稍后... </div>';
     html += '</div>';
     html += '</div>';
+    html += '</div>';
+    html += '</div>';
     return html;
 }
 
@@ -921,7 +1010,7 @@
             ]
             series[i] = {
                 name: seriesData[i].name,
-                type: 'bar',
+                type: seriesData[i].chartType,
                 label: {
                     show: true,
                     color: '#fff',
Index: ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/css/index.css
===================================================================
diff -u -r38627 -r38632
--- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/css/index.css	(.../index.css)	(revision 38627)
+++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/css/index.css	(.../index.css)	(revision 38632)
@@ -15,7 +15,7 @@
 }
 
 .loading {
-  position: fixed;
+  position: absolute;
   left: 0;
   top: 0;
   font-size: .3rem;
Index: ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/headerColumn.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/headerColumn.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/headerColumn.js	(revision 38632)
@@ -0,0 +1,207 @@
+//今日设备使用情况
+var deviceUsageSummaryHeaders = [{
+    header: "设备名称",
+    dataIndex: 'name',
+    width: '45%',
+    align: 'left'
+}, {
+    header: "当前状态",
+    dataIndex: 'status',
+    width: '25%',
+    align: 'center'
+}, {
+    header: "当前状态",
+    dataIndex: 'dateStr',
+    width: '30%',
+    align: 'center'
+}];
+//加急物品汇总
+var urgentGoodsSummaryHeaders = [{
+    header: "物品名称",
+    dataIndex: 'tousseName',
+    width: '50%',
+    align: 'left'
+}, {
+    header: "加急级别",
+    dataIndex: 'name',
+    width: '25%',
+    align: 'center'
+}, {
+    header: "加急数量",
+    dataIndex: 'urgentAmount',
+    width: '25%',
+    align: 'center'
+}];
+//加急明细汇总
+var urgentGoodsDetailsHeaders = [{
+    header: "物品名称",
+    dataIndex: 'tousseName',
+    width: '25%',
+    align: 'left'
+}, {
+    header: "申请",
+    dataIndex: 'totalAmount',
+    width: '15%',
+    align: 'center'
+}, {
+    header: "已回收",
+    dataIndex: 'recyUrgentAmount',
+    width: '15%',
+    align: 'center'
+}, {
+    header: "已装配",
+    dataIndex: 'packAmount',
+    width: '15%',
+    align: 'center'
+}, {
+    header: "已灭菌",
+    dataIndex: 'steMount',
+    width: '15%',
+    align: 'center'
+}, {
+    header: "已发货",
+    dataIndex: 'invoiceAmount',
+    width: '15%',
+    align: 'center'
+}];
+//今日器械包汇总
+var tousseSummarySeriesData = [{
+    header: "全部物品",
+    xAxisData: [{
+        name: '回收清点',
+        dataIndex: 'sumApplyAmount',
+        color: '#2289ff'
+    }, {
+        name: '清洗消毒',
+        dataIndex: 'sumWashedAmount',
+        color: '#4077f6'
+    }, {
+        name: '装配管理',
+        dataIndex: 'sumPackAmount',
+        color: '#5d5ef6'
+    }, {
+        name: '灭菌管理',
+        dataIndex: 'sumSterilizationAmount',
+        color: '#6557de'
+    }, {
+        name: '发货计划',
+        dataIndex: 'sumInvoiceAmount',
+        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'
+    }]
+}]
+//今日外来器械包汇总
+var foreignTousseSummarySeriesData = [{
+    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'
+    }]
+}]
+//工作量汇总
+var workloadSummarySeriesData = [{
+    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/index.jsp
===================================================================
diff -u -r38627 -r38632
--- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/index.jsp	(.../index.jsp)	(revision 38627)
+++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/index.jsp	(.../index.jsp)	(revision 38632)
@@ -32,9 +32,6 @@
 <script type="text/javascript" src="${ctx }/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <body>
-    <div class="loading">
-        <div class="loadbox"> <img src="images/loading.gif"> 数据加载中，请稍后... </div>
-    </div>
     <div class="viewport">
         <div class="column columnLeft"></div>
         <div class="column columnCenter"> </div>
@@ -44,6 +41,7 @@
 </body>
 <script src="./js/jquery.min.js"></script>
 <script src="./js/echarts.min.js"></script>
+<script src="./js/headerColumn.js"></script>
 <script src="./js/index.js"></script>
 <script type="text/javascript" src="js/bg.js"></script>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboardsConfig.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboardsConfig.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboardsConfig.js	(revision 38632)
@@ -0,0 +1,73 @@
+//注释说明：模块最多显示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: 20,
+    items: [{
+      dataSources: 'onlineUserAmount',
+      title: '',
+      height: 15,
+      type: 2
+    }, {
+      dataSources: 'deviceUsageSummary',
+      title: '今日设备使用情况',
+      height: 72
+    }]
+  },
+  //中间显示的模块
+  columnCenter: {
+    width: 60,
+    items: [{
+      dataSources: 'tousseSummary',
+      title: '今日器械包汇总',
+      height: 43
+    }, {
+      dataSources: 'foreignTousseSummary',
+      title: '今日外来器械包汇总',
+      height: 43
+    }]
+  },
+  //右边显示的模块
+  columnRight: {
+    width: 20,
+    items: [{
+      dataSources: 'nowTime',
+      title: '',
+      height: 15
+    }, {
+      dataSources: 'urgentGoodsSummary',
+      title: '待发货加急物品列表',
+      height: 30
+    }, {
+      dataSources: 'workloadSummary',
+      title: '今日工作量统计',
+      height: 40
+    }]
+  }
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/images/border.png
===================================================================
diff -u -r35169 -r38632
Binary files differ
Fisheye: Tag 38632 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/fonts/icomoon.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/images/logo.png
===================================================================
diff -u -r36709 -r38632
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/fonts/icomoon.ttf
===================================================================
diff -u -r35169 -r38632
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/images/rect.png
===================================================================
diff -u -r35169 -r38632
Binary files differ
Fisheye: Tag 38632 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/js/bg.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/images/line.png
===================================================================
diff -u -r35169 -r38632
Binary files differ
Fisheye: Tag 38632 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/fonts/icomoon.svg'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/images/loading.gif
===================================================================
diff -u -r35169 -r38632
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/fonts/icomoon.woff
===================================================================
diff -u -r35169 -r38632
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/css/DISPLAY FREE TFB.ttf
===================================================================
diff -u -r35169 -r38632
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/fonts/icomoon.eot
===================================================================
diff -u -r35169 -r38632
Binary files differ
Fisheye: Tag 38632 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/css/index.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 38632 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/js/echarts.min.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 38632 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/js/jquery.min.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 38632 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/index.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 38632 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/js/index.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/realTimeDashboards/images/user.png
===================================================================
diff -u -r36122 -r38632
Binary files differ