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

src/pages/main/PatientBox.vue

@@ -452,7 +452,7 @@ export default {
 }
 .yztx {
   margin: 0 5px;
-  padding: 4px 10px;
+  padding: 3px 10px;
   background-color: #f56c6c;
   color: #fff;
   border-radius: 15px;

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1078,15 +1078,16 @@
         for (let keys in treatment_mode) {
           if (treatment_mode[keys].id == val) {
             treatment_mode_name = treatment_mode[keys].name
-            if (treatment_mode_name == 'HD' || treatment_mode_name == 'HD+HP' || treatment_mode_name == 'HP' || treatment_mode_name == 'HF' || treatment_mode_name == 'SCUF' || treatment_mode_name == 'IUF' || treatment_mode_name == 'HFHD' || treatment_mode_name == 'HFHD +HP' || treatment_mode_name == 'PHF'|| treatment_mode_name == 'HFR' || treatment_mode_name == 'CRRT' || treatment_mode_name == '腹水回收' || treatment_mode_name == 'HD前置换' || treatment_mode_name == 'HD后置换') {
-              this.zhiShow = false
-              this.totalShow = false
-              this.huShow = false
-            } else {
+          var treatment_mode_id = treatment_mode[keys].id
+          console.log("呵呵",treatment_mode_id)
+            if(treatment_mode_id === 1 || treatment_mode_id === 3 || treatment_mode_id === 4 || treatment_mode_id === 5 || treatment_mode_id === 6 || treatment_mode_id === 7 || treatment_mode_id === 8 || treatment_mode_id === 9 || treatment_mode_id === 10 || treatment_mode_id === 11 || treatment_mode_id === 13 || treatment_mode_id === 14 || treatment_mode_id === 15 || treatment_mode_id === 16){
+                 this.zhiShow = false
+                 this.totalShow = false
+                 this.huShow =false
+            }else{
               this.zhiShow = true
               this.totalShow = true
-              this.huShow = true
-              console.log("a")
+              this.huShow  = true           
             }
           }
         }

src/styles/media.scss

@@ -1,4 +1,4 @@
-@media only screen and (max-width: 500px) {
+@media only screen and (max-width: 767px) {
   html {
     font-size: 30px;
   }
@@ -10,17 +10,17 @@
 // }
 
 /* Medium devices (landscape tablets, 768px and up) */
-@media only screen and (min-width: 768px) {
-  html {
-    font-size: 50px;
-  }
-}
-
-// @media screen and (orientation: portrait) and (max-width: 640px) {
-// .mainBox {
-//   -webkit-transform: rotate(-90deg);
-//   -moz-transform: rotate(-90deg);
-//   -ms-transform: rotate(-90deg);
-//   transform: rotate(-90deg);
-// }
+// @media only screen and (min-width: 800px) {
+//   html {
+//     font-size: 50px;
+//   }
 // }
+
+@media screen and (orientation: portrait) and (max-width: 640px) {
+  // .mainBox {
+  //   -webkit-transform: rotate(-90deg);
+  //   -moz-transform: rotate(-90deg);
+  //   -ms-transform: rotate(-90deg);
+  //   transform: rotate(-90deg);
+  // }
+}