Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS
This commit is contained in:
commit
d7379579ba
|
@ -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 />
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue