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/components/SettingDeviceDialog.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue
index c945877..e2817cc 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue
@@ -23,7 +23,7 @@
</template>
<div class="setting-device-dialog-content">
<div class="content-row1">
- <div class="row1-label">设备编号</div>
+ <div class="row1-label" @click="openQrScanner">设备编号<i class="iconfont icon-saoma"></i></div>
<div class="row1-inp-box">
<input
v-model="devcieCode"
@@ -54,9 +54,12 @@
<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>
+ <!-- 长识别二维码 -->
+ <QrScanner ref="QrScannerRef" @scan="onQrScan" />
+
</div>
</template>
@@ -72,8 +75,11 @@
import closeImg from "@/img/close.png";
import uploadImg from "@/img/upload.png";
import { useBedsideAuxiliaryScreenStore } from "@/store/bedsideAuxiliaryScreen";
+import QrScanner from "@/components/QrScanner/index.vue";
const bedsideAuxiliaryScreenStore = useBedsideAuxiliaryScreenStore();
+
+const QrScannerRef = ref(null);
const isShow = ref(false);
const isUploading = ref(false);
@@ -137,14 +143,25 @@
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('已更新至最新版本')
+};
+
+const openQrScanner = () => {
+ QrScannerRef.value?.open();
+};
+
+const onQrScan = ({ success, code}) => {
+ if (!success) return;
+ devcieCode.value = code;
+ ElMessage.success("识别成功");
};
defineExpose({
@@ -226,6 +243,10 @@
line-height: 16px;
color: #ffffff;
font-style: normal;
+ .iconfont {
+ margin-left: 2px;
+ font-size: 9px;
+ }
}
.row1-inp-box {
flex: 1;
--
Gitblit v1.8.0