Merge remote-tracking branch 'origin/master'

src/views/equipment-management/equipment-management/equipment-add.vue

@@ -6,7 +6,7 @@
           <span class="topTitleText">新增</span>
         </div>
         <div style="width: 100%">
-          <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="7.82rem">
               <div class="title-paragraph">
                 <span class="title-text">基本信息</span>
               </div>

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -6,7 +6,7 @@
           <div class="topTitle">
             <span class="topTitleText">详情</span>
           </div>
-          <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="7.82rem">
             <div class="title-paragraph">
               <div class="title-text">
                 基本信息
@@ -341,7 +341,7 @@
           <div class="topTitle">
             <span class="topTitleText">编辑</span>
           </div>
-          <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="7.82rem">
 
             <div class="title-paragraph">
               <div class="title-text">

src/views/medical-record-management/medical-edit.vue

@@ -2683,9 +2683,9 @@ export default {
   // 宠物图片
   .petPicture {
     display: inline-block;
-    width: 150px;
-    height: 150px;
-    padding-left: 28px;
+    width: 9.375rem;
+    height: 9.375rem;
+    padding-left: 1.75rem;
 
     ::v-deep .el-image {
       box-shadow: unset !important;
@@ -2706,8 +2706,8 @@ export default {
   //3--主人信息--模块内信息整体样式
   .ownerMsg-inner {
     color: #666666;
-    margin-top: 20px;
-    margin-bottom: 20px;
+    margin-top: 1.25rem;
+    margin-bottom: 1.25rem;
   }
 
   //模块tip样式--绿色
@@ -2771,7 +2771,7 @@ export default {
   // 表格中输入框样式
   .el-table {
     .el-form-item {
-      margin-bottom: 0;
+      //margin-bottom: 0;
     }
 
     .el-link {

src/views/service-management/registration-queue/components/prescribing-modle.vue

 <template>
-  <el-dialog :visible.sync="isShow" class="prescribing-modle" title="开具处方" @close="onClose">
+  <el-dialog :visible.sync="isShow" :close-on-click-modal="false" class="prescribing-modle" title="开具处方" @close="onClose">
     <el-form ref="prescribingForm" :model="prescribingForm" label-width="5rem" size="small">
       <!--      标题区域-->
       <div class="prescribing-head">

src/views/service-management/registration-queue/components/schedule-info.vue

@@ -137,16 +137,16 @@ export default {
 
     /*模块tip图形样式--左绿色*/
     .tip-green {
-      width: 3px;
-      height: 24px;
+      width: 0.1875rem;
+      height: 1.5rem;
       background: #5FB54B;
-      border-radius: 10px 10px 10px 10px;
+      border-radius: 0.625rem;
     }
 
     /*模块tip内容样式*/
     .tip-content {
-      padding-left: 13px;
-      font-size: 16px;
+      padding-left: 0.8125rem;
+      font-size: 1rem;
       font-family: Microsoft YaHei-Bold, Microsoft YaHei, serif;
       font-weight: bold;
       color: #333333;
@@ -163,33 +163,33 @@ export default {
       display: flex;
       //当前触发的背景样式
       .bkg-on {
-        width: 260px;
-        height: 143px;
+        width: 16.25rem;
+        height: 8.9375rem;
         background: #F1F9EF;
-        border-radius: 4px 4px 4px 4px;
+        border-radius: 0.25rem;
         opacity: 1;
       }
 
       //当前未触发的背景样式
       .bkg-off {
-        width: 260px;
-        height: 143px;
+        width: 16.25rem;
+        height: 8.9375rem;
         background: #FFFFFF;
-        border-radius: 4px 4px 4px 4px;
+        border-radius: 0.25rem;
         opacity: 1;
         border: 1px solid #5FB54B;
       }
 
       //箭头样式
       .arrow {
-        height: 13px;
-        width: 104px;
-        margin: 65px 22px 65px 22px;
+        height: 0.8125rem;
+        width: 6.5rem;
+        margin: 4.0625rem 1.375rem 4.0625rem 1.375rem;
       }
 
       //状态触发状态
       .status-on {
-        font-size: 12px;
+        font-size: 0.75rem;
         font-family: Microsoft YaHei-Regular, Microsoft YaHei;
         font-weight: 400;
         color: #5FB54B;
@@ -197,7 +197,7 @@ export default {
 
       //状态未触发状态
       .status-off {
-        font-size: 12px;
+        font-size: 0.75rem;
         font-family: Microsoft YaHei-Regular, Microsoft YaHei;
         font-weight: 400;
         color: #AFAFAF;
@@ -207,16 +207,16 @@ export default {
       .avatar {
         width: 44px;
         height: 44px;
-        margin-bottom: 14px;
+        margin-bottom: 0.875rem;
       }
 
       //标题
       .title {
-        font-size: 14px;
+        font-size: 0.875rem;
         font-family: Microsoft YaHei-Bold, Microsoft YaHei;
         font-weight: bold;
         color: #333333;
-        margin-bottom: 14px;
+        margin-bottom: 0.875rem;
       }
 
       //预约/挂号
@@ -224,7 +224,7 @@ export default {
         display: flex;
         align-items: center;
         flex-direction: column;
-        padding-top: 18px;
+        padding-top: 1.125rem;
       }
     }
   }
@@ -232,7 +232,7 @@ export default {
 }
 /*进度条样式*/
 .schedule_style {
-  margin-top: 20px !important;
+  margin-top: 1.25rem !important;
 }
 
 /*底部提交返回按钮布局*/