This commit is contained in:
高飞 2025-12-26 10:57:02 +08:00
parent 2b54ca1530
commit 8c09097e94
4 changed files with 49 additions and 17 deletions

View File

@ -88,12 +88,12 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite
string url = string.Empty;
if (picUrl != null && !string.IsNullOrWhiteSpace(picUrl.ToString()))
{
string httpUrl = Funs.SGGLUrl;
//var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
//if (sysSet6 != null)
//{
// httpUrl = sysSet6.SetValue;
//}
string httpUrl = string.Empty;
var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
if (sysSet6 != null)
{
httpUrl = sysSet6.SetValue;
}
url = BLL.UploadAttachmentService.ShowImage(httpUrl, picUrl.ToString());
}
return url;
@ -268,7 +268,7 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite
{
return;
}
var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.PersonId, BLL.Const.ProjectHighlightsSitePicMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectHighlightsSitePicMenuId);
if (buttonList.Count() > 0)
{
//if (buttonList.Contains(BLL.Const.BtnAdd))

View File

@ -68,8 +68,8 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite
Model.CQMS_ProjectHighlightsSitePic model = new Model.CQMS_ProjectHighlightsSitePic();
model.Id = this.Id;
model.Resume = this.txtResume.Text.Trim();
model.CompileMan = this.CurrUser.PersonId;
model.CompileManName = this.CurrUser.PersonName;
model.CompileMan = this.CurrUser.UserId;
model.CompileManName = this.CurrUser.UserName;
model.CompileDate = DateTime.Now;
var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id);
if (attachFile != null)

View File

@ -115,12 +115,12 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite
string url = string.Empty;
if (picUrl != null && !string.IsNullOrWhiteSpace(picUrl.ToString()))
{
string httpUrl = Funs.SGGLUrl;
//var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
//if (sysSet6 != null)
//{
// httpUrl = sysSet6.SetValue;
//}
string httpUrl = string.Empty;
var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
if (sysSet6 != null)
{
httpUrl = sysSet6.SetValue;
}
url = BLL.UploadAttachmentService.ShowImage(httpUrl, picUrl.ToString());
}
return url;
@ -333,7 +333,7 @@ namespace FineUIPro.Web.CQMS.ProjectHighlightsSite
{
return;
}
var buttonList = BLL.CommonService.GetAllButtonList(null, this.CurrUser.PersonId, BLL.Const.ProjectHighlightsSitePicReportMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(null, this.CurrUser.UserId, BLL.Const.ProjectHighlightsSitePicReportMenuId);
if (buttonList.Count() > 0)
{
//if (buttonList.Contains(BLL.Const.BtnAdd))

View File

@ -496,6 +496,10 @@
<Content Include="CQMS\Plan\TechnicalProposalReview.aspx" />
<Content Include="CQMS\Plan\TechnicalProposalReviewEdit.aspx" />
<Content Include="CQMS\Plan\TechnicalProposalReviewView.aspx" />
<Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePic.aspx" />
<Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicEdit.aspx" />
<Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicReport.aspx" />
<Content Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSiteType.aspx" />
<Content Include="CQMS\QualityActivity\QCManage\QCGroupRegistration.aspx" />
<Content Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationEdit.aspx" />
<Content Include="CQMS\QualityActivity\QCManage\QCGroupRegistrationView.aspx" />
@ -9228,6 +9232,34 @@
<Compile Include="CQMS\Plan\TechnicalProposalReviewView.aspx.designer.cs">
<DependentUpon>TechnicalProposalReviewView.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePic.aspx.cs">
<DependentUpon>ProjectHighlightsSitePic.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePic.aspx.designer.cs">
<DependentUpon>ProjectHighlightsSitePic.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicEdit.aspx.cs">
<DependentUpon>ProjectHighlightsSitePicEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicEdit.aspx.designer.cs">
<DependentUpon>ProjectHighlightsSitePicEdit.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicReport.aspx.cs">
<DependentUpon>ProjectHighlightsSitePicReport.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSitePicReport.aspx.designer.cs">
<DependentUpon>ProjectHighlightsSitePicReport.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSiteType.aspx.cs">
<DependentUpon>ProjectHighlightsSiteType.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CQMS\ProjectHighlightsSite\ProjectHighlightsSiteType.aspx.designer.cs">
<DependentUpon>ProjectHighlightsSiteType.aspx</DependentUpon>
</Compile>
<Compile Include="CQMS\QualityActivity\QCManage\QCGroupRegistration.aspx.cs">
<DependentUpon>QCGroupRegistration.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -16862,7 +16894,7 @@
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">