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

提交代码

Browse Source
This commit is contained in:
高飞
2024-10-12 14:24:42 +08:00
parent 3f8685cdcf
commit a2afd22163
7 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2024-10-12-002-gaofei.sql
+3
View File
@@ -0,0 +1,3 @@
update Sys_Menu set MenuName='安全生产治本攻坚三年行动工作台账' where MenuId='CB76394B-BDEB-4F45-9D19-F38612DC6591'
update Sys_Menu set MenuName='安全生产管理评价工作调度台账' where MenuId='C48087A8-4C9F-485D-B0A4-C85E112BA705'
GO
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx
+4 -4
View File
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>中央企业安全生产治本攻坚三年行动工作台账</title> <title>安全生产治本攻坚三年行动工作台账</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" /> <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style> <style>
.f-grid-row-summary .f-grid-cell-inner { .f-grid-row-summary .f-grid-cell-inner {
@@ -129,18 +129,18 @@
</f:Region> </f:Region>
</Regions> </Regions>
</f:RegionPanel> </f:RegionPanel>
<f:Window ID="Window1" Title="编辑中央企业安全生产治本攻坚三年行动工作台账" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="编辑安全生产治本攻坚三年行动工作台账" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="false" Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="false"
CloseAction="HidePostBack" Width="1300px" Height="540px"> CloseAction="HidePostBack" Width="1300px" Height="540px">
</f:Window> </f:Window>
<f:Window ID="Window2" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true" <f:Window ID="Window2" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window2_Close" IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window2_Close"
Title="导入中央企业安全生产治本攻坚三年行动工作台账" CloseAction="HidePostBack" EnableIFrame="true" Height="600px" Title="导入安全生产治本攻坚三年行动工作台账" CloseAction="HidePostBack" EnableIFrame="true" Height="600px"
Width="900px"> Width="900px">
</f:Window> </f:Window>
<f:Window ID="Window3" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true" <f:Window ID="Window3" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true"
Title="打印中央企业安全生产治本攻坚三年行动工作台账" CloseAction="HidePostBack" EnableIFrame="true" Height="768px" Title="打印安全生产治本攻坚三年行动工作台账" CloseAction="HidePostBack" EnableIFrame="true" Height="768px"
Width="1024px"> Width="1024px">
</f:Window> </f:Window>
<f:Window ID="Window4" Title="查看审核信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window4" Title="查看审核信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs
+3 -3
View File
@@ -101,7 +101,7 @@ namespace FineUIPro.Web.ZHGL.Information
state = "(待上报)"; state = "(待上报)";
} }
} }
this.SimpleForm1.Title = "中央企业安全生产治本攻坚三年行动工作台账" + state; this.SimpleForm1.Title = "安全生产治本攻坚三年行动工作台账" + state;
this.ActionWorkLedgerId = report.ActionWorkLedgerId; this.ActionWorkLedgerId = report.ActionWorkLedgerId;
txtUnitName.Text = "单位：" + report.UnitName; txtUnitName.Text = "单位：" + report.UnitName;
txtQuarter.Text = "季度：" + report.Quarters; txtQuarter.Text = "季度：" + report.Quarters;
@@ -485,7 +485,7 @@ namespace FineUIPro.Web.ZHGL.Information
{ {
responeData.code = 0; responeData.code = 0;
responeData.message = "获取失败：" + ex.Message; responeData.message = "获取失败：" + ex.Message;
ErrLogInfo.WriteLog("中央企业安全生产治本攻坚三年行动工作台账获取！", ex); ErrLogInfo.WriteLog("安全生产治本攻坚三年行动工作台账获取！", ex);
} }
return responeData; return responeData;
@@ -607,7 +607,7 @@ namespace FineUIPro.Web.ZHGL.Information
{ {
Response.ClearContent(); Response.ClearContent();
string filename = Funs.GetNewFileName(); string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("中央企业安全生产治本攻坚三年行动工作台账" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("安全生产治本攻坚三年行动工作台账" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel"; Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8; Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.Write(GetGridTableHtml(Grid1)); Response.Write(GetGridTableHtml(Grid1));
SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx
+1 -1
View File
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>编辑中央企业安全生产治本攻坚三年行动工作台账</title> <title>编辑安全生产治本攻坚三年行动工作台账</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" /> <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head> </head>
<body> <body>
SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx
+4 -4
View File
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>中央企业安全生产管理评价工作调度台账</title> <title>安全生产管理评价工作调度台账</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" /> <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style> <style>
.f-grid-row-summary .f-grid-cell-inner { .f-grid-row-summary .f-grid-cell-inner {
@@ -129,18 +129,18 @@
</f:Region> </f:Region>
</Regions> </Regions>
</f:RegionPanel> </f:RegionPanel>
<f:Window ID="Window1" Title="编辑中央企业安全生产管理评价工作调度台账" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="编辑安全生产管理评价工作调度台账" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="false" Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="false"
CloseAction="HidePostBack" Width="1300px" Height="540px"> CloseAction="HidePostBack" Width="1300px" Height="540px">
</f:Window> </f:Window>
<f:Window ID="Window2" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true" <f:Window ID="Window2" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window2_Close" IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window2_Close"
Title="导入中央企业安全生产管理评价工作调度台账" CloseAction="HidePostBack" EnableIFrame="true" Height="600px" Title="导入安全生产管理评价工作调度台账" CloseAction="HidePostBack" EnableIFrame="true" Height="600px"
Width="900px"> Width="900px">
</f:Window> </f:Window>
<f:Window ID="Window3" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true" <f:Window ID="Window3" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true"
Title="打印中央企业安全生产管理评价工作调度台账" CloseAction="HidePostBack" EnableIFrame="true" Height="768px" Title="打印安全生产管理评价工作调度台账" CloseAction="HidePostBack" EnableIFrame="true" Height="768px"
Width="1024px"> Width="1024px">
</f:Window> </f:Window>
<f:Window ID="Window4" Title="查看审核信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window4" Title="查看审核信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.cs
+3 -3
View File
@@ -101,7 +101,7 @@ namespace FineUIPro.Web.ZHGL.Information
state = "(待上报)"; state = "(待上报)";
} }
} }
this.SimpleForm1.Title = "中央企业安全生产管理评价工作调度台账" + state; this.SimpleForm1.Title = "安全生产管理评价工作调度台账" + state;
this.SafetyProductionEvaluationId = report.SafetyProductionEvaluationId; this.SafetyProductionEvaluationId = report.SafetyProductionEvaluationId;
txtUnitName.Text = "单位：" + report.UnitName; txtUnitName.Text = "单位：" + report.UnitName;
txtQuarter.Text = "季度：" + report.Quarters; txtQuarter.Text = "季度：" + report.Quarters;
@@ -485,7 +485,7 @@ namespace FineUIPro.Web.ZHGL.Information
{ {
responeData.code = 0; responeData.code = 0;
responeData.message = "获取失败：" + ex.Message; responeData.message = "获取失败：" + ex.Message;
ErrLogInfo.WriteLog("中央企业安全生产管理评价工作调度台账获取！", ex); ErrLogInfo.WriteLog("安全生产管理评价工作调度台账获取！", ex);
} }
return responeData; return responeData;
@@ -607,7 +607,7 @@ namespace FineUIPro.Web.ZHGL.Information
{ {
Response.ClearContent(); Response.ClearContent();
string filename = Funs.GetNewFileName(); string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("中央企业安全生产管理评价工作调度台账" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("安全生产管理评价工作调度台账" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel"; Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8; Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.Write(GetGridTableHtml(Grid1)); Response.Write(GetGridTableHtml(Grid1));
SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx
+1 -1
View File
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>编辑中央企业安全生产管理评价工作调度台账</title> <title>编辑安全生产管理评价工作调度台账</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" /> <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head> </head>
<body> <body>