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

升级

This commit is contained in:
geh 2026-04-09 15:26:39 +08:00
parent 1066f6ae6f
commit ad4f329930
32 changed files with 1556 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
DataBase/版本日志/SUBQHSE_V2026-03-26-geh.sql Normal file
View File

@ -0,0 +1,35 @@
-- 自动获取总包检查数据
alter table Base_Project add IsAutoFetch bit NULL;
--定制版放到公司级的【报表管理/数据管理】下的【项目数据分析】,父级菜单id和菜单类型根据实际情况进行替换
UPDATE [dbo].[Sys_Menu] SET [MenuName] = N'项目数据分析', [Icon] = NULL, [Url] = '', [SortIndex] = 125, [SuperMenu] = N'0', [MenuType] = N'Menu_SJTB', [IsOffice] = '1', [IsEnd] = '0', [IsUsed] = '1' WHERE CONVERT(NVARCHAR(MAX), [MenuId]) = N'96763EC0-6AFF-4FA2-BFA1-63CCF1FF65A9';
INSERT INTO [dbo].[Sys_Menu] ( [MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed] )
VALUES
( N'A9E94BE9-6F53-4A41-9A65-250F09D9E449', N'安全巡检统计分析', NULL, N'HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx?Types=1', 50, N'96763EC0-6AFF-4FA2-BFA1-63CCF1FF65A9', N'Menu_SJTB', '0', '1', '1' );
GO
INSERT INTO [dbo].[Sys_Menu] ( [MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed] )
VALUES
( N'28848506-234F-4D21-8E79-A0F24F2B2DDA', N'质量巡检统计分析', NULL, N'HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx?Types=2', 60, N'96763EC0-6AFF-4FA2-BFA1-63CCF1FF65A9', N'Menu_SJTB', '0', '1', '1' );
GO
--加颁奖年份字段
alter table QCManage_QCGroupRegistration add AwardYear datetime
go
【注意】
-----根据实际情况吧原本填写在过程字段(Process)上的年份数据移到新的新的字段(AwardYear)上
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'颁奖年份' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'QCManage_QCGroupRegistration', @level2type=N'COLUMN',@level2name=N'AwardYear'
GO
--把原来的数据替换到新的字段上
update QCManage_QCGroupRegistration set AwardYear = Process where AwardYear is null and LEN(Process) = 4

2
SUBQHSE/BLL/BaseInfo/WorkPostService.cs
View File

@ -40,6 +40,7 @@ namespace BLL
PostType = workPost.PostType,
IsHsse = workPost.IsHsse,
IsCQMS = workPost.IsCQMS,
IsCQMSCheck = workPost.IsCQMSCheck,
CNCodes = workPost.CNCodes,
Remark = workPost.Remark
};
@ -94,6 +95,7 @@ namespace BLL
newWorkPost.PostType = workPost.PostType;
newWorkPost.IsHsse = workPost.IsHsse;
newWorkPost.IsCQMS = workPost.IsCQMS;
newWorkPost.IsCQMSCheck = workPost.IsCQMSCheck;
newWorkPost.CNCodes = workPost.CNCodes;
newWorkPost.Remark = workPost.Remark;
db.SubmitChanges();

2
SUBQHSE/BLL/CQMS/QualityActivity/QCManage/QCManage_QCGroupRegistrationService.cs
View File

@ -37,6 +37,7 @@ namespace BLL
newQCGroupRegistration.AwardType = QCGroupRegistration.AwardType;
newQCGroupRegistration.AwardLevel = QCGroupRegistration.AwardLevel;
newQCGroupRegistration.AwardingUnit = QCGroupRegistration.AwardingUnit;
newQCGroupRegistration.AwardYear = QCGroupRegistration.AwardYear;
db.QCManage_QCGroupRegistration.InsertOnSubmit(newQCGroupRegistration);
db.SubmitChanges();
}
@ -64,6 +65,7 @@ namespace BLL
newQCGroupRegistration.AwardingUnit = QCGroupRegistration.AwardingUnit;
newQCGroupRegistration.IsUpdate = null;
newQCGroupRegistration.AwardType = QCGroupRegistration.AwardType;
newQCGroupRegistration.AwardYear = QCGroupRegistration.AwardYear;
db.SubmitChanges();
}
}

3
SUBQHSE/BLL/DataShare/APIDataShareSyncService.cs
View File

@ -348,7 +348,7 @@ namespace BLL
/// </summary>
/// <param name="WorkPostName"></param>
/// <returns></returns>
public static string getWorkPostId(string WorkPostName, string PostType, string IsHsse, string IsCQMS)
public static string getWorkPostId(string WorkPostName, string PostType, string IsHsse, string IsCQMS, string IsCQMSCheck)
{
string WorkPostId = null;
if (!string.IsNullOrEmpty(WorkPostName))
@ -363,6 +363,7 @@ namespace BLL
PostType = PostType,
IsHsse = Convert.ToBoolean(IsHsse),
IsCQMS = Convert.ToBoolean(IsCQMS),
IsCQMSCheck = Convert.ToBoolean(IsCQMSCheck),
Remark = "导入"
};
WorkPostService.AddWorkPost(newWorkPost);

5
SUBQHSE/BLL/DataShare/HSSE/APIPersonSyncService.cs
View File

@ -134,6 +134,7 @@ namespace BLL
PostType = wp.PostType, //岗位诶类型
IsHsse = wp.IsHsse, //岗位是否是安管人员
IsCQMS = wp.IsCQMS, //岗位是否是质量管理
IsCQMSCheck = wp.IsCQMSCheck,
TeamGroupName = tg.TeamGroupName,
WorkAreaName = APIDataShareSyncService.GetWorkAreaNames(x.WorkAreaId, projectId)
}).ToList();
@ -373,7 +374,7 @@ namespace BLL
TeamGroupId = APIDataShareSyncService.GetTeamGroupId(item.TeamGroupName, projectId, unitId),
WorkAreaId = APIDataShareSyncService.getWorkAreaId(item.WorkAreaName, projectId),
WorkPostId = APIDataShareSyncService.getWorkPostId(item.WorkPostName, item.PostType,
item.IsHsse.ToString(), item.IsCQMS.ToString()),
item.IsHsse.ToString(), item.IsCQMS.ToString(),item.IsCQMSCheck.ToString()),
InTime = item.InTime,
OutTime = item.OutTime,
OutResult = item.OutResult,
@ -432,7 +433,7 @@ namespace BLL
model.UnitId = unitId;
model.TeamGroupId = APIDataShareSyncService.GetTeamGroupId(item.TeamGroupName, projectId, unitId);
model.WorkAreaId = APIDataShareSyncService.getWorkAreaId(item.WorkAreaName, projectId);
model.WorkPostId = APIDataShareSyncService.getWorkPostId(item.WorkPostName, item.PostType, item.IsHsse.ToString(), item.IsCQMS.ToString());
model.WorkPostId = APIDataShareSyncService.getWorkPostId(item.WorkPostName, item.PostType, item.IsHsse.ToString(), item.IsCQMS.ToString(),item.IsCQMSCheck.ToString());
model.InTime = item.InTime;
model.OutTime = item.OutTime;
model.OutResult = item.OutResult;

8
SUBQHSE/BLL/ZHGL/DataSync/CQMSDataService.cs
View File

@ -644,8 +644,8 @@ namespace BLL
MaterialInspectionNum = inspectionEquipmentList.Count(),
MaterialInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
UseNum = useNum.Count(),
OKNum = okNum.Count(),
UseNum = useNum.Sum(x => x.UnitsCount ?? 1),
OKNum = okNum.Sum(x => x.UnitsCount ?? 1),
SingleProjectNum = singleProjectNum.Count(),
UnitProjectNum = unitProjectNum.Count(),
SubProjectNum = subProjectNum.Count(),
@ -724,8 +724,8 @@ namespace BLL
MaterialInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
MaterialInspectionQualifiedNum = inspectionEquipmentList
.Where(x => x.SamplingResult == "1" && x.ProjectId == projectid).Count(),
UseNum = useNum.Count(x => x.ProjectId == projectid),
OKNum = okNum.Count(x => x.ProjectId == projectid),
UseNum = useNum.Where(x => x.ProjectId == projectid).Sum(x => x.UnitsCount ?? 1),
OKNum = okNum.Where(x => x.ProjectId == projectid).Sum(x => x.UnitsCount ?? 1),
SingleProjectNum = singleProjectNum.Count(x => x.ProjectId == projectid),
UnitProjectNum = unitProjectNum.Count(x => x.ProjectId == projectid),
SubProjectNum = subProjectNum.Count(x => x.ProjectId == projectid),

2
SUBQHSE/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
View File

@ -1415,6 +1415,7 @@ namespace BLL
AwardType = x.AwardType,
AwardLevel = x.AwardLevel,
AwardingUnit = x.AwardingUnit,
AwardYear = x.AwardYear,
}).Take(pushNum).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0)
@ -1484,6 +1485,7 @@ namespace BLL
AwardName = x.AwardName,
AwardLevel = x.AwardLevel,
AwardingUnit = x.AwardingUnit,
AwardYear = x.AwardYear,
}).ToList();
if (items.Count() > 0)

160
SUBQHSE/FineUIPro.Web/BaseInfo/WorkPost.aspx
View File

@ -4,31 +4,29 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>岗位信息</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<link href="../res/css/common.css" rel="stylesheet" type="text/css"/>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="岗位信息" ShowHeader="false"
Layout="HBox">
<items>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server"/>
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="岗位信息" ShowHeader="false"
Layout="HBox">
<Items>
<f:Grid ID="Grid1" Title="岗位信息" ShowHeader="false" EnableCollapse="true" PageSize="20"
EnableColumnLines="true" ShowBorder="true" AllowPaging="true" IsDatabasePaging="true"
runat="server" Width="750px" DataKeyNames="WorkPostId" DataIDField="WorkPostId" AllowSorting="true"
SortField="PostType,WorkPostCode" SortDirection="ASC"
OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
EnableTextSelection="True">
<Toolbars>
EnableColumnLines="true" ShowBorder="true" AllowPaging="true" IsDatabasePaging="true"
runat="server" Width="960px" DataKeyNames="WorkPostId" DataIDField="WorkPostId" AllowSorting="true"
SortField="PostType,WorkPostCode" SortDirection="ASC"
OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="名称" ID="txtKey" EmptyText="输入查询条件"
AutoPostBack="true" Width="200px" LabelWidth="50px"></f:TextBox>
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" >
</f:Button>
<f:TextBox runat="server" Label="名称" ID="txtKey" EmptyText="输入查询条件" AutoPostBack="true" Width="200px" LabelWidth="50px">
</f:TextBox>
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false">
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出" EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnDataBase" Text="岗位合并" ToolTip="数据清理" Icon="DatabaseWrench" runat="server" Hidden="true" OnClick="btnDataBase_Click">
</f:Button>
@ -37,12 +35,12 @@
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
TextAlign="Center"/>
<f:RenderField Width="150px" ColumnID="WorkPostCode" DataField="WorkPostCode" FieldType="String"
HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName" FieldType="String"
HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="180px" ColumnID="WorkPostName" DataField="WorkPostName" FieldType="String"
HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="120px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
@ -50,31 +48,35 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="80px" ColumnID="IsHsse" DataField="IsHsse" FieldType="Boolean"
RendererFunction="renderIsHsse" HeaderText="安管人员" HeaderTextAlign="Center"
TextAlign="Center">
RendererFunction="renderIsHsse" HeaderText="安管人员" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="IsCQMS" DataField="IsCQMS" FieldType="Boolean"
RendererFunction="renderIsHsse" HeaderText="质量管理" HeaderTextAlign="Center"
TextAlign="Center">
RendererFunction="renderIsHsse" HeaderText="质量管理" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="120px" HeaderText="对口专业" HeaderTextAlign="Center" TextAlign="Center" >
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# ConvertCNCodes(Eval("CNCodes")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="80px" ColumnID="IsCQMSCheck" DataField="IsCQMSCheck" FieldType="Boolean"
RendererFunction="renderIsHsse" HeaderText="质量报验" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="120px" HeaderText="对口专业" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# ConvertCNCodes(Eval("CNCodes")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="90px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="职责" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="职责" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="10px" ColumnID="PostType" DataField="PostType" FieldType="String"
HeaderText="类型" Hidden="true" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="类型" Hidden="true" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="10px" ColumnID="CNCodes" DataField="CNCodes" FieldType="String"
HeaderText="对口专业" Hidden="true" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="对口专业" Hidden="true" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="rowselect" Handler="onGridRowSelect" />
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="rowselect" Handler="onGridRowSelect"/>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu"/>
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@ -82,46 +84,48 @@
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
<f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
LabelWidth="80px" BodyPadding="5px" Width="350px">
LabelWidth="80px" BodyPadding="5px" Width="350px">
<Items>
<f:TextBox ID="hfFormID" Hidden="true"
runat="server" LabelAlign="right">
runat="server" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpWorkPostCode" runat="server" Label="编号" LabelAlign="Right" Required="true"
ShowRedStar="true" LabelWidth="80px">
ShowRedStar="true" LabelWidth="80px">
</f:DropDownList>
<f:TextBox ID="txtWorkPostName" Label="名称" ShowRedStar="true" Required="true" runat="server"
MaxLength="100" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
LabelWidth="80px">
MaxLength="100" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
LabelWidth="80px">
</f:TextBox>
<f:DropDownList ID="drpPostType" runat="server" Label="类型" LabelAlign="Right" Required="true"
ShowRedStar="true" LabelWidth="80px">
ShowRedStar="true" LabelWidth="80px">
</f:DropDownList>
<f:CheckBox ID="ckbIsHsse" runat="server" Label="安管人员" LabelAlign="Right" LabelWidth="80px">
</f:CheckBox>
<f:CheckBox ID="ckbIsCQMS" runat="server" Label="质量管理" LabelAlign="Right" LabelWidth="80px">
</f:CheckBox>
<f:CheckBox ID="ckbIsCQMSCheck" runat="server" Label="质量报验" LabelAlign="Right" LabelWidth="80px">
</f:CheckBox>
<f:DropDownBox runat="server" Label="对口专业" ID="txtCNCodes" EmptyText="--请选择--" EnableMultiSelect="true" MatchFieldWidth="true" LabelWidth="80px">
<PopPanel>
<f:Grid ID="gvCNCodes" DataIDField="CNProfessionalId" ForceFit="true"
<PopPanel>
<f:Grid ID="gvCNCodes" DataIDField="CNProfessionalId" ForceFit="true"
EnableMultiSelect="true" KeepCurrentSelection="true" Height="300px" Hidden="true" SortField="SortIndex" DataTextField="ProfessionalName"
ShowBorder="true" ShowHeader="false"
runat="server" EnableCheckBoxSelect="true">
<Columns>
<f:BoundField Width="100px" DataField="CNProfessionalId" SortField="CNProfessionalId" DataFormatString="{0}" Hidden="true" />
<f:BoundField Width="100px" DataField="ProfessionalName" SortField="ProfessionalName" DataFormatString="{0}"
HeaderText="专业名称" />
</Columns>
</f:Grid>
</PopPanel>
</f:DropDownBox>
<Columns>
<f:BoundField Width="100px" DataField="CNProfessionalId" SortField="CNProfessionalId" DataFormatString="{0}" Hidden="true"/>
<f:BoundField Width="100px" DataField="ProfessionalName" SortField="ProfessionalName" DataFormatString="{0}"
HeaderText="专业名称"/>
</Columns>
</f:Grid>
</PopPanel>
</f:DropDownBox>
<f:TextArea ID="txtRemark" runat="server" Label="职责" LabelAlign="right" MaxLength="200"
LabelWidth="80px">
LabelWidth="80px">
</f:TextArea>
<f:Label ID="lb1" runat="server" Text="岗位类型说明：" LabelWidth="120px">
</f:Label>
@ -136,39 +140,39 @@
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server">
<Items>
<f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" Hidden="true" Text="新增"
runat="server">
runat="server">
<Listeners>
<f:Listener Event="click" Handler="onNewButtonClick" />
<f:Listener Event="click" Handler="onNewButtonClick"/>
</Listeners>
</f:Button>
<f:Button ID="btnDelete" Enabled="false" ToolTip="删除" Icon="Delete" ConfirmText="确定删除当前数据？" Text="删除"
Hidden="true" OnClick="btnDelete_Click" runat="server">
Hidden="true" OnClick="btnDelete_Click" runat="server">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Text="保存"
Hidden="true" OnClick="btnSave_Click">
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Text="保存"
Hidden="true" OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:SimpleForm>
</items>
</f:Panel>
<f:Window ID="Window1" Title="单位合并" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="false"
CloseAction="HidePostBack" Width="1200px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑" Icon="Pencil">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
</Items>
</f:Panel>
<f:Window ID="Window1" Title="单位合并" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="false"
CloseAction="HidePostBack" Width="1200px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
Hidden="true" runat="server" Text="编辑" Icon="Pencil">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
function renderIsHsse(value) {
return value == true ? '是' : '否';
}
@ -193,8 +197,9 @@
var drpPostTypeClientID = '<%= drpPostType.ClientID %>';
var ckbIsHsseClientID = '<%= ckbIsHsse.ClientID %>';
var ckbIsCQMSClientID = '<%= ckbIsCQMS.ClientID %>';
var ckbIsCQMSCheckClientID = '<%= ckbIsCQMSCheck.ClientID %>';
var txtCNCodesClientID = '<%= txtCNCodes.ClientID %>';
var txtRemarkClientID = '<%=txtRemark.ClientID %>';
var txtRemarkClientID = '<%= txtRemark.ClientID %>';
function onGridRowSelect(event, rowId) {
var grid = F(gridClientID);
@ -211,6 +216,7 @@
F(drpPostTypeClientID).setValue(rowValue['PostType']);
F(ckbIsHsseClientID).setValue(rowValue['IsHsse']);
F(ckbIsCQMSClientID).setValue(rowValue['IsCQMS']);
F(ckbIsCQMSCheckClientID).setValue(rowValue['IsCQMSCheck']);
F(txtCNCodesClientID).setValue(rowValue['CNCodes']);
F(txtRemarkClientID).setValue(rowValue['Remark']);

34
SUBQHSE/FineUIPro.Web/BaseInfo/WorkPost.aspx.cs
View File

@ -5,6 +5,7 @@ using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web.UI.WebControls;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
namespace FineUIPro.Web.BaseInfo
@ -38,14 +39,14 @@ namespace FineUIPro.Web.BaseInfo
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.IsCQMS,wp.CNCodes,
string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.IsCQMS,wp.IsCQMSCheck,wp.CNCodes,
case wp.IsHsse when 1 then '是' else '否' end as IsHsseStr,const.ConstText as PostTypeName
FROM dbo.Base_WorkPost AS wp
LEFT JOIN Sys_Const AS const ON const.ConstValue = wp.PostType and const.GroupId = '" + ConstValue.Group_PostType + "' ";
if (!string.IsNullOrEmpty(this.txtKey.Text.Trim()))
{
strSql += "where wp.WorkPostName like '%"+this.txtKey.Text.Trim()+"%' ";
strSql += "where wp.WorkPostName like '%" + this.txtKey.Text.Trim() + "%' ";
}
List<SqlParameter> listStr = new List<SqlParameter>();
//strSql += " AND HazardList.ProjectId = @ProjectId";
@ -191,6 +192,10 @@ namespace FineUIPro.Web.BaseInfo
{
this.ckbIsCQMS.Checked = true;
}
if (workPost.IsCQMSCheck == true)
{
this.ckbIsCQMSCheck.Checked = true;
}
if (!string.IsNullOrEmpty(workPost.CNCodes))
{
txtCNCodes.Values = workPost.CNCodes.Split(',');
@ -205,10 +210,21 @@ namespace FineUIPro.Web.BaseInfo
{
BindGrid();
}
protected void btnQuery_Click(object sender, EventArgs e)
protected void btnQuery_Click(object sender, EventArgs e)
{
BindGrid();
}
/// <summary>
/// 关闭导入弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
/// <summary>
/// 保存按钮
/// </summary>
@ -228,7 +244,7 @@ namespace FineUIPro.Web.BaseInfo
}
var q2 = Funs.DB.Base_WorkPost.FirstOrDefault(x => x.WorkPostName == this.txtWorkPostName.Text.Trim() &&
(x.WorkPostId != hfFormID.Text || (hfFormID.Text == null && x.WorkPostId != null))
&&x.WorkPostCode==drpWorkPostCode.SelectedValue);
&& x.WorkPostCode == drpWorkPostCode.SelectedValue);
if (q2 != null)
{
ShowNotify("输入的岗位名称已存在！", MessageBoxIcon.Warning);
@ -242,6 +258,7 @@ namespace FineUIPro.Web.BaseInfo
PostType = this.drpPostType.SelectedValue,
IsHsse = Convert.ToBoolean(this.ckbIsHsse.Checked),
IsCQMS = Convert.ToBoolean(this.ckbIsCQMS.Checked),
IsCQMSCheck = Convert.ToBoolean(this.ckbIsCQMSCheck.Checked),
CNCodes = string.Join(",", txtCNCodes.Values),
Remark = txtRemark.Text.Trim()
};
@ -375,15 +392,6 @@ namespace FineUIPro.Web.BaseInfo
}
#endregion
/// <summary>
/// 关闭导入弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
#region 数据清理

9
SUBQHSE/FineUIPro.Web/BaseInfo/WorkPost.aspx.designer.cs generated
View File

@ -203,6 +203,15 @@ namespace FineUIPro.Web.BaseInfo
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsCQMS;
/// <summary>
/// ckbIsCQMSCheck 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsCQMSCheck;
/// <summary>
/// txtCNCodes 控件。
/// </summary>

5
SUBQHSE/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
View File

@ -83,6 +83,11 @@ namespace FineUIPro.Web.CQMS.Check
}
btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;";
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
var getProject = ProjectService.GetProjectByProjectId(ProjectId);
if (getProject != null && getProject.IsAutoFetch == true)
{
APICheckControlSyncService.getCheckControlLists(this.ProjectId);
}
// 绑定表格
BindGrid();
}

34
SUBQHSE/FineUIPro.Web/CQMS/Comprehensive/CqmsPersonEdit.aspx.cs
View File

@ -127,6 +127,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.rblIsTrain.SelectedValue = person.IsTrain.HasValue && person.IsTrain == true ? "true" : "false";
}
var personQuality = PersonQualityService.GetPersonQualityByPersonId(this.PersonId);
if (personQuality != null)
{
this.txtCertificateCode.Text = personQuality.CertificateNo;
this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", personQuality.LimitDate);
}
}
else
@ -376,6 +382,34 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.LogService.AddSys_Log(this.CurrUser, person.PersonName, person.PersonId, BLL.Const.PersonListMenuId,
BLL.Const.BtnModify);
}
if (!string.IsNullOrEmpty(person.PersonId))
{
////更新特岗人员资质
var personQuality = BLL.PersonQualityService.GetPersonQualityByPersonId(person.PersonId);
if (personQuality != null)
{
personQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
personQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
personQuality.CompileMan = this.CurrUser.UserId;
personQuality.CompileDate = DateTime.Now;
BLL.PersonQualityService.UpdatePersonQuality(personQuality);
}
else
{
Model.QualityAudit_PersonQuality newPersonQuality = new Model.QualityAudit_PersonQuality
{
PersonQualityId = SQLHelper.GetNewID(typeof(Model.QualityAudit_PersonQuality)),
PersonId = person.PersonId,
CompileMan = this.CurrUser.UserId,
CompileDate = DateTime.Now
};
newPersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
newPersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
BLL.PersonQualityService.AddPersonQuality(newPersonQuality);
}
}
///上传人脸库
var getProject = ProjectService.GetProjectByProjectId(person.ProjectId);
if (!string.IsNullOrEmpty(person.PhotoUrl) && getProject != null && getProject.IsFace == true)

9
SUBQHSE/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistration.aspx
View File

@ -73,9 +73,12 @@
FieldType="String" HeaderText="课题" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="Process" DataField="Process"
FieldType="String" HeaderText="颁奖年份" TextAlign="Center"
HeaderTextAlign="Center">
<%-- <f:RenderField Width="180px" ColumnID="Process" DataField="Process" --%>
<%-- FieldType="String" HeaderText="颁奖年份" TextAlign="Center" --%>
<%-- HeaderTextAlign="Center"> --%>
<%-- </f:RenderField> --%>
<f:RenderField Width="120px" ColumnID="AwardYear" DataField="AwardYear" SortField="AwardYear"
FieldType="Date" Renderer="Date" RendererArgument="yyyy" HeaderText="颁奖年份" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Achievement" DataField="Achievement"
FieldType="String" HeaderText="成果" TextAlign="Center"

9
SUBQHSE/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx
View File

@ -51,9 +51,12 @@
<Items>
<%-- <f:TextBox ID="txtProcess" runat="server" LabelWidth="100px" Label="过程" LabelAlign="Right"> --%>
<%-- </f:TextBox> --%>
<f:NumberBox ID="txtProcess" runat="server" Label="颁奖年份" NoDecimal="true" NoNegative="true"
LabelAlign="Right" LabelWidth="100px">
</f:NumberBox>
<%-- <f:NumberBox ID="txtProcess" runat="server" Label="颁奖年份" NoDecimal="true" NoNegative="true" --%>
<%-- LabelAlign="Right" LabelWidth="100px"> --%>
<%-- </f:NumberBox> --%>
<f:DatePicker runat="server" Required="true" DateFormatString="yyyy" Label="颁奖年份" EmptyText="请选择颁奖年份"
ID="txtAwardYear" ShowRedStar="true" DisplayType="Year" ShowTodayButton="false">
</f:DatePicker>
<f:TextBox ID="txtAchievement" runat="server" LabelWidth="120px" Label="成果" LabelAlign="Right">
</f:TextBox>
</Items>

10
SUBQHSE/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx.cs
View File

@ -53,7 +53,8 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
this.drpUnitId.SelectedValue = QCGroupRegistration.UnitId;
}
txtSubjects.Text = QCGroupRegistration.Subjects;
txtProcess.Text = QCGroupRegistration.Process;
// txtProcess.Text = QCGroupRegistration.Process;
txtAwardYear.Text = string.Format("{0:yyyy}", QCGroupRegistration.AwardYear);
txtAchievement.Text = QCGroupRegistration.Achievement;
txtAwardName.Text = QCGroupRegistration.AwardName;
if (!string.IsNullOrEmpty(QCGroupRegistration.AwardType))
@ -125,7 +126,12 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
QCGroupRegistration.UnitId = this.drpUnitId.SelectedValue;
}
QCGroupRegistration.Subjects = txtSubjects.Text.Trim();
QCGroupRegistration.Process = txtProcess.Text.Trim();
// QCGroupRegistration.Process = txtProcess.Text.Trim();
var awardYearText = this.txtAwardYear.Text.Trim();
if (!string.IsNullOrEmpty(awardYearText))
{
QCGroupRegistration.AwardYear = DateTime.ParseExact(awardYearText, "yyyy", null);
}
QCGroupRegistration.Achievement = txtAchievement.Text.Trim();
QCGroupRegistration.AwardName = txtAwardName.Text.Trim();
if (!string.IsNullOrEmpty(this.drpAwardType.SelectedValue))

4
SUBQHSE/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx.designer.cs generated
View File

@ -96,13 +96,13 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
protected global::FineUIPro.TextBox txtSubjects;
/// <summary>
/// txtProcess 控件。
/// txtAwardYear 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtProcess;
protected global::FineUIPro.DatePicker txtAwardYear;
/// <summary>
/// txtAchievement 控件。

165
SUBQHSE/FineUIPro.Web/Controls/ChartControl.ascx.cs
View File

@ -1,8 +1,9 @@
using System;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Web.UI.DataVisualization.Charting;
using System.Web.UI.WebControls;
namespace Web.Controls
{
public partial class ChartControl : System.Web.UI.UserControl
@ -258,5 +259,167 @@ namespace Web.Controls
Controls.Add(chart1);
}
public void CreateChart1(Model.DataSourceChart dataSourceChart)
{
int totalDataCount = 0;
if (dataSourceChart.DataSourceTeams != null && dataSourceChart.DataSourceTeams.Count > 0)
{
var firstTeam = dataSourceChart.DataSourceTeams.FirstOrDefault(t => t.DataPointName != "累计");
if (firstTeam != null)
totalDataCount = firstTeam.DataSourcePoints.Count;
}
// 每个标签分配 70px 宽度（可微调：60-80 之间）
int autoChartWidth = totalDataCount * 45;
Chart chart1 = new Chart
{
ID = "chart1",
BackColor = Color.WhiteSmoke,
ImageLocation = "~/Images/ChartPic_#SEQ(300,3)",
BorderlineDashStyle = ChartDashStyle.Solid,
Palette = ChartColorPalette.BrightPastel,
BackSecondaryColor = Color.White,
BackGradientStyle = GradientStyle.TopBottom,
BorderWidth = 2,
BorderColor = Color.FromArgb(26, 59, 105),
ImageType = ChartImageType.Png,
Width = dataSourceChart.Width > autoChartWidth ? dataSourceChart.Width : autoChartWidth,
Height = dataSourceChart.Height
};
Title title = new Title
{
Text = dataSourceChart.Title,
ShadowColor = Color.FromArgb(32, 0, 0, 0),
Font = new Font("Trebuchet MS", 10F, FontStyle.Bold),
ShadowOffset = 3,
ForeColor = Color.FromArgb(26, 59, 105)
};
chart1.Titles.Add(title);
Legend legend = new Legend
{
Name = dataSourceChart.Title,
TextWrapThreshold = 1,
Docking = Docking.Top,
Alignment = StringAlignment.Center,
BackColor = Color.Transparent,
Font = new Font(new FontFamily("Trebuchet MS"), 8),
LegendStyle = LegendStyle.Row,
IsEquallySpacedItems = true,
IsTextAutoFit = false
};
chart1.Legends.Add(legend);
ChartArea chartArea = new ChartArea
{
Name = dataSourceChart.Title,
BackColor = Color.Transparent
};
chartArea.AxisX.IsLabelAutoFit = false;
chartArea.AxisY.IsLabelAutoFit = false;
chartArea.AxisX.Interval = 1; // 每个点都显示标签
chartArea.AxisX.LabelStyle.Angle = 45; // 倾斜45°
chartArea.AxisX.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F);
chartArea.AxisY.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F);
// 线条样式
chartArea.AxisY.LineColor = Color.FromArgb(64, 64, 64, 64);
chartArea.AxisX.LineColor = Color.FromArgb(64, 64, 64, 64);
chartArea.AxisY.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64);
chartArea.AxisX.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64);
chart1.ChartAreas.Add(chartArea);
Panel scrollPanel = new Panel();
scrollPanel.Style.Add("width", "100%"); // 父容器自适应
scrollPanel.Style.Add("overflow-x", "auto"); // 横向滚动条
scrollPanel.Style.Add("overflow-y", "hidden");
scrollPanel.Style.Add("margin-bottom", "10px");
scrollPanel.Controls.Add(chart1);
if (dataSourceChart.ChartType == SeriesChartType.Pie)
{
foreach (Model.DataSourceTeam dataSourceTeam in dataSourceChart.DataSourceTeams)
{
this.lblTotal.Text = "累计值为：";
if (dataSourceTeam.DataPointName == "累计")
{
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
{
this.lblTotal.Text += (dataSourcePoint.PointText + "：" + dataSourcePoint.PointValue + ",");
}
if (this.lblTotal.Text != "累计值为：")
{
this.lblTotal.Text = this.lblTotal.Text.Substring(0, this.lblTotal.Text.LastIndexOf(","));
}
}
else
{
this.lblTotal.Visible = false;
chart1.Series.Add(dataSourceTeam.DataPointName);
chart1.Series[dataSourceTeam.DataPointName].ChartType = dataSourceChart.ChartType;
chart1.Series[dataSourceTeam.DataPointName].Name = dataSourceTeam.DataPointName;
chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;
chart1.Series[dataSourceTeam.DataPointName].BorderWidth = 2;
chart1.Series[dataSourceTeam.DataPointName].Label = "#PERCENT{P1}";
chart1.Series[dataSourceTeam.DataPointName]["DrawingStyle"] = "Cylinder";
int m = 0;
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
{
chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText,
dataSourcePoint.PointValue);
chart1.Series[dataSourceTeam.DataPointName].Points[m].LegendText =
dataSourcePoint.PointText + "#PERCENT{P1}";
m++;
}
}
}
}
else
{
foreach (Model.DataSourceTeam dataSourceTeam in dataSourceChart.DataSourceTeams)
{
this.lblTotal.Text = "累计值为：";
if (dataSourceTeam.DataPointName == "累计")
{
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
{
this.lblTotal.Text += (dataSourcePoint.PointText + "：" + dataSourcePoint.PointValue + ",");
}
if (this.lblTotal.Text != "累计值为：")
{
this.lblTotal.Text = this.lblTotal.Text.Substring(0, this.lblTotal.Text.LastIndexOf(","));
}
}
else
{
this.lblTotal.Visible = false;
chart1.Series.Add(dataSourceTeam.DataPointName);
chart1.Series[dataSourceTeam.DataPointName].ChartType = dataSourceChart.ChartType;
chart1.Series[dataSourceTeam.DataPointName].Name = dataSourceTeam.DataPointName;
chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;
chart1.Series[dataSourceTeam.DataPointName].BorderWidth = 2;
chart1.Series[dataSourceTeam.DataPointName]["DrawingStyle"] = "Cylinder";
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
{
chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText,
dataSourcePoint.PointValue);
}
}
}
}
Controls.Add(scrollPanel);
}
}
}

6
SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1145,6 +1145,8 @@
<Content Include="HSSE\Hazard\ConstructionRiskView.aspx" />
<Content Include="HSSE\Hazard\LocationSelect.aspx" />
<Content Include="HSSE\Hazard\ShowWBS.aspx" />
<Content Include="HSSE\HiddenInspection\CheckStatisticsAnalysis.aspx" />
<Content Include="HSSE\HiddenInspection\CheckStatisticsAnalysisProject.aspx" />
<Content Include="HSSE\Meeting\MeetingManage.aspx" />
<Content Include="HSSE\QualityAudit\SubcontractLeasingProtocolEdit.aspx" />
<Content Include="HSSE\QualityAudit\SubcontractLeasingProtocol.aspx" />
@ -12521,6 +12523,10 @@
<Compile Include="HSSE\Hazard\ShowWBS.aspx.designer.cs">
<DependentUpon>ShowWBS.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\HiddenInspection\CheckStatisticsAnalysis.aspx.cs" />
<Compile Include="HSSE\HiddenInspection\CheckStatisticsAnalysis.aspx.designer.cs" />
<Compile Include="HSSE\HiddenInspection\CheckStatisticsAnalysisProject.aspx.cs" />
<Compile Include="HSSE\HiddenInspection\CheckStatisticsAnalysisProject.aspx.designer.cs" />
<Compile Include="HSSE\Meeting\MeetingManage.aspx.cs">
<DependentUpon>MeetingManage.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

66
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx Normal file
View File

@ -0,0 +1,66 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckStatisticsAnalysis.aspx.cs" Inherits="FineUIPro.Web.HSSE.HiddenInspection.HSSECheckStatisticsAnalysis" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>隐患分析</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-row.yellow {
background-color: YellowGreen;
background-image: none;
}
.f-grid-row.red {
background-color: Yellow;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel3" runat="server" />
<f:Panel ID="Panel3" Margin="24px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit" IFrameUrl="" EnableIFrame="True"
Title="中间面板" ShowBorder="False" ShowHeader="false" BodyPadding="10px" IconFont="_RoundPlus">
</f:Panel>
</Items>
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker runat="server" Required="true" DateFormatString="yyyy-MM-dd" Label="开始日期" EmptyText="请选择日期"
ID="DatePicker1" ShowRedStar="true" DisplayType="Day" ShowTodayButton="false" Width="250px" LabelWidth="90px">
</f:DatePicker>
<f:DatePicker ID="DatePicker2" Required="true" Readonly="false" CompareControl="DatePicker1" DateFormatString="yyyy-MM-dd"
CompareOperator="GreaterThanEqual" CompareMessage="结束日期应该大于开始日期" Label="结束日期"
runat="server" ShowRedStar="true" DisplayType="Day" ShowTodayButton="false" Width="250px" LabelWidth="90px">
</f:DatePicker>
<f:DropDownList ID="drpProject" runat="server" Label="项目" EmptyText="-请选择-" Width="400px"
EnableEdit="true" LabelWidth="70px" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" EnableSimulateTree="True">
</f:DropDownList>
<f:ToolbarFill runat="server" />
<f:Button ID="BtnAnalyse" Text="统计" ToolTip="统计" Icon="ChartPie" runat="server" ValidateForms="Panel3" OnClick="BtnAnalyse_Click"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Panel>
</form>
<script>
function onRefIframe() {
panelCenterRegion.refreshIFrame();
}
</script>
</body>
</html>

56
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx.cs Normal file
View File

@ -0,0 +1,56 @@
using System;
using BLL;
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HSSECheckStatisticsAnalysis : PageBase
{
public string Types
{
get => (string)ViewState["Types"];
set => ViewState["Types"] = value;
}
public string UnitId
{
get => (string)ViewState["UnitId"];
set => ViewState["UnitId"] = value;
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.DatePicker1.Text = new DateTime(DateTime.Now.Year, 1, 1).ToString("yyyy-MM-dd");
this.DatePicker2.Text = DateTime.Now.ToString("yyyy-MM-dd");
UnitId = this.CurrUser.UnitId;
if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sedinId)
{
UnitId = CommonService.GetThisUnitId();
}
BLL.ProjectService.InitProjectDropDownList(this.drpProject,UnitId, false);//项目
Types = Request.Params["Types"] ?? "1";
}
}
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
string ProjectStr = string.Empty;
foreach (ListItem item in this.drpProject.SelectedItemArray)
{
ProjectStr += item.Value + ",";
}
string queryStr = string.Empty;
if (!string.IsNullOrWhiteSpace(queryStr))
{
ShowNotify(queryStr, MessageBoxIcon.Warning);
return;
}
panelCenterRegion.IFrameUrl = $"./CheckStatisticsAnalysisProject.aspx?StartDate={DatePicker1.Text}&EndDate={DatePicker2.Text}&ProjectStr={ProjectStr}&Types={Types}&UnitId={UnitId}";
}
}
}

98
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,98 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HSSECheckStatisticsAnalysis
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel3;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// DatePicker1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker DatePicker1;
/// <summary>
/// DatePicker2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker DatePicker2;
/// <summary>
/// drpProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
}
}

139
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysisProject.aspx Normal file
View File

@ -0,0 +1,139 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckStatisticsAnalysisProject.aspx.cs" Inherits="FineUIPro.Web.HSSE.HiddenInspection.HSSECheckStatisticsAnalysisProject" %>
<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" 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"/>
<title></title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css"/>
<style type="text/css">
.f-grid-row-summary .f-grid-cell-text {
font-weight: bold;
color: red;
}
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-row.yellow {
background-color: YellowGreen;
background-image: none;
}
.f-grid-row.red {
background-color: Yellow;
}
.f-grid-cell[data-color=color1] {
background-color: Yellow;
color: #000000;
}
.f-grid-row-summary .f-grid-cell-text {
font-weight: bold;
color: red;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="TabStrip1" AjaxAspnetControls="divHiddenDangerProject"/>
<f:TabStrip ID="TabStrip1" IsFluid="true" Height="350px" ShowBorder="true" TabPosition="Top"
EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server">
<Tabs>
<f:Tab Title="数据分析" BodyPadding="10px" Layout="Fit" runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="问题分析表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" AllowCellEditing="true"
ClicksToEdit="1" DataIDField="ProjectId" AllowSorting="true" SortField="ProjectId"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowColumnLocking="true"
AllowPaging="false" IsDatabasePaging="false" PageSize="50" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableRowClickEvent="True" EnableSummary="true" SummaryPosition="Bottom">
<Toolbars>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill runat="server"/>
<f:Button ID="btnQuery" ToolTip="查询" Text="查询" Icon="SystemSearch" runat="server" EnablePostBack="true" Hidden="True"
OnClick="btnQuery_OnClick">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center" EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="500px" ColumnID="ProjectName" DataField="ProjectName"
SortField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:GroupField HeaderText="巡检数量" TextAlign="Center" HeaderTextAlign="Center">
<Columns>
<f:RenderField HeaderText="待整改" ColumnID="UNCloseNum" DataField="UNCloseNum" ExpandUnusedSpace="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField HeaderText="已关闭" ColumnID="CloseNum" DataField="CloseNum" ExpandUnusedSpace="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField HeaderText="合计" ColumnID="HJNum" DataField="HJNum" ExpandUnusedSpace="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="150px" ColumnID="ProjectRate" DataField="ProjectRate" SortField="ProjectRate"
FieldType="String" HeaderText="关闭总占比" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Tab>
<f:Tab Title="图表分析" BodyPadding="10px"
runat="server">
<Items>
<f:DropDownList ID="drpChartType" runat="server" LabelWidth="100px" Label="图形类别" AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" LabelAlign="Right">
</f:DropDownList>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpHiddenDangerUnit" Margin="0 0 0 0">
<div id="divHiddenDangerProject">
<uc1:ChartControl ID="ChartHiddenDangerProject" runat="server"/>
</div>
</f:ContentPanel>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
<f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true"
Title="编辑PHTGL_ContractTrack" EnableIFrame="true" Height="650px"
Width="1200px">
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="650px">
</f:Window>
</form>
<script type="text/javascript">
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</body>
</html>

576
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysisProject.aspx.cs Normal file
View File

@ -0,0 +1,576 @@
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HSSECheckStatisticsAnalysisProject : PageBase
{
public DataTable ChartTable
{
get { return (DataTable)ViewState["ChartTable"]; }
set { ViewState["ChartTable"] = value; }
}
/// <summary>
/// 开始年月
/// </summary>
public string StartDate
{
get => (string)ViewState["StartDate"];
set => ViewState["StartDate"] = value;
}
/// <summary>
/// 结束年月
/// </summary>
public string EndDate
{
get => (string)ViewState["EndDate"];
set => ViewState["EndDate"] = value;
}
public string UnitId
{
get => (string)ViewState["UnitId"];
set => ViewState["UnitId"] = value;
}
public bool ShowHsse
{
get => (bool)ViewState["ShowHsse"];
set => ViewState["ShowHsse"] = value;
}
public bool ShowEnvironment
{
get => (bool)ViewState["ShowEnvironment"];
set => ViewState["ShowEnvironment"] = value;
}
public bool ShowCqms
{
get => (bool)ViewState["ShowCqms"];
set => ViewState["ShowCqms"] = value;
}
public List<string> projects = new List<string>();
#region Page_Init
// 注意：动态创建的代码需要放置于Page_Init（不是Page_Load），这样每次构造页面时都会执行
protected void Page_Init(object sender, EventArgs e)
{
string ProblemTypes = Request.Params["Types"];
ShowHsse = ProblemTypes.Contains("1");
ShowCqms = ProblemTypes.Contains("2");
ShowEnvironment = ProblemTypes.Contains("3");
InitGrid();
}
private void InitGrid()
{
StartDate = Request.Params["StartDate"];
EndDate = Request.Params["EndDate"];
UnitId = Request.Params["UnitId"];
string ProjectStr = Request.Params["ProjectStr"];
if (!string.IsNullOrWhiteSpace(ProjectStr))
{
var projectlst = ProjectStr.Split(',');
foreach (var un in projectlst)
{
if (!string.IsNullOrWhiteSpace(un))
{
projects.Add(un);
}
}
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.drpChartType.DataTextField = "ConstText";
this.drpChartType.DataValueField = "ConstValue";
this.drpChartType.DataSource = BLL.ConstValue.drpConstItemList(ConstValue.Group_ChartType);
this.drpChartType.DataBind();
// 绑定表格
this.BindGrid();
AnalyseData();
}
}
#region 绑定数据
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
ChartTable = new DataTable();
ChartTable.Columns.Add("项目");
ChartTable.Columns.Add("待整改数");
ChartTable.Columns.Add("已关闭数");
DateTime start = DateTime.Parse(StartDate);
DateTime end = DateTime.Parse(EndDate);
var sublist = (from x in Funs.DB.Base_Project
where (x.ProjectState == null || x.ProjectState == BLL.Const.ProjectState_1) &&
(x.IsDelete == null || x.IsDelete == false) && x.UnitId == UnitId
orderby x.ProjectCode descending
select x).ToList();
var allHazardList = new List<TempHazardModel>();
if (ShowHsse)
{
allHazardList = (from x in Funs.DB.View_Hazard_HazardRegister
where x.CheckTime.HasValue && x.CheckTime.Value >= start && x.CheckTime.Value <= end
select new TempHazardModel
{
ProjectId = x.ProjectId,
ProjectName = x.ProjectName,
States = x.States,
CheckTime = x.CheckTime
}).ToList();
}
if (ShowCqms)
{
allHazardList = (from x in Funs.DB.Check_CheckControl
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pt
from p in pt
join y in Funs.DB.Check_CheckControl on x.CheckControlCode equals y.CheckControlCode into yt
from y in yt
where x.CheckDate.HasValue && x.CheckDate.Value >= start && x.CheckDate.Value <= end
select new TempHazardModel
{
ProjectId = x.ProjectId,
ProjectName = p.ProjectName,
States = y.State,
CheckTime = x.CheckDate
}).ToList();
}
if (projects.Count > 0)
{
allHazardList = allHazardList.Where(x => projects.Contains(x.ProjectId)).ToList();
}
List<AnalysisData> dataList = new List<AnalysisData>();
foreach (var item in sublist) //项目分组
{
if (projects.Count > 0 && !(projects.Where(x => x == item.ProjectId).Any()))
{
continue;
}
AnalysisData analysisData = new AnalysisData();
var projectHazardList = from x in allHazardList
where x.ProjectId == item.ProjectId
select x; //当前项目所有隐患
int closeList = 0;
if (ShowHsse)
{
closeList = projectHazardList.Where(x => x.States == "3").Count(); //已闭环
}
if (ShowCqms)
{
closeList = projectHazardList.Where(x => x.States == "7").Count(); //已闭环
}
analysisData.ProjectId = item.ProjectId;
analysisData.ProjectName = !string.IsNullOrEmpty(item.ShortName) ? item.ShortName : item.ProjectName;
analysisData.HJNum = projectHazardList.Count();
analysisData.CloseNum = closeList;
analysisData.UNCloseNum = projectHazardList.Count() - closeList;
if (projectHazardList.Count() > 0)
{
double rate = closeList / (double)projectHazardList.Count() * 100;
analysisData.ProjectRate = rate.ToString("F2") + "%"; // 保留两位小数
}
else
{
// 处理分母为零的情况，例如设置一个默认值或抛出异常
analysisData.ProjectRate = "0.00%"; // 或者其他适当的默认值
}
dataList.Add(analysisData);
//chart图表
DataRow chartTableRow = ChartTable.NewRow();
chartTableRow["项目"] = !string.IsNullOrEmpty(item.ShortName) ? item.ShortName : item.ProjectName;
chartTableRow["待整改数"] = projectHazardList.Count() - closeList;
chartTableRow["已关闭数"] = closeList;
ChartTable.Rows.Add(chartTableRow);
}
Grid1.RecordCount = dataList.Count;
Grid1.DataSource = dataList;
Grid1.DataBind();
// 数据合计
OutputSummaryData(dataList);
}
/// <summary>
/// 数据合计
/// </summary>
/// <param name="source"></param>
private void OutputSummaryData(List<AnalysisData> source)
{
JObject summary = new JObject();
summary.Add("ProjectName", "合计");
int UNCloseNumAll = 0;
int CloseNumAll = 0;
int HJNumAll = 0;
foreach (var analysisData in source)
{
UNCloseNumAll += Convert.ToInt32(analysisData.UNCloseNum);
CloseNumAll += Convert.ToInt32(analysisData.CloseNum);
HJNumAll += Convert.ToInt32(analysisData.HJNum);
}
summary.Add("UNCloseNum", UNCloseNumAll);
summary.Add("CloseNum", CloseNumAll);
summary.Add("HJNum", HJNumAll);
Grid1.SummaryData = summary;
}
#endregion
#region GV 数据操作
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
this.Grid1.PageIndex = e.NewPageIndex;
this.BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
this.Grid1.SortDirection = e.SortDirection;
this.Grid1.SortField = e.SortField;
this.BindGrid();
}
#endregion
#region 数据编辑事件
protected void btnQuery_OnClick(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 关闭弹出窗
/// <summary>
/// 关闭弹出窗
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition",
"attachment; filename=" +
System.Web.HttpUtility.UrlEncode("安全巡检统计分析表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = 500;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
private string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
MultiHeaderTable mht = new MultiHeaderTable();
mht.ResolveMultiHeaderTable(Grid1.Columns);
sb.Append("<meta http-equiv=\"Content-Type\" content=\"application/vnd.ms-excel;charset=utf-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
foreach (List<object[]> rows in mht.MultiTable)
{
sb.Append("<tr>");
foreach (object[] cell in rows)
{
int rowspan = Convert.ToInt32(cell[0]);
int colspan = Convert.ToInt32(cell[1]);
GridColumn column = cell[2] as GridColumn;
sb.AppendFormat("<th{0}{1}{2}>{3}</th>",
rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "",
colspan != 1 ? " colspan=\"" + colspan + "\"" : "",
colspan != 1 ? " style=\"text-align:center;\"" : "",
column.HeaderText);
}
sb.Append("</tr>");
}
foreach (GridRow row in grid.Rows)
{
sb.Append("<tr>");
foreach (GridColumn column in mht.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber")
{
html = (row.FindControl("lblNumber") as System.Web.UI.WebControls.Label).Text;
}
else if (column.ColumnID == "tfGender")
{
html = (row.FindControl("labGender") as System.Web.UI.WebControls.Label).Text;
}
sb.AppendFormat("<td>{0}</td>", html);
}
sb.Append("</tr>");
}
sb.Append("</table>");
return sb.ToString();
}
#region 多表头处理
/// <summary>
/// 多表头处理
/// </summary>
public class MultiHeaderTable
{
// 包含 rowspan，colspan 的多表头，方便生成 HTML 的 table 标签
public List<List<object[]>> MultiTable = new List<List<object[]>>();
// 最终渲染的列数组
public List<GridColumn> Columns = new List<GridColumn>();
public void ResolveMultiHeaderTable(GridColumnCollection columns)
{
List<object[]> row = new List<object[]>();
foreach (GridColumn column in columns)
{
object[] cell = new object[4];
cell[0] = 1; // rowspan
cell[1] = 1; // colspan
cell[2] = column;
cell[3] = null;
row.Add(cell);
}
ResolveMultiTable(row, 0);
ResolveColumns(row);
}
private void ResolveColumns(List<object[]> row)
{
foreach (object[] cell in row)
{
GroupField groupField = cell[2] as GroupField;
if (groupField != null && groupField.Columns.Count > 0)
{
List<object[]> subrow = new List<object[]>();
foreach (GridColumn column in groupField.Columns)
{
subrow.Add(new object[]
{
1,
1,
column,
groupField
});
}
ResolveColumns(subrow);
}
else
{
Columns.Add(cell[2] as GridColumn);
}
}
}
private void ResolveMultiTable(List<object[]> row, int level)
{
List<object[]> nextrow = new List<object[]>();
foreach (object[] cell in row)
{
GroupField groupField = cell[2] as GroupField;
if (groupField != null && groupField.Columns.Count > 0)
{
// 如果当前列包含子列，则更改当前列的 colspan，以及增加父列（向上递归）的colspan
cell[1] = Convert.ToInt32(groupField.Columns.Count);
PlusColspan(level - 1, cell[3] as GridColumn, groupField.Columns.Count - 1);
foreach (GridColumn column in groupField.Columns)
{
nextrow.Add(new object[]
{
1,
1,
column,
groupField
});
}
}
}
MultiTable.Add(row);
// 如果当前下一行，则增加上一行（向上递归）中没有子列的列的 rowspan
if (nextrow.Count > 0)
{
PlusRowspan(level);
ResolveMultiTable(nextrow, level + 1);
}
}
private void PlusRowspan(int level)
{
if (level < 0)
{
return;
}
foreach (object[] cells in MultiTable[level])
{
GroupField groupField = cells[2] as GroupField;
if (groupField != null && groupField.Columns.Count > 0)
{
}
else
{
cells[0] = Convert.ToInt32(cells[0]) + 1;
}
}
PlusRowspan(level - 1);
}
private void PlusColspan(int level, GridColumn parent, int plusCount)
{
if (level < 0)
{
return;
}
foreach (object[] cells in MultiTable[level])
{
GridColumn column = cells[2] as GridColumn;
if (column == parent)
{
cells[1] = Convert.ToInt32(cells[1]) + plusCount;
PlusColspan(level - 1, cells[3] as GridColumn, plusCount);
}
}
}
}
#endregion
#endregion
protected void drpChartType_SelectedIndexChanged(object sender, EventArgs e)
{
AnalyseData();
}
private void AnalyseData()
{
DataView dv = new DataView(ChartTable);
var tb = dv.ToTable();
DataTable newTable = new DataTable();
foreach (DataColumn column in tb.Columns)
{
newTable.Columns.Add(column.ColumnName, column.DataType);
}
// 将数据从原始表复制到新的DataTable中
foreach (DataRow row in tb.Rows)
{
DataRow newRow = newTable.NewRow();
foreach (DataColumn column in newTable.Columns)
{
newRow[column.ColumnName] = row[column.ColumnName];
}
newTable.Rows.Add(newRow);
}
this.ChartHiddenDangerProject.CreateChart1(BLL.ChartControlService.GetDataSourceChart(newTable, "安全巡检统计分析",
this.drpChartType.SelectedValue, 1150, 450, false));
}
public class AnalysisData
{
public string ProjectId { get; set; }
public string ProjectName { get; set; }
public int UNCloseNum { get; set; }
public int CloseNum { get; set; }
public int HJNum { get; set; }
public string ProjectRate { get; set; }
}
public class TempHazardModel
{
public string ProjectId { get; set; }
public string ProjectName { get; set; }
public string States { get; set; }
public DateTime? CheckTime { get; set; }
}
}
}

134
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysisProject.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,134 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HSSECheckStatisticsAnalysisProject
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// TabStrip1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// drpChartType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpChartType;
/// <summary>
/// cpHiddenDangerUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel cpHiddenDangerUnit;
/// <summary>
/// ChartHiddenDangerProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::Web.Controls.ChartControl ChartHiddenDangerProject;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
}
}

5
SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
View File

@ -103,6 +103,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
this.drpProblemTypes.DataSource = ProblemTypes;
this.drpProblemTypes.DataBind();
Funs.FineUIPleaseSelect(this.drpProblemTypes);
var getProject = ProjectService.GetProjectByProjectId(ProjectId);
if (getProject != null && getProject.IsAutoFetch == true)
{
APIHazardRegisterSyncService.getHazardRegisterLists(this.ProjectId);
}
// 绑定表格
BindGrid();
}

2
SUBQHSE/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
View File

@ -24,6 +24,8 @@
<Items>
<f:CheckBox ID="ckbIsFace" runat="server" Label="移动端人脸识别" Text="是否启用" LabelWidth="200">
</f:CheckBox>
<f:CheckBox ID="ckbIsAutoFetch" runat="server" Label="自动拉取检查数据" Text="是否启用" LabelWidth="200">
</f:CheckBox>
<f:Label runat="server"></f:Label>
<f:Button runat="server" Text="坐标范围" OnClick="btnSetMap_Click" ID="btnSetMap" Hidden="true" ></f:Button>
</Items>

6
SUBQHSE/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs
View File

@ -93,6 +93,7 @@ namespace FineUIPro.Web.common.ProjectSet
if (getProject != null)
{
getProject.IsFace = this.ckbIsFace.Checked;
getProject.IsAutoFetch = this.ckbIsAutoFetch.Checked;
Funs.DB.SubmitChanges();
}
#endregion
@ -454,7 +455,10 @@ namespace FineUIPro.Web.common.ProjectSet
{
this.ckbIsFace.Checked = true;
}
if (getProject != null && getProject.IsAutoFetch == true)
{
this.ckbIsAutoFetch.Checked = true;
}
var q = from x in Funs.DB.Project_Sys_Set where x.ProjectId == projectId select x;
if (q.Count() > 0)
{

9
SUBQHSE/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs generated
View File

@ -77,6 +77,15 @@ namespace FineUIPro.Web.common.ProjectSet
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsFace;
/// <summary>
/// ckbIsAutoFetch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsAutoFetch;
/// <summary>
/// btnSetMap 控件。
/// </summary>

9
SUBQHSE/FineUIPro.Web/index_gateway.aspx.cs
View File

@ -53,6 +53,15 @@ namespace FineUIPro.Web
if (!IsPostBack)
{
int unitType = CommonService.GetUnitTypeByUserId(this.CurrUser.UserId);
if (unitType == 0)
{
Button3.Text = "公司";
}
else if (unitType == 1)
{
Button3.Text = "分公司";
}
this.CurrUser.LoginProjectId = null;
}
}

1
SUBQHSE/Model/APIItem/DataShare/PersonSyncData.cs
View File

@ -119,6 +119,7 @@ namespace Model
public string PostType { get; set; }
public bool? IsHsse { get; set; }
public bool? IsCQMS { get; set; }
public bool? IsCQMSCheck { get; set; }
public string TeamGroupName { get; set; }
public string WorkAreaName { get; set; }
}

9
SUBQHSE/Model/APIItem/HSSE/QCRegistrationItem.cs
View File

@ -158,6 +158,13 @@ namespace Model{
get;
set;
}
/// <summary>
/// 颁奖年份
/// </summary>
public DateTime? AwardYear
{
get;
set;
}
}
}

48
SUBQHSE/Model/Model.cs
View File

@ -28009,6 +28009,8 @@ namespace Model
private string _SubjectUnitWebUrl;
private System.Nullable<bool> _IsAutoFetch;
private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@ -28767,6 +28769,8 @@ namespace Model
partial void OnSubjectUnitApiUrlChanged();
partial void OnSubjectUnitWebUrlChanging(string value);
partial void OnSubjectUnitWebUrlChanged();
partial void OnIsAutoFetchChanging(System.Nullable<bool> value);
partial void OnIsAutoFetchChanged();
#endregion
public Base_Project()
@ -29957,6 +29961,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAutoFetch", DbType="Bit")]
public System.Nullable<bool> IsAutoFetch
{
get
{
return this._IsAutoFetch;
}
set
{
if ((this._IsAutoFetch != value))
{
this.OnIsAutoFetchChanging(value);
this.SendPropertyChanging();
this._IsAutoFetch = value;
this.SendPropertyChanged("IsAutoFetch");
this.OnIsAutoFetchChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
{
@ -345256,6 +345280,8 @@ namespace Model
private string _AwardType;
private System.Nullable<System.DateTime> _AwardYear;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -345290,6 +345316,8 @@ namespace Model
partial void OnIsUpdateChanged();
partial void OnAwardTypeChanging(string value);
partial void OnAwardTypeChanged();
partial void OnAwardYearChanging(System.Nullable<System.DateTime> value);
partial void OnAwardYearChanged();
#endregion
public QCManage_QCGroupRegistration()
@ -345597,6 +345625,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AwardYear", DbType="DateTime")]
public System.Nullable<System.DateTime> AwardYear
{
get
{
return this._AwardYear;
}
set
{
if ((this._AwardYear != value))
{
this.OnAwardYearChanging(value);
this.SendPropertyChanging();
this._AwardYear = value;
this.SendPropertyChanged("AwardYear");
this.OnAwardYearChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;