lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

总部检查图片预览功能实现

This commit is contained in:
杨红卫 2024-03-07 16:12:32 +08:00
parent 5823d7534e
commit d03c9a0e00
9 changed files with 339 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -14336,6 +14336,7 @@
</Compile>
<Compile Include="ZHGL\Supervise\SuperviseCheckRectifyEdit.aspx.cs">
<DependentUpon>SuperviseCheckRectifyEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ZHGL\Supervise\SuperviseCheckRectifyEdit.aspx.designer.cs">
<DependentUpon>SuperviseCheckRectifyEdit.aspx</DependentUpon>
@ -14420,7 +14421,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:14290/</IISUrl>
<IISUrl>http://localhost:8653/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

59
SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx
View File

@ -5,8 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>总部检查</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<title></title>
<script type="text/javascript" src="../../Controls/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
@ -23,7 +22,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Left" runat="server">
<Items>
<f:RadioButtonList ID="rbStates" runat="server" Label="状态"
<f:RadioButtonList ID="rbStates" runat="server" Label="状态"
LabelAlign="Right" Width="400px" AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
<f:RadioItem Text="不合格" Value="0" Selected="true" />
<f:RadioItem Text="合格" Value="1" />
@ -36,9 +35,9 @@
SortField="RectifyItemId" FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
Hidden="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="StatesName" DataField="StatesName" FieldType="string"
HeaderText="状态">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="StatesName" DataField="StatesName" FieldType="string"
HeaderText="状态">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RectifyCode" DataField="RectifyCode" FieldType="string"
HeaderText="整改单">
</f:RenderField>
@ -53,11 +52,23 @@
</f:RenderField>
<f:LinkButtonField HeaderText="整改前" ConfirmTarget="Top" Width="80" CommandName="AttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="详细" />
<f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("RectifyItemId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string"
HeaderText="整改结果">
</f:RenderField>
<f:LinkButtonField ColumnID="ReAttachUrl" HeaderText="整改后" ConfirmTarget="Top" Width="80" CommandName="ReAttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="整改后" />
<f:TemplateField ColumnID="tfImageUrl2" Width="120px" HeaderText="整改后" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImageUrlByImage2(Eval("RectifyItemId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="dataload" Handler="onGridDataLoad" />
@ -70,26 +81,44 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<div id="imgID1" style="position: absolute; left: 0; top: 0; width: 300px; height: 300px; z-index: 99999999;">
<img src="" alt="Alternate Text" style="width: 100%; height: auto;" />
</div>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnSubmit" EnablePostBack="true" runat="server"
<f:MenuButton ID="btnSubmit" EnablePostBack="true" runat="server"
Text="提交" Icon="TableEdit" OnClick="btnSubmit_Click">
</f:MenuButton>
</f:MenuButton>
</Items>
</f:Menu>
</form>
<script type="text/javascript">
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
}
function onGridDataLoad(event) {
this.mergeColumns(['RectifyCode'], { depends: true });
}
</script>
function onGridDataLoad(event) {
this.mergeColumns(['RectifyCode'], { depends: true });
}
</script>
<script type="text/javascript">
var imgID = '<%=Grid1.ClientID %>';
F.ready(function () {
var $wrap = $("#" + imgID)
$wrap.find('img').hover(function (e) {
console.log($(this).offset())
var top = $(this).offset().top;
var left = $(this).offset().left - 200;
var src = $(this).attr('src')
console.log('src', src, top, left)
$('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
}, function () {
$('#imgID1').hide()
})
})
</script>
</body>
</html>

40
SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
View File

@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
namespace FineUIPro.Web.HSSE.Check
{
@ -127,5 +128,44 @@ namespace FineUIPro.Web.HSSE.Check
ShowNotify("数据已提交成功!");
}
}
/// <summary>
/// 获取整改前图片(放于Img中)
/// </summary>
/// <param name="registrationId"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage(object RectifyItemId)
{
string url = string.Empty;
if (RectifyItemId != null)
{
var RectifyNoticesItem = BLL.AttachFileService.GetAttachFileByToKeyId(RectifyItemId.ToString() + "#1");
if (RectifyNoticesItem != null)
{
url = HttpUtility.HtmlDecode(BLL.UploadAttachmentService.ShowImage("../../", RectifyNoticesItem.AttachUrl));
}
}
return url;
}
/// <summary>
/// 获取整改后图片
/// </summary>
/// <param name="registrationId"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage2(object RectifyItemId)
{
string url = string.Empty;
if (RectifyItemId != null)
{
var RectifyNoticesItem = BLL.AttachFileService.GetAttachFileByToKeyId(RectifyItemId.ToString() + "#2");
if (RectifyNoticesItem != null)
{
url = BLL.UploadAttachmentService.ShowImage("../../", RectifyNoticesItem.AttachUrl);
}
}
return url;
}
}
}

18
SGGL/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.designer.cs generated
View File

@ -68,6 +68,24 @@ namespace FineUIPro.Web.HSSE.Check
/// </remarks>
protected global::FineUIPro.RadioButtonList rbStates;
/// <summary>
/// lbImageUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbImageUrl;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// WindowAtt 控件。
/// </summary>

2
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
View File

@ -84,7 +84,7 @@
<f:TemplateField ColumnID="tfImageUrl2" Width="110px" HeaderText="整改后" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("RectifyNoticesItemId")) %>'> %>'></asp:Label>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("RectifyNoticesItemId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="IsRectify" DataField="IsRectify" FieldType="string"

7
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx.cs
View File

@ -1,7 +1,9 @@
using BLL;
using FineUIPro.Web.HSSE.Check;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Policy;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.OfficeCheck.Check
@ -383,10 +385,9 @@ namespace FineUIPro.Web.OfficeCheck.Check
var getRectify = ProjectSupervision_RectifyService.GetRectifyByCheckNoticeId(this.CheckNoticeId);
if (getRectify != null && getRectify.States != "0" && !string.IsNullOrEmpty(getRectify.States))
{
window = String.Format("RectifyEdit.aspx?CheckNoticeId={0}&type=1", this.CheckNoticeId, "编辑 - ");
PageContext.RegisterStartupScript(Window2.GetShowReference(window));
window = String.Format("RectifyEdit.aspx?CheckNoticeId={0}&type=1", this.CheckNoticeId, "编辑 - ");
}
PageContext.RegisterStartupScript(Window2.GetShowReference(window));
}

224
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx
View File

@ -5,9 +5,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>隐患整改</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../Controls/My97DatePicker/WdatePicker.js"></script>
<title></title>
<script type="text/javascript" src="../../Controls/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<form id="form1" runat="server">
@ -48,6 +47,107 @@
</f:DropDownList>--%>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" AllowCellEditing="true" ClicksToEdit="1"
EnableCollapse="true" EnableColumnLines="true" EnableColumnMove="true" runat="server" BoxFlex="1"
DataKeyNames="RectifyItemId,IsRectify" DataIDField="RectifyItemId" AllowSorting="true" SortField="RectifyItemId"
SortDirection="ASC" EnableTextSelection="True" MinHeight="240px" PageSize="500"
EnableRowDoubleClickEvent="true" OnRowCommand="Grid1_RowCommand" OnRowDataBound="Grid1_RowDataBound">
<Toolbars>
<f:Toolbar ID="toolAdd" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnAdd" Icon="Add" runat="server" OnClick="btnAdd_Click" ToolTip="新增">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField HeaderText="主键" ColumnID="RectifyItemId" DataField="RectifyItemId"
SortField="RectifyItemId" FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
Hidden="true">
</f:RenderField>
<f:RenderField Width="550px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string"
HeaderText="具体位置及隐患内容">
<Editor>
<f:TextBox ID="tWrongContent" runat="server" MaxLength="800" ShowRedStar="true" Required="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:TemplateField ColumnID="HiddenHazardType" HeaderText="隐患类别" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
<ItemTemplate>
<asp:DropDownList ID="drpHiddenHazardType" runat="server">
<asp:ListItem Text="一般" Value="1" Selected="True" />
<asp:ListItem Text="较大" Value="2" />
<asp:ListItem Text="重大" Value="3" />
</asp:DropDownList>
<f:HiddenField ID="hdHiddenHazardType" runat="server" Text='<%# Eval("HiddenHazardType") %>'></f:HiddenField>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="220px" ColumnID="Requirement" DataField="Requirement" FieldType="string" HeaderTextAlign="Center"
HeaderText="整改要求">
<Editor>
<f:TextBox ID="tRequirement" runat="server" MaxLength="800" ShowRedStar="true" Required="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:TemplateField ColumnID="LimitTime" Width="120px" HeaderText="整改期限" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:TextBox ID="txtLimitTimes" runat="server" Text='<%# Eval("LimitTime")!=null? ConvertDate(Eval("LimitTime")):"" %>'
Width="98%" CssClass="Wdate" Style="width: 98%; cursor: hand" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})"
BorderStyle="None">
</asp:TextBox>
</ItemTemplate>
</f:TemplateField>
<f:LinkButtonField HeaderText="整改前" ConfirmTarget="Top" Width="80" CommandName="AttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="编辑" />
<f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("FileUrlId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="200px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string" HeaderTextAlign="Center"
HeaderText="整改结果">
<Editor>
<f:TextBox ID="txtRectifyResults" runat="server" MaxLength="800">
</f:TextBox>
</Editor>
</f:RenderField>
<f:LinkButtonField ColumnID="ReAttachUrl" HeaderText="整改后" ConfirmTarget="Top" Width="80" CommandName="ReAttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="详细" />
<f:TemplateField ColumnID="tfImageUrl2" Width="120px" HeaderText="整改后" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImageUrlByImage2(Eval("FileUrlId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="IsRectify" HeaderText="合格" HeaderTextAlign="Center" TextAlign="Center" Width="60px">
<ItemTemplate>
<asp:DropDownList ID="drpIsRectify" runat="server">
<asp:ListItem Value="false">否</asp:ListItem>
<asp:ListItem Value="true">是</asp:ListItem>
</asp:DropDownList>
<f:HiddenField ID="hdIsRectify" runat="server" Text='<%# Eval("IsRectify") %>'></f:HiddenField>
</ItemTemplate>
</f:TemplateField>
<f:LinkButtonField ID="del" ColumnID="del" HeaderText="删除" Width="50px" CommandName="delete"
Icon="Delete" />
<f:RenderField HeaderText="报告明细id" ColumnID="hdCheckReportItemId" DataField="CheckReportItemId" FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="next">
<Items>
<f:DropDownList ID="drpSignPerson" runat="server" Label="整改责任人：项目安全经理" LabelWidth="200px"
LabelAlign="Right" EnableEdit="true" ShowRedStar="true">
</f:DropDownList>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
@ -66,111 +166,31 @@
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Form ID="Form2" ShowBorder="true" ShowHeader="false" Title="安全隐患及整改要求" AutoScroll="true"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" AllowCellEditing="true" ClicksToEdit="1"
ForceFit="true" EnableCollapse="true" EnableColumnLines="true" EnableColumnMove="true" runat="server" BoxFlex="1"
DataKeyNames="RectifyItemId,IsRectify" DataIDField="RectifyItemId" AllowSorting="true" SortField="RectifyItemId"
SortDirection="ASC" EnableTextSelection="True" MinHeight="240px" PageSize="500"
EnableRowDoubleClickEvent="true" OnRowCommand="Grid1_RowCommand" OnRowDataBound="Grid1_RowDataBound">
<Toolbars>
<f:Toolbar ID="toolAdd" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnAdd" Icon="Add" runat="server" OnClick="btnAdd_Click" ToolTip="新增">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField HeaderText="主键" ColumnID="RectifyItemId" DataField="RectifyItemId"
SortField="RectifyItemId" FieldType="String" HeaderTextAlign="Center" TextAlign="Center"
Hidden="true">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="WrongContent" DataField="WrongContent" FieldType="string"
HeaderText="具体位置及隐患内容">
<Editor>
<f:TextBox ID="tWrongContent" runat="server" MaxLength="800" ShowRedStar="true" Required="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:TemplateField ColumnID="HiddenHazardType" HeaderText="隐患类别" HeaderTextAlign="Center" TextAlign="Center" Width="60px">
<ItemTemplate>
<asp:DropDownList ID="drpHiddenHazardType" runat="server">
<asp:ListItem Text="一般" Value="1" Selected="True" />
<asp:ListItem Text="较大" Value="2" />
<asp:ListItem Text="重大" Value="3" />
</asp:DropDownList>
<f:HiddenField ID="hdHiddenHazardType" runat="server" Text='<%# Eval("HiddenHazardType") %>'></f:HiddenField>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="Requirement" DataField="Requirement" FieldType="string" HeaderTextAlign="Center"
HeaderText="整改要求">
<Editor>
<f:TextBox ID="tRequirement" runat="server" MaxLength="800" ShowRedStar="true" Required="true">
</f:TextBox>
</Editor>
</f:RenderField>
<f:TemplateField ColumnID="LimitTime" Width="100px" HeaderText="整改期限" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:TextBox ID="txtLimitTimes" runat="server" Text='<%# Eval("LimitTime")!=null? ConvertDate(Eval("LimitTime")):"" %>'
Width="98%" CssClass="Wdate" Style="width: 98%; cursor: hand" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})"
BorderStyle="None">
</asp:TextBox>
</ItemTemplate>
</f:TemplateField>
<f:LinkButtonField HeaderText="整改前" ConfirmTarget="Top" Width="80" CommandName="AttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="详细" />
<f:RenderField Width="100px" ColumnID="RectifyResults" DataField="RectifyResults" FieldType="string"
HeaderText="整改结果">
<Editor>
<f:TextBox ID="txtRectifyResults" runat="server" MaxLength="800" LabelWidth="160px">
</f:TextBox>
</Editor>
</f:RenderField>
<f:LinkButtonField ColumnID="ReAttachUrl" HeaderText="整改后" ConfirmTarget="Top" Width="80" CommandName="ReAttachUrl"
TextAlign="Center" ToolTip="整改照片" Text="整改后" />
<f:TemplateField ColumnID="IsRectify" HeaderText="合格" HeaderTextAlign="Center" TextAlign="Center" Width="60px">
<ItemTemplate>
<asp:DropDownList ID="drpIsRectify" runat="server">
<asp:ListItem Value="false">否</asp:ListItem>
<asp:ListItem Value="true">是</asp:ListItem>
</asp:DropDownList>
<f:HiddenField ID="hdIsRectify" runat="server" Text='<%# Eval("IsRectify") %>'></f:HiddenField>
</ItemTemplate>
</f:TemplateField>
<f:LinkButtonField ID="del" ColumnID="del" HeaderText="删除" Width="60px" CommandName="delete"
Icon="Delete" />
<f:RenderField HeaderText="报告明细id" ColumnID="hdCheckReportItemId" DataField="CheckReportItemId" FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow runat="server" ID="next">
<Items>
<f:DropDownList ID="drpSignPerson" runat="server" Label="整改责任人：项目安全经理" LabelWidth="200px"
LabelAlign="Right" EnableEdit="true" ShowRedStar="true">
</f:DropDownList>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<div id="imgID1" style="position: absolute; left: 0; top: 0; width: 300px; height: 300px; z-index: 99999999;">
<img src="" alt="Alternate Text" style="width: 100%; height: auto;" />
</div>
</form>
<script type="text/javascript">
var imgID = '<%=Grid1.ClientID %>';
F.ready(function () {
var $wrap = $("#" + imgID)
$wrap.find('img').hover(function (e) {
console.log($(this).offset())
var top = $(this).offset().top;
var left = $(this).offset().left - 200;
var src = $(this).attr('src')
console.log('src', src, top, left)
$('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
}, function () {
$('#imgID1').hide()
})
})
</script>
</body>
</html>

49
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
namespace FineUIPro.Web.OfficeCheck.Check
{
@ -49,7 +50,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.btnSave.Hidden = true;
this.btnAdd.Hidden = true;
this.btnSubmit.Hidden = true;
this.Grid1.Columns[9].Hidden = true;
this.Grid1.Columns[11].Hidden = true;
}
this.CheckNoticeId = Request.Params["CheckNoticeId"];
@ -133,14 +134,16 @@ namespace FineUIPro.Web.OfficeCheck.Check
List <SqlParameter> listStr = new List<SqlParameter>();
if (Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(x => x.RectifyId == this.hdRectifyNoticesId.Text) != null)
{
strSql = @"select RectifyItemId,WrongContent,Requirement,LimitTime,RectifyResults,IsRectify,HiddenHazardType,null as CheckReportItemId
strSql = @"select RectifyItemId,WrongContent,Requirement,LimitTime,RectifyResults,IsRectify,HiddenHazardType
,null as CheckReportItemId, RectifyItemId AS FileUrlId
from ProjectSupervision_RectifyItem
where RectifyId = @RectifyId";
listStr.Add(new SqlParameter("@RectifyId", this.hdRectifyNoticesId.Text));
}
else
{
strSql = @"select newid() as RectifyItemId,UnConformItem as WrongContent,null as Requirement,null as LimitTime, null as RectifyResults,0 as IsRectify,'1' as HiddenHazardType,item.CheckReportItemId
strSql = @"select newid() as RectifyItemId,UnConformItem as WrongContent,null as Requirement,null as LimitTime, null as RectifyResults,0 as IsRectify
,'1' as HiddenHazardType,item.CheckReportItemId,item.CheckReportItemId AS FileUrlId
from ProjectSupervision_CheckReportItem as item
left join ProjectSupervision_CheckReport as Report on item.CheckReportId=Report.CheckReportId
where Report.CheckNoticeId = @CheckNoticeId";
@ -264,7 +267,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
}
else
{
string checkReportItemId= Grid1.Rows[e.RowIndex].Values[10].ToString();
string checkReportItemId= Grid1.Rows[e.RowIndex].Values[12].ToString();
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Rectify&menuId={1}&type=0&strParam=1", checkReportItemId, BLL.Const.CheckInfoMenuId)));
}
}
@ -528,5 +531,43 @@ namespace FineUIPro.Web.OfficeCheck.Check
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
/// <summary>
/// 获取整改前图片(放于Img中)
/// </summary>
/// <param name="registrationId"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage(object FileUrlId)
{
string url = string.Empty;
if (FileUrlId != null)
{
var RectifyNoticesItem = BLL.AttachFileService.GetAttachFileByToKeyId(FileUrlId.ToString() + "#1");
if (RectifyNoticesItem != null)
{
url = HttpUtility.HtmlDecode(BLL.UploadAttachmentService.ShowImage("../../", RectifyNoticesItem.AttachUrl));
}
}
return url;
}
/// <summary>
/// 获取整改后图片
/// </summary>
/// <param name="registrationId"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage2(object FileUrlId)
{
string url = string.Empty;
if (FileUrlId != null)
{
var RectifyNoticesItem = BLL.AttachFileService.GetAttachFileByToKeyId(FileUrlId.ToString() + "#2");
if (RectifyNoticesItem != null)
{
url = BLL.UploadAttachmentService.ShowImage("../../", RectifyNoticesItem.AttachUrl);
}
}
return url;
}
}
}

126
SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.designer.cs generated
View File

@ -95,60 +95,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.DatePicker txtCheckedDate;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdRectifyNoticesId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdRectifyNoticesId;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnSure 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSure;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -221,6 +167,15 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtLimitTimes;
/// <summary>
/// lbImageUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbImageUrl;
/// <summary>
/// txtRectifyResults 控件。
/// </summary>
@ -230,6 +185,15 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.TextBox txtRectifyResults;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// drpIsRectify 控件。
/// </summary>
@ -257,15 +221,6 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.LinkButtonField del;
/// <summary>
/// Form3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// next 控件。
/// </summary>
@ -284,6 +239,51 @@ namespace FineUIPro.Web.OfficeCheck.Check
/// </remarks>
protected global::FineUIPro.DropDownList drpSignPerson;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdRectifyNoticesId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdRectifyNoticesId;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnSure 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSure;
/// <summary>
/// WindowAtt 控件。
/// </summary>