From 3b2e941a83ad49d3167df864a5a06a81ef944470 Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期三, 24 九月 2025 23:55:45 +0800
Subject: [PATCH] Merge branch 'ID2130-未签到页面优化' into test
---
src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue | 115 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 30 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue b/src/views/mobile/bedsideAuxiliaryScreen/pages/SignedIn.vue
index da20c84..6b33391 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>
@@ -249,7 +251,8 @@
<tr>
<td>体重增长</td>
<td class="flex-td">
- <span class="sub-text">(透前-干体重)</span><span class="text-right">{{ weightGain2 }}kg</span>
+ <span class="sub-text">(透前-干体重)</span
+ ><span class="text-right">{{ weightGain2 }}kg</span>
</td>
</tr>
<!-- <tr>
@@ -292,14 +295,15 @@
@click="() => onScheduledTasksClick()"
class="btn"
/>
- <BlockBotttom
+ <!-- <BlockBotttom
:icon="jiaoHaoImg"
text="叫号"
backgroundColor="#20C6B6"
@click="() => onCallBumberClick()"
class="btn"
- />
+ /> -->
<BlockBotttom
+ v-if="isShowStartBtn"
:icon="kaiShiImg"
text="开始"
backgroundColor="#409EFF"
@@ -309,10 +313,12 @@
</div>
<!-- 定时任务 -->
<ScheduledTaskDialog ref="scheduledTaskDialogRef" />
+ <!-- 开始透析组件 -->
+ <StartDialysis ref="startDialysisRef" />
</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");
@@ -343,9 +349,11 @@
// @ts-ignore
import BlockBotttom from "../components/BlockBotttom.vue";
import { ElMessage } from "element-plus";
+import { EMedStatus } from '@/store/type/bedsideAuxiliaryScreen.type';
const ScheduledTaskDialog = defineAsyncComponent(
() => import("../components/ScheduledTask.vue")
);
+const StartDialysis = defineAsyncComponent(() => import('../components/StartDialysis/index.vue'));
interface Props {
height: number;
@@ -356,7 +364,7 @@
const bloodPressureRectangularChart = ref<HTMLElement | null>(null);
const scheduledTaskDialogRef = ref<any>(null);
-
+const startDialysisRef = ref<any>(null);
const pageData = computed(() => {
return Object.assign(bedsideAuxiliaryScreenStore.deviceData.signedIn, {
@@ -414,6 +422,20 @@
return formattedValue;
});
+/**
+ * 是否显示开始透析按钮
+ */
+const isShowStartBtn = computed(() => {
+ return +bedsideAuxiliaryScreenStore.deviceData.treatmentStatus === EMedStatus.SIGNED_IN;
+})
+
+watch(
+ () => pageData.value.四点血压图数据,
+ (newVal) => {
+ genderBloodPressureRectangularChart(newVal);
+ }
+);
+
/** 点击定时任务 */
const onScheduledTasksClick = () => {
if (
@@ -432,20 +454,27 @@
};
const onStartClick = () => {
- ElMessage({
- message: "功能开发中,敬请期待!",
- type: "warning",
- });
+ if (
+ !bedsideAuxiliaryScreenStore.deviceCode ||
+ !bedsideAuxiliaryScreenStore.deviceData.deviceCode
+ )
+ return ElMessage.warning("未初始化或正在进行初始化操作中");
+ if (!bedsideAuxiliaryScreenStore.userInfo?.token)
+ return ElMessage.warning("请登录");
+ startDialysisRef.value?.openDialog();
};
-const genderBloodPressureRectangularChart = (datas: 四点血压图数据[] | null) => {
+const genderBloodPressureRectangularChart = (
+ datas: 四点血压图数据[] | null
+) => {
if (!bloodPressureRectangularChart.value) return;
const benchmarkData = { width: 386, height: 280 };
// 获取容器宽高(90% 缩放)
const containerWidth = bloodPressureRectangularChart.value.offsetWidth * 0.9;
- const containerHeight = bloodPressureRectangularChart.value.offsetHeight * 0.9;
+ const containerHeight =
+ bloodPressureRectangularChart.value.offsetHeight * 0.9;
// 获取设备像素比
const dpr = window.devicePixelRatio || 1;
@@ -506,10 +535,22 @@
// ========== 血压数据 ==========
const measurements = [
- { systolic: datas?.[0]?.血压1_透前收缩压 ?? 0, diastolic: datas?.[0]?.血压1_透前舒张压 ?? 0 },
- { systolic: datas?.[0]?.血压2_前半程最低收缩压 ?? 0, diastolic: datas?.[0]?.血压2_前半程最低舒张压 ?? 0 },
- { systolic: datas?.[0]?.血压3_后半程最低收缩压 ?? 0, diastolic: datas?.[0]?.血压3_后半程最低舒张压 ?? 0 },
- { systolic: datas?.[0]?.血压4_透后收缩压 ?? 0, diastolic: datas?.[0]?.血压4_透后舒张压 ?? 0 },
+ {
+ systolic: datas?.[0]?.血压1_透前收缩压 ?? 0,
+ diastolic: datas?.[0]?.血压1_透前舒张压 ?? 0,
+ },
+ {
+ systolic: datas?.[0]?.血压2_前半程最低收缩压 ?? 0,
+ diastolic: datas?.[0]?.血压2_前半程最低舒张压 ?? 0,
+ },
+ {
+ systolic: datas?.[0]?.血压3_后半程最低收缩压 ?? 0,
+ diastolic: datas?.[0]?.血压3_后半程最低舒张压 ?? 0,
+ },
+ {
+ systolic: datas?.[0]?.血压4_透后收缩压 ?? 0,
+ diastolic: datas?.[0]?.血压4_透后舒张压 ?? 0,
+ },
];
const measurementWidth = chartWidth / (measurements.length + 1);
@@ -570,7 +611,8 @@
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,
@@ -584,13 +626,11 @@
datas?.[0]?.脱水百分比 ?? 0,
datas?.[0]?.透后体重减干体重的差值 ?? 0,
体重增长_透前减干体重,
- 透前减干体重减超滤总量差值,
+ 透前减干体重减超滤总量差值
);
ctx.restore(); // 恢复
};
-
-
const drawCylinder = (
ctx: CanvasRenderingContext2D,
@@ -604,7 +644,7 @@
脱水百分比: number, // 脱水百分比
透后体重减干体重的差值: number, // 透后体重减干体重的差值
体重增长_透前减干体重: number, // 体重增长_透前减干体重
- 透前减干体重减超滤总量差值: number, // 透前减干体重减超滤总量差值
+ 透前减干体重减超滤总量差值: number // 透前减干体重减超滤总量差值
) => {
ctx.beginPath();
ctx.arc(x, y + height, radius, 0, Math.PI * 2);
@@ -639,24 +679,26 @@
// 如果超滤总量 与 体重增长_透前减干体重 相等,则显示 "/超滤总量"
if (Number(超滤总量) && 体重增长_透前减干体重 === Number(超滤总量)) {
- ctx.font = `${baseFontSize * scale}px Arial`;
- ctx.textAlign = "center";
- ctx.fillStyle = "#07c160";
- ctx.fillText('/' + 超滤总量, textX, canvasHeight - height + height * 0.3 + 10);
+ ctx.font = `${baseFontSize * scale}px Arial`;
+ ctx.textAlign = "center";
+ ctx.fillStyle = "#07c160";
+ ctx.fillText(
+ "/" + 超滤总量,
+ textX,
+ canvasHeight - height + height * 0.3 + 10
+ );
} else {
// 透析前-干体重
ctx.font = `${baseFontSize * scale}px Arial`;
ctx.textAlign = "center";
ctx.fillStyle = "#409EFF";
- ctx.fillText(体重增长_透前减干体重 + '', textX, canvasHeight - height + 10);
+ ctx.fillText(体重增长_透前减干体重 + "", textX, canvasHeight - height + 10);
// 超滤总量
ctx.font = `${baseFontSize * scale}px Arial`;
ctx.textAlign = "center";
ctx.fillStyle = "#07c160";
ctx.fillText(超滤总量, textX, canvasHeight - height + height * 0.3 + 10);
}
-
-
if (透前减干体重减超滤总量差值 > 0) {
ctx.font = `${baseFontSize * scale}px Arial`;
@@ -665,6 +707,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 +856,7 @@
text-align: left;
font-style: normal;
.list-item-name {
- margin-bottom: 2px;
+ // margin-bottom: 2px;
}
}
}
@@ -1069,7 +1124,7 @@
font-size: 3px;
color: #666;
margin-right: 1.2px;
- white-space: nowrap;
+ white-space: nowrap;
}
// .text-right {
// position: absolute;
--
Gitblit v1.8.0