diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognition.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognition.aspx.cs index 151ce14..f7b382b 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognition.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognition.aspx.cs @@ -66,7 +66,7 @@ namespace FineUIPro.Web.HJGL.DataIn } string fileUrl = initFullPath + BLL.Funs.GetNewFileName() + IsXls; this.FileExcel.PostedFile.SaveAs(fileUrl); - RegionPanel1.IFrameUrl = "./DrawingRecognitionContent.aspx?fileUrl=" + fileUrl.Replace(rootPath,""); + RegionPanel1.IFrameUrl = "./DrawingRecognitionContent.aspx?fileUrl=" + fileUrl.Replace(rootPath,"")+ "&fileName=" + FileExcel.FileName; } catch (Exception ex) diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs index fcbefc6..d44ee17 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx.cs @@ -32,6 +32,18 @@ namespace FineUIPro.Web.HJGL.DataIn ViewState["URL"] = value; } } + + public string fileName + { + get + { + return (string)ViewState["fileName"]; + } + set + { + ViewState["fileName"] = value; + } + } public string fileUrl { get @@ -86,7 +98,7 @@ namespace FineUIPro.Web.HJGL.DataIn URL = Funs.HJGLUrl + Request.Params["fileUrl"].Replace("\\", "/"); string rootPath = Server.MapPath("~/"); fileUrl = rootPath + Request.Params["fileUrl"]; - + fileName = Request.Params["fileName"]; // 加载PDF文档 if (!File.Exists(fileUrl)) @@ -604,11 +616,11 @@ namespace FineUIPro.Web.HJGL.DataIn /// private string GetUrlFileName() { - if (!string.IsNullOrEmpty(URL)) + if (!string.IsNullOrEmpty(fileName)) { try { - return System.IO.Path.GetFileNameWithoutExtension(URL); + return System.IO.Path.GetFileNameWithoutExtension(fileName); } catch { } }