From bae842ad4d3ea87ed547dcbf5c8dd85ba0bdbb01 Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期六, 26 七月 2025 15:12:30 +0800
Subject: [PATCH] Merge branch 'ID1825-床旁副屏改版' into test

---
 src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue b/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue
index 13d4fd7..d84d884 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue
@@ -85,17 +85,26 @@
           class="row1-col4-row"
           header-class-name="mihi-header"
         >
-          <div class="dehydrated-level">
+          <div class="dehydrated-level left-0">
             <div class="dehydrated-level-item">
               <span class="item-left"
-                >平均脱水量:{{ pageData.averageDehydrationRate }} L</span
+                >平均脱水量:{{ pageData.averageDehydrationRate }} L</span
               >
               <span class="item-right">(最近9次)</span>
             </div>
             <div class="dehydrated-level-item">
               <span class="item-left"
-                >最大脱水量:{{ pageData.maximumDehydrationCapacity }} L</span
-              >
+                ><span
+                  >最大脱水量:{{ pageData.maximumDehydrationCapacity }} L</span
+                >
+                <template v-if="pageData.maximumDehydrationDuration"
+                  >/
+                  <span class="level-dete">{{
+                    pageData.maximumDehydrationDuration
+                  }}</span>
+                </template>
+              </span>
+
               <span class="item-right"
                 >({{ pageData.maximumDehydrationCapacityDate }})</span
               >
@@ -151,7 +160,9 @@
         header-class-name="big-header"
       >
         <div class="weight-box">
-          <span v-if="pageData.weightIncreaseRate > 0" class="weight-text">+</span>
+          <span v-if="pageData.weightIncreaseRate > 0" class="weight-text"
+            >+</span
+          >
           <span class="weight-text">{{ pageData.weightIncrease }}</span>
           <span class="unit-text">kg</span>
         </div>
@@ -205,7 +216,7 @@
 import kaiShiImg from "@/img/kaiShi.png";
 import xinlvImg from "@/img/xinlv.png";
 import zlmsImg from "@/img/zlms.png";
-import zlztImg from '@/img/txzt.png';
+import zlztImg from "@/img/txzt.png";
 import cljdImg from "@/img/cljd.png";
 import txqImg from "@/img/txq.png";
 import tizhongImg from "@/img/tizhong.png";
@@ -320,6 +331,9 @@
           flex-direction: column;
           align-items: center;
           justify-content: space-between;
+          &.left-0 {
+            padding-left: 0;
+          }
           .dehydrated-level-item {
             width: 100%;
             display: flex;
@@ -332,6 +346,14 @@
               color: #333333;
               line-height: 6px;
               font-style: normal;
+              .level-dete {
+                font-family: PingFangSC, PingFang SC;
+                font-weight: 600;
+                font-size: 4px;
+                color: #d58e56;
+                text-align: left;
+                font-style: normal;
+              }
             }
             .item-right {
               font-family: PingFangSC, PingFang SC;

--
Gitblit v1.8.0