Merge branch 'ID1825-床旁副屏改版' into test

zhangchen

2025-07-26 bae842ad4d3ea87ed547dcbf5c8dd85ba0bdbb01

Merge branch 'ID1825-床旁副屏改版' into test

 src/store/type/bedsideAuxiliaryScreen.type.ts

@@ -308,6 +308,7 @@
  weightAfterLastDialysis: number | null; // 上次透后称重
  weightIncrease: number | null; // 体重增加
  weightIncreaseRate: number | null; // 体重增长率
  maximumDehydrationDuration: string;
}

export const defaultSignedIn = (): SignedIn => {
@@ -324,6 +325,7 @@
    weightAfterLastDialysis: null, // 上次透后称重
    weightIncrease: null, // 体重增加
    weightIncreaseRate: null, // 体重增长率
    maximumDehydrationDuration: '',
  };
};

@@ -504,6 +506,8 @@
          seeMsg.透析状态?.上次透后称重 ?? null;
        signedIn.weightIncrease = seeMsg.透析状态?.体重增加 ?? null;
        signedIn.weightIncreaseRate = seeMsg.透析状态?.体重增长率 ?? null;
        signedIn.maximumDehydrationDuration =
          seeMsg.透析状态?.最近最大脱水量透析时长 ?? "";

        result.signedIn = signedIn;
      }

 src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue

@@ -167,8 +167,6 @@
watch(countdown, (newVal) => {
  if (newVal <= 0 && !isTaskAlartIsOpen.value) {
    isTaskAlartIsOpen.value = true;

    // 弹窗逻辑，替换为你自己的弹窗组件或 UI 框
    showTaskAlart();
  }
});

 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;