From f94372d20bc4fa87a897abfb785b1fe1bbe2fdd3 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 11 Mar 2025 16:13:03 +0800 Subject: [PATCH 1/4] =?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/utils/webSocketClient.ts | 2 +- frontend/src/views/machine/controlSource/index.vue | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/utils/webSocketClient.ts b/frontend/src/utils/webSocketClient.ts index d88b557..d78013a 100644 --- a/frontend/src/utils/webSocketClient.ts +++ b/frontend/src/utils/webSocketClient.ts @@ -37,7 +37,7 @@ export default class SocketService { // let token = '4E6EF539AAF119D82AC4C2BC84FBA21F'; - const url = 'ws://192.168.1.124:7777/hello?name=cdf' + const url = 'ws://127.0.0.1:7777/hello?name=cdf' this.ws = new WebSocket(url); // 连接成功的事件 this.ws.onopen = () => { diff --git a/frontend/src/views/machine/controlSource/index.vue b/frontend/src/views/machine/controlSource/index.vue index 422abf1..02b8479 100644 --- a/frontend/src/views/machine/controlSource/index.vue +++ b/frontend/src/views/machine/controlSource/index.vue @@ -238,6 +238,10 @@ watch(webMsgSend, function (newValue, oldValue) { switch (newValue.operateCode) { case "Source": ElMessage.error('源连接失败!') + connectDisabeld.value = false + startDisabeld.value = true + pauseDisabled.value = true + break; } break; case 'server_error': From d2f70419888d13868fc97a1d57cd964d3da11fc3 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 11 Mar 2025 18:10:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/controlSource/components/controlSourceDetail.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue index babfbe3..79f8150 100644 --- a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue +++ b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue @@ -450,7 +450,7 @@ const startLoading = async () => { ElMessage.success({message:'启动中...',duration:5000}) // 启动加载逻辑 controlContent.value.userPageId = 'cdf' - //controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57' + controlContent.value.scriptId = props.formControl.scriptId controlContent.value.scriptIndex = childActiveIndex.value controlContent.value.sourceId = props.formControl.sourceId setTimeout(async () => { @@ -462,7 +462,7 @@ const startLoading = async () => { const stopLoading = async () => { // 启动加载逻辑 controlContent.value.userPageId = 'cdf' - //controlContent.value.scriptId = '9ff96807cf8c7524587982ed8baa8b57' + controlContent.value.scriptId = props.formControl.scriptId controlContent.value.scriptIndex = childActiveIndex.value controlContent.value.sourceId = props.formControl.sourceId await closeSimulateTest(controlContent.value) @@ -497,6 +497,7 @@ const secondToTime = (secd: number) => { const stopTimeCount = () => { if (timer) { clearInterval(timer) + timer = null } //Loading效果关闭 showLoading.value = false From 49059d9c59a610081e3ce6971eacf08cc415da89 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 11 Mar 2025 18:19:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/controlSource/components/controlSourceDetail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue index 79f8150..f4bc554 100644 --- a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue +++ b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue @@ -479,6 +479,7 @@ const startTimeCount = () => { hour.value = 0 minute.value = 0 second.value = 0 + timeCount.value = 0 if (!timer) { timer = setInterval(() => { timeCount.value = timeCount.value + 1 From 6d2fb4dde8ed3e440f82272daa7a04a578225e5e Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 11 Mar 2025 18:29:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controlSource/components/controlSourceDetail.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue index f4bc554..7334fcb 100644 --- a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue +++ b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue @@ -476,11 +476,11 @@ const startTimeCount = () => { // Loading效果展示 showLoading.value = true - hour.value = 0 - minute.value = 0 - second.value = 0 - timeCount.value = 0 if (!timer) { + hour.value = 0 + minute.value = 0 + second.value = 0 + timeCount.value = 0 timer = setInterval(() => { timeCount.value = timeCount.value + 1 secondToTime(timeCount.value)