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

2022-11-09 焊接三维传参修改

Browse Source
This commit is contained in:
李鹏飞
2022-11-09 16:57:01 +08:00
parent 0fda5ad389
commit 1f39165abd
9 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+10 -3
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
+2 -2
View File
@@ -43,9 +43,9 @@
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true" MinColumnWidth="50px" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true" MinColumnWidth="50px"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId" EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId" AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort" AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
EnableCheckBoxSelect="true" EnableMultiSelect="false" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" EnableCheckBoxSelect="true" EnableMultiSelect="true" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"> AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="right">
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+1 -1
View File
@@ -537,7 +537,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.ColorModel = colorModel; parameter3D.ColorModel = colorModel;
parameter3D.TagNum = string.Join(",", weldjointcodes); parameter3D.TagNum = string.Join(",", weldjointcodes);
parameter3D.ButtonType = "2.1"; parameter3D.ButtonType = "2.1";
parameter3D.Crater_data = "2"; parameter3D.Crater_data = "1";
if (this.tvControlItem.SelectedNode.CommandName == "单位工程") if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{ {
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+3 -3
View File
@@ -138,10 +138,10 @@ namespace FineUIPro.Web.HJGL.InfoQuery
Model.ColorModel colorModel = new Model.ColorModel(); Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel; parameter3D.ColorModel = colorModel;
parameter3D.TagNum = ""; parameter3D.TagNum = Line_No;
parameter3D.ButtonType = "2"; parameter3D.ButtonType = "2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Line_No = Line_No; // parameter3D.Line_No = Line_No;
parameter3D.Transparency = colorModel.PipelineComplete; parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor; parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor; parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
@@ -454,7 +454,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "2"; parameter3D.ButtonType = "2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Line_No = Line_No; //parameter3D.Line_No = Line_No;
parameter3D.Transparency = colorModel.PipelineComplete; parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor; parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor; parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
+3 -3
View File
@@ -156,10 +156,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
Model.ColorModel colorModel = new Model.ColorModel(); Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel; parameter3D.ColorModel = colorModel;
parameter3D.TagNum = ""; parameter3D.TagNum = Line_No;
parameter3D.ButtonType = "1"; parameter3D.ButtonType = "1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Line_No = Line_No; // parameter3D.Line_No = Line_No;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D; ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData(); ctlAuditFlow.BindData();
@@ -281,7 +281,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "1"; parameter3D.ButtonType = "1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Line_No = Line_No; // parameter3D.Line_No = Line_No;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D; ctlAuditFlow.data = parameter3D;
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
+13 -12
View File
@@ -229,7 +229,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
pipelinecode = x.Key.pipelinecode, pipelinecode = x.Key.pipelinecode,
PipelineComponentCode = x.Key.PipelineComponentCode, PipelineComponentCode = x.Key.PipelineComponentCode,
// DrawingName = x.Key.DrawingName, // DrawingName = x.Key.DrawingName,
QRCode = String.Join("&", x.Select(z => z.Field<string>("二维码信息"))) QRCode = String.Join(";", x.Select(z => z.Field<string>("二维码信息")))
}); });
foreach (var item in dt) foreach (var item in dt)
{ {
@@ -237,17 +237,18 @@ namespace FineUIPro.Web.HJGL.PreDesign
var hJGL_Pipeline_Component = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(item.PipelineComponentCode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""), pipeline.PipelineId); var hJGL_Pipeline_Component = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(item.PipelineComponentCode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""), pipeline.PipelineId);
if (hJGL_Pipeline_Component!=null) if (hJGL_Pipeline_Component!=null)
{ {
model.Pipeline_ComponentQRCodeRootName rootName = new model.Pipeline_ComponentQRCodeRootName(); //model.Pipeline_ComponentQRCodeRootName rootName = new model.Pipeline_ComponentQRCodeRootName();
rootName.QRCode = new List<model.Pipeline_ComponentQRCodeQRCodeItem>(); //rootName.QRCode = new List<model.Pipeline_ComponentQRCodeQRCodeItem>();
var elementlist = item.QRCode.Split('&'); //var elementlist = item.QRCode.Split(';');
foreach (var element in elementlist) //foreach (var element in elementlist)
{ //{
model.Pipeline_ComponentQRCodeQRCodeItem qRCodeQRCodeItem = new model.Pipeline_ComponentQRCodeQRCodeItem(); // model.Pipeline_ComponentQRCodeQRCodeItem qRCodeQRCodeItem = new model.Pipeline_ComponentQRCodeQRCodeItem();
qRCodeQRCodeItem.element = element; // qRCodeQRCodeItem.element = element;
rootName.QRCode.Add(qRCodeQRCodeItem); // rootName.QRCode.Add(qRCodeQRCodeItem);
} //}
hJGL_Pipeline_Component.QRCode = JsonConvert.SerializeObject(rootName); //hJGL_Pipeline_Component.QRCode = JsonConvert.SerializeObject(rootName);
//hJGL_Pipeline_Component.DrawingName = item.DrawingName;
hJGL_Pipeline_Component.QRCode = item.QRCode;
Pipeline_ComponentList.Add(hJGL_Pipeline_Component); Pipeline_ComponentList.Add(hJGL_Pipeline_Component);
} }
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
+3 -3
View File
@@ -235,9 +235,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
Model.ColorModel colorModel = new Model.ColorModel(); Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel; parameter3D.ColorModel = colorModel;
parameter3D.TagNum = ""; parameter3D.TagNum = Line_No;
parameter3D.ButtonType = "4"; parameter3D.ButtonType = "4";
parameter3D.Line_No = Line_No; //parameter3D.Line_No = Line_No;
if (this.tvControlItem.SelectedNode.CommandName == "单位工程") if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{ {
@@ -579,7 +579,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
parameter3D.ColorModel = colorModel; parameter3D.ColorModel = colorModel;
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "4"; parameter3D.ButtonType = "4";
parameter3D.Line_No = Line_No; // parameter3D.Line_No = Line_No;
if (this.tvControlItem.SelectedNode.CommandName == "单位工程") if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{ {
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+4 -3
View File
@@ -231,7 +231,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
} }
parameter3D.Line_No = string.Join(",", pipelineList); parameter3D.TagNum= string.Join(",", pipelineList);
//parameter3D.Line_No = string.Join(",", pipelineList);
} }
else if (this.tvControlItem.SelectedNode.CommandName == "管线") else if (this.tvControlItem.SelectedNode.CommandName == "管线")
{ {
@@ -263,7 +264,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
Line_No = "/" + pipeline.PipelineCode; Line_No = "/" + pipeline.PipelineCode;
} }
parameter3D.Line_No = Line_No; //parameter3D.Line_No = Line_No;
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(pipeline.UnitWorkId); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(pipeline.UnitWorkId);
var pipecode = "/" + pipeline.PipelineCode; var pipecode = "/" + pipeline.PipelineCode;
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
@@ -367,7 +368,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
Line_No ="/"+ modelpipe.PipelineCode; Line_No ="/"+ modelpipe.PipelineCode;
} }
parameter3D.Line_No = Line_No; // parameter3D.Line_No = Line_No;
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId);
var pipecode = "/" + modelpipe.PipelineCode; var pipecode = "/" + modelpipe.PipelineCode;
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+1 -1
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
parameter3D.TagNum = ""; parameter3D.TagNum = "";
parameter3D.ButtonType = "0"; parameter3D.ButtonType = "0";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
// PipelineService.GetPipelinesByUnitWordId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D; ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData(); ctlAuditFlow.BindData();