lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2022-11-03 焊接修改，二次焊口设计增加新增焊口类型

Browse Source
This commit is contained in:
李鹏飞
2022-11-03 17:39:51 +08:00
parent eeddc36939
commit 31e416c302
25 changed files with 375 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
+1 -1
View File
@@ -62,7 +62,7 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口台账总览"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WeldJointId"
ClicksToEdit="2" DataIDField="WeldJointId" AllowSorting="true"
ClicksToEdit="2" DataIDField="WeldJointId" AllowSorting="true" EnableCheckBoxSelect="true"
SortField="UnitWorkCode,PipelineCode,WeldJointCode" OnSort="Grid1_Sort" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True">
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+20 -10
View File
@@ -242,15 +242,16 @@ namespace FineUIPro.Web.HJGL.InfoQuery
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2.1";
parameter3D.ButtonType = "2.1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction = Incomplete_weldjunction;
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Crater_data = "0";
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction = Incomplete_weldjunction;
}
else if (this.tvControlItem.SelectedNode.CommandName == "管线")
@@ -258,6 +259,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
if (model != null&&!string.IsNullOrEmpty(model.UnitWorkId))
{
parameter3D.Crater_data = "1";
parameter3D.TagNum = "/" + model.PipelineCode;
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
}
@@ -518,16 +521,23 @@ namespace FineUIPro.Web.HJGL.InfoQuery
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
{
var q = WeldJointService.GetViewWeldJointById(Grid1.SelectedRowID).PipelineCode;
var pipecode = "/" + q;
var Id = Grid1.SelectedRowIDArray;
List<string> weldjointcodes = new List<string>();
foreach (var item in Id)
{
var WeldJointCode = WeldJointService.GetViewWeldJointById(item).WeldJointCode;
weldjointcodes.Add("/" + WeldJointCode);
}
//var q = WeldJointService.GetViewWeldJointById(Grid1.SelectedRowID).PipelineCode;
//var pipecode = "/" + q;
Model.Parameter3D parameter3D = new Model.Parameter3D();
Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,2.1";
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction=Incomplete_weldjunction;
parameter3D.TagNum = string.Join(",", weldjointcodes);
parameter3D.ButtonType = "2.1";
parameter3D.Crater_data = "2";
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+3
View File
@@ -76,6 +76,9 @@
<f:Button ID="btnSinglePreview" ToolTip="ISO轴测图" Icon="PageRed" Text="ISO轴测图"
EnablePostBack="true" OnClick="btnSinglePreview_Click" runat="server">
</f:Button>
<f:Button ID="btnSinglePreview_2" ToolTip="ISO施工轴测图" Icon="PageRed" Text="ISO施工轴测图"
EnablePostBack="true" OnClick="btnSinglePreview_2_Click" runat="server">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Text="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+26 -2
View File
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2";
parameter3D.ButtonType = "2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Line_No = Line_No;
parameter3D.Transparency = colorModel.PipelineComplete;
@@ -452,7 +452,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,2";
parameter3D.ButtonType = "2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Line_No = Line_No;
parameter3D.Transparency = colorModel.PipelineComplete;
@@ -463,5 +463,29 @@ namespace FineUIPro.Web.HJGL.InfoQuery
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
}
protected void btnSinglePreview_2_Click(object sender, EventArgs e)
{
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, "4", this.CurrUser.LoginProjectId);
if (filemodel != null)
{
string httpUrl = filemodel.FilePath;
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/AttachFile/Look.aspx?fileUrl={0}", httpUrl, "查看 -")));
}
else
{
ShowNotify("请上传相关ISO施工轴测图", MessageBoxIcon.Warning);
return;
}
}
}
}
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs
Generated
+9
View File
@@ -185,6 +185,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// </remarks>
protected global::FineUIPro.Button btnSinglePreview;
/// <summary>
/// btnSinglePreview_2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSinglePreview_2;
/// <summary>
/// btnOut 控件。
/// </summary>