From 031da535a58f83913db6287b5f29f5983435cfa2 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 24 七月 2024 15:46:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- UI-Project/src/views/Identify/identify.vue | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue index a972dbe..64df621 100644 --- a/UI-Project/src/views/Identify/identify.vue +++ b/UI-Project/src/views/Identify/identify.vue @@ -103,15 +103,16 @@ // 鐮存崯 const handleDamage = async () => { try { - var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201; - console.log(url); - const response = await request.post(url) - // const response = await request.post('/cacheGlass/taskCache/identControls', { - // identId: currentGlassId.value, - // controlsId: 201, - // }) + // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+201; + // console.log(url); + // const response = await request.post(url) + const response = await request.post('/cacheGlass/taskCache/identControls', { + identId: currentGlassId.value, + controlsId: 201, + line: 1001, + machine: '璇嗗埆', + }) if (response.code == 200) { - // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫 ElMessage.success(response.message); // window.location.reload() blind.value = false; @@ -126,16 +127,18 @@ console.error(error); } } -// // 浜哄伐鎷胯蛋 + // 浜哄伐鎷胯蛋 const handleManualTake = async () => { try { - var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200; - console.log(url); - const response = await request.post(url) - // const response = await request.post('/cacheGlass/taskCache/identControls', { - // identId: currentGlassId.value, - // controlsId: 200, - // }) + // var url="/cacheGlass/taskCache/identControls?identId="+currentGlassId.value+'&controlsId='+200; + // console.log(url); + // const response = await request.post(url) + const response = await request.post('/cacheGlass/taskCache/identControls', { + identId: currentGlassId.value, + controlsId: 200, + line: 1001, + machine: '璇嗗埆', + }) if (response.code == 200) { // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫 ElMessage.success(response.message); -- Gitblit v1.8.0