xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

安全检查补充公司级树

This commit is contained in:
夏菊 2025-04-09 20:34:57 +08:00
parent 023e3d33cf
commit 3db3510a9d
21 changed files with 1330 additions and 714 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
SUBQHSE/FineUIPro.Web/Customization/CNCCG/ZHGL/Problem/ProblemNoticeManager.aspx
View File

@ -1,124 +1,140 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProblemNoticeManager.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCCG.ZHGL.Problem.ProblemNoticeManager" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<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>
<style>
.f-grid-row.red {
background-color: red;
}
</style>
.f-grid-row.red {
background-color: red;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="问题督导整改通知单" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProNoticeId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="ProNoticeId" AllowSorting="true" SortField="CreateDate" ForceFit="true"
SortDirection="DESC" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
Width="980px" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtProCode" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="210px" LabelWidth="50px">
</f:TextBox>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="问题督导整改通知单" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProNoticeId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="ProNoticeId" AllowSorting="true" SortField="CreateDate" ForceFit="true"
SortDirection="DESC" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
Width="980px" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtProCode" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="210px" LabelWidth="50px">
</f:TextBox>
<f:TextBox runat="server" Label="单位/项目名称" ID="txtProjectName" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
LabelWidth="120px">
</f:TextBox>
<f:TextBox runat="server" Label="单位/项目名称" ID="txtProjectName" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
LabelWidth="120px">
</f:TextBox>
<%-- <f:DropDownList ID="drpProject" runat="server" Label="所属项目" EnableEdit="true" Hidden="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>--%>
<%-- <f:DropDownList ID="drpProject" runat="server" Label="所属项目" EnableEdit="true" Hidden="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>--%>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" runat="server" ToolTip="新增" Icon="Add" Text="新增"
EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
</f:Button>
<f:Button ID="btnNew_Finalize" runat="server" ToolTip="新增(定稿)" Icon="Add" Text="新增(定稿)"
EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" runat="server" ToolTip="新增" Icon="Add" Text="新增"
EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
</f:Button>
<f:Button ID="btnNew_Finalize" runat="server" ToolTip="新增(定稿)" Icon="Add" Text="新增(定稿)"
EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目/单位名称"
<f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目/单位名称"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProCode" DataField="ProCode" SortField="ProCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckMans" DataField="CheckMans" SortField="CheckMans"
FieldType="String" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProCode" DataField="ProCode" SortField="ProCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckMans" DataField="CheckMans" SortField="CheckMans"
FieldType="String" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" Hidden="True"
FieldType="String" HeaderText="回复单位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" Hidden="True"
FieldType="String" HeaderText="回复单位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckStartTime" DataField="CheckStartTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查开始时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckEndTime" DataField="CheckEndTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查结束时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckStartTime" DataField="CheckStartTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查开始时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckEndTime" DataField="CheckEndTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查结束时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="CreateUserName" DataField="CreateUserName" SortField="CreateUserName"
FieldType="String" HeaderText="录入人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="CreateUserName" DataField="CreateUserName" SortField="CreateUserName"
FieldType="String" HeaderText="录入人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CreateDate" DataField="CreateDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="录入时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CreateDate" DataField="CreateDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="录入时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="State" Width="100px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="labState" runat="server" Text='<%# ConvertState(Eval("ProType"),Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ThisApprove" Width="100px" HeaderText="当前节点" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# GetThisApprove(Eval("ProNoticeId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
<f:TemplateField ColumnID="State" Width="100px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="labState" runat="server" Text='<%# ConvertState(Eval("ProType"),Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ThisApprove" Width="100px" HeaderText="当前节点" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# GetThisApprove(Eval("ProNoticeId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="新增" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@ -126,26 +142,23 @@
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看明细" Icon="Find"
OnClick="btnMenuView_Click">
</f:MenuButton>
<f:MenuButton ID="MenuButton1" EnablePostBack="true" runat="server" Text="查看回复单" Icon="Find"
OnClick="btnMenuViewReply_Click">
</f:MenuButton>
<f:MenuButton ID="MenuButton2" EnablePostBack="true" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" Text="导出" Icon="FolderUp"
OnClick="btnMenuOut_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuEdit" EnablePostBack="true" runat="server" Text="编辑" Icon="TableEdit"
OnClick="btnMenuEdit_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
OnClick="btnMenuView_Click">
</f:MenuButton>
<f:MenuButton ID="MenuButton1" EnablePostBack="true" runat="server" Text="查看回复单" Icon="Find"
OnClick="btnMenuViewReply_Click">
</f:MenuButton>
<f:MenuButton ID="MenuButton2" EnablePostBack="true" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" Text="导出" Icon="FolderUp"
OnClick="btnMenuOut_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuEdit" EnablePostBack="true" runat="server" Text="编辑" Icon="TableEdit"
OnClick="btnMenuEdit_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/jscript">
@ -161,4 +174,4 @@
}
</script>
</body>
</html>
</html>

116
SUBQHSE/FineUIPro.Web/Customization/CNCCG/ZHGL/Problem/ProblemNoticeManager.aspx.cs
View File

@ -48,14 +48,21 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
{
if (!IsPostBack)
{
////权限按钮方法
GetButtonPower();
Funs.DropDownPageSize(this.ddlPageSize);
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
}
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
}
this.btnNew.OnClientClick = Window1.GetShowReference("ProblemNoticeManagerEdit.aspx?Type=0") + "return false;";
this.btnNew_Finalize.OnClientClick = Window1.GetShowReference("ProblemNoticeManagerEdit.aspx?Type=-1") + "return false;";
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
@ -65,19 +72,25 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
this.BindGrid();
for (int i = 0; i < Grid1.Rows.Count; i++)
{
Model.Problem_Notice model = Funs.DB.Problem_Notice.FirstOrDefault(x => x.ProNoticeId == Grid1.Rows[i].DataKeys[0].ToString());
if (model.State == "-1" && string.IsNullOrEmpty(BLL.AttachFileService.getFileUrl(model.ProNoticeId + "-FinalizeRelpy")))
{
Grid1.Rows[i].RowCssClass = "red";
}
}
}
}
/// <summary>
/// 公司级树加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
btnNew.Hidden = true;
}
this.GetButtonPower();
this.BindGrid();
}
#region 获取按钮权限
/// <summary>
@ -91,7 +104,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
{
return;
}
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProblemNoticeManagerMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProblemNoticeManagerMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
@ -151,6 +164,10 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
#region 加载数据
protected void BindGrid()
{
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
int unitType = CommonService.GetUnitTypeByUserId(this.CurrUser.UserId);
string strSql = @"select F.ProjectId,ProNoticeId,
@ -168,15 +185,15 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
LEFT JOIN Base_unit e on b.UnitId=e.Unitid
Where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (unitType!=0 && string.IsNullOrEmpty(ProjectId)) //公司/分公司
if (unitType != 0 && string.IsNullOrEmpty(this.ProjectId)) //公司/分公司
{
strSql += " AND ( F.ProjectId='" + CurrUser.UnitId + "' and proType='2') or ( proType='1' and F.Unitid='" + CurrUser.UnitId + "' ) or a.UnitId='"+ CurrUser.UnitId + "'";
strSql += " AND ( F.ProjectId='" + CurrUser.UnitId + "' and proType='2') or ( proType='1' and F.Unitid='" + CurrUser.UnitId + "' ) or a.UnitId='" + CurrUser.UnitId + "'";
}
else
{
if (!string.IsNullOrEmpty(ProjectId))
if (!string.IsNullOrEmpty(this.ProjectId))
{
strSql+= " and proType='1' And F.ProjectId='" + ProjectId + "' ";
strSql += " and proType='1' And F.ProjectId='" + this.ProjectId + "' ";
}
}
if (!string.IsNullOrEmpty(txtProCode.Text.Trim()))
@ -198,7 +215,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
//}
//除了超级管理员,其他只显示单位的数据
if (CurrUser.Account!="hfnbd")
if (CurrUser.Account != "hfnbd")
{
strSql += " AND e.UnitId=@CreateUnitId ";
listStr.Add(new SqlParameter("@CreateUnitId", CurrUser.UnitId));
@ -212,13 +229,22 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < Grid1.Rows.Count; i++)
{
Model.Problem_Notice model = Funs.DB.Problem_Notice.FirstOrDefault(x => x.ProNoticeId == Grid1.Rows[i].DataKeys[0].ToString());
if (model.State == "-1" && string.IsNullOrEmpty(BLL.AttachFileService.getFileUrl(model.ProNoticeId + "-FinalizeRelpy")))
{
Grid1.Rows[i].RowCssClass = "red";
}
}
}
#endregion
#region 状态
protected string ConvertState(object proType,object state)
protected string ConvertState(object proType, object state)
{
if (state != null&& proType!=null)
if (state != null && proType != null)
{
//项目级
string proTypes = proType.ToString();
@ -252,13 +278,13 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
string result = "";
if (proNoticeId != null)
{
var list= ProblemNoticeApprove.GetProblem_NoticeApproveByParentId(proNoticeId.ToString());
if (list != null)
var list = ProblemNoticeApprove.GetProblem_NoticeApproveByParentId(proNoticeId.ToString());
if (list != null)
{
string userids = string.Join(",", list.Select(x => x.ApproveMan).ToList());
result = UserService.getUserNamesUserIds(userids);
}
}
return result;
}
@ -283,7 +309,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
var ProblemNoticeItem = Funs.DB.Problem_Notice.FirstOrDefault(x => x.ProNoticeId == id);
if (ProblemNoticeItem != null)
{
if (Convert.ToInt32(ProblemNoticeItem.State)<=2)
if (Convert.ToInt32(ProblemNoticeItem.State) <= 2)
{
ShowNotify("当前通知单尚未回复。", MessageBoxIcon.Warning);
}
@ -340,8 +366,8 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
var ProblemNoticeItem = Funs.DB.Problem_Notice.FirstOrDefault(x => x.ProNoticeId == id);
if (ProblemNoticeItem != null)
{
if ((this.btnMenuEdit.Hidden || Convert.ToInt32(ProblemNoticeItem.State)>1)&& ProblemNoticeItem.CreateUser==CurrUser.UserId) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
if ((this.btnMenuEdit.Hidden || Convert.ToInt32(ProblemNoticeItem.State) > 1) && ProblemNoticeItem.CreateUser == CurrUser.UserId) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProblemNoticeManagerEdit.aspx?ProNoticeId={0}&Type=1", id, "查看 - ")));
}
@ -400,13 +426,13 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
{
ShowNotify("只能导出已提交的数据。!", MessageBoxIcon.Warning);
return;
}
}
BuildSignaturesAndProjectInfo(id, model, out CheckUnitSignature, out CheckMansSignature, out ProjectName);
var cdate = Convert.ToDateTime(model.CreateDate);
var nowFileName = cdate.Month.ToString() + "." + cdate.Day.ToString() + ProjectName + "问题督导整改通知单";
string rootPath = Server.MapPath("~/");
var initTemplatePath = "File\\Word\\问题督导整改通知单.docx";
var uploadfilepath = rootPath + initTemplatePath;
var uploadfilepath = rootPath + initTemplatePath;
var newUrl = uploadfilepath.Replace("问题督导整改通知单.docx", nowFileName + ".docx");
if (File.Exists(newUrl))
{
@ -418,7 +444,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
#region 问题督导整改通知单
Bookmark Bmark = doc.Range.Bookmarks["ProjectName"]; //项目名称
if (Bmark != null)
{
@ -439,12 +465,12 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
Bmark = doc.Range.Bookmarks["CheckTime"]; //检查时间
if (Bmark != null)
{
{
var CheckTime = Convert.ToDateTime(model.CheckStartTime);
var EndTime = Convert.ToDateTime(model.CheckEndTime);
Bmark.Text = CheckTime.Year.ToString() + "." + CheckTime.Month.ToString() + "." +
CheckTime.Day.ToString()
+ "-" + EndTime.Month.ToString() + "." +
+ "-" + EndTime.Month.ToString() + "." +
EndTime.Day.ToString();
}
@ -476,7 +502,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
builder.StartTable();
builder.RowFormat.Alignment = Aspose.Words.Tables.RowAlignment.Center;
builder.CellFormat.Borders.LineStyle = LineStyle.Single;
builder.CellFormat.Borders.Color = System.Drawing.Color.Black;
builder.CellFormat.Borders.Color = System.Drawing.Color.Black;
//builder.RowFormat.LeftIndent = 5;
//builder.RowFormat.RightPadding = 50;
builder.Bold = false;
@ -496,7 +522,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
foreach (var item in detailList)
{
var CheckManName = UserService.GetUserNameByUserId(item.CheckMan);
dt.Rows.Add(new string[] { item.SortIndex+ item.QueDescribe, item.Requirements , CheckManName });
dt.Rows.Add(new string[] { item.SortIndex + item.QueDescribe, item.Requirements, CheckManName });
}
}
@ -512,13 +538,13 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
builder.CellFormat.Width = width1;
builder.Write("存在问题");
builder.InsertCell();
builder.CellFormat.Width = width2/2;
builder.CellFormat.Width = width2 / 2;
builder.Write("整改要求");
builder.InsertCell();
builder.Write("整改责任人");
builder.CellFormat.Width = width2 / 2;
builder.EndRow();
//循环插入表格内容
foreach (DataRow row in dt.Rows)
{
@ -751,7 +777,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
builder.EndRow();
}
}
builder.EndTable();
}
@ -819,7 +845,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
tables.Add(tempDt);
}
var table2= builder.StartTable();
var table2 = builder.StartTable();
builder.RowFormat.Height = 20;
builder.Bold = false;
builder.InsertCell();
@ -830,12 +856,12 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
builder.ParagraphFormat.Alignment = ParagraphAlignment.Center; //水平居中对齐
builder.CellFormat.Width = width1 + width2;
builder.Write("检查问题照片");
builder.EndRow();
builder.EndRow();
builder.RowFormat.Height = 50;
builder.Bold = false;
foreach (var dataTable in tables) //循环表格
{
@ -896,7 +922,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
builder.InsertCell();
builder.CellFormat.Width = width1;
builder.Write(dataTable.Rows[0]["存在问题"].ToString()??" ");
builder.Write(dataTable.Rows[0]["存在问题"].ToString() ?? " ");
builder.InsertCell();
builder.CellFormat.Width = width2;
builder.Write(dataTable.Rows[1]["存在问题"].ToString() ?? " ");
@ -983,7 +1009,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
FileInfo info = new FileInfo(newUrl);
long fileSize = info.Length;
System.Web.HttpContext.Current.Response.Clear();
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
System.Web.HttpContext.Current.Response.TransmitFile(newUrl, 0, fileSize);
@ -1014,7 +1040,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
}
if (model.ProType == "1")
{
ProjectName = BLL.ProjectService.GetProjectByProjectId(model.ProjectId).ShortName;
ProjectName = BLL.ProjectService.GetProjectByProjectId(model.ProjectId).ShortName;
var ProjectApprove = BLL.UserService.getUserListUserIds(model.ProjectUnitApproveUserIds);
if (ProjectApprove != null)
{
@ -1033,7 +1059,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
}
}
}
#endregion
}
}

36
SUBQHSE/FineUIPro.Web/Customization/CNCCG/ZHGL/Problem/ProblemNoticeManager.aspx.designer.cs generated
View File

@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ucTree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>

191
SUBQHSE/FineUIPro.Web/Customization/CNCCG/ZHGL/Problem/ProblemReplyManager.aspx
View File

@ -1,105 +1,121 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProblemReplyManager.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCCG.ZHGL.Problem.ProblemReplyManager" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<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>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全质量检查回复单" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProNoticeId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="ProNoticeId" AllowSorting="true" SortField="CreateDate" ForceFit="true"
SortDirection="DESC" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
Width="980px" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtProCode" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="210px" LabelWidth="50px">
</f:TextBox>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全质量检查回复单" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProNoticeId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="ProNoticeId" AllowSorting="true" SortField="CreateDate" ForceFit="true"
SortDirection="DESC" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
Width="980px" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtProCode" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="210px" LabelWidth="50px">
</f:TextBox>
<f:TextBox runat="server" Label="单位/项目名称" ID="txtProjectName" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
LabelWidth="120px">
</f:TextBox>
<f:TextBox runat="server" Label="单位/项目名称" ID="txtProjectName" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
LabelWidth="120px">
</f:TextBox>
<%-- <f:DropDownList ID="drpProject" runat="server" Label="所属项目" EnableEdit="true" Hidden="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>--%>
<%-- <f:DropDownList ID="drpProject" runat="server" Label="所属项目" EnableEdit="true" Hidden="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>--%>
<f:ToolbarFill runat="server"></f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
<f:ToolbarFill runat="server"></f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目/单位名称"
<f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目/单位名称"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProCode" DataField="ProCode" SortField="ProCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckMans" DataField="CheckMans" SortField="CheckMans"
FieldType="String" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckStartTime" DataField="CheckStartTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查开始时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckEndTime" DataField="CheckEndTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查结束时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProCode" DataField="ProCode" SortField="ProCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckMans" DataField="CheckMans" SortField="CheckMans"
FieldType="String" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckStartTime" DataField="CheckStartTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查开始时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckEndTime" DataField="CheckEndTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查结束时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="CreateUserName" DataField="CreateUserName" SortField="CreateUserName"
FieldType="String" HeaderText="录入人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="CreateUserName" DataField="CreateUserName" SortField="CreateUserName"
FieldType="String" HeaderText="录入人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CreateDate" DataField="CreateDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="录入时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CreateDate" DataField="CreateDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="录入时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="State" Width="100px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="labState" runat="server" Text='<%# ConvertState(Eval("ProType"),Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ThisApprove" Width="100px" HeaderText="当前节点" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# GetThisApprove(Eval("ProNoticeId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
<f:TemplateField ColumnID="State" Width="100px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="labState" runat="server" Text='<%# ConvertState(Eval("ProType"),Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="ThisApprove" Width="100px" HeaderText="当前节点" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# GetThisApprove(Eval("ProNoticeId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="新增" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@ -107,22 +123,21 @@
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="Find"
OnClick="btnMenuView_Click">
</f:MenuButton>
OnClick="btnMenuView_Click">
</f:MenuButton>
<f:MenuButton ID="MenuButton2" EnablePostBack="true" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" Text="导出" Icon="FolderUp"
OnClick="btnMenuOut_Click">
</f:MenuButton>
<f:MenuButton ID="MenuButton2" EnablePostBack="true" EnableAjax="false" runat="server" DisableControlBeforePostBack="false" Text="导出" Icon="FolderUp"
OnClick="btnMenuOut_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuEdit" EnablePostBack="true" runat="server" Text="回复" Icon="TableEdit"
OnClick="btnMenuEdit_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuEdit" EnablePostBack="true" runat="server" Text="回复" Icon="TableEdit"
OnClick="btnMenuEdit_Click">
</f:MenuButton>
<%-- <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
<%-- <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>--%>
</f:Menu>
</form>
<script type="text/jscript">
@ -138,4 +153,4 @@
}
</script>
</body>
</html>
</html>

43
SUBQHSE/FineUIPro.Web/Customization/CNCCG/ZHGL/Problem/ProblemReplyManager.aspx.cs
View File

@ -32,15 +32,21 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
////权限按钮方法
GetButtonPower();
Funs.DropDownPageSize(this.ddlPageSize);
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
}
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
{
Grid1.PageSize = this.CurrUser.PageSize.Value;
@ -51,6 +57,24 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
}
}
/// <summary>
/// 公司级树加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
//if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
// btnNew.Hidden = true;
//}
this.GetButtonPower();
this.BindGrid();
}
#region 获取按钮权限
/// <summary>
/// 获取按钮权限
@ -63,7 +87,7 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
{
return;
}
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProblemReplyManagerMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProblemReplyManagerMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
@ -122,21 +146,26 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
#region 加载数据
protected void BindGrid()
{
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
int unitType = CommonService.GetUnitTypeByUserId(this.CurrUser.UserId);
string strSql = @"select F.ProjectId,ProNoticeId,
string strSql = @"SELECT F.ProjectId,ProNoticeId,
case when F.ProType='1' then a.ProjectName
else d.UnitName end as ProjectName
,ProCode,CheckMans,
case when F.ProType='1' then c.UnitName
else d.UnitName end as UnitName
,CheckStartTime
,CheckEndTime,b.UserName as CreateUserName,F.CreateDate,CreateUser,State,ProType from Problem_Notice F
,CheckEndTime,b.UserName as CreateUserName,F.CreateDate,CreateUser,State,ProType
FROM Problem_Notice F
LEFT JOIN Base_Project a on F.ProjectId=a.ProjectId
LEFT JOIN Sys_User b on F.CreateUser=b.UserId
LEFT JOIN Base_Unit c on F.Unitid=c.UnitId
LEFT JOIN Base_unit d on F.ProjectId=d.UnitId
Where F.State not in ('0','1') ";
Where F.State not in ('0','1') ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (unitType != 0 && string.IsNullOrEmpty(ProjectId)) //公司/分公司
{

36
SUBQHSE/FineUIPro.Web/Customization/CNCCG/ZHGL/Problem/ProblemReplyManager.aspx.designer.cs generated
View File

@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.CNCCG.ZHGL.Problem
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ucTree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>

159
SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/SuperviseCheck.aspx
View File

@ -1,5 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SuperviseCheck.aspx.cs" Inherits="FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection.SuperviseCheck" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
@ -11,81 +12,95 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全监督检查" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="SuperviseCheckId"
ClicksToEdit="2" DataIDField="SuperviseCheckId" AllowSorting="true" SortField="CheckDate" ForceFit="true"
SortDirection="DESC" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
Width="980px" >
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtProCode" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="210px" LabelWidth="50px">
</f:TextBox>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全监督检查" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="SuperviseCheckId"
ClicksToEdit="2" DataIDField="SuperviseCheckId" AllowSorting="true" SortField="CheckDate" ForceFit="true"
SortDirection="DESC" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
Width="980px">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" Label="编号" ID="txtProCode" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="210px" LabelWidth="50px">
</f:TextBox>
<f:TextBox runat="server" Label="项目名称" ID="txtProjectName" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
LabelWidth="120px">
</f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" runat="server" ToolTip="新增" Icon="Add" Text="新增"
EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TextBox runat="server" Label="项目名称" ID="txtProjectName" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
LabelWidth="120px">
</f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" runat="server" ToolTip="新增" Icon="Add" Text="新增"
EnableAjax="false" DisableControlBeforePostBack="false" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="SuperviseCheckReportCode" DataField="SuperviseCheckReportCode" SortField="SuperviseCheckReportCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckTeam" DataField="CheckTeam" SortField="CheckTeam"
FieldType="String" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="SuperviseCheckReportCode" DataField="SuperviseCheckReportCode" SortField="SuperviseCheckReportCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckTeam" DataField="CheckTeam" SortField="CheckTeam"
FieldType="String" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckDate" DataField="CheckDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="CheckDate" DataField="CheckDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="UserName" DataField="UserName" SortField="UserName"
FieldType="String" HeaderText="责任人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="State" DataField="State" SortField="State"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<%-- <f:TemplateField ColumnID="State" Width="100px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="labState" runat="server" Text='<%# ConvertState(Eval("ProType"),Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>--%>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
<f:RenderField Width="200px" ColumnID="UserName" DataField="UserName" SortField="UserName"
FieldType="String" HeaderText="责任人" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="State" DataField="State" SortField="State"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<%-- <f:TemplateField ColumnID="State" Width="100px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="labState" runat="server" Text='<%# ConvertState(Eval("ProType"),Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>--%>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="新增" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@ -94,10 +109,10 @@
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看明细" Icon="Find"
OnClick="btnMenuView_Click">
</f:MenuButton>
</f:MenuButton>
<f:MenuButton ID="btnMenuEdit" EnablePostBack="true" runat="server" Text="编辑" Icon="TableEdit"
OnClick="btnMenuEdit_Click">
</f:MenuButton>
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>

80
SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/SuperviseCheck.aspx.cs
View File

@ -7,7 +7,6 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using Microsoft.Office.Interop.Excel;
namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
{
@ -33,14 +32,21 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
{
if (!IsPostBack)
{
////权限按钮方法
GetButtonPower();
Funs.DropDownPageSize(this.ddlPageSize);
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
}
this.btnNew.OnClientClick = Window1.GetShowReference("SuperviseCheckEdit.aspx?Type=0") + "return false;";
if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
{
@ -50,7 +56,23 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
// 绑定表格
this.BindGrid();
}
}
/// <summary>
/// 公司级树加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
btnNew.Hidden = true;
}
this.GetButtonPower();
this.BindGrid();
}
#region 获取按钮权限
/// <summary>
@ -64,12 +86,12 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
{
return;
}
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.SuperviseCheckMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.SuperviseCheckMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
{
this.btnNew.Hidden = false;
this.btnNew.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
@ -80,7 +102,7 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
this.btnMenuDelete.Hidden = false;
}
}
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.btnNew.Hidden = true;
}
@ -122,31 +144,35 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
}
#region 加载数据
protected void BindGrid()
{
var result=(from supervise in Funs.DB.ZJ_SuperviseCheck
join project in Funs.DB.Base_Project on supervise.ProjectId equals project.ProjectId
join user in Funs.DB.Sys_User on supervise.RecUserId equals user.UserId
select new
{
supervise.SuperviseCheckId,
project.ProjectName,
project.ProjectId,
supervise.SuperviseCheckReportCode,
user.UserName,
supervise.CheckDate,
State=supervise.State==0?"未提交": supervise.State == 1 ? "未整改" : supervise.State == 2 ? "部分整改" : supervise.State == 3 ? "已整改" : "",
supervise.CheckTeam,
}).ToList();
if (!string .IsNullOrEmpty(this.CurrUser.LoginProjectId))
if (string.IsNullOrEmpty(this.ProjectId))
{
result=result.Where(p=>p.ProjectId==this.CurrUser.LoginProjectId).ToList();
return;
}
Grid1.RecordCount = result.Count;
var result = (from supervise in Funs.DB.ZJ_SuperviseCheck
join project in Funs.DB.Base_Project on supervise.ProjectId equals project.ProjectId
join user in Funs.DB.Sys_User on supervise.RecUserId equals user.UserId
select new
{
supervise.SuperviseCheckId,
project.ProjectName,
project.ProjectId,
supervise.SuperviseCheckReportCode,
user.UserName,
supervise.CheckDate,
State = supervise.State == 0 ? "未提交" : supervise.State == 1 ? "未整改" : supervise.State == 2 ? "部分整改" : supervise.State == 3 ? "已整改" : "",
supervise.CheckTeam,
}).ToList();
if (!string.IsNullOrEmpty(this.ProjectId))
{
result = result.Where(p => p.ProjectId == this.ProjectId).ToList();
}
Grid1.RecordCount = result.Count;
Grid1.DataSource = this.GetPagedDataTable(Grid1, Funs.LINQToDataTable(result));
Grid1.DataBind();
@ -220,7 +246,7 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var getV = SupervisecheckService.GetZJ_SuperviseCheckById(rowID);
if (getV.State !=0)
if (getV.State != 0)
{
ShowNotify("只能删除待提交的数据!", MessageBoxIcon.Warning);
return;

36
SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/SuperviseCheck.aspx.designer.cs generated
View File

@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ucTree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>

166
SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesStatistics.aspx
View File

@ -1,5 +1,7 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RectifyNoticesStatistics.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.RectifyNoticesStatistics" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
@ -39,84 +41,98 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患整改单统计" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DataId" DataIDField="DataId" AllowSorting="true" SortField="DataAllName,DataName"
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" ForceFit="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList runat="server" ID="drpProject" Label="项目" LabelWidth="50px" Width="320px" EnableEdit="true" Hidden="true">
</f:DropDownList>
<f:DropDownList runat="server" ID="drpUnit" Label="单位" LabelWidth="50px" Width="280px" EnableEdit="true">
</f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="统计" Icon="SystemSearch" OnClick="TextBox_TextChanged" runat="server" Text="统计">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:RenderField Width="250px" ColumnID="DataAllName" DataField="DataAllName" FieldType="String"
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患整改单统计" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DataId" DataIDField="DataId" AllowSorting="true" SortField="DataAllName,DataName"
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" ForceFit="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<%-- <f:DropDownList runat="server" ID="drpProject" Label="项目" LabelWidth="50px" Width="320px" EnableEdit="true" Hidden="true">
</f:DropDownList>--%>
<f:DropDownList runat="server" ID="drpUnit" Label="单位" LabelWidth="50px" Width="280px" EnableEdit="true">
</f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="统计" Icon="SystemSearch" OnClick="TextBox_TextChanged" runat="server" Text="统计">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:RenderField Width="250px" ColumnID="DataAllName" DataField="DataAllName" FieldType="String"
HeaderText="项目" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>--%>
<f:RenderField Width="250px" ColumnID="DataName" DataField="DataName" FieldType="String"
HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataSumCount" DataField="DataSumCount" FieldType="Int"
HeaderText="总数" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount1" DataField="DataCount1" FieldType="Int"
HeaderText="待签发" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount2" DataField="DataCount2" FieldType="Int"
HeaderText="待整改" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount3" DataField="DataCount3" FieldType="Int"
HeaderText="待审核" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount4" DataField="DataCount4" FieldType="Int"
HeaderText="待复查" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount5" DataField="DataCount5" FieldType="Int"
HeaderText="已完成" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCountRate2" DataField="DataCountRate2" FieldType="String"
HeaderText="整改完成率" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
</PageItems>
</f:Grid>
<f:RenderField Width="250px" ColumnID="DataName" DataField="DataName" FieldType="String"
HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataSumCount" DataField="DataSumCount" FieldType="Int"
HeaderText="总数" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount1" DataField="DataCount1" FieldType="Int"
HeaderText="待签发" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount2" DataField="DataCount2" FieldType="Int"
HeaderText="待整改" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount3" DataField="DataCount3" FieldType="Int"
HeaderText="待审核" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount4" DataField="DataCount4" FieldType="Int"
HeaderText="待复查" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount5" DataField="DataCount5" FieldType="Int"
HeaderText="已完成" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCountRate2" DataField="DataCountRate2" FieldType="String"
HeaderText="整改完成率" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>

52
SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesStatistics.aspx.cs
View File

@ -36,25 +36,63 @@ namespace FineUIPro.Web.HSSE.Check
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
this.ProjectId = this.CurrUser.LoginProjectId;
ProjectService.InitProjectDropDownList(this.drpProject, false);
this.drpProject.SelectedValue = this.ProjectId;
this.drpProject.Enabled = false;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
this.InitDropDownList();
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.panelLeftRegion.Hidden = true;
////权限按钮方法
//this.GetButtonPower();
}
//this.ProjectId = this.CurrUser.LoginProjectId;
//ProjectService.InitProjectDropDownList(this.drpProject, false);
//this.drpProject.SelectedValue = this.ProjectId;
//this.drpProject.Enabled = false;
UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
//UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BindGrid();
}
}
private void InitDropDownList()
{
UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
}
/// <summary>
/// 公司级树加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
this.InitDropDownList();
//if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
// btnNew.Hidden = true;
//}
//this.GetButtonPower();
this.BindGrid();
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
var getDatas = DataStatisticsService.RectifyNoticesStatistics(this.drpProject.SelectedValue, this.drpUnit.SelectedValue, Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text));
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
var getDatas = DataStatisticsService.RectifyNoticesStatistics(this.ProjectId, this.drpUnit.SelectedValue, Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text));
//var getDatas = DataStatisticsService.RectifyNoticesStatistics(this.drpProject.SelectedValue, this.drpUnit.SelectedValue, Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text));
DataTable tb = this.GetPagedDataTable(Grid1, getDatas);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);

85
SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesStatistics.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Check {
public partial class RectifyNoticesStatistics {
namespace FineUIPro.Web.HSSE.Check
{
public partial class RectifyNoticesStatistics
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ucTree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -56,16 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// drpUnit 控件。
/// </summary>
@ -74,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// txtStartTime 控件。
/// </summary>
@ -83,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// txtEndTime 控件。
/// </summary>
@ -92,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -101,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSearch 控件。
/// </summary>
@ -110,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnOut 控件。
/// </summary>
@ -119,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
@ -128,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -137,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -146,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>

128
SUBQHSE/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
View File

@ -1,5 +1,7 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ConstructionRisk.aspx.cs" Inherits="FineUIPro.Web.HSSE.Hazard.ConstructionRisk" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
@ -13,24 +15,32 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelLeftRegion2" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="280px" Title="施工作业风险" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Items>
<f:TextBox runat="server" ID="hdState" Hidden="true"></f:TextBox>
<f:Tree ID="tvControlItem" EnableCollapse="true" ShowHeader="false" Title="WBS"
OnNodeCommand="tvControlItem_NodeCommand111" AutoLeafIdentification="true"
runat="server" ShowBorder="false" EnableTextSelection="True">
</f:Tree>
<f:Tree ID="tvControlItem" EnableCollapse="true" ShowHeader="false" Title="WBS"
OnNodeCommand="tvControlItem_NodeCommand111" AutoLeafIdentification="true"
runat="server" ShowBorder="false" EnableTextSelection="True">
</f:Tree>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="施工作业风险"
TitleToolTip="施工作业风险" AutoScroll="true">
<f:Panel runat="server" ID="panel4" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="危险源台账" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" ForceFit="true" OnRowCommand="Grid1_RowCommand"
EnableColumnLines="true" DataIDField="Id" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
EnableColumnLines="true" DataIDField="Id" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server" Position="Top">
@ -38,76 +48,88 @@
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" Icon="Add" runat="server" ToolTip="添加" Text="添加" ValidateForms="SimpleForm1"
OnClick="btnNew_Click">
</f:Button>
<f:Button ID="btnImport" Text="导入" ToolTip="导入" Icon="ApplicationGet" runat="server" Hidden="true" OnClick="btnImport_Click">
</f:Button>
<%-- <f:Button ID="btnQR" Text="生成二维码" ToolTip="生成二维码" Icon="TableRefresh" runat="server" OnClick="btnQR_Click">
</f:Button>--%>
<%--<f:Button runat="server" ID="btnSeeQR" OnClick="btnSeeQR_Click" Icon="Shading"
ToolTip="小程序二维码" Text="小程序二维码" Hidden="true">
</f:Button>--%>
<%-- <f:Button runat="server" ID="btnSeeQR1" OnClick="btnImport_Click" Icon="TableRefresh"
ToolTip="二维码" Text="二维码">
</f:Button>--%>
</f:Button>
<f:Button ID="btnImport" Text="导入" ToolTip="导入" Icon="ApplicationGet" runat="server" Hidden="true" OnClick="btnImport_Click">
</f:Button>
<%-- <f:Button ID="btnQR" Text="生成二维码" ToolTip="生成二维码" Icon="TableRefresh" runat="server" OnClick="btnQR_Click">
</f:Button>--%>
<%--<f:Button runat="server" ID="btnSeeQR" OnClick="btnSeeQR_Click" Icon="Shading"
ToolTip="小程序二维码" Text="小程序二维码" Hidden="true">
</f:Button>--%>
<%-- <f:Button runat="server" ID="btnSeeQR1" OnClick="btnImport_Click" Icon="TableRefresh"
ToolTip="二维码" Text="二维码">
</f:Button>--%>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="100px" ColumnID="MainItemName" DataField="MainItemName"
<f:RenderField Width="100px" ColumnID="MainItemName" DataField="MainItemName"
SortField="MainItemName" FieldType="String" HeaderText="主项" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="ConstructionContent" DataField="ConstructionContent"
<f:RenderField Width="300px" ColumnID="ConstructionContent" DataField="ConstructionContent"
SortField="ConstructionContent" FieldType="String" HeaderText="施工内容" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="RefLicense" DataField="RefLicense"
<f:RenderField Width="200px" ColumnID="RefLicense" DataField="RefLicense"
SortField="RefLicense" FieldType="String" HeaderText="涉及的高风险作业" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="LicenseDes" DataField="LicenseDes"
<f:RenderField Width="200px" ColumnID="LicenseDes" DataField="LicenseDes"
SortField="LicenseDes" FieldType="String" HeaderText="作业风险描述" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RiskLevel" DataField="RiskLevel"
<f:RenderField Width="100px" ColumnID="RiskLevel" DataField="RiskLevel"
SortField="RiskLevel" FieldType="String" HeaderText="风险等级" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Measures" DataField="Measures"
<f:RenderField Width="200px" ColumnID="Measures" DataField="Measures"
SortField="Measures" FieldType="String" HeaderText="管控措施" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="State" Width="100px" HeaderText="审批状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.ConstructionRiskListService.ConvertState(Eval("States")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="AuditMan" Width="80px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label41" runat="server" Text='<%# ConvertMan(Eval("Id")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="State" Width="100px" HeaderText="审批状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# BLL.ConstructionRiskListService.ConvertState(Eval("States")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="AuditMan" Width="80px" HeaderText="办理人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label41" runat="server" Text='<%# ConvertMan(Eval("Id")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:LinkButtonField HeaderText="过程管控情况" ColumnID="download" Width="120px" TextAlign="Center" Icon="ApplicationViewIcons" CommandName="CheckSee" />
</Columns>
<Listeners>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="dataload" Handler="onGridDataLoad" />
<f:Listener Event="dataload" Handler="onGridDataLoad" />
</Listeners>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
<%-- <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="施工作业风险"
TitleToolTip="施工作业风险" AutoScroll="true">
<Items>
</Items>
</f:Panel>
</Items>
</f:Panel>--%>
<f:Window ID="Window1" Title="施工作业风险" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1000px" Height="600px">
</f:Window>
<f:Window ID="Window2" Title="施工作业风险" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window2" Title="施工作业风险" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="true" runat="server" OnClose="Window2_Close" IsModal="true"
Width="600px" Height="350px">
</f:Window>
@ -117,14 +139,14 @@
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
OnClick="btnMenuModify_Click">
</f:MenuButton>
OnClick="btnMenuModify_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuComplete" EnablePostBack="true" runat="server" Hidden="true" Text="完成" Icon="Accept"
OnClick="btnMenuComplete_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="ApplicationViewIcons"
OnClick="btnMenuView_Click">
</f:MenuButton>
OnClick="btnMenuComplete_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="ApplicationViewIcons"
OnClick="btnMenuView_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuCheck" EnablePostBack="true" runat="server" Hidden="true"
Text="巡检" Icon="ScriptLightning" OnClick="btnMenuCheck_Click">
</f:MenuButton>
@ -145,9 +167,9 @@
function onGridDataLoad(event) {
this.mergeColumns(['UnitWorkName', 'ConstructionContent', 'RefLicense', 'LicenseDes','RiskLevel']);
this.mergeColumns(['UnitWorkName', 'ConstructionContent', 'RefLicense', 'LicenseDes', 'RiskLevel']);
}
</script>
</body>
</html>

71
SUBQHSE/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs
View File

@ -13,22 +13,73 @@ namespace FineUIPro.Web.HSSE.Hazard
{
public partial class ConstructionRisk : PageBase
{
#region 项目主键
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
GetButtonPower();//权限设置
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
}
this.InitTreeMenu();//加载树
}
}
/// <summary>
/// 公司级树加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
btnNew.Hidden = true;
}
this.GetButtonPower();
this.InitTreeMenu();
this.BindGrid();
}
#region 加载树施工单位
/// <summary>
/// 加载树
/// </summary>
private void InitTreeMenu()
{
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
this.tvControlItem.Nodes.Clear();
List<Base_Unit> units = null;
@ -36,12 +87,12 @@ namespace FineUIPro.Web.HSSE.Hazard
var user = UserService.GetUserByUserId(this.CurrUser.UserId);
if (!string.IsNullOrEmpty(user.UnitId))
{
var projectUnit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, user.UnitId);
var projectUnit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.ProjectId, user.UnitId);
if (projectUnit != null)
{
if (projectUnit.UnitType == BLL.Const.ProjectUnitType_1 || projectUnit.UnitType == BLL.Const.ProjectUnitType_3 || projectUnit.UnitType == BLL.Const.ProjectUnitType_4)
{
var ids = Funs.DB.HSSE_ConstructionRisk.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).Select(x => x.UnitId).Distinct().ToList();
var ids = Funs.DB.HSSE_ConstructionRisk.Where(x => x.ProjectId == this.ProjectId).Select(x => x.UnitId).Distinct().ToList();
units = (from x in Funs.DB.Base_Unit
where ids.Contains(x.UnitId)
select x).OrderBy(x => x.UnitCode).ToList();
@ -56,7 +107,7 @@ namespace FineUIPro.Web.HSSE.Hazard
}
else if (user.UnitId == CommonService.GetThisUnitId() || user.UserId == Const.hfnbdId)
{
var ids = Funs.DB.HSSE_ConstructionRisk.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).Select(x => x.UnitId).Distinct().ToList();
var ids = Funs.DB.HSSE_ConstructionRisk.Where(x => x.ProjectId == this.ProjectId).Select(x => x.UnitId).Distinct().ToList();
units = (from x in Funs.DB.Base_Unit
where ids.Contains(x.UnitId)
select x).OrderBy(x => x.UnitCode).ToList();
@ -122,6 +173,7 @@ namespace FineUIPro.Web.HSSE.Hazard
this.BindGrid();
}
#endregion
#region 页索引改变事件
/// <summary>
/// 页索引改变事件
@ -135,7 +187,6 @@ namespace FineUIPro.Web.HSSE.Hazard
}
#endregion
#region 删除
/// <summary>
/// 删除
@ -177,10 +228,6 @@ namespace FineUIPro.Web.HSSE.Hazard
}
#endregion
/// <summary>
/// 数据绑定
/// </summary>
@ -223,7 +270,7 @@ namespace FineUIPro.Web.HSSE.Hazard
{
var DateWeek = (from x in Funs.DB.HSSE_ConstructionRisk
where x.ProjectId == this.CurrUser.LoginProjectId
where x.ProjectId == this.ProjectId
&& x.UnitId == node.NodeID
select x.DateWeek).Distinct().ToList().OrderByDescending(x => x);
foreach (var d in DateWeek)
@ -249,7 +296,7 @@ namespace FineUIPro.Web.HSSE.Hazard
}
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ConstructionRiskMenuId);
var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ConstructionRiskMenuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
@ -317,7 +364,7 @@ namespace FineUIPro.Web.HSSE.Hazard
// }
// }
//}
var r = Funs.DB.HSSE_ConstructionRisk.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == "2");
var r = Funs.DB.HSSE_ConstructionRisk.Where(x => x.ProjectId == this.ProjectId && x.States == "2");
foreach (var item in r)
{
item.States = "3";

87
SUBQHSE/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Hazard {
public partial class ConstructionRisk {
namespace FineUIPro.Web.HSSE.Hazard
{
public partial class ConstructionRisk
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@ -47,7 +49,34 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ucTree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelLeftRegion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion2;
/// <summary>
/// hdState 控件。
/// </summary>
@ -56,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdState;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@ -65,16 +94,16 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// panel4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
protected global::FineUIPro.Panel panel4;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -83,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -92,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -101,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -110,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnImport 控件。
/// </summary>
@ -119,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// Label1 控件。
/// </summary>
@ -128,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label41 控件。
/// </summary>
@ -137,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label41;
/// <summary>
/// Window1 控件。
/// </summary>
@ -146,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@ -155,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
@ -164,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -173,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
@ -182,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuComplete 控件。
/// </summary>
@ -191,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuComplete;
/// <summary>
/// btnMenuView 控件。
/// </summary>
@ -200,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuView;
/// <summary>
/// btnMenuCheck 控件。
/// </summary>
@ -209,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuCheck;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>

162
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/RishAnalysis.aspx
View File

@ -1,5 +1,7 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RishAnalysis.aspx.cs" Inherits="FineUIPro.Web.HSSE.HiddenInspection.RishAnalysis" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
@ -39,82 +41,96 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患整改单统计" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DataId" DataIDField="DataId" AllowSorting="true" SortField="DataAllName,DataName"
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" ForceFit="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList runat="server" ID="drpProject" Label="项目" LabelWidth="50px" Width="320px" EnableEdit="true" Hidden="true">
</f:DropDownList>
<f:DropDownList runat="server" ID="drpUnit" Label="单位" LabelWidth="50px" Width="280px" EnableEdit="true">
</f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="统计" Icon="SystemSearch" OnClick="TextBox_TextChanged" runat="server" Text="统计">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:RenderField Width="250px" ColumnID="DataAllName" DataField="DataAllName" FieldType="String"
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患整改单统计" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DataId" DataIDField="DataId" AllowSorting="true" SortField="DataAllName,DataName"
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" ForceFit="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<%--<f:DropDownList runat="server" ID="drpProject" Label="项目" LabelWidth="50px" Width="320px" EnableEdit="true" Hidden="true">
</f:DropDownList>--%>
<f:DropDownList runat="server" ID="drpUnit" Label="单位" LabelWidth="50px" Width="280px" EnableEdit="true">
</f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="统计" Icon="SystemSearch" OnClick="TextBox_TextChanged" runat="server" Text="统计">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:RenderField Width="250px" ColumnID="DataAllName" DataField="DataAllName" FieldType="String"
HeaderText="项目" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>--%>
<f:RenderField Width="250px" ColumnID="DataName" DataField="DataName" FieldType="String"
HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataSumCount" DataField="DataSumCount" FieldType="Int"
HeaderText="总数" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount1" DataField="DataCount1" FieldType="Int"
HeaderText="待整改" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount2" DataField="DataCount2" FieldType="Int"
HeaderText="已整改" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount3" DataField="DataCount3" FieldType="Int"
HeaderText="已闭环" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="DataCountRate" Width="120px" HeaderText="整改完成率" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="DataCountRate" runat="server" Text='<%# ConvertDataCountRate(Eval("DataCountRate")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
</PageItems>
</f:Grid>
<f:RenderField Width="250px" ColumnID="DataName" DataField="DataName" FieldType="String"
HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataSumCount" DataField="DataSumCount" FieldType="Int"
HeaderText="总数" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount1" DataField="DataCount1" FieldType="Int"
HeaderText="待整改" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount2" DataField="DataCount2" FieldType="Int"
HeaderText="已整改" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DataCount3" DataField="DataCount3" FieldType="Int"
HeaderText="已闭环" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="DataCountRate" Width="120px" HeaderText="整改完成率" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="DataCountRate" runat="server" Text='<%# ConvertDataCountRate(Eval("DataCountRate")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>

55
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/RishAnalysis.aspx.cs
View File

@ -35,34 +35,75 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
Funs.DropDownPageSize(this.ddlPageSize);
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
this.InitDropDownList();
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.panelLeftRegion.Hidden = true;
//////权限按钮方法
//this.GetButtonPower();
}
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
this.txtEndTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
this.txtStartTime.Text = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
this.ProjectId = this.CurrUser.LoginProjectId;
ProjectService.InitProjectDropDownList(this.drpProject, false);
this.drpProject.SelectedValue = this.ProjectId;
this.drpProject.Enabled = false;
//this.ProjectId = this.CurrUser.LoginProjectId;
//ProjectService.InitProjectDropDownList(this.drpProject, false);
//this.drpProject.SelectedValue = this.ProjectId;
//this.drpProject.Enabled = false;
UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
//UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BindGrid();
}
}
private void InitDropDownList()
{
UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
var getDatas = DataStatisticsService.HazardRegisterStatistics(this.drpProject.SelectedValue, this.drpUnit.SelectedValue, Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text));
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
//var getDatas = DataStatisticsService.HazardRegisterStatistics(this.drpProject.SelectedValue, this.drpUnit.SelectedValue, Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text));
var getDatas = DataStatisticsService.HazardRegisterStatistics(this.ProjectId, this.drpUnit.SelectedValue, Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text));
DataTable tb = this.GetPagedDataTable(Grid1, getDatas);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
/// <summary>
/// 公司级树加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
this.InitDropDownList();
//if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
// btnNew.Hidden = true;
//}
//this.GetButtonPower();
this.BindGrid();
}
#endregion
#region 查询

45
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/RishAnalysis.aspx.designer.cs generated
View File

@ -41,6 +41,42 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ucTree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -59,15 +95,6 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// drpUnit 控件。
/// </summary>

112
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx
View File

@ -1,6 +1,8 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RiskAnalysisChart.aspx.cs"
Inherits="FineUIPro.Web.HSSE.HiddenInspection.RiskAnalysisChart" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@ -12,53 +14,75 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />
<f:Panel ID="Panel3" CssClass="blockpanel" runat="server" EnableCollapse="false"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<%--<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />--%>
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
<Rows>
<f:FormRow ColumnWidths="20% 3% 20% 30% 15% 10%">
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
<Items>
<f:Panel ID="panelLeftRegion2" CssClass="blockpanel" runat="server" EnableCollapse="false"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:DatePicker ID="txtStartRectificationTime" runat="server" Label="检查时间" LabelAlign="Right"
LabelWidth="80px">
</f:DatePicker>
<f:Label ID="Label3" runat="server" Text="至" Width="5px">
</f:Label>
<f:DatePicker ID="txtEndRectificationTime" runat="server">
</f:DatePicker>
<f:RadioButtonList ID="rblState" runat="server" Label="分析类型" LabelWidth="80px" Width="250px"
AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
<f:RadioItem Value="0" Selected="true" Text="按责任单位" />
<f:RadioItem Value="1" Text="按检查项" />
</f:RadioButtonList>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
</f:Button>
<f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
<Rows>
<f:FormRow ColumnWidths="20% 3% 20% 30% 15% 10%">
<Items>
<f:DatePicker ID="txtStartRectificationTime" runat="server" Label="检查时间" LabelAlign="Right"
LabelWidth="80px">
</f:DatePicker>
<f:Label ID="Label3" runat="server" Text="至" Width="5px">
</f:Label>
<f:DatePicker ID="txtEndRectificationTime" runat="server">
</f:DatePicker>
<f:RadioButtonList ID="rblState" runat="server" Label="分析类型" LabelWidth="80px" Width="250px"
AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
<f:RadioItem Value="0" Selected="true" Text="按责任单位" />
<f:RadioItem Value="1" Text="按检查项" />
</f:RadioButtonList>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
</f:Button>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Panel>
<f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false" MarginTop="10px"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="400px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
<Tabs>
<f:Tab ID="Tab2" Title="按类别" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
TitleToolTip="按类别统计">
<Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0" AutoScroll="true">
<div id="divAccidentTime" style="width: 1500px; height: 300px;">
</div>
</f:ContentPanel>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</f:Panel>
<f:Panel ID="panelLeftRegion3" CssClass="blockpanel" runat="server" EnableCollapse="false" MarginTop="10px"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="400px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
<Tabs>
<f:Tab ID="Tab2" Title="按类别" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
TitleToolTip="按类别统计">
<Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0" AutoScroll="true">
<div id="divAccidentTime" style="width: 1500px; height: 300px;">
</div>
</f:ContentPanel>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
</f:Panel>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>
</body>
<script language="javascript">
@ -97,7 +121,7 @@
myChart.setOption(option);
}
rendChart(<%=legend%>,<%=xAxis%>,<%=series%>)
rendChart(<%=legend%>,<%=xAxis%>,<%=series%>)
</script>
</html>

96
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx.cs
View File

@ -9,6 +9,23 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class RiskAnalysisChart : PageBase
{
#region 项目主键
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
#endregion
#region 加载页面
/// <summary>
/// 加载页面
@ -17,10 +34,41 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
this.AnalyseData();
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.ProjectId))
{
this.panelLeftRegion.Hidden = true;
//////权限按钮方法
//this.GetButtonPower();
}
this.AnalyseData();
}
/// <summary>
/// 公司级树加载
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
//if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
// btnNew.Hidden = true;
//}
//this.GetButtonPower();
this.AnalyseData();
}
#endregion
#region 统计
@ -32,22 +80,24 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
this.AnalyseData();
PageContext.RegisterStartupScript(@" setTimeout(function () { rendChart(" + legend+","+xAxis+","+series+ ");},1500); ");
PageContext.RegisterStartupScript(@" setTimeout(function () { rendChart(" + legend + "," + xAxis + "," + series + ");},1500); ");
}
public string legend = "[]";
public string xAxis="[]";
public string series="[]";
public string xAxis = "[]";
public string series = "[]";
/// <summary>
/// 统计方法
/// </summary>
private void AnalyseData()
{
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
if (this.rblState.SelectedValue == "0")
{
string strSql = @" select u.UnitId,u.unitName,
count(*) as allnum,
Sum(case when States= 1 or States is null then 1 else 0 end) as todo,
@ -61,11 +111,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
{
strSql += " and CheckTime <'" + DateTime.Parse( this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
strSql += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
strSql += " group by u.UnitId,u.unitName ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@ -154,7 +204,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
strSql += " group by u.UnitId,u.unitName ,r.RegisterTypesId,t.RegisterTypesName ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@ -175,14 +225,14 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
Dictionary<string, string> temp = null;
if (!data.ContainsKey(dr["unitName"].ToString()))
{
data.Add(dr["unitName"].ToString(), new Dictionary<string,string>());
data.Add(dr["unitName"].ToString(), new Dictionary<string, string>());
}
temp = data[dr["unitName"].ToString()];
if (!temp.ContainsKey(dr["RegisterTypesName"].ToString()))
{
temp.Add(dr["RegisterTypesName"].ToString(),"0");
temp.Add(dr["RegisterTypesName"].ToString(), "0");
}
temp[dr["RegisterTypesName"].ToString()]=dr["allnum"].ToString();
temp[dr["RegisterTypesName"].ToString()] = dr["allnum"].ToString();
}
foreach (string types in xdic)
@ -216,7 +266,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
series += @"{
name: '"+ unit + @"[全部]',
name: '" + unit + @"[全部]',
type: 'bar',
stack: '全部',
barWidth: 10,
@ -230,11 +280,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
data: [" + tempseries.TrimEnd(',') + @"]
},";
}
data = new Dictionary<string, Dictionary<string, string>>();
data = new Dictionary<string, Dictionary<string, string>>();
foreach (DataRow dr in tb.Rows)
{
xdic.Add(dr["RegisterTypesName"].ToString());
Dictionary<string,string> temp = null;
Dictionary<string, string> temp = null;
if (!data.ContainsKey(dr["unitName"].ToString()))
{
data.Add(dr["unitName"].ToString(), new Dictionary<string, string>());
@ -244,7 +294,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
temp.Add(dr["RegisterTypesName"].ToString(), "0");
}
temp[dr["RegisterTypesName"].ToString()]=dr["todo"].ToString();
temp[dr["RegisterTypesName"].ToString()] = dr["todo"].ToString();
}
foreach (string unit in data.Keys)
{
@ -290,7 +340,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
temp.Add(dr["RegisterTypesName"].ToString(), "0");
}
temp[dr["RegisterTypesName"].ToString()]=dr["finish"].ToString();
temp[dr["RegisterTypesName"].ToString()] = dr["finish"].ToString();
}
foreach (string unit in data.Keys)
{
@ -324,10 +374,10 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
series = series.TrimEnd(',');
series += "]";
}
// this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "单位巡检分析", this.drpChartType.SelectedValue, 1130, 450, this.ckbShow.Checked));

53
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx.designer.cs generated
View File

@ -33,13 +33,58 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel3 控件。
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel3;
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ucTree 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// panelLeftRegion2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion2;
/// <summary>
/// Form2 控件。
@ -96,13 +141,13 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// Panel4 控件。
/// panelLeftRegion3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
protected global::FineUIPro.Panel panelLeftRegion3;
/// <summary>
/// TabStrip1 控件。