From 3472da566ba3013ca786396a351f8ff8dade7af5 Mon Sep 17 00:00:00 2001 From: lixiao <932184220@qq.com> Date: Sun, 28 Sep 2025 17:44:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/pages/alarm/Detail.ets | 22 ++++++++++++++++++--- entry/src/main/ets/pages/home/Index.ets | 6 +++++- entry/src/main/ets/utils/CommandService.ets | 4 +--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/entry/src/main/ets/pages/alarm/Detail.ets b/entry/src/main/ets/pages/alarm/Detail.ets index c80569d..c83ad50 100644 --- a/entry/src/main/ets/pages/alarm/Detail.ets +++ b/entry/src/main/ets/pages/alarm/Detail.ets @@ -1,11 +1,18 @@ import { CusButton } from '../components/button/Index' import { Layout } from '../components/layout/Index' import { Title } from '../components/title/Index' -import { router } from '@kit.ArkUI' +import { promptAction, router } from '@kit.ArkUI' import { Option } from '../../typings/Common' import VideoPlayer from '../components/player/Index' +import { commandService } from '../../utils/CommandService' +import { BusinessError } from '@kit.BasicServicesKit' +interface RouterParams { + data: API.InspectAlarmItemVo + line: string +} + @Extend(Text) function label() { .fontFamily("Alimama") @@ -54,9 +61,12 @@ struct Detail { @State remark: string = "" @State isFullScreen: boolean = false @State url: string = "" + private line: string = "" aboutToAppear(): void { - let data: API.InspectAlarmItemVo = router.getParams() + let params = router.getParams() as RouterParams + let data = params.data + this.line = params.line this.base[0].value = data.createTime || "" this.base[1].value = data.alarmCode || "" this.base[2].value = data.stageName || "" @@ -65,7 +75,13 @@ struct Detail { } submit() { - + commandService.submitAlarm(this.line, JSON.stringify({})).then(() => { + router.back() + }).catch((err: BusinessError) => { + promptAction.showToast({ + message: JSON.stringify(err) + }) + }) } build() { diff --git a/entry/src/main/ets/pages/home/Index.ets b/entry/src/main/ets/pages/home/Index.ets index 54ea44f..8200e60 100644 --- a/entry/src/main/ets/pages/home/Index.ets +++ b/entry/src/main/ets/pages/home/Index.ets @@ -197,7 +197,11 @@ struct Home { WarnCard({ onDetail: () => { router.pushUrl({ - url: "pages/alarm/Detail" + url: "pages/alarm/Detail", + params: { + data: {}, + line: "", + } }) } }) diff --git a/entry/src/main/ets/utils/CommandService.ets b/entry/src/main/ets/utils/CommandService.ets index 069f16b..56fe933 100644 --- a/entry/src/main/ets/utils/CommandService.ets +++ b/entry/src/main/ets/utils/CommandService.ets @@ -82,9 +82,7 @@ export class CommandService { if (message.type === CommandType.PostCmd) { return new Promise((_resolve, _reject) => { this.service!.send(JSON.stringify(message)).then(() => { - this.commandCallback.set(message.reqCode, (res: ResponseMessage) => { - resolve(res) - }) + this.commandCallback.set(message.reqCode, (res: ResponseMessage) => resolve(res)) _resolve(true) }).catch(_reject) })