From e58abcbf89b27bb822ac008d336c00d9c52e8de7 Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Thu, 14 Aug 2025 11:13:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WeldMat/UsingSentMat/FaceRecognition.aspx | 2 +- .../WeldMat/UsingSentMat/WelderConfirm.aspx | 20 +------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx index b565dfb..a50c832 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx @@ -122,7 +122,7 @@ var node = { - iframeUrl: './WeldMat/UsingSentMat/WelderConfirm.aspx?welderCode=' + data.d, + iframeUrl: './WeldMat/UsingSentMat/UsingMat.aspx?welderCode=' + data.d, title: "焊材领用", id: "UsingMat" + getFormattedDate() }; diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx index 851bf88..2a4cce9 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderConfirm.aspx @@ -64,25 +64,7 @@ } } - function FingerConfirm(keyId, flag, grid) { - var result = window.showModalDialog("../../FingerMark/FingerConfirm.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=610px;dialogHeight=460px;menu=no;resizeable=no;scroll=no;center=yes;edge=raise;location=no"); - } - - function FaceConfirm(keyId, flag, grid) { - var result = window.showModalDialog("../../RLSB/FaceConfirm.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=1260px;dialogHeight=680px;menu=no;resizeable=no;scroll=yes;center=yes;edge=raise;location=no"); - } - - // function CodeConfirm(keyId, flag, grid) { - // var result = window.showModalDialog("CodeConfirm.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=600px;dialogHeight=280px;menu=no;resizeable=no;scroll=yes;center=yes;edge=raise;location=no"); - //} - - function CodeConfirm(keyId, flag, grid) { - var result = window.showModalDialog("LC700.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=600px;dialogHeight=280px;menu=no;resizeable=no;scroll=yes;center=yes;edge=raise;location=no"); - } - - function ReportPrint(reportId, replaceParameter, varValue) { - var result = window.showModalDialog("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&projectId=0&reportId=" + reportId + "&replaceParameter=" + replaceParameter + "&varValue=" + varValue, "", "status=no;dialogWidth=610px;dialogHeight=460px;menu=no;resizeable=no;scroll=no;center=yes;edge=raise;location=no"); - } + function backData(data) { //debugger