From 3c6f38acb8f4f2ffc3bf4246ec0ce8f4686a0050 Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期一, 28 七月 2025 12:02:35 +0800
Subject: [PATCH] Merge branch 'ID2690-缓存修改' into test
---
src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue | 11 ++++++-----
src/store/type/bedsideAuxiliaryScreen.type.ts | 4 ++--
src/store/bedsideAuxiliaryScreen.ts | 6 +++---
src/router/index.ts | 2 +-
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index 9fbbaad..361020f 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -18,7 +18,7 @@
{
path: '/test2',
name: 'test2',
- component: deviceWindows2,
+ component: bedsideAuxiliaryScreen,
},
{
path: '/test',
diff --git a/src/store/bedsideAuxiliaryScreen.ts b/src/store/bedsideAuxiliaryScreen.ts
index 1424463..63a739c 100644
--- a/src/store/bedsideAuxiliaryScreen.ts
+++ b/src/store/bedsideAuxiliaryScreen.ts
@@ -1,7 +1,6 @@
import { defineStore } from "pinia";
import { ref } from "vue";
import dayjs from "dayjs";
-import cache from "../utils/cache";
import { EventSourcePolyfill } from "event-source-polyfill";
import type { BedsideAuxiliaryScreen, SseMsgData } from "./type/bedsideAuxiliaryScreen.type";
import type { Task } from "./type/task.type";
@@ -11,12 +10,13 @@
formatDeviceData,
} from "./type/bedsideAuxiliaryScreen.type";
import { ElMessage } from "element-plus/es";
+import { Local } from "@/utils/storage";
export const useBedsideAuxiliaryScreenStore = defineStore(
"bedsideAuxiliaryScreen",
() => {
/** 设备编号 */
- const deviceCode = ref<string>(cache.get("devcieCode") || "");
+ const deviceCode = ref<string>(Local.get("devcieCode") || "");
/** 设备信息数据 */
const deviceData = ref<BedsideAuxiliaryScreen>(defaultDeviceData());
@@ -30,7 +30,7 @@
*/
const setDeviceCode = (code: string) => {
deviceCode.value = code;
- cache.set("devcieCode", code);
+ Local.set("devcieCode", code);
};
/**
diff --git a/src/store/type/bedsideAuxiliaryScreen.type.ts b/src/store/type/bedsideAuxiliaryScreen.type.ts
index b9ad888..67defc8 100644
--- a/src/store/type/bedsideAuxiliaryScreen.type.ts
+++ b/src/store/type/bedsideAuxiliaryScreen.type.ts
@@ -1,5 +1,5 @@
import { tryConvertToInt, deepClone } from "@/utils/utils";
-import cache from "@/utils/cache";
+import { Local } from "@/utils/storage";
export interface IotInfo {
属性历史列表: any[];
床号: string;
@@ -402,7 +402,7 @@
};
export const defaultDeviceData = (): BedsideAuxiliaryScreen => {
- const pageType = cache.get("devcieCode")
+ const pageType = Local.get("devcieCode")
? EPageType.LOADING
: EPatForm.OUTPATIENT_SERVICE;
return {
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue
index c945877..9394352 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue
@@ -54,7 +54,7 @@
<template #footer>
<div class="my-button cancel" @click="handleCancel">取消</div>
<div class="my-button confirm" @click="handleConfirm">确认</div>
- <div class="my-button refresh" @click="handleRefresh">刷新</div>
+ <div class="my-button refresh" @click="handleRefresh">检查更新</div>
</template>
</el-dialog>
</div>
@@ -137,14 +137,15 @@
const handleConfirm = () => {
bedsideAuxiliaryScreenStore.setDeviceCode(devcieCode.value + "");
- handleRefresh();
+ bedsideAuxiliaryScreenStore.refresh(
+ `${import.meta.env.VITE_SSE_BASE_URL}${devcieCode.value}`
+ );
handleCancel();
};
const handleRefresh = () => {
- bedsideAuxiliaryScreenStore.refresh(
- `${import.meta.env.VITE_SSE_BASE_URL}${devcieCode.value}`
- );
+ window.location.reload();
+ ElMessage.success('已更新至最新版本')
};
defineExpose({
--
Gitblit v1.8.0