zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://toscode.gitee.com/frane-yang/sggl_cd

This commit is contained in:
李超 2023-05-11 10:30:57 +08:00
parent f7eefb0e71 d4e79ba232
commit ec4b8265ea
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_CD/v17/.wsuo
View File

Binary file not shown.

4
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx
View File

@ -36,8 +36,8 @@
</f:DatePicker>
<f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="重大" Value="0" Selected="true" />
<f:RadioItem Text="一般" Value="1" />
<f:RadioItem Text="重大" Value="0" />
<f:RadioItem Text="一般" Value="1" Selected="true"/>
</f:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">

4
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx
View File

@ -37,8 +37,8 @@
</f:DropDownList>
<f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="重大" Value="0" Selected="true" />
<f:RadioItem Text="一般" Value="1" />
<f:RadioItem Text="重大" Value="0" />
<f:RadioItem Text="一般" Value="1" Selected="true" />
</f:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">

18
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
View File

@ -1,6 +1,7 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
@ -152,18 +153,12 @@ namespace FineUIPro.Web.DataShow
protected string ConvertImageUrlByImage(object registrationId)
{
string url = string.Empty;
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;
}
if (registrationId != null)
{
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.ImageUrl);
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], registration.ImageUrl);
}
}
return url;
@ -178,21 +173,16 @@ namespace FineUIPro.Web.DataShow
protected string ConvertImgUrlByImage(object registrationId)
{
string url = string.Empty;
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;
}
if (registrationId != null)
{
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.RectificationImageUrl);
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], registration.RectificationImageUrl);
}
}
return url;
}
}
}

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

@ -17,7 +17,7 @@
<add key="SystemName" value="数字化施工管理信息平台V1.0"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
<add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
<add key="SGGLUrl" value="http://localhost/sggl/"/>
<add key="SGGLUrl" value="http://localhost:1295/"/>
<add key="SystemVersion" value="SGGLPackFile_V2022-11-11-001"/>
<!--启用与集团实名制 True启用 False 不启用-->
<add key="EnableRealName" value="False"/>