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

Compare commits

base: gaofei:0d612c05aa42d013a013b3dc730b1a3430750f49
Branches Tags
gaofei:master
..
compare: gaofei:e1ae773cb50510275192fe2746bc365eaa142b9f
Branches Tags
gaofei:master

No commits in common. "0d612c05aa42d013a013b3dc730b1a3430750f49" and "e1ae773cb50510275192fe2746bc365eaa142b9f" have entirely different histories.
0d612c05aa ... e1ae773cb5

5 changed files with 3 additions and 30 deletions
Show Stats Expand all files Collapse all files

2
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

9
HJGL_DS/FineUIPro.Web/Global.asax.cs
View File

@ -628,11 +628,6 @@
materialTypeName = "其它";
}
}
else if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
else
{
if (queProject[1].Trim().Contains("Ni"))
@ -705,10 +700,6 @@
{
location = "2FG,4FG";
}
else if (queProject[1].Contains("5G"))
{
location = "1G,3G,4G,5G";
}
else
{
location = queProject[2].Trim();

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

18
HJGL_DS/FineUIPro.Web/Welder/QualifiedProject.aspx.cs
View File

@ -529,11 +529,6 @@ namespace FineUIPro.Web.Welder
materialTypeName = "其它";
}
}
else if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
else
{
if (queProject[1].Trim().Contains("Ni"))
@ -596,10 +591,6 @@ namespace FineUIPro.Web.Welder
{
location = "2FG,4FG";
}
else if (queProject[1].Contains("5G"))
{
location = "1G,3G,4G,5G";
}
else
{
location = queProject[2];
@ -847,11 +838,6 @@ namespace FineUIPro.Web.Welder
materialTypeName = "其它";
}
}
else if (queProject[1].Trim().Contains("5G"))
{
materialType = "FeⅣ,FeⅢ,FeⅡ,FeⅠ,NiⅤ,NiⅣ,NiⅢ,NiⅡ,NiⅠ,Zr3,Zr5,TiⅡ,TiⅠ";
materialTypeName = "镍基合金";
}
else
{
if (queProject[1].Trim().Contains("Ni"))
@ -914,10 +900,6 @@ namespace FineUIPro.Web.Welder
{
location = "2FG,4FG";
}
else if (queProject[1].Contains("5G"))
{
location = "1G,3G,4G,5G";
}
else
{
location = queProject[2];

2
HJGL_DS/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />