From 6a738089d6471d048c32ce7f3dcbd15c935ada79 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 14 六月 2025 14:49:42 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Web/src/views/device/deviceInfo/index.vue | 2 +-
Web/src/views/device/deviceInfo/data.ts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Web/src/views/device/deviceInfo/data.ts b/Web/src/views/device/deviceInfo/data.ts
index 436a8d6..2e89cc6 100644
--- a/Web/src/views/device/deviceInfo/data.ts
+++ b/Web/src/views/device/deviceInfo/data.ts
@@ -924,8 +924,8 @@
{ Id: 251, Code: '330', IsShow: 0, IsUse: 0 },
{ Id: 252, Code: '', IsShow: 0, IsUse: 2 },
{ Id: 253, Code: '332', IsShow: 0, IsUse: 0 },
- { Id: 254, Code: '324', IsShow: 0, IsUse: 0 },
- { Id: 255, Code: '325', IsShow: 0, IsUse: 0 },
+ { Id: 254, Code: '334', IsShow: 0, IsUse: 0 },
+ { Id: 255, Code: '335', IsShow: 0, IsUse: 0 },
{ Id: 256, Code: '', IsShow: 0, IsUse: 2 },
{ Id: 257, Code: '', IsShow: 1, IsUse: 0 },
{ Id: 258, Code: '', IsShow: 1, IsUse: 0 },
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index 24e4dc1..d950189 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -447,7 +447,7 @@
const textLock = async (row: any) => {
if (lockText.value == "閿佸畾") {
- lockStatus.value = false;
+ lockStatus.value = true;
lockInputStatus.value = true;
lockText.value = "瑙ｉ攣";
if (floorStates.value.isPlain1 == false) {
--
Gitblit v1.8.0