From a99886eb9c73018235e2c373f3d82a2b0b2311d5 Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期二, 16 九月 2025 13:36:40 +0800
Subject: [PATCH] Merge branch 'ID1766-添加推送登录功能' into test
---
src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue
index 10d1d6e..e2817cc 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/SettingDeviceDialog.vue
@@ -7,6 +7,8 @@
width="80%"
:show-close="false"
class="scheduled-task-dialog"
+ :destroy-on-close="true"
+ :close-on-click-modal="false"
>
<template #header>
<div class="setting-dialog-header">
@@ -21,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"
@@ -52,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>
@@ -70,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);
@@ -135,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({
@@ -224,6 +243,10 @@
line-height: 16px;
color: #ffffff;
font-style: normal;
+ .iconfont {
+ margin-left: 2px;
+ font-size: 9px;
+ }
}
.row1-inp-box {
flex: 1;
@@ -237,11 +260,11 @@
height: 100%;
border: none;
outline: none;
- padding: 0 4px;
+ padding: 0 4px;
line-height: 16px;
font-size: 9px;
font-family: PingFangSC, PingFang SC;
- vertical-align: middle;
+ vertical-align: middle;
box-sizing: border-box; // 避免padding撑高
&::placeholder {
--
Gitblit v1.8.0