From d085d0504041e29e82b51a6ade1a183149fc9ffa Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期二, 09 九月 2025 16:44:55 +0800
Subject: [PATCH] Merge branch 'master' of http://dh.leon056.com:7499/r/data2/Single_application into ID1956-已签到页面改版
---
src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue b/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue
index da20c84..9e9d42f 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue
@@ -100,6 +100,8 @@
item.是否为追加 ? item.追加剂量 : item.维持剂量
}}{{ item.单位 }}</span
>
+ </div>
+ <div class="list-item-num">
<span>总量：{{ item.总量 }}{{ item.单位 }}</span>
</div>
</div>
@@ -127,7 +129,7 @@
<template v-if="pageData.最近最大脱水量透析时长"
>/
<span class="level-dete">{{
- pageData.最近最大脱水量透析时长
+ formatDuration(pageData.最近最大脱水量透析时长)
}}</span>
</template>
</div>
@@ -312,7 +314,7 @@
</div>
</template>
<script lang="ts" setup name="SignedIn">
-import { computed, defineAsyncComponent, onMounted, ref } from "vue";
+import { computed, defineAsyncComponent, onMounted, ref, watch } from "vue";
import dayjs from "dayjs";
import "dayjs/locale/zh-cn";
dayjs.locale("zh-cn");
@@ -412,6 +414,13 @@
? value
: Number(value.toFixed(1));
return formattedValue;
+});
+
+
+watch(
+ () => pageData.value.四点血压图数据,
+ (newVal) => {
+ genderBloodPressureRectangularChart(newVal);
});
/** 点击定时任务 */
@@ -570,7 +579,11 @@
const cylinderRadius = 6;
const cylinderHeight = 计算脱水量刻度 * (datas?.[0]?.超滤总量 || 0);
const 体重增长_透前减干体重 = weightGain2.value;
- const 透前减干体重减超滤总量差值 = 体重增长_透前减干体重 - (datas?.[0]?.超滤总量 || 0);
+ const 透前减干体重减超滤总量差值 =
+ Math.round(
+ (体重增长_透前减干体重 - (datas?.[0]?.超滤总量 || 0)) * 10
+ ) / 10;
+
drawCylinder(
ctx,
@@ -665,6 +678,19 @@
ctx.fillText(透前减干体重减超滤总量差值 + "", textX, canvasHeight - 10); // 文本位于圆柱上方一点
}
};
+
+function formatDuration(input: string): string {
+ const match = input.match(/(\d+)小时(\d+)分钟/);
+ if (!match) return input; // 如果不符合格式，直接返回原字符串
+
+ const hours = parseInt(match[1], 10);
+ const minutes = parseInt(match[2], 10);
+
+ if (minutes > 0) {
+ return `${hours}h${minutes}min`;
+ }
+ return `${hours}h`;
+}
onMounted(() => {
genderBloodPressureRectangularChart(pageData.value.四点血压图数据);
});
@@ -801,7 +827,7 @@
text-align: left;
font-style: normal;
.list-item-name {
- margin-bottom: 2px;
+ // margin-bottom: 2px;
}
}
}
--
Gitblit v1.8.0