Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/css/index.css
===================================================================
diff -u -r35074 -r35124
--- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/css/index.css	(.../index.css)	(revision 35074)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/css/index.css	(.../index.css)	(revision 35124)
@@ -115,10 +115,9 @@
 }
 
 .columnLeft_1 h4 {
-  font-size: 1.167rem;
+  font-size: 2rem;
   padding-left: 0.2rem;
   color: #fff;
-  margin-bottom: 0.333rem;
   text-align: center;
   font-family: myFirstFont !important;
 }
@@ -338,13 +337,12 @@
 }
 
 .columnRight_1 .inner .time {
-  font-size: 1.65rem;
+  font-size: 2.2rem;
   text-align: center;
 }
 
 .columnRight_1 .inner .monthAndDay {
-  font-size: 1rem;
-  margin-top: 0.4rem;
+  font-size: 1.2rem;
   text-align: center;
   color: #fff;
 }
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r35069 -r35124
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 35069)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 35124)
@@ -719,8 +719,10 @@
 					xtype: "fieldset",
 					title: '系统参数设置',
 					layout: 'column',
+					id:'systemConfig',
 					width: itemWidth,
-					height: fontSize == 12 ? 135 : 150,
+					style:'height:auto',
+					//height: fontSize == 12 ? 135 : 150,
 					// columnWidth : 1,
 					labelWidth: 95,
 					items: [
Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/js/index.js
===================================================================
diff -u -r35113 -r35124
--- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/js/index.js	(.../index.js)	(revision 35113)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/js/index.js	(.../index.js)	(revision 35124)
@@ -23,9 +23,9 @@
         return
     }
     if (sstsConfig.enableUrgentFunction) {
-        $('.urgent').css('display','flex');
-    }else {
-        $('.noUrgent').css('display','flex');
+        $('.urgent').css('display', 'flex');
+    } else {
+        $('.noUrgent').css('display', 'flex');
     }
     setInterval(getTime, 1000);
     initToTime();
@@ -116,9 +116,9 @@
         grid: {
             // 距离 上右下左 的距离
             left: '0',
-            right: '3%',
-            bottom: '3%',
-            top: '5%',
+            right: '0',
+            bottom: '0',
+            top: '10%',
             // 大小是否包含文本【类似于boxsizing】
             containLabel: true,
             //显示边框
@@ -383,6 +383,9 @@
                 }
             }
             $('#equipment').html(html)
+            if (result.data.length < 15) {
+                $('#equipment').removeClass('marquee');
+            }
         }
     })
 }
@@ -451,7 +454,7 @@
             /************************ 本日工作量 开始*************************/
             var xAxisData1 = ['申请', '回收', '清点', '清洗', '装配', '审核', '灭菌', '发货', '签收'];
             var seriesData1 = [applyAmount, recycledAmount, inventoryEdAmount, washedAmount, packedAmount, reviewedAmount, sterilizationedAmount, invoicedAmount, signedAmount];
-            createChartsForLine('#line',xAxisData1,seriesData1);
+            createChartsForLine('#line', xAxisData1, seriesData1);
             /************************ 本日工作量 结束*************************/
 
             /************************ 器械包处理量 开始***********************/
Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/index.jsp
===================================================================
diff -u -r35114 -r35124
--- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/index.jsp	(.../index.jsp)	(revision 35114)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/index.jsp	(.../index.jsp)	(revision 35124)
@@ -31,7 +31,7 @@
   <div class="viewport">
       <div class="column">
           <div class="panel columnLeft_1">
-              <div class="inner urgent">
+              <div class="inner urgent" style="top: -2.5rem;">
                   <div class="item">
                       <h4 id="invoicedAmount">0</h4>
                       <span style="color: #fff">
@@ -102,7 +102,8 @@
               <div class="inner">
                   <p class="time newFont"></p>
                   <p class="monthAndDay">
-                    <span class="month newFont"></span> 
+                    <span class="month newFont"></span>
+                    <span class="newFont">-</span>
                     <span class="day newFont"></span> 
                     <span class="week"></span></span>
                   </p>
@@ -129,7 +130,7 @@
   <canvas id="canvas" style="position: absolute;top: 0;left: 0;"></canvas>
 </body>
 <script src="./js/jquery.min.js"></script>
-<script src="./js/echarts.min.js"></script>\
+<script src="./js/echarts.min.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/qysrmyy/realTimeDashboards/css/DISPLAY FREE TFB.ttf
===================================================================
diff -u -r35069 -r35124
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
===================================================================
diff -u -r35069 -r35124
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp	(.../supplyRoomTypeView.jsp)	(revision 35069)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp	(.../supplyRoomTypeView.jsp)	(revision 35124)
@@ -27,6 +27,9 @@
 	fieldset {
 		margin-bottom: 10px !important;
 	}
+	#systemConfig .x-fieldset-body{
+		height: auto !important;
+	}
 </style>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 <script type="text/javascript" src="setForeiTousseHandleDepartAndTaskGroup.js?version=${svnRevision}"></script>