seimin 1 rok temu
rodzic
commit
801707013b

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

@@ -633,14 +633,6 @@
633 633
                       nz-row
634 634
                       class="h100p"
635 635
                     >
636
-                      <div
637
-                        nz-col
638
-                        nzSpan="8"
639
-                        class="borderR alignC display_flex justify-content_flex-center align-items_center h100p"
640
-                      >
641
-                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1" nz-button nzType="primary" class="btn txtC mr8" (click)="sendWard($event, surgeryWKOMsg)">送回病房</button>
642
-                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1" nz-button nzType="primary" class="btn txtC" (click)="sendAwakeningRoom($event, surgeryWKOMsg)">送回苏醒间</button>
643
-                      </div>
644 636
                       <div nz-col nzSpan="16" class="h100p">
645 637
                         <div class="txtC h50p borderB">
646 638
                           <div class="swiperBox">
@@ -711,6 +703,14 @@
711 703
                           </div>
712 704
                         </div>
713 705
                       </div>
706
+                      <div
707
+                        nz-col
708
+                        nzSpan="8"
709
+                        class="borderL alignC display_flex justify-content_flex-center align-items_center h100p"
710
+                      >
711
+                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1" nz-button nzType="primary" class="btn txtC mr8" (click)="sendWard($event, surgeryWKOMsg)">送回病房</button>
712
+                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1" nz-button nzType="primary" class="btn txtC" (click)="sendAwakeningRoom($event, surgeryWKOMsg)">送回苏醒间</button>
713
+                      </div>
714 714
                     </div>
715 715
                     <div
716 716
                       *ngIf="surgeryLoading"

+ 41 - 37
src/app/views/hushijiandan/hushijiandan.component.less

@@ -122,7 +122,7 @@
122 122
     background: #f9fafb;
123 123
     box-shadow: 1px 1px 20px rgba(0, 0, 0, 0.3);
124 124
     border-radius: 30px;
125
-    border: 1px solid #e5e9ed;
125
+    border: 1px solid @hs_border_color;
126 126
     overflow: hidden;
127 127
     cursor: move;
128 128
 
@@ -145,7 +145,7 @@
145 145
         right: 16px;
146 146
         font-size: 16px;
147 147
         cursor: pointer;
148
-        color: #dde1e5;
148
+        color: @hs_border_color;
149 149
       }
150 150
     }
151 151
 
@@ -153,7 +153,7 @@
153 153
       width: 235px;
154 154
       height: 208px;
155 155
       background-color: #fff;
156
-      border: 1px solid #dde1e5;
156
+      border: 1px solid @hs_border_color;
157 157
       margin: 0 auto;
158 158
       border-radius: 30px;
159 159
       position: relative;
@@ -259,7 +259,7 @@
259 259
       width: 960px;
260 260
       height: 474px;
261 261
       background-color: #f9fafb;
262
-      border: 1px solid #e5e9ed;
262
+      border: 1px solid @hs_border_color;
263 263
       border-radius: 8px;
264 264
       display: flex;
265 265
       justify-content: center;
@@ -270,7 +270,7 @@
270 270
         height: 420px;
271 271
         background-color: #fff;
272 272
         border-radius: 8px;
273
-        border: 1px solid #e5e9ed;
273
+        border: 1px solid @hs_border_color;
274 274
 
275 275
         table {
276 276
           width: 100%;
@@ -349,7 +349,7 @@
349 349
         line-height: 34px;
350 350
         text-align: center;
351 351
         background-color: #f9fafb;
352
-        border: 1px solid #dde1e5;
352
+        border: 1px solid @hs_border_color;
353 353
         border-radius: 4px;
354 354
         font-size: 14px;
355 355
         color: @primary-color;
@@ -362,7 +362,7 @@
362 362
 // 查看标本详情 end
363 363
 .otherBox-nav {
364 364
   width: 20%;
365
-  border-right: 1px solid #dde1e5;
365
+  border-right: 1px solid @hs_border_color;
366 366
   display: flex;
367 367
   flex-direction: column;
368 368
 
@@ -435,12 +435,12 @@
435 435
 
436 436
     .otherBoxInner {
437 437
       height: 100%;
438
-      border: 1px solid #dde1e5;
438
+      border: 1px solid @hs_border_color;
439 439
       display: flex;
440 440
 
441 441
       .otherBox-nav {
442 442
         width: 20%;
443
-        border-right: 1px solid #dde1e5;
443
+        border-right: 1px solid @hs_border_color;
444 444
         display: flex;
445 445
         flex-direction: column;
446 446
 
@@ -552,7 +552,7 @@
552 552
           .modalBody_right_head {
553 553
             font-size: 16px;
554 554
             font-weight: bold;
555
-            border-bottom: 1px solid #dde1e5;
555
+            border-bottom: 1px solid @hs_border_color;
556 556
             display: flex;
557 557
             justify-content: space-between;
558 558
             align-items: center;
@@ -561,9 +561,9 @@
561 561
               .s_tab {
562 562
                 cursor: pointer;
563 563
                 padding: 8px;
564
-                border-right: 1px solid #e5e9ed;
564
+                border-right: 1px solid @hs_border_color;
565 565
                 &:first-of-type{
566
-                  border-left: 1px solid #e5e9ed;
566
+                  border-left: 1px solid @hs_border_color;
567 567
                 }
568 568
                 &.active{
569 569
                   color: #fff;
@@ -593,12 +593,12 @@
593 593
             display: flex;
594 594
             flex-direction: column;
595 595
             // justify-content: center;
596
-            border-left: 1px solid #dde1e5;
596
+            border-left: 1px solid @hs_border_color;
597 597
             padding: 0 8px 8px;
598 598
 
599 599
             .modalBody_right_list {
600 600
               text-align: justify;
601
-              border-bottom: 1px solid #dde1e5;
601
+              border-bottom: 1px solid @hs_border_color;
602 602
               padding: 8px 0;
603 603
 
604 604
               b {
@@ -906,7 +906,7 @@
906 906
           padding: 8px;
907 907
           box-sizing: border-box;
908 908
           font-size: 14px;
909
-          border-left: 1px solid #e5e9ed;
909
+          border-left: 1px solid @hs_border_color;
910 910
 
911 911
           .wel {
912 912
             line-height: 15px;
@@ -946,12 +946,12 @@
946 946
     .inner-content {
947 947
       background: #fff;
948 948
       height: 100% !important;
949
-      // border-bottom: 1px solid #e5e9ed;
949
+      // border-bottom: 1px solid @hs_border_color;
950 950
 
951 951
       .launch {
952 952
         width: 90px;
953 953
         height: 100%;
954
-        border-right: 1px solid #e5e9ed;
954
+        border-right: 1px solid @hs_border_color;
955 955
         position: relative;
956 956
         overflow: hidden;
957 957
         z-index: 3;
@@ -962,7 +962,7 @@
962 962
           color: #333;
963 963
           text-align: center;
964 964
           background: #fff;
965
-          border-bottom: 1px solid #e5e9ed;
965
+          border-bottom: 1px solid @hs_border_color;
966 966
           position: absolute;
967 967
           z-index: 1;
968 968
         }
@@ -1026,7 +1026,7 @@
1026 1026
           &:nth-child(1) {
1027 1027
             display: flex;
1028 1028
             flex-direction: column;
1029
-            border-right: 1px solid #e5e9ed;
1029
+            border-right: 1px solid @hs_border_color;
1030 1030
           }
1031 1031
         }
1032 1032
 
@@ -1153,7 +1153,7 @@
1153 1153
                 position: relative;
1154 1154
                 background-size: 400% 100%;
1155 1155
                 color: #333;
1156
-                border: 1px solid #e5e9ed;
1156
+                border: 1px solid @hs_border_color;
1157 1157
 
1158 1158
                 .text {
1159 1159
                   width: 100%;
@@ -1252,7 +1252,7 @@
1252 1252
             .box {
1253 1253
               border-radius: 5px;
1254 1254
               background: #f9fafb;
1255
-              border: 1px solid #e5e9ed;
1255
+              border: 1px solid @hs_border_color;
1256 1256
               padding-bottom: 60px;
1257 1257
               position: relative;
1258 1258
               height: 100%;
@@ -1288,7 +1288,7 @@
1288 1288
                 }
1289 1289
 
1290 1290
                 .ant-table-body {
1291
-                  border-bottom: 1px solid #e5e9ed;
1291
+                  border-bottom: 1px solid @hs_border_color;
1292 1292
                 }
1293 1293
 
1294 1294
                 .ant-table-tbody {
@@ -1354,7 +1354,7 @@
1354 1354
           .orderTit {
1355 1355
             width: 100%;
1356 1356
             overflow: hidden;
1357
-            border-bottom: 1px solid #e5e9ed;
1357
+            border-bottom: 1px solid @hs_border_color;
1358 1358
             padding: 8px;
1359 1359
             position: relative;
1360 1360
             z-index: 9;
@@ -1423,7 +1423,7 @@
1423 1423
 
1424 1424
                         &:nth-child(3) {
1425 1425
                           padding-bottom: 8px;
1426
-                          border-bottom: 1px solid #dde1e5;
1426
+                          border-bottom: 1px solid @hs_border_color;
1427 1427
                         }
1428 1428
 
1429 1429
                         .col {
@@ -1474,7 +1474,7 @@
1474 1474
                               vertical-align: text-top;
1475 1475
 
1476 1476
                               i {
1477
-                                color: #e5e9ed;
1477
+                                color: @hs_border_color;
1478 1478
 
1479 1479
                                 &.green {
1480 1480
                                   color: @primary-color;
@@ -1495,7 +1495,7 @@
1495 1495
                               display: inline-block;
1496 1496
                               width: 40px;
1497 1497
                               height: 2px;
1498
-                              background: #e5e9ed;
1498
+                              background: @hs_border_color;
1499 1499
                             }
1500 1500
                           }
1501 1501
                         }
@@ -1511,7 +1511,7 @@
1511 1511
                         color: @primary-color;
1512 1512
                         cursor: default;
1513 1513
                         background: #f9fafb;
1514
-                        border: 1px solid #e5e9ed;
1514
+                        border: 1px solid @hs_border_color;
1515 1515
                         border-left: 0;
1516 1516
                         cursor: pointer;
1517 1517
                         border-bottom: 0;
@@ -1528,7 +1528,7 @@
1528 1528
               background: #fff;
1529 1529
               padding: 16px 0;
1530 1530
               text-align: center;
1531
-              border-top: 1px solid #e5e9ed;
1531
+              border-top: 1px solid @hs_border_color;
1532 1532
             }
1533 1533
           }
1534 1534
         }
@@ -1549,12 +1549,16 @@
1549 1549
   text-align: right;
1550 1550
 }
1551 1551
 
1552
+.borderL {
1553
+  border-left: 1px solid @hs_border_color;
1554
+}
1555
+
1552 1556
 .borderR {
1553
-  border-right: 1px solid #e5e9ed;
1557
+  border-right: 1px solid @hs_border_color;
1554 1558
 }
1555 1559
 
1556 1560
 .borderB {
1557
-  border-bottom: 1px solid #e5e9ed;
1561
+  border-bottom: 1px solid @hs_border_color;
1558 1562
 }
1559 1563
 
1560 1564
 .h100p {
@@ -1644,7 +1648,7 @@
1644 1648
       width: 100%;
1645 1649
       min-height: 117px;
1646 1650
       background: #f9fafb;
1647
-      border: 1px solid #e5e9ed;
1651
+      border: 1px solid @hs_border_color;
1648 1652
       border-radius: 5px;
1649 1653
       overflow: hidden;
1650 1654
       margin-top: 12px;
@@ -1791,7 +1795,7 @@
1791 1795
         }
1792 1796
 
1793 1797
         &:nth-child(1) {
1794
-          border-bottom: 1px solid #dde1e5;
1798
+          border-bottom: 1px solid @hs_border_color;
1795 1799
         }
1796 1800
 
1797 1801
         &:nth-child(2) {
@@ -1858,7 +1862,7 @@
1858 1862
       width: 460px;
1859 1863
       height: 147px;
1860 1864
       background: #f9fafb;
1861
-      border: 1px solid #e5e9ed;
1865
+      border: 1px solid @hs_border_color;
1862 1866
       border-radius: 5px;
1863 1867
       overflow: hidden;
1864 1868
       margin-top: 12px;
@@ -1961,7 +1965,7 @@
1961 1965
     background: #fff;
1962 1966
     padding: 16px;
1963 1967
     border-radius: 5px;
1964
-    border: 1px solid #e5e9ed;
1968
+    border: 1px solid @hs_border_color;
1965 1969
     position: relative;
1966 1970
     z-index: 98;
1967 1971
 
@@ -1970,7 +1974,7 @@
1970 1974
       width: 100%;
1971 1975
       height: 100%;
1972 1976
       border-radius: 5px;
1973
-      border: 1px solid #e5e9ed;
1977
+      border: 1px solid @hs_border_color;
1974 1978
       padding: 16px 20px;
1975 1979
 
1976 1980
       &.tableCon {
@@ -2053,7 +2057,7 @@
2053 2057
     z-index: 98;
2054 2058
 
2055 2059
     .fixedMenu {
2056
-      border: 1px solid #e5e9ed;
2060
+      border: 1px solid @hs_border_color;
2057 2061
       color: @primary-color;
2058 2062
       background: rgba(255, 255, 255, 0.5);
2059 2063
       text-align: center;
@@ -2069,7 +2073,7 @@
2069 2073
           line-height: 35px;
2070 2074
           padding: 0 6px;
2071 2075
           cursor: default;
2072
-          border-bottom: 1px solid #e5e9ed;
2076
+          border-bottom: 1px solid @hs_border_color;
2073 2077
           user-select: none;
2074 2078
 
2075 2079
           &.checked {

+ 1 - 1
src/theme.less

@@ -2,4 +2,4 @@
2 2
 @primary-color: #49b856; //主题色
3 3
 @bg-start: #72c172; //渐变色起始
4 4
 @bg-end: #3bb197; //渐变色结束
5
-
5
+@hs_border_color: #ccc;