From b7e7f77fb0390d9d99dcae76e2a3c70a440c11c2 Mon Sep 17 00:00:00 2001
From: yuetsh <517252939@qq.com>
Date: Tue, 27 Oct 2026 11:43:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=8F=B0=EF=BC=9A=E5=8A=A0?=
 =?UTF-8?q?=20ADAM-4150=20DO1=20=E7=85=A7=E6=98=8E=E7=81=AF=E7=9A=84?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=EF=BC=88=E9=A1=B9=E7=9B=AE=207=20=E7=94=A8?=
 =?UTF-8?q?=EF=BC=89=EF=BC=9B=E6=BB=91=E5=9D=97=E6=9D=BE=E5=BC=80=E5=90=8E?=
 =?UTF-8?q?=E7=AD=89=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9B=9E=E4=BC=A0=E5=90=8C?=
 =?UTF-8?q?=E6=A0=B7=E7=9A=84=E5=80=BC=E5=86=8D=E6=8D=A2=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E9=94=AE=E7=9B=98=E6=96=B9=E5=90=91=E9=94=AE=E8=BF=9E=E6=8C=89?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E4=B8=A2=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 web/src/scene/TrainingBoard.vue | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/web/src/scene/TrainingBoard.vue b/web/src/scene/TrainingBoard.vue
index 7acb06f..600ea0b 100644
--- a/web/src/scene/TrainingBoard.vue
+++ b/web/src/scene/TrainingBoard.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 // 虚拟实训台：按教材实训台布局图（顶棚 → LED 屏 → 传感器 → 采集模块）排列。
 // 传感器卡片上的滑块和开关调节环境（经服务器推给学生程序），灯和继电器的状态由学生程序控制。
-import { computed, onBeforeUnmount, ref } from 'vue'
+import { computed, onBeforeUnmount, ref, watch } from 'vue'
 import { ANALOG_INFO, clockWall, type AnalogKey, type BoardState, type ClientMessage, type DigitalKey } from '@iot/shared'
 
 type BoardInput = Omit<Extract<ClientMessage, { type: 'boardInput' }>, 'type'>
@@ -63,12 +63,34 @@ function flush() {
   pending = {}
 }
 
+// 松开后继续显示本地值，等服务器回传了这个值再用服务器的：键盘方向键连按时每按一下都会触发 change，
+// 立刻换回服务器的旧值，下一下就从旧值开始加，看起来像丢了几步。服务器没回传同样的值（比如被截到范围内）时 1 秒后放弃
+const releasing = new Map<AnalogKey, ReturnType<typeof setTimeout>>()
+
 function release(key: AnalogKey) {
   flush()
+  clearTimeout(releasing.get(key))
+  releasing.set(
+    key,
+    setTimeout(() => drop(key), 1000),
+  )
+}
+
+function drop(key: AnalogKey) {
+  clearTimeout(releasing.get(key))
+  releasing.delete(key)
   const { [key]: _, ...rest } = dragging.value
   dragging.value = rest
 }
 
+watch(
+  () => props.board?.analog,
+  (values) => {
+    for (const key of [...releasing.keys()]) if (values?.[key] === dragging.value[key]) drop(key)
+  },
+)
+onBeforeUnmount(() => releasing.forEach((timer) => clearTimeout(timer)))
+
 function toggle(key: DigitalKey) {
   if (props.board) emit('set', { digital: { [key]: !props.board.digital[key] } })
 }
@@ -77,6 +99,8 @@ const digital = computed(() => props.board?.digital ?? { bodyInfrared: false, fi
 const relays = computed(() => props.board?.relays ?? [])
 const streetLampOn = computed(() => props.board?.zigbee[1] === true)
 const alarmOn = computed(() => relays.value[0] === true)
+/** ADAM-4150 DO1 接的照明灯（教材项目 7 的智慧教室、寝室、会议室用它） */
+const roomLampOn = computed(() => relays.value[1] === true)
 const ledText = computed(() => props.board?.ledText ?? '')
 const camera = computed(() => props.board?.camera ?? { on: false, x: 3, y: 1 })
 // ---------- 虚拟时钟：显示学生程序看到的时间，可以拨时间、调倍速 ----------
@@ -122,6 +146,7 @@ const cameraTitle = computed(() =>
     <span class="board-name">虚拟实训台</span>
     <span class="io out warn" :class="{ lit: alarmOn }"><i />警示灯</span>
     <span class="io out" :class="{ lit: streetLampOn }"><i />照明灯 1</span>
+    <span class="io out" :class="{ lit: roomLampOn }"><i />照明灯 2</span>
     <span class="summary-readings">
       <span v-for="key in ['temperature', 'humidity', 'light'] as AnalogKey[]" :key="key">
         {{ ANALOG_INFO[key].label }} <b>{{ analog(key) }}{{ ANALOG_INFO[key].unit }}</b>
@@ -251,6 +276,12 @@ const cameraTitle = computed(() =>
         <div class="card-title">火焰传感器</div>
         <div class="card-note">{{ digital.fire ? '有火焰' : '正常' }}</div>
       </button>
+
+      <div class="card" title="照明灯 2：由 ADAM-4150 的 DO1 控制（教材项目 7 的教室、寝室、会议室照明）">
+        <div class="bulb" :class="{ on: roomLampOn }" />
+        <div class="card-title">照明灯 2</div>
+        <div class="card-note">ADAM-4150 DO1</div>
+      </div>
     </div>
 
     <!-- 采集模块与串口 -->