Browse Source

调整样式

seimin 1 year ago
parent
commit
cf55958814

+ 3 - 3
src/app/views/hushijiandan/hushijiandan.component.html

@@ -404,9 +404,9 @@
404 404
           <div
405 405
             class="nurseTitle display_flex justify-content_space-between align-items_center"
406 406
           >
407
-            <span>护士端<span class="todayNum">当日建单数:{{ todayNum }}</span></span>
408
-            <p class="updateTipsForNurses red">{{ updateTipsForNurses }}</p>
409
-            <span class="todayNum" *ngIf="inspectAndPatientTransportConfig.queuingInformation == 1">等待陪检:<span class="red">{{queuingInformationList[0]}}</span>&emsp;陪检中:<span class="red">{{queuingInformationList[1]}}</span></span>
407
+            <div class="todayNumWrap">护士端<span class="todayNum">当日建单数:{{ todayNum }}</span></div>
408
+            <div class="updateTipsForNurses red">{{ updateTipsForNurses }}</div>
409
+            <div class="queuingInformation" *ngIf="!updateTipsForNurses && inspectAndPatientTransportConfig.queuingInformation == 1">等待陪检:<span class="red">{{queuingInformationList[0]}}</span>&emsp;陪检中:<span class="red">{{queuingInformationList[1]}}</span></div>
410 410
             <div class="nurseCode" (click)="showNurseCode()">
411 411
               <i class="nurseCodeIcon icon_transport transport-erweima"></i
412 412
               >二维码

+ 9 - 2
src/app/views/hushijiandan/hushijiandan.component.less

@@ -866,6 +866,7 @@
866 866
         padding-left: 24px;
867 867
 
868 868
         .nurseTitle {
869
+          display: flex;
869 870
           height: 88px;
870 871
           font-size: 22px;
871 872
           color: #333;
@@ -875,9 +876,15 @@
875 876
             margin-left: 16px;
876 877
           }
877 878
 
879
+          .queuingInformation{
880
+            margin-right: 16px;
881
+            font-size: 16px;
882
+          }
883
+
878 884
           .updateTipsForNurses {
879
-            margin: 0;
880
-            width: 50%;
885
+            word-break: break-all;
886
+            margin: 0 16px;
887
+            flex: 1;
881 888
             line-height: normal;
882 889
             font-size: 14px;
883 890
           }

+ 1 - 0
src/app/views/main/main.component.less

@@ -18,6 +18,7 @@ nz-sider {
18 18
 }
19 19
 
20 20
 .menu-sidebar {
21
+  width: 224px;
21 22
   flex: 0 0 224px;
22 23
   position: relative;
23 24
   z-index: 8;

+ 1 - 1
src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
8 8
   enableProdMode();
9 9
   if (window) {
10 10
     window.console.log = function () { };
11
-    console.info('v2.4.29');
11
+    console.info('v2.4.30');
12 12
   }
13 13
 }
14 14
 platformBrowserDynamic().bootstrapModule(AppModule)