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

Compare commits

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

3 Commits
ddeee081aa ... 2f9fceb03a

Author SHA1 Message Date
高飞 2f9fceb03a 删除v15 2025-04-09 16:40:12 +08:00
高飞 f8790ad0da Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS 2025-04-09 16:39:47 +08:00
高飞 98151c9476 提交代码 2025-04-09 16:34:15 +08:00
6 changed files with 11 additions and 4 deletions
Show Stats Expand all files Collapse all files

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

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm
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">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<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="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.6.1">
<compilation debug="false" targetFramework="4.6.1">
<assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies>

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

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

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>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />