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

src/pages/monitoring/index.vue

@@ -64,74 +64,76 @@
       </div>
       <van-list v-model="loading" :finished="finished" finished-text="  " @load="onLoad">
         <div class="blueBorder"></div>
-        <table class="table">
-          <tr>
-            <th width="8%">姓名</th>
-            <th width="6%">机号</th>
-            <th width="9%">透析号</th>
-            <th width="10%">排班时间</th>
-            <th width="10%">透析模式</th>
-            <th width="9%">脱水量</th>
-            <th width="10%">体重(透前/透后)</th>
-            <th width="28%">监控预警(血压/心率)</th>
-          </tr>
-        </table>
+        <div class="monitoringTable">
+          <table class="table">
+            <tr>
+              <th width="8%">姓名</th>
+              <th width="6%">机号</th>
+              <th width="9%">透析号</th>
+              <th width="10%">排班时间</th>
+              <th width="10%">透析模式</th>
+              <th width="9%">脱水量</th>
+              <th width="10%">体重(透前/透后)</th>
+              <th width="28%">监控预警(血压/心率)</th>
+            </tr>
+          </table>
 
-        <table class="table" v-for="(items, index) in dialysis_scheduals" :key="index">
-          <tr v-if="items.zone_name.length > 0">
-            <td width="8%">{{ items.zone_name }}</td>
-            <td width="6%"></td>
-            <td width="9%"></td>
-            <td width="10%"></td>
-            <td width="10%"></td>
-            <td width="9%"></td>
-            <td width="10%"></td>
-            <td width="28%"></td>
-          </tr>
-          <tr v-for="(item, index) in items.scheduals" :key="index" @click="clickfunction(item)">
-            <td width="8%" style="color:#409eff;">{{ item.patient.name }}</td>
-            <td width="6%">
-              {{
-              item.dialysis_order.device_number.number.length > 0
-              ? item.dialysis_order.device_number.number
-              : item.device_number.number
-              }}
-            </td>
+          <table class="table" v-for="(items, index) in dialysis_scheduals" :key="index">
+            <tr v-if="items.zone_name.length > 0">
+              <td width="8%">{{ items.zone_name }}</td>
+              <td width="6%"></td>
+              <td width="9%"></td>
+              <td width="10%"></td>
+              <td width="10%"></td>
+              <td width="9%"></td>
+              <td width="10%"></td>
+              <td width="28%"></td>
+            </tr>
+            <tr v-for="(item, index) in items.scheduals" :key="index" @click="clickfunction(item)">
+              <td width="8%" style="color:#409eff;">{{ item.patient.name }}</td>
+              <td width="6%">
+                {{
+                item.dialysis_order.device_number.number.length > 0
+                ? item.dialysis_order.device_number.number
+                : item.device_number.number
+                }}
+              </td>
 
-            <td width="9%">{{ item.patient.dialysis_no }}</td>
-            <td width="10%">{{ parseTime(item.schedule_date, "{y}-{m}-{d}") }}</td>
-            <td width="10%">{{ item.treatment_mode.name }}</td>
-            <td width="9%">
-              {{
-              item.prescription.dewater_amount
-              ? item.prescription.dewater_amount
-              : ""
-              }}
-            </td>
-            <td width="10%">
-              {{
-              item.assessment_before_dislysis.weight_before
-              ? item.assessment_before_dislysis.weight_before
-              : ""
-              }}/{{
-              item.assessment_after_dislysis.weight_after
-              ? item.assessment_after_dislysis.weight_after
-              : ""
-              }}
-            </td>
-            <td width="28%">
-              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 1">低压</span>
-              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 2">正常</span>
-              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 3">高压</span>
-              <span v-if="monitorRateStatus(item.monitoring_record) == 1">心率过缓</span>
-              <span v-if="monitorRateStatus(item.monitoring_record) == 2">正常</span>
-              <span v-if="monitorRateStatus(item.monitoring_record) == 3">心率过高</span>
-            </td>
-          </tr>
-        </table>
+              <td width="9%">{{ item.patient.dialysis_no }}</td>
+              <td width="10%">{{ parseTime(item.schedule_date, "{y}-{m}-{d}") }}</td>
+              <td width="10%">{{ item.treatment_mode.name }}</td>
+              <td width="9%">
+                {{
+                item.prescription.dewater_amount
+                ? item.prescription.dewater_amount
+                : ""
+                }}
+              </td>
+              <td width="10%">
+                {{
+                item.assessment_before_dislysis.weight_before
+                ? item.assessment_before_dislysis.weight_before
+                : ""
+                }}/{{
+                item.assessment_after_dislysis.weight_after
+                ? item.assessment_after_dislysis.weight_after
+                : ""
+                }}
+              </td>
+              <td width="28%">
+                <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 1">低压</span>
+                <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 2">正常</span>
+                <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 3">高压</span>
+                <span v-if="monitorRateStatus(item.monitoring_record) == 1">心率过缓</span>
+                <span v-if="monitorRateStatus(item.monitoring_record) == 2">正常</span>
+                <span v-if="monitorRateStatus(item.monitoring_record) == 3">心率过高</span>
+              </td>
+            </tr>
+          </table>
 
-        <div class="NoData" v-show="dialysis_scheduals.length == 0">
-          <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
+          <div class="NoData" v-show="dialysis_scheduals.length == 0">
+            <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
+          </div>
         </div>
       </van-list>
       <!-- <div class="monitoringTable">
@@ -615,20 +617,22 @@ export default {
 }
 
 .monitoringTable {
-  .el-table {
-    width: 99.9% !important;
-  }
-  .newTable {
-    margin-top: 80px;
-    @media only screen and (min-width: 768px) {
-      margin-top: 140px !important;
-    }
-  }
-  .el-table td {
-    padding: 0;
-  }
-  .el-table th {
-    padding: 6px 0;
-  }
+  width: 100%;
+  overflow: auto;
+  // .el-table {
+  //   width: 99.9% !important;
+  // }
+  // .newTable {
+  //   margin-top: 80px;
+  //   @media only screen and (min-width: 768px) {
+  //     margin-top: 140px !important;
+  //   }
+  // }
+  // .el-table td {
+  //   padding: 0;
+  // }
+  // .el-table th {
+  //   padding: 6px 0;
+  // }
 }
 </style>

src/pages/personal/ChangePassword.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="container">
     <div class="changePassword">
+      <h1 class="title">
+        <div class="GoBack" @click="$router.go(-1)">
+          <span class="iconfont">&#xe720;</span>返回
+        </div>
+        <span class="name">修改密码</span>
+        <div class="GoBack"></div>
+      </h1>
       <van-field v-model="username" clearable label="旧密码" placeholder="请输入旧密码" />
       <van-field v-model="sms" center clearable label="验证码" placeholder="请输入短信验证码">
         <van-button slot="button" size="small" type="primary">发送验证码</van-button>
@@ -22,8 +29,35 @@
   justify-content: space-between;
   .changePassword {
     width: 100%;
-    margin-top: 1rem;
     font-size: 0.45rem;
+    .title {
+      margin-bottom: 1rem;
+
+      font-size: 0.45rem;
+      padding: 0.3rem 0.37rem;
+      color: $title-color;
+      @include align-items-center;
+      @include display-flex;
+      @include justify-content-between;
+      @include text-align;
+      background: #fff;
+      .GoBack {
+        color: $main-color;
+        font-size: 0.45rem;
+        @include display-flex;
+        .iconfont {
+          color: $main-color;
+          font-size: 0.5rem;
+          margin-top: 1px;
+          @media only screen and (min-width: 768px) {
+            margin-top: 3px;
+          }
+        }
+      }
+      .name {
+        margin-right: 1.3rem;
+      }
+    }
     .van-cell {
       width: 90%;
       margin: 0 auto;