优化样式

src/app/views/hushijiandan/hushijiandan.component.html

@@ -633,14 +633,6 @@
                       nz-row
                       class="h100p"
                     >
-                      <div
-                        nz-col
-                        nzSpan="8"
-                        class="borderR alignC display_flex justify-content_flex-center align-items_center h100p"
-                      >
-                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1" nz-button nzType="primary" class="btn txtC mr8" (click)="sendWard($event, surgeryWKOMsg)">送回病房</button>
-                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1" nz-button nzType="primary" class="btn txtC" (click)="sendAwakeningRoom($event, surgeryWKOMsg)">送回苏醒间</button>
-                      </div>
                       <div nz-col nzSpan="16" class="h100p">
                         <div class="txtC h50p borderB">
                           <div class="swiperBox">
@@ -711,6 +703,14 @@
                           </div>
                         </div>
                       </div>
+                      <div
+                        nz-col
+                        nzSpan="8"
+                        class="borderL alignC display_flex justify-content_flex-center align-items_center h100p"
+                      >
+                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1" nz-button nzType="primary" class="btn txtC mr8" (click)="sendWard($event, surgeryWKOMsg)">送回病房</button>
+                        <button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1" nz-button nzType="primary" class="btn txtC" (click)="sendAwakeningRoom($event, surgeryWKOMsg)">送回苏醒间</button>
+                      </div>
                     </div>
                     <div
                       *ngIf="surgeryLoading"

src/app/views/hushijiandan/hushijiandan.component.less

@@ -122,7 +122,7 @@
     background: #f9fafb;
     box-shadow: 1px 1px 20px rgba(0, 0, 0, 0.3);
     border-radius: 30px;
-    border: 1px solid #e5e9ed;
+    border: 1px solid @hs_border_color;
     overflow: hidden;
     cursor: move;
 
@@ -145,7 +145,7 @@
         right: 16px;
         font-size: 16px;
         cursor: pointer;
-        color: #dde1e5;
+        color: @hs_border_color;
       }
     }
 
@@ -153,7 +153,7 @@
       width: 235px;
       height: 208px;
       background-color: #fff;
-      border: 1px solid #dde1e5;
+      border: 1px solid @hs_border_color;
       margin: 0 auto;
       border-radius: 30px;
       position: relative;
@@ -259,7 +259,7 @@
       width: 960px;
       height: 474px;
       background-color: #f9fafb;
-      border: 1px solid #e5e9ed;
+      border: 1px solid @hs_border_color;
       border-radius: 8px;
       display: flex;
       justify-content: center;
@@ -270,7 +270,7 @@
         height: 420px;
         background-color: #fff;
         border-radius: 8px;
-        border: 1px solid #e5e9ed;
+        border: 1px solid @hs_border_color;
 
         table {
           width: 100%;
@@ -349,7 +349,7 @@
         line-height: 34px;
         text-align: center;
         background-color: #f9fafb;
-        border: 1px solid #dde1e5;
+        border: 1px solid @hs_border_color;
         border-radius: 4px;
         font-size: 14px;
         color: @primary-color;
@@ -362,7 +362,7 @@
 // 查看标本详情 end
 .otherBox-nav {
   width: 20%;
-  border-right: 1px solid #dde1e5;
+  border-right: 1px solid @hs_border_color;
   display: flex;
   flex-direction: column;
 
@@ -435,12 +435,12 @@
 
     .otherBoxInner {
       height: 100%;
-      border: 1px solid #dde1e5;
+      border: 1px solid @hs_border_color;
       display: flex;
 
       .otherBox-nav {
         width: 20%;
-        border-right: 1px solid #dde1e5;
+        border-right: 1px solid @hs_border_color;
         display: flex;
         flex-direction: column;
 
@@ -552,7 +552,7 @@
           .modalBody_right_head {
             font-size: 16px;
             font-weight: bold;
-            border-bottom: 1px solid #dde1e5;
+            border-bottom: 1px solid @hs_border_color;
             display: flex;
             justify-content: space-between;
             align-items: center;
@@ -561,9 +561,9 @@
               .s_tab {
                 cursor: pointer;
                 padding: 8px;
-                border-right: 1px solid #e5e9ed;
+                border-right: 1px solid @hs_border_color;
                 &:first-of-type{
-                  border-left: 1px solid #e5e9ed;
+                  border-left: 1px solid @hs_border_color;
                 }
                 &.active{
                   color: #fff;
@@ -593,12 +593,12 @@
             display: flex;
             flex-direction: column;
             // justify-content: center;
-            border-left: 1px solid #dde1e5;
+            border-left: 1px solid @hs_border_color;
             padding: 0 8px 8px;
 
             .modalBody_right_list {
               text-align: justify;
-              border-bottom: 1px solid #dde1e5;
+              border-bottom: 1px solid @hs_border_color;
               padding: 8px 0;
 
               b {
@@ -906,7 +906,7 @@
           padding: 8px;
           box-sizing: border-box;
           font-size: 14px;
-          border-left: 1px solid #e5e9ed;
+          border-left: 1px solid @hs_border_color;
 
           .wel {
             line-height: 15px;
@@ -946,12 +946,12 @@
     .inner-content {
       background: #fff;
       height: 100% !important;
-      // border-bottom: 1px solid #e5e9ed;
+      // border-bottom: 1px solid @hs_border_color;
 
       .launch {
         width: 90px;
         height: 100%;
-        border-right: 1px solid #e5e9ed;
+        border-right: 1px solid @hs_border_color;
         position: relative;
         overflow: hidden;
         z-index: 3;
@@ -962,7 +962,7 @@
           color: #333;
           text-align: center;
           background: #fff;
-          border-bottom: 1px solid #e5e9ed;
+          border-bottom: 1px solid @hs_border_color;
           position: absolute;
           z-index: 1;
         }
@@ -1026,7 +1026,7 @@
           &:nth-child(1) {
             display: flex;
             flex-direction: column;
-            border-right: 1px solid #e5e9ed;
+            border-right: 1px solid @hs_border_color;
           }
         }
 
@@ -1153,7 +1153,7 @@
                 position: relative;
                 background-size: 400% 100%;
                 color: #333;
-                border: 1px solid #e5e9ed;
+                border: 1px solid @hs_border_color;
 
                 .text {
                   width: 100%;
@@ -1252,7 +1252,7 @@
             .box {
               border-radius: 5px;
               background: #f9fafb;
-              border: 1px solid #e5e9ed;
+              border: 1px solid @hs_border_color;
               padding-bottom: 60px;
               position: relative;
               height: 100%;
@@ -1288,7 +1288,7 @@
                 }
 
                 .ant-table-body {
-                  border-bottom: 1px solid #e5e9ed;
+                  border-bottom: 1px solid @hs_border_color;
                 }
 
                 .ant-table-tbody {
@@ -1354,7 +1354,7 @@
           .orderTit {
             width: 100%;
             overflow: hidden;
-            border-bottom: 1px solid #e5e9ed;
+            border-bottom: 1px solid @hs_border_color;
             padding: 8px;
             position: relative;
             z-index: 9;
@@ -1423,7 +1423,7 @@
 
                         &:nth-child(3) {
                           padding-bottom: 8px;
-                          border-bottom: 1px solid #dde1e5;
+                          border-bottom: 1px solid @hs_border_color;
                         }
 
                         .col {
@@ -1474,7 +1474,7 @@
                               vertical-align: text-top;
 
                               i {
-                                color: #e5e9ed;
+                                color: @hs_border_color;
 
                                 &.green {
                                   color: @primary-color;
@@ -1495,7 +1495,7 @@
                               display: inline-block;
                               width: 40px;
                               height: 2px;
-                              background: #e5e9ed;
+                              background: @hs_border_color;
                             }
                           }
                         }
@@ -1511,7 +1511,7 @@
                         color: @primary-color;
                         cursor: default;
                         background: #f9fafb;
-                        border: 1px solid #e5e9ed;
+                        border: 1px solid @hs_border_color;
                         border-left: 0;
                         cursor: pointer;
                         border-bottom: 0;
@@ -1528,7 +1528,7 @@
               background: #fff;
               padding: 16px 0;
               text-align: center;
-              border-top: 1px solid #e5e9ed;
+              border-top: 1px solid @hs_border_color;
             }
           }
         }
@@ -1549,12 +1549,16 @@
   text-align: right;
 }
 
+.borderL {
+  border-left: 1px solid @hs_border_color;
+}
+
 .borderR {
-  border-right: 1px solid #e5e9ed;
+  border-right: 1px solid @hs_border_color;
 }
 
 .borderB {
-  border-bottom: 1px solid #e5e9ed;
+  border-bottom: 1px solid @hs_border_color;
 }
 
 .h100p {
@@ -1644,7 +1648,7 @@
       width: 100%;
       min-height: 117px;
       background: #f9fafb;
-      border: 1px solid #e5e9ed;
+      border: 1px solid @hs_border_color;
       border-radius: 5px;
       overflow: hidden;
       margin-top: 12px;
@@ -1791,7 +1795,7 @@
         }
 
         &:nth-child(1) {
-          border-bottom: 1px solid #dde1e5;
+          border-bottom: 1px solid @hs_border_color;
         }
 
         &:nth-child(2) {
@@ -1858,7 +1862,7 @@
       width: 460px;
       height: 147px;
       background: #f9fafb;
-      border: 1px solid #e5e9ed;
+      border: 1px solid @hs_border_color;
       border-radius: 5px;
       overflow: hidden;
       margin-top: 12px;
@@ -1961,7 +1965,7 @@
     background: #fff;
     padding: 16px;
     border-radius: 5px;
-    border: 1px solid #e5e9ed;
+    border: 1px solid @hs_border_color;
     position: relative;
     z-index: 98;
 
@@ -1970,7 +1974,7 @@
       width: 100%;
       height: 100%;
       border-radius: 5px;
-      border: 1px solid #e5e9ed;
+      border: 1px solid @hs_border_color;
       padding: 16px 20px;
 
       &.tableCon {
@@ -2053,7 +2057,7 @@
     z-index: 98;
 
     .fixedMenu {
-      border: 1px solid #e5e9ed;
+      border: 1px solid @hs_border_color;
       color: @primary-color;
       background: rgba(255, 255, 255, 0.5);
       text-align: center;
@@ -2069,7 +2073,7 @@
           line-height: 35px;
           padding: 0 6px;
           cursor: default;
-          border-bottom: 1px solid #e5e9ed;
+          border-bottom: 1px solid @hs_border_color;
           user-select: none;
 
           &.checked {

src/theme.less

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