Merge branch 'wzf' of http://git.shengws.com/zhangbj/xt_pad into wzf

src/pages/main/dialysis/LongTable.vue

@@ -813,7 +813,7 @@ export default {
         }
         .iconfont {
           color: $main-color;
-          font-size: 0.3rem;
+          font-size: 0.45rem;
           margin-right: 0.1rem;
         }
       }

src/pages/main/records/CaseHistory.vue

@@ -77,7 +77,7 @@ export default {
   background: #fff;
   background: #fff;
   @media only screen and (max-width: 767px) {
-    top: 40px !important;
+    top: 38px !important;
   }
   // @media only screen and (min-width: 376px) and (max-width: 668px) {
   //   top: 50px !important;

src/pages/monitoring/index.vue

@@ -27,7 +27,7 @@
             >搜索</van-button>
           </van-field>
         </div>-->
-        <div class="newSearch">
+        <div class="newSearch1">
           <el-input
             prefix-icon="el-icon-search"
             v-model="patient_keyword"
@@ -575,7 +575,7 @@ export default {
 }
 </style>
 <style lang="scss">
-.newSearch {
+.newSearch1 {
   height: 1rem;
   width: 100%;
   background: #fff;
@@ -602,6 +602,9 @@ export default {
     border-radius: 30px;
     border: none;
     font-size: 0.45rem;
+    @media only screen and (min-width: 768px) {
+      padding-left: 0.9rem;
+    }
   }
   .el-input__icon {
     line-height: 1rem;

src/pages/personal/ElectronicSignature.vue

@@ -427,7 +427,7 @@ export default {
       height: 400px;
       margin: 0 auto;
       border-radius: 4px;
-
+      overflow: hidden;
       // @media only screen and (max-width: 812px) {
       //   width: 500px !important;
       //   height: 200px !important;
@@ -467,8 +467,12 @@ export default {
   }
 }
 .fl {
-  @media only screen and (max-width: 812px) {
-    width: 100% !important;
+  // @media only screen and (max-width: 812px) {
+  //   width: 100% !important;
+  //   height: 400px !important;
+  // }
+  @media only screen and (min-width: 768px) {
+    width: 1000px !important;
     height: 400px !important;
   }
 }

src/styles/style.scss

@@ -581,13 +581,13 @@ body {
 
       .xg {
         color: $main-color;
-        font-size: 0.28rem;
+        font-size: 0.45rem;
         margin-right: 0.2rem;
         cursor: pointer;
         .iconfont {
           margin-right: 0.1rem;
           color: $main-color;
-          font-size: 0.3rem;
+          font-size: 0.45rem;
         }
       }
       .sc {