From 3398b414ca1c4077f4a97013e86971de43dcb9c9 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Sat, 8 Mar 2025 16:56:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/device/interface/controlSource.ts | 3 ++- .../machine/controlSource/components/controlSourceDetail.vue | 5 ++++- frontend/src/views/machine/controlSource/index.vue | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/api/device/interface/controlSource.ts b/frontend/src/api/device/interface/controlSource.ts index 7557244..81d3dc9 100644 --- a/frontend/src/api/device/interface/controlSource.ts +++ b/frontend/src/api/device/interface/controlSource.ts @@ -10,6 +10,7 @@ export namespace controlSource { userPageId: string; scriptId: string; scriptIndex: number; - sourceId: string; + sourceId: string; + valueType:number // 1为绝对值脚本、2为相对值脚本 } } \ No newline at end of file diff --git a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue index c77ac07..9b6e409 100644 --- a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue +++ b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue @@ -251,7 +251,8 @@ const controlContent = ref({ userPageId: '', scriptId: '', scriptIndex: 0, - sourceId: '', + sourceId: '', + valueType:-1 }) // 获取树 const getTree = () => { @@ -393,6 +394,7 @@ const startLoading = async () => { controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57' controlContent.value.scriptIndex = childActiveIndex.value controlContent.value.sourceId = props.formControl.sourceId + controlContent.value.valueType = 2 setTimeout(async () => { await startSimulateTest(controlContent.value) },3000) @@ -405,6 +407,7 @@ const stopLoading = async () => { controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57' controlContent.value.scriptIndex = childActiveIndex.value controlContent.value.sourceId = props.formControl.sourceId + controlContent.value.valueType = 2 await closeSimulateTest(controlContent.value) emit('update:pauseDisabled', true) emit('update:startDisabeld', true) diff --git a/frontend/src/views/machine/controlSource/index.vue b/frontend/src/views/machine/controlSource/index.vue index 4ed255c..72c1366 100644 --- a/frontend/src/views/machine/controlSource/index.vue +++ b/frontend/src/views/machine/controlSource/index.vue @@ -83,6 +83,7 @@ const controlContent = ref({ scriptId: '', scriptIndex: 0, sourceId: '', + valueType: -1, }) //开始创建webSocket客户端 const dataSocket = reactive({ @@ -267,6 +268,7 @@ const start = async () => { controlContent.value.userPageId = 'cdf' controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57' controlContent.value.scriptIndex = scriptIndex.value + controlContent.value.valueType = 2 await checkSimulate(controlContent.value) }