lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改集团展示页

Browse Source
This commit is contained in:
高飞
2023-03-28 16:44:12 +08:00
parent e5f663ff7f
commit 7e7188039b
55 changed files with 7524 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/Accident.aspx
+3 -3
View File
@@ -38,7 +38,7 @@
<f:RadioItem Text="特别重大" Value="5" />
</f:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -111,13 +111,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
-1
View File
@@ -23,7 +23,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/Check.aspx
+3 -3
View File
@@ -44,7 +44,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -110,13 +110,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
-1
View File
@@ -24,7 +24,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
+3 -3
View File
@@ -35,7 +35,7 @@
<f:RadioItem Text="专职" Value="1" />
</f:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -96,13 +96,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
-1
View File
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
+3 -3
View File
@@ -43,7 +43,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -113,13 +113,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
-1
View File
@@ -19,7 +19,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
// btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/Emergency.aspx
+3 -3
View File
@@ -38,7 +38,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -195,13 +195,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
+1 -3
View File
@@ -19,9 +19,7 @@ namespace FineUIPro.Web.DataShow
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
Funs.DropDownPageSize(this.ddlPageSize);
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
SGGL/FineUIPro.Web/DataShow/Environmental.aspx
+3 -3
View File
@@ -38,7 +38,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -109,13 +109,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
-1
View File
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
// btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
+3 -3
View File
@@ -35,7 +35,7 @@
Width="130px">
</f:DatePicker>--%>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -95,13 +95,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
-1
View File
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
+3 -3
View File
@@ -29,7 +29,7 @@
</f:DropDownList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -109,13 +109,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
-1
View File
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
+4 -4
View File
@@ -35,7 +35,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -95,7 +95,7 @@
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
<f:MenuButton ID="btnView" EnablePostBack="true" runat="server" Hidden="true"
Text="查看" Icon="Find" OnClick="btnView_Click">
</f:MenuButton>
</Items>
@@ -110,13 +110,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
+30 -17
View File
@@ -20,8 +20,7 @@ namespace FineUIPro.Web.DataShow
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
@@ -29,7 +28,7 @@ namespace FineUIPro.Web.DataShow
}
}
/// <summary>
/// 绑定数据
/// </summary>
@@ -58,7 +57,7 @@ namespace FineUIPro.Web.DataShow
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -140,13 +139,13 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void EditData()
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
//if (Grid1.SelectedRowIndexArray.Length == 0)
//{
// Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
// return;
//}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HJGLWeldingItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HJGLWeldingItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
}
#endregion
@@ -171,7 +170,10 @@ namespace FineUIPro.Web.DataShow
select x;
if (getD1.Count() > 0)
{
cout1 = getD1.Sum(x => Funs.GetNewIntOrZero(x.TotalWeldQuantity ?? ""));
foreach (var item in getD1)
{
cout1 += Funs.GetNewIntOrZero(item.TotalWeldQuantity);
}
}
}
return cout1;
@@ -193,12 +195,15 @@ namespace FineUIPro.Web.DataShow
// join y in Funs.DB.BO_WeldReportMain on x.DReportID equals y.DReportID
// where x.ProjectId == projectId.ToString()
// select new { x.JOT_DoneDin, y.JOT_WeldDate };
var getD1= from x in Funs.DB.HJGL_FL_TotalQuantity
where x.ProjectId == projectId.ToString()
select x;
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
where x.ProjectId == projectId.ToString()
select x;
if (getD1.Count() > 0)
{
cout1 = getD1.Sum(x => Funs.GetNewIntOrZero(x.TotalWeldQuantity ?? ""));
foreach (var item in getD1)
{
cout1 += Funs.GetNewIntOrZero(item.TotalWeldQuantity);
}
}
//if (datetime1.HasValue)
//{
@@ -251,8 +256,12 @@ namespace FineUIPro.Web.DataShow
select x;
if (getD1.Count() > 0)
{
cout1 = getD1.Sum(x => Funs.GetNewIntOrZero(x.OneTimeFilmAmount ?? ""));
foreach (var item in getD1)
{
cout1 += Funs.GetNewIntOrZero(item.OneTimeFilmAmount);
}
}
}
return cout1;
}
@@ -291,8 +300,12 @@ namespace FineUIPro.Web.DataShow
select x;
if (getD1.Count() > 0)
{
cout1 = getD1.Sum(x => Funs.GetNewIntOrZero(x.OneTimeFilmQualifiedAmount ?? ""));
foreach (var item in getD1)
{
cout1 += Funs.GetNewIntOrZero(item.OneTimeFilmQualifiedAmount);
}
}
}
return cout1;
}
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx
+9 -9
View File
@@ -29,18 +29,18 @@
<f:DatePicker ID="txtStartTime" runat="server" Label="检查时间" LabelAlign="Right"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
</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:RadioButtonList>
<f:Label ID="Label3" runat="server" Text="至">
</f:Label>
<f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="130px">
</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:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -57,7 +57,7 @@
</f:RenderField>
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="问题数量" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
@@ -115,13 +115,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
+12 -12
View File
@@ -62,7 +62,7 @@ namespace FineUIPro.Web.DataShow
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
Grid1.DataBind();
}
#endregion
@@ -177,11 +177,11 @@ namespace FineUIPro.Web.DataShow
}
if (this.rbType.SelectedValue == "0")
{
getT = getT.Where(x => x.HazardValue == "3");
getT = getT.Where(x => x.Risk_Level == "重大");
}
else
{
getT = getT.Where(x => x.HazardValue != "3");
getT = getT.Where(x => x.Risk_Level == "一般");
}
cout1 = getT.Count();
}
@@ -206,11 +206,11 @@ namespace FineUIPro.Web.DataShow
}
if (this.rbType.SelectedValue == "0")
{
getT = getT.Where(x => x.HazardValue == "3");
getT = getT.Where(x => x.Risk_Level == "重大");
}
else
{
getT = getT.Where(x => x.HazardValue != "3");
getT = getT.Where(x => x.Risk_Level == "一般");
}
cout1 = getT.Count();
}
@@ -224,7 +224,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "3" && x.States != "4");
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "3" && x.States != "4");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.RegisterDate >= datetime1);
@@ -235,11 +235,11 @@ namespace FineUIPro.Web.DataShow
}
if (this.rbType.SelectedValue == "0")
{
getT = getT.Where(x => x.HazardValue == "3");
getT = getT.Where(x => x.Risk_Level == "重大");
}
else
{
getT = getT.Where(x => x.HazardValue != "3");
getT = getT.Where(x => x.Risk_Level == "一般");
}
cout1 = getT.Count();
}
@@ -248,19 +248,19 @@ namespace FineUIPro.Web.DataShow
protected string Count4(object projectId)
{
string rate=string.Empty;
string rate = string.Empty;
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getALL= Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4");
var getALL = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4");
if (this.rbType.SelectedValue == "0")
{
getALL = getALL.Where(x => x.HazardValue == "3");
getALL = getALL.Where(x => x.Risk_Level == "重大");
}
else
{
getALL = getALL.Where(x => x.HazardValue != "3");
getALL = getALL.Where(x => x.Risk_Level == "一般");
}
if (datetime1.HasValue)
{
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.designer.cs
Generated
+9 -9
View File
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.DataShow
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// rbType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbType;
/// <summary>
/// Label3 控件。
/// </summary>
@@ -104,6 +95,15 @@ namespace FineUIPro.Web.DataShow
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// rbType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbType;
/// <summary>
/// btnClose 控件。
/// </summary>
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx
+4 -4
View File
@@ -32,14 +32,14 @@
<f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="130px">
</f:DatePicker>
<f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
<f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
LabelWidth="70px" LabelAlign="Right" Width="210px">
</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:RadioButtonList>
<f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
LabelWidth="70px" LabelAlign="Right" Width="210px">
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
+21 -6
View File
@@ -1,9 +1,13 @@
using BLL;
using Aspose.Words;
using BLL;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{
@@ -81,14 +85,13 @@ namespace FineUIPro.Web.DataShow
}
if (this.rbType.SelectedValue == "0")
{
strSql += " AND HazardValue =@HazardValue";
strSql += " AND Risk_Level = '重大'";
}
else
{
strSql += " AND HazardValue != @HazardValue";
strSql += " AND Risk_Level ='一般'";
}
listStr.Add(new SqlParameter("@HazardValue", "3"));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -153,12 +156,18 @@ 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("../", registration.ImageUrl);
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.ImageUrl);
}
}
return url;
@@ -173,12 +182,18 @@ 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("../", registration.RectificationImageUrl);
url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.RectificationImageUrl);
}
}
return url;
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.designer.cs
Generated
+9 -9
View File
@@ -95,15 +95,6 @@ namespace FineUIPro.Web.DataShow
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// rbType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbType;
/// <summary>
/// drpStates 控件。
/// </summary>
@@ -113,6 +104,15 @@ namespace FineUIPro.Web.DataShow
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// rbType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbType;
/// <summary>
/// btnClose 控件。
/// </summary>
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx
+3 -3
View File
@@ -35,7 +35,7 @@
Width="130px">
</f:DatePicker>--%>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -120,13 +120,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
-1
View File
@@ -25,7 +25,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
LargerHazard = (from x in Funs.DB.Solution_LargerHazard
SGGL/FineUIPro.Web/DataShow/License.aspx
+8 -8
View File
@@ -42,7 +42,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -127,19 +127,19 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank";
window.close();
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = 'about:blank'
window.close()
} else {
window.opener = null;
window.open("", "_self");
window.close();
window.opener = null
window.open('', '_self')
window.close()
}
}
</script>
SGGL/FineUIPro.Web/DataShow/License.aspx.cs
-1
View File
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
// btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/Meeting.aspx
+3 -3
View File
@@ -42,7 +42,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -110,13 +110,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
-1
View File
@@ -24,7 +24,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/Project.aspx
+3 -3
View File
@@ -31,7 +31,7 @@
<f:RadioItem Text="竣工" Value="3" />
</f:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -133,13 +133,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
-1
View File
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx
+3 -3
View File
@@ -35,7 +35,7 @@
Width="130px">
</f:DatePicker>--%>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -105,13 +105,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
+3 -3
View File
@@ -39,7 +39,7 @@
<f:RadioItem Text="C证" Value="6" />
</f:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -117,13 +117,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
-1
View File
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx
+3 -3
View File
@@ -43,7 +43,7 @@
Width="130px">
</f:DatePicker>--%>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -109,13 +109,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
-1
View File
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx
+3 -3
View File
@@ -35,7 +35,7 @@
Width="130px">
</f:DatePicker>--%>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -109,13 +109,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
-1
View File
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx
+3 -3
View File
@@ -35,7 +35,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -101,13 +101,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
-1
View File
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx
+3 -3
View File
@@ -33,7 +33,7 @@
EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true" Hidden="true">
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -98,13 +98,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
-1
View File
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx
+3 -3
View File
@@ -35,7 +35,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -103,13 +103,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
-1
View File
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx
+3 -3
View File
@@ -40,7 +40,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -101,13 +101,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
+1 -5
View File
@@ -1,12 +1,9 @@
using Aspose.Words;
using BLL;
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{
@@ -24,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx
+3 -3
View File
@@ -42,7 +42,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -106,13 +106,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs
-1
View File
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
// btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx
+3 -3
View File
@@ -35,7 +35,7 @@
Width="130px">
</f:DatePicker>--%>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -111,13 +111,13 @@
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
-1
View File
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx
+3 -3
View File
@@ -35,7 +35,7 @@
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="close();">
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@@ -105,13 +105,13 @@
return false;
}
// 点击标题栏工具图标 - 退出
function close(event) {
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
-1
View File
@@ -21,7 +21,6 @@ namespace FineUIPro.Web.DataShow
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t