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-01-30 17:30:12 +08:00
parent 0d612c05aa
commit a794871559
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/Global.asax.cs
+5 -5
View File
@@ -628,11 +628,6 @@
materialTypeName = "其它"; materialTypeName = "其它";
} }
} }
else if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
else else
{ {
if (queProject[1].Trim().Contains("Ni")) if (queProject[1].Trim().Contains("Ni"))
@@ -666,6 +661,11 @@
materialTypeName = "其它"; materialTypeName = "其它";
} }
} }
if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
} }
} }
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="true" targetFramework="4.6.1"> <compilation debug="false" 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
+10 -10
View File
@@ -529,11 +529,6 @@ namespace FineUIPro.Web.Welder
materialTypeName = "其它"; materialTypeName = "其它";
} }
} }
else if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
else else
{ {
if (queProject[1].Trim().Contains("Ni")) if (queProject[1].Trim().Contains("Ni"))
@@ -557,6 +552,11 @@ namespace FineUIPro.Web.Welder
materialTypeName = "其它"; materialTypeName = "其它";
} }
} }
if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
} }
} }
@@ -847,11 +847,6 @@ namespace FineUIPro.Web.Welder
materialTypeName = "其它"; materialTypeName = "其它";
} }
} }
else if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
else else
{ {
if (queProject[1].Trim().Contains("Ni")) if (queProject[1].Trim().Contains("Ni"))
@@ -875,6 +870,11 @@ namespace FineUIPro.Web.Welder
materialTypeName = "其它"; materialTypeName = "其它";
} }
} }
if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
} }
} }