This commit is contained in:
2026-05-30 10:09:22 +08:00
parent d0fcabe103
commit 7b944d66c5
9 changed files with 158 additions and 74 deletions
@@ -76,6 +76,9 @@
<f:Button ID="btnGetChart" ToolTip="图表" Icon="ChartPie" Text="统计图表"
EnablePostBack="true" OnClick="btnGetChart_Click" runat="server">
</f:Button>
<f:Button ID="btnJoinMarke" ToolTip="ISO轴测图标注" Icon="PageRed" Text="ISO轴测图标注"
EnablePostBack="true" OnClick="btnJoinMarke_Click" runat="server">
</f:Button>
<f:Button ID="btnSinglePreview" ToolTip="ISO轴测图" Icon="PageRed" Text="ISO轴测图"
EnablePostBack="true" OnClick="btnSinglePreview_Click" runat="server">
</f:Button>
@@ -213,6 +216,7 @@
FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<PageItems>
@@ -246,6 +250,10 @@
Target="Parent" EnableResize="true" runat="server" IsModal="false" EnableDrag="false" AutoScroll="true"
Width="800px" Height="600px">
</f:Window>
<f:Window ID="Window3" Title="轴测图" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" EnableDrag="false" AutoScroll="true"
Width="800px" Height="600px">
</f:Window>
</form>
<script type="text/javascript">
@@ -460,7 +460,29 @@ namespace FineUIPro.Web.HJGL.InfoQuery
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PipelineQueryChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNoComplete, "编辑 - ")));
}
protected void btnJoinMarke_Click(object sender, EventArgs e)
{ //string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf";
//var newurl = Funs.SGGLUrl + httpUrl.Replace(Funs.RootPath, "");
var id = Grid1.SelectedRowID;
if (string.IsNullOrEmpty(id))
{
ShowNotify("请选择相对应的ISO轴测图", MessageBoxIcon.Warning);
return;
}
var SingleName = (from x in Funs.DB.View_HJGL_Pipeline where x.PipelineId == id select (x.SingleName)).FirstOrDefault();
var filemodel = BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName, "0", this.CurrUser.LoginProjectId);
if (filemodel != null)
{
string httpUrl = filemodel.FilePath;
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../JoinMarking/JoinMarking.aspx?ISO_ID=?fileUrl={0}", httpUrl, "查看 -")));
}
else
{
ShowNotify("请上传相关ISO轴测图", MessageBoxIcon.Warning);
return;
}
}
protected void btnSinglePreview_Click(object sender, EventArgs e)
{
//string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf";
@@ -176,6 +176,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// </remarks>
protected global::FineUIPro.Button btnGetChart;
/// <summary>
/// btnJoinMarke 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnJoinMarke;
/// <summary>
/// btnSinglePreview 控件。
/// </summary>
@@ -274,5 +283,14 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
}
}