lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

This commit is contained in:
李鹏飞 2023-09-21 19:13:34 +08:00
parent 687bc577cd 06a95b1616
commit 74327b5a3e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx
View File

@ -82,7 +82,7 @@
</f:FileUpload>
<f:Button ID="btnZxtgdImport" runat="server" OnClick="btnZxtgdImport_Click" Text="导入">
</f:Button>
<f:ToolbarFill ID="ToolbarFill" runat="server"></f:ToolbarFill>
<f:ToolbarFill ID="ToolbarFill" runat="server"></f:ToolbarFill>
<f:Button ID="btnGdDownLoad" runat="server" Icon="ApplicationGo" Text="管道模板下载" ToolTip="管道模板下载" OnClick="btnGdDownLoad_Click"></f:Button>
<f:Button ID="btnZxtgdSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnZxtgdSave_Click"></f:Button>
</Items>
@ -381,8 +381,10 @@
<f:ToolbarFill ID="ToolbarFill2" runat="server"></f:ToolbarFill>
<f:Button ID="btnSelect" Text="选择" ToolTip="选择" Icon="TableSave" runat="server" OnClick="btnSelect_Click"></f:Button>
<f:Button ID="btnSelectSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnSelectSave_Click"></f:Button>
<f:HiddenField runat="server" ID="hidSelectProperty"></f:HiddenField>
<f:HiddenField runat="server" ID="hidSystemId"></f:HiddenField>
<%--<f:HiddenField runat="server" ID="hidSelectProperty"></f:HiddenField>
<f:HiddenField runat="server" ID="hidSystemId"></f:HiddenField>--%>
<f:TextBox runat="server" ID="hidSelectProperty" Hidden="true"></f:TextBox>
<f:TextBox runat="server" ID="hidSystemId" Hidden="true"></f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>

4
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.cs
View File

@ -944,7 +944,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void Window2_Close(object sender, WindowCloseEventArgs e)
{
var list = hidSelectTechnology.Text.Split(',').ToList();
var list = hidSystemId.Text.Split(',').ToList();
SubTechnologyBrid(list);
}
@ -954,7 +954,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected void btngySelect_Click(object sender, EventArgs e)
{
string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}&SelectTechnologyIds={hidSelectTechnology.Text}";
PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hidSelectTechnology.ClientID) + Window2.GetShowReference(window));
PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hidSystemId.ClientID) + Window2.GetShowReference(window));
}
/// <summary>

4
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.designer.cs generated
View File

@ -696,7 +696,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hidSelectProperty;
protected global::FineUIPro.TextBox hidSelectProperty;
/// <summary>
/// hidSystemId 控件。
@ -705,7 +705,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hidSystemId;
protected global::FineUIPro.TextBox hidSystemId;
/// <summary>
/// ToolbarSeparator3 控件。