diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config
index e47cfd0..1963de0 100644
--- a/HJGL/.vs/HJGL/config/applicationhost.config
+++ b/HJGL/.vs/HJGL/config/applicationhost.config
@@ -162,7 +162,7 @@
             </site>
             <site name="WebApi" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
+                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:3862:localhost" />
@@ -250,7 +250,7 @@
             </site>
             <site name="FineUIPro.Web(10)" id="13">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:13960:localhost" />
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index f37f730..b1a0588 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportItemEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportItemEdit.aspx.cs
index 15fc344..4237ea4 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportItemEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportItemEdit.aspx.cs
@@ -128,7 +128,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             rootNode.Expanded = true;
             this.tvControlItem.Nodes.Add(rootNode);
 
-            var iso = (from x in Funs.DB.Pipeline_Pipeline where x.InstallationId == this.InstallationId && x.UnitId == this.UnitId orderby x.PipelineCode select x).ToList();
+            var iso = (from x in Funs.DB.Pipeline_Pipeline 
+                       join y in Funs.DB.Project_WorkArea on x.WorkAreaId equals y.WorkAreaId
+                       where x.InstallationId == this.InstallationId && x.UnitId == this.UnitId orderby x.PipelineCode 
+                       select new {x.PipelineId,x.PipelineCode,y.WorkAreaCode }).ToList();
             if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
             {
                 iso = (from x in iso where x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList();
@@ -137,7 +140,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             foreach (var item in iso)
             {
                 TreeNode newNode = new TreeNode();
-                newNode.Text = item.PipelineCode;
+                newNode.Text = item.PipelineCode + "(" + item.WorkAreaCode + ")";
                 newNode.NodeID = item.PipelineId;
                 newNode.ToolTip = item.PipelineCode;
                 newNode.EnableClickEvent = true;