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/index.vue | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/index.vue b/src/views/mobile/bedsideAuxiliaryScreen/index.vue
index 5aedcc5..cdf3c55 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/index.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/index.vue
@@ -68,6 +68,7 @@
EPageType.NOT_INIT,
EPageType.LOADING,
EPageType.UNPLANNED_SCHEDULE,
+ EPageType.NOT_SIGNED_IN,
].includes(bedsideAuxiliaryScreenStore.deviceData.pageType)
) {
color = "#fff";
@@ -117,48 +118,36 @@
});
// 版本更新/手动刷新场景
-watch(
- [
- bedsideAuxiliaryScreenStore.version,
- bedsideAuxiliaryScreenStore.deviceData.isRefresh,
- ],
- ([newVersion, newIsRefresh], [oldVersion, oldIsRefresh]) => {
- // 如果远程版本号存在更新/设备列表页面进行了手动刷新
- console.log('bedsideAuxiliaryScreenStore.version :', bedsideAuxiliaryScreenStore.version)
- if (
- newVersion !== bedsideAuxiliaryScreenStore.version ||
- newIsRefresh === 1
- ) {
- refreshFun();
- }
- }
-);
+// watch(
+// [
+// bedsideAuxiliaryScreenStore.version,
+// bedsideAuxiliaryScreenStore.deviceData.isRefresh,
+// ],
+// ([newVersion, newIsRefresh], [oldVersion, oldIsRefresh]) => {
+// // 如果远程版本号存在更新/设备列表页面进行了手动刷新
+// console.log('bedsideAuxiliaryScreenStore.version :', bedsideAuxiliaryScreenStore.version)
+// if (
+// newVersion !== oldVersion||
+// newIsRefresh === 1
+// ) {
+// refreshFun();
+// }
+// }
+// );
const getServiceVersionFun = async () => {
try {
- const { version } = await getServiceVersionApi();
- if (version !== bedsideAuxiliaryScreenStore.version) {
- refreshFun(version);
+ const { data } = await getServiceVersionApi(bedsideAuxiliaryScreenStore.version);
+ if (data?.version && data?.version !== bedsideAuxiliaryScreenStore.version) {
+ bedsideAuxiliaryScreenStore.refreshVersion(data.version);
+ } else if (!data?.version) {
+ ElMessage.error("获取版本号失败，请联系管理员！");
}
} catch (error) {
ElMessage.error("获取版本号失败，请联系管理员！");
}
};
-/** 副屏刷新的方法 */
-const refreshFun = (val?: string) => {
- if (val) {
- bedsideAuxiliaryScreenStore.setVersion(val);
- }
- ElMessage({
- type: "success",
- duration: 1000 * 3,
- message: "系统更新···",
- onClose: function () {
- window.location.reload();
- },
- });
-};
onMounted(() => {
if (bedsideAuxiliaryScreenStore.deviceCode) {
--
Gitblit v1.8.0