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

Compare commits

base: gaofei:2f9fceb03aa3feb5e7b04fcfa9cce24f26cebfcd
Branches Tags
gaofei:master
..
compare: gaofei:ddeee081aabadcab608c13165f6865d7c5843e85
Branches Tags
gaofei:master

No commits in common. "2f9fceb03aa3feb5e7b04fcfa9cce24f26cebfcd" and "ddeee081aabadcab608c13165f6865d7c5843e85" have entirely different histories.
2f9fceb03a ... ddeee081aa

6 changed files with 4 additions and 11 deletions
Show Stats Expand all files Collapse all files

BIN
HJGL_DS/.vs/SGGL/v15/.suo Normal file
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm Normal file
View File

Binary file not shown.

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

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

@ -50,7 +50,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>

9
HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
View File

@ -78,14 +78,7 @@
// drpUnit.SelectedValue = this.CurrUser.UnitId; // drpUnit.SelectedValue = this.CurrUser.UnitId;
// drpUnit.Enabled = false; // drpUnit.Enabled = false;
//} //}
if (this.CurrUser.UserId == BLL.Const.GlyId)
{
this.drpIfOnGuard.Enabled = true;
}
else
{
this.drpIfOnGuard.Enabled = false;
}
this.PersonLoad(); this.PersonLoad();
} }
} }

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

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