gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
高飞
2026-08-11 16:06:26 +08:00
parent 65bc4f64e3
commit 75cd095980
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/Global.asax.cs
+8 -1
View File
@@ -743,7 +743,14 @@
} }
else else
{ {
weldType = "1,2"; if (queProject[2].Contains("6G"))
{
weldType = "1,2,3";
}
else
{
weldType = "1,2";
}
} }
} }
HJGL_DS/FineUIPro.Web/Web.config
+1 -1
View File
@@ -67,7 +67,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/> <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
<add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/> <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
</httpHandlers> </httpHandlers>
<compilation debug="false" targetFramework="4.6.1"> <compilation debug="true" targetFramework="4.6.1">
<assemblies> <assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/> <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies> </assemblies>
HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
+17 -3
View File
@@ -625,13 +625,20 @@ namespace FineUIPro.Web.Welder
} }
// 1-对接，2-角焊缝，3-支管连接焊缝 // 1-对接，2-角焊缝，3-支管连接焊缝
if (queProject[2].Contains("FG")) if (queProject[2].Contains("FG") )
{ {
weldType = "2,3"; weldType = "2,3";
} }
else else
{ {
weldType = "1,2"; if (queProject[2].Contains("6G"))
{
weldType = "1,2,3";
}
else
{
weldType = "1,2";
}
} }
} }
@@ -964,7 +971,14 @@ namespace FineUIPro.Web.Welder
} }
else else
{ {
weldType = "1,2"; if (queProject[2].Contains("6G"))
{
weldType = "1,2,3";
}
else
{
weldType = "1,2";
}
} }
} }