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

看板、安全风险因素、教材库

This commit is contained in:
夏菊 2026-04-03 14:17:06 +08:00
parent 5f7620614d
commit 6a6d1eb792
15 changed files with 489 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
DataBase/版本日志/SGGLDB_V2026-04-03-xiaj（Sp_HazardFactor_Statistics）.sql Normal file
View File

@ -0,0 +1,45 @@
CREATE PROCEDURE [dbo].[Sp_HazardFactor_Statistics]
@year NVARCHAR(20)=NULL,
@month NVARCHAR(20)=NULL,
@projectId NVARCHAR(200)=NULL
AS
BEGIN
IF @projectId IS NULL OR @projectId = ''
BEGIN
WITH CTE AS (
SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tbb.ProjectName,tba.BaseRiskLevel
FROM HazardFactor_Safety AS tba WITH(NOLOCK)
LEFT JOIN Base_Project AS tbb WITH(NOLOCK) ON tbb.ProjectId = tba.ProjectId
WHERE 1=1 AND tba.State = 1 AND tba.Year = @year AND tba.Month = @month
)
SELECT BaseRiskLevel AS Title,COUNT(1) AS Num
FROM CTE
WHERE rn = 1
GROUP BY BaseRiskLevel
END
ELSE
BEGIN
WITH CTE AS (
SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tbb.ProjectName,tba.BaseRiskLevel
FROM HazardFactor_Safety AS tba WITH(NOLOCK)
LEFT JOIN Base_Project AS tbb WITH(NOLOCK) ON tbb.ProjectId = tba.ProjectId
WHERE 1=1 AND tba.State = 1 AND tba.Year = @year AND tba.Month = @month AND tba.ProjectId = @projectId
)
SELECT BaseRiskLevel AS Title,COUNT(1) AS Num
FROM CTE
WHERE rn = 1
GROUP BY BaseRiskLevel
END
END
GO

11
DataBase/版本日志/SGGLDB_V2026-04-05-xiaj.sql Normal file
View File

@ -0,0 +1,11 @@
--初始化安全生产开始日期
IF NOT EXISTS (SELECT * FROM Sys_Const WHERE GroupId = 'WorkSafetyStartDate')
BEGIN
INSERT [dbo].[Sys_Const] ([ID], [ConstValue], [ConstText], [SortIndex], [GroupId], [Remark])
VALUES (N'3145B013-16ED-4303-A1DF-F97EBB5DD127', N'2025-05-20', N'WorkSafetyStartDate', N'1', N'WorkSafetyStartDate', N'安全生产开始日期（说明：用于计算看板安全生产累计天数。）')
END
GO

4
SGGL/BLL/Common/ConstValue.cs
View File

@ -395,6 +395,10 @@ namespace BLL
/// 穿透界面Referer白名单
/// </summary>
public const string Group_SafeReferer = "SafeReferer";
/// <summary>
/// 安全生产开始日期
/// </summary>
public const string Group_WorkSafetyStartDate = "WorkSafetyStartDate";
#endregion
public static void DeleteConstValueBygroupId(string groupId)

20
SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs
View File

@ -8,7 +8,6 @@ namespace BLL
/// </summary>
public class CompanyTrainingService
{
public static Model.CNPCDB db = Funs.DB;
/// <summary>
/// 根据主键获取公司培训
@ -17,6 +16,7 @@ namespace BLL
/// <returns></returns>
public static Model.Training_CompanyTraining GetCompanyTrainingById(string companyTrainingId)
{
var db = Funs.DB;
return db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTrainingId);
}
@ -26,6 +26,7 @@ namespace BLL
/// <param name="companyTraining"></param>
public static void AddCompanyTraining(Model.Training_CompanyTraining companyTraining)
{
var db = Funs.DB;
Model.Training_CompanyTraining newCompanyTraining = new Model.Training_CompanyTraining();
newCompanyTraining.CompanyTrainingId = companyTraining.CompanyTrainingId;
newCompanyTraining.CompanyTrainingCode = companyTraining.CompanyTrainingCode;
@ -42,6 +43,7 @@ namespace BLL
/// <param name="companyTraining"></param>
public static void UpdateCompanyTraining(Model.Training_CompanyTraining companyTraining)
{
var db = Funs.DB;
Model.Training_CompanyTraining newCompanyTraining = db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTraining.CompanyTrainingId);
if (newCompanyTraining != null)
{
@ -59,9 +61,21 @@ namespace BLL
/// <param name="companyTrainingId"></param>
public static void DeleteCompanyTraining(string companyTrainingId)
{
var db = Funs.DB;
Model.Training_CompanyTraining companyTraining = db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTrainingId);
if (companyTraining!=null)
if (companyTraining != null)
{
var getItems = from x in Funs.DB.Training_CompanyTrainingItem
where x.CompanyTrainingId == companyTraining.CompanyTrainingId
select x;
if (getItems.Count() > 0)
{
foreach (var item in getItems)
{
BLL.CommonService.DeleteAttachFileById(item.TestTrainingIds);
}
db.Training_CompanyTrainingItem.DeleteAllOnSubmit(getItems);
}
db.Training_CompanyTraining.DeleteOnSubmit(companyTraining);
db.SubmitChanges();
}
@ -127,7 +141,7 @@ namespace BLL
/// <param name="dropName"></param>
/// <param name="projectId"></param>
/// <param name="isShowPlease"></param>
public static void InitCompanyTrainingDropDownList(FineUIPro.DropDownList dropName,string supItem, bool isShowPlease)
public static void InitCompanyTrainingDropDownList(FineUIPro.DropDownList dropName, string supItem, bool isShowPlease)
{
dropName.DataValueField = "CompanyTrainingId";
dropName.DataTextField = "CompanyTrainingName";

5
SGGL/BLL/ReportManage/HazardFactor/HazardFactorSafetyService.cs
View File

@ -1,6 +1,8 @@
using Model;
using Microsoft.Office.Interop.Word;
using Model;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
@ -125,5 +127,6 @@ namespace BLL
{
return Funs.DB.HazardFactor_Safety.FirstOrDefault(e => e.ProjectId == projectId && e.Year == year && e.Month == month);
}
}
}

222
SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx
View File

@ -38,6 +38,13 @@
<f:Label ID="Label7" runat="server" Text="说明：与集团数据交换数据是否自动提取。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>--%>
<f:FormRow ColumnWidths="35% 65%">
<Items>
<f:DatePicker ID="drpWorkSafetyStartDate" runat="server" Label="安全生产开始日期" DateFormatString="yyyy-MM-dd" LabelWidth="230px">
</f:DatePicker>
<f:Label ID="Label25" runat="server" Text="说明：用于计算看板安全生产累计天数。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="35% 65%">
<Items>
<f:NumberBox ID="txtNumberBox" runat="server" Label="有效期警示" LabelWidth="230px"></f:NumberBox>
@ -69,20 +76,20 @@
</f:FormRow>
<f:FormRow ColumnWidths="35% 1% 20% 30%">
<Items>
<f:NumberBox ID="txtMarch" runat="server" Label="员工绩效考核第一季度生成时间" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="230px" ShowRedStar="true" Required="true">
<f:NumberBox ID="txtMarch" runat="server" Label="员工绩效考核第一季度生成时间" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="230px" ShowRedStar="true" Required="true">
</f:NumberBox>
<f:Label ID="Label1" runat="server" Text="月" MarginLeft="5px"></f:Label>
<f:NumberBox ID="txtMarchday" runat="server" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="220px" ShowRedStar="true" Required="true">
<f:NumberBox ID="txtMarchday" runat="server" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="220px" ShowRedStar="true" Required="true">
</f:NumberBox>
<f:Label ID="Label2" runat="server" Text="日" MarginLeft="5px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="35% 1% 20% 30%">
<Items>
<f:NumberBox ID="txtJune" runat="server" Label="员工绩效考核第二季度生成时间" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="230px" ShowRedStar="true" Required="true">
<f:NumberBox ID="txtJune" runat="server" Label="员工绩效考核第二季度生成时间" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="230px" ShowRedStar="true" Required="true">
</f:NumberBox>
<f:Label ID="Label3" runat="server" Text="月" MarginLeft="5px"></f:Label>
<f:NumberBox ID="txtJuneday" runat="server" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="220px" ShowRedStar="true" Required="true">
<f:NumberBox ID="txtJuneday" runat="server" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="220px" ShowRedStar="true" Required="true">
</f:NumberBox>
<f:Label ID="Label4" runat="server" Text="日" MarginLeft="5px"></f:Label>
</Items>
@ -90,20 +97,20 @@
<f:FormRow ColumnWidths="35% 1% 20% 30%">
<Items>
<f:NumberBox ID="txtSeptember" runat="server" Label="员工绩效考核第三季度生成时间" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="230px" ShowRedStar="true" Required="true">
<f:NumberBox ID="txtSeptember" runat="server" Label="员工绩效考核第三季度生成时间" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="230px" ShowRedStar="true" Required="true">
</f:NumberBox>
<f:Label ID="Label5" runat="server" Text="月" MarginLeft="5px"></f:Label>
<f:NumberBox ID="txtSeptemberday" runat="server" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="220px" ShowRedStar="true" Required="true">
<f:NumberBox ID="txtSeptemberday" runat="server" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="220px" ShowRedStar="true" Required="true">
</f:NumberBox>
<f:Label ID="Label6" runat="server" Text="日" MarginLeft="5px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="35% 1% 20% 30%">
<Items>
<f:NumberBox ID="txtDecember" runat="server" Label="员工绩效考核第四季度生成时间" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="230px" ShowRedStar="true" Required="true">
<f:NumberBox ID="txtDecember" runat="server" Label="员工绩效考核第四季度生成时间" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="230px" ShowRedStar="true" Required="true">
</f:NumberBox>
<f:Label ID="Label7" runat="server" Text="月" MarginLeft="5px"></f:Label>
<f:NumberBox ID="txtDecemberday" runat="server" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="220px" ShowRedStar="true" Required="true">
<f:NumberBox ID="txtDecemberday" runat="server" NoDecimal="true" NoNegative="true" MinValue="1" LabelWidth="220px" ShowRedStar="true" Required="true">
</f:NumberBox>
<f:Label ID="Label13" runat="server" Text="日" MarginLeft="5px"></f:Label>
</Items>
@ -121,13 +128,13 @@
<f:TextBox ID="txtESBSerVerUrl" runat="server" Label="集团ESB地址" LabelWidth="230px"></f:TextBox>
<f:TextBox ID="txtClientId" runat="server" Label="ClientId" LabelWidth="230px"></f:TextBox>
<f:Button ID="txtTestPost" Icon="SystemSave" Text="测试对接" runat="server" ValidateForms="SimpleForm1"
OnClick="txtTestPost_OnClick">
OnClick="txtTestPost_OnClick">
</f:Button>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtRefererWhitelist" Label="数据穿透白名单"></f:TextArea>
<f:TextArea runat="server" ID="txtRefererWhitelist" Label="数据穿透白名单"></f:TextArea>
</Items>
</f:FormRow>
</Rows>
@ -138,7 +145,7 @@
<f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnArrowRefresh" Icon="ArrowRefresh" runat="server" Hidden="true" ToolTip="多附件路径转换" OnClick="btnArrowRefresh_Click">
</f:Button>
</f:Button>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
@ -155,8 +162,9 @@
<f:RadioItem Value="MenuType_S" Text="本部" />
<f:RadioItem Value="MenuType_P" Text="项目" Selected="true" />
</f:RadioButtonList>
<f:DropDownList runat="server" Label="菜单类型" LabelWidth="80px" Width="220px" AutoPostBack="true" ID="drpSuperMenu"
OnSelectedIndexChanged="drpSuperMenu_SelectedIndexChanged"></f:DropDownList>
<f:DropDownList runat="server" Label="菜单类型" LabelWidth="80px" Width="220px" AutoPostBack="true" ID="drpSuperMenu"
OnSelectedIndexChanged="drpSuperMenu_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownBox runat="server" ID="drpMenu" Values="henan" EmptyText="请选择末级菜单" Width="500px"
EnableMultiSelect="false" AutoPostBack="true" OnTextChanged="drpMenu_TextChanged" EnableEdit="true">
<PopPanel>
@ -165,106 +173,106 @@
</PopPanel>
</f:DropDownBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnTab2Save" Icon="SystemSave" runat="server" ValidateForms="SimpleForm2"
<f:Button ID="btnTab2Save" Icon="SystemSave" runat="server" ValidateForms="SimpleForm2"
OnClick="btnTab2Save_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:TabStrip ID="TabStrip2" CssClass="f-tabstrip-theme-simple" ShowBorder="true" Height="450px"
<f:TabStrip ID="TabStrip2" CssClass="f-tabstrip-theme-simple" ShowBorder="true" Height="450px"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false"
runat="server" ActiveTabIndex="2">
<Tabs>
<f:Tab ID="TabCode" Title="文档编码" BodyPadding="5px" Layout="Fit" runat="server">
<Items>
<f:Form ID="SimpleForm2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckProjectCode" Label="项目号" LabelWidth="150px"></f:CheckBox>
<f:Label runat="server" Text="说明：编号前是否添加项目代号。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtPrefix" Label="前缀" MaxLength="50" EmptyText="请输入前缀" LabelWidth="150px"></f:TextBox>
<f:Label ID="Label8" runat="server" Text="说明：编号添加前缀的字符。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckUnitCode" Label="单位代号" LabelWidth="150px" Width="500px"></f:CheckBox>
<f:Label ID="Label22" runat="server" Text="说明：编号前是否添加单位代号。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtDigit" Label="流水号位数" NoDecimal="true" NoNegative="true" LabelWidth="150px" ></f:NumberBox>
<f:Label ID="Label23" runat="server" Text="说明：编号最后生成流水号位数。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtSymbol" Label="间隔符" MaxLength="50" ShowRedStar="true" Required="true" LabelWidth="150px"></f:TextBox>
<f:Label ID="Label24" runat="server" Text="说明：前缀字符与流水号之间连接字符。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Tab>
<f:Tab ID="Tab4" Title="模板设置" BodyPadding="5px" Layout="Fit" runat="server">
<Tabs>
<f:Tab ID="TabCode" Title="文档编码" BodyPadding="5px" Layout="Fit" runat="server">
<Items>
<f:HtmlEditor runat="server" Label="模板" ID="txtTemplate" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="400px">
</f:HtmlEditor>
<f:Form ID="SimpleForm2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckProjectCode" Label="项目号" LabelWidth="150px"></f:CheckBox>
<f:Label runat="server" Text="说明：编号前是否添加项目代号。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtPrefix" Label="前缀" MaxLength="50" EmptyText="请输入前缀" LabelWidth="150px"></f:TextBox>
<f:Label ID="Label8" runat="server" Text="说明：编号添加前缀的字符。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckUnitCode" Label="单位代号" LabelWidth="150px" Width="500px"></f:CheckBox>
<f:Label ID="Label22" runat="server" Text="说明：编号前是否添加单位代号。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtDigit" Label="流水号位数" NoDecimal="true" NoNegative="true" LabelWidth="150px"></f:NumberBox>
<f:Label ID="Label23" runat="server" Text="说明：编号最后生成流水号位数。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtSymbol" Label="间隔符" MaxLength="50" ShowRedStar="true" Required="true" LabelWidth="150px"></f:TextBox>
<f:Label ID="Label24" runat="server" Text="说明：前缀字符与流水号之间连接字符。" MarginLeft="50px"></f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>
</f:Tab>
<f:Tab ID="Tab5" Title="单据流程" BodyPadding="5px" Layout="Fit" runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" EnableColumnLines="true" EnableColumnMove="true"
runat="server" BoxFlex="1" DataKeyNames="FlowOperateId" AllowCellEditing="true" ClicksToEdit="2"
DataIDField="FlowOperateId" AllowSorting="true" SortField="FlowStep,GroupNum,OrderNum" SortDirection="ASC" Height="320px"
OnSort="Grid1_Sort" AllowPaging="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar4" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnFlowOperateNew" ToolTip="增加" Icon="Add" runat="server" OnClick="btnFlowOperateNew_Click" />
<f:Button ID="btnFlowOperateDelete" ToolTip="删除" Icon="Delete" ConfirmText="确定删除当前数据？" OnClick="btnFlowOperateDelete_Click" runat="server">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="100px" ColumnID="FlowStep" DataField="FlowStep" FieldType="Int"
HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="GroupNum" DataField="GroupNum" FieldType="Int"
HeaderText="组号" HeaderTextAlign="Center" TextAlign="Center" Hidden="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="OrderNum" DataField="OrderNum" FieldType="Int"
HeaderText="组内序号" HeaderTextAlign="Center" TextAlign="Center" Hidden="true">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="AuditFlowName" DataField="AuditFlowName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="300px" HeaderText="审批角色" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
<ItemTemplate>
<asp:Label ID="Label27" runat="server" Text='<%# ConvertRole(Eval("RoleId")) %>' ></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:CheckBoxField Width="80px" RenderAsStaticField="true" TextAlign="Center" DataField="IsFlowEnd" HeaderText="是否结束" />
</Columns>
<Listeners>
<f:Listener Event="dataload" Handler="onGridDataLoad" />
</Listeners>
</f:Grid>
</Items>
<f:Tab ID="Tab4" Title="模板设置" BodyPadding="5px" Layout="Fit" runat="server">
<Items>
<f:HtmlEditor runat="server" Label="模板" ID="txtTemplate" ShowLabel="false"
Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="400px">
</f:HtmlEditor>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
<f:Tab ID="Tab5" Title="单据流程" BodyPadding="5px" Layout="Fit" runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" EnableColumnLines="true" EnableColumnMove="true"
runat="server" BoxFlex="1" DataKeyNames="FlowOperateId" AllowCellEditing="true" ClicksToEdit="2"
DataIDField="FlowOperateId" AllowSorting="true" SortField="FlowStep,GroupNum,OrderNum" SortDirection="ASC" Height="320px"
OnSort="Grid1_Sort" AllowPaging="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar4" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnFlowOperateNew" ToolTip="增加" Icon="Add" runat="server" OnClick="btnFlowOperateNew_Click" />
<f:Button ID="btnFlowOperateDelete" ToolTip="删除" Icon="Delete" ConfirmText="确定删除当前数据？" OnClick="btnFlowOperateDelete_Click" runat="server">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="100px" ColumnID="FlowStep" DataField="FlowStep" FieldType="Int"
HeaderText="步骤" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="GroupNum" DataField="GroupNum" FieldType="Int"
HeaderText="组号" HeaderTextAlign="Center" TextAlign="Center" Hidden="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="OrderNum" DataField="OrderNum" FieldType="Int"
HeaderText="组内序号" HeaderTextAlign="Center" TextAlign="Center" Hidden="true">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="AuditFlowName" DataField="AuditFlowName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="300px" HeaderText="审批角色" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
<ItemTemplate>
<asp:Label ID="Label27" runat="server" Text='<%# ConvertRole(Eval("RoleId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:CheckBoxField Width="80px" RenderAsStaticField="true" TextAlign="Center" DataField="IsFlowEnd" HeaderText="是否结束" />
</Columns>
<Listeners>
<f:Listener Event="dataload" Handler="onGridDataLoad" />
</Listeners>
</f:Grid>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
</f:Tab>
<f:Tab ID="Tab3" Title="考试规则" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server">
@ -372,7 +380,7 @@
<f:NumberBox ID="txtYearActualOutPutValue" Label="施工实际产值(亿元)" runat="server" LabelWidth="180px" Width="280px"
NoNegative="true" DecimalPrecision="2">
</f:NumberBox>
<f:Button ID="btnYearOutPutValue" Icon="ArrowRefresh" runat="server" Text="刷新汇总"
<f:Button ID="btnYearOutPutValue" Icon="ArrowRefresh" runat="server" Text="刷新汇总"
OnClick="btnYearOutPutValue_Click">
</f:Button>
</Items>
@ -416,7 +424,7 @@
</f:Form>
</Items>
</f:Tab>
<f:Tab ID="TabOnlineMenuSet" Title="在线编辑设置" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server">
<f:Tab ID="TabOnlineMenuSet" Title="在线编辑设置" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server">
<Items>
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
@ -443,14 +451,14 @@
<f:Toolbar ID="Toolbar5" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="OnlineMenuSetSave" Icon="SystemSave" runat="server" ValidateForms="frTestSet" Text="保存"
OnClick="OnlineMenuSetSave_OnClick">
OnClick="OnlineMenuSetSave_OnClick">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Tab>
<f:Tab ID="TabHttpLog" Title="接口日志查询" BodyPadding="5px" Height="600" Layout="Fit" EnableIFrame="true" IconFont="Bookmark" IFrameUrl="./HttpLog.aspx" Hidden="true" runat="server">
</f:Tab>
<f:Tab ID="TabHttpLog" Title="接口日志查询" BodyPadding="5px" Height="600" Layout="Fit" EnableIFrame="true" IconFont="Bookmark" IFrameUrl="./HttpLog.aspx" Hidden="true" runat="server">
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
@ -459,7 +467,7 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="640px" Height="450px">
</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="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window2_Close"
Width="800px" Height="600px">
</f:Window>

24
SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs
View File

@ -1,14 +1,15 @@
using System;
using BLL;
using FineUIPro.Web.HSSE.Check;
using Model;
using Newtonsoft.Json;
using RestSharp;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using BLL;
using Newtonsoft.Json;
using RestSharp;
using Model;
using System.Net;
using System.Web;
namespace FineUIPro.Web.SysManage
{
@ -294,6 +295,11 @@ namespace FineUIPro.Web.SysManage
// this.ckSynchronization.Checked = false;
// }
//}
var sysSet1 = BLL.ConstValue.drpConstItemList(BLL.ConstValue.Group_WorkSafetyStartDate).FirstOrDefault();
if (sysSet1 != null)
{
this.drpWorkSafetyStartDate.Text = string.Format("{0:yyyy-MM-dd}", sysSet1.ConstValue);
}
var sysSet2 = BLL.ConstValue.drpConstItemList(BLL.ConstValue.Group_IsMonthReportGetAVG).FirstOrDefault();
if (sysSet2 != null)
{
@ -410,6 +416,12 @@ namespace FineUIPro.Web.SysManage
// }
// Funs.DB.SubmitChanges();
//}
var sysSet1 = BLL.ConstValue.drpConstItemList(BLL.ConstValue.Group_WorkSafetyStartDate).FirstOrDefault();
if (sysSet1 != null)
{
sysSet1.ConstValue = this.drpWorkSafetyStartDate.Text;
db.SubmitChanges();
}
var sysSet2 = BLL.ConstValue.drpConstItemList(BLL.ConstValue.Group_IsMonthReportGetAVG).FirstOrDefault();
if (sysSet2 != null)
{

24
SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.SysManage {
namespace FineUIPro.Web.SysManage
{
public partial class SysConstSet {
public partial class SysConstSet
{
/// <summary>
/// form1 控件。
@ -66,6 +68,24 @@ namespace FineUIPro.Web.SysManage {
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpWorkSafetyStartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker drpWorkSafetyStartDate;
/// <summary>
/// Label25 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label25;
/// <summary>
/// txtNumberBox 控件。
/// </summary>

70
SGGL/FineUIPro.Web/common/main.aspx
View File

@ -135,7 +135,7 @@
</div>
</div>
<div class="center" style="height: 100%">
<div class="aqsc">
<div class="aqsc" :title="form?.projectInfo?.workSafetyStartDateTip">
<span>安全生产累计</span>
<p><span>{{form?.projectInfo?.workSafetyDay1000 || 0}}</span><span>{{form?.projectInfo?.workSafetyDay100 || 0}}</span><span>{{form?.projectInfo?.workSafetyDay10 || 0}}</span><span>{{form?.projectInfo?.workSafetyDay1 || 0}}</span></p>
<span>天</span>
@ -187,7 +187,39 @@
</div>
</div>
</div>
<div class="site_500" style="height: 3.05rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">风险分级管控</span></h2>
<div id="risk" class="site_content">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>重大风险</h6>
<p><span>{{form?.hazardFactor?.majorRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>较大风险</h6>
<p><span>{{form?.hazardFactor?.largerRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>一般风险</h6>
<p><span>{{form?.hazardFactor?.generalRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>低风险</h6>
<p><span>{{form?.hazardFactor?.lowRiskNum}}</span></p>
</div>
</div>
</div>
</div>
<div class="site_500" style="height: 2.275rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">高风险作业许可</span></h2>
<div id="job" class="site_content">
@ -212,40 +244,6 @@
</div>
</div>
</div>
<div class="site_500" style="height: 3.05rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">风险分级管控</span></h2>
<div id="risk" class="site_content">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>重大风险</h6>
<p><span>0</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>较大风险</h6>
<p><span>0</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>一般风险</h6>
<p><span>0</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>低风险</h6>
<p><span>0</span></p>
</div>
</div>
</div>
</div>
<div class="site_500" style="height: 2.275rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">高风险作业许可</span></h2>
<div id="job" class="site_content">

32
SGGL/FineUIPro.Web/common/main.aspx.cs
View File

@ -1,4 +1,6 @@
using BLL;
using FineUIPro.Web.DataShow;
using FineUIPro.Web.SysManage;
using FineUIPro.Web.ZHGL.DataSync;
using Model;
using NPOI.SS.Formula.Functions;
@ -35,11 +37,11 @@ namespace FineUIPro.Web.common
var page = new main();
MainSevice mainSevice = new MainSevice(page.CurrUser.UserId);
// 获取数据
//获取数据
var hsseData = Task.Run(() => mainSevice.GetHsseData()).Result;
//var hiddenDangerList = mainSevice.GetDataHiddenDangerDetailItems();
// 获取项目数据
//获取项目数据
int unitType = CommonService.GetUnitTypeByUserId(page.CurrUser.UserId);
var projects = new List<Base_Project>();
@ -52,12 +54,24 @@ namespace FineUIPro.Web.common
projects = Funs.DB.Base_Project.Where(x => x.UnitId == page.CurrUser.UnitId && x.MapCoordinates != null && (x.IsDelete == null || x.IsDelete == false)).ToList();
}
//获取安全生产开始日期
var sysSet1 = BLL.ConstValue.drpConstItemList(BLL.ConstValue.Group_WorkSafetyStartDate).FirstOrDefault();
string workSafetyStartDate = sysSet1.ConstValue;
//安全生产天数
int workSafetyDays = DateHelper.DaysDifference(new DateTime(2020, 5, 20), DateTime.Today);
int workSafetyDays = DateHelper.DaysDifference(Convert.ToDateTime(workSafetyStartDate), DateTime.Today);
//事故事件
var list = AccidentWarningService.GetYearsTodayList();
// 构造返回数据
var dateNow = DateTime.Now.ToString("yyyy-MM");
//风险
var getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], "").ToList();
var lowRisk = getHazardFactorList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRisk = getHazardFactorList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRisk = getHazardFactorList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRisk = getHazardFactorList.Where(x => x.Title == "重大风险").FirstOrDefault();
//构造返回数据
return new
{
success = true,
@ -82,6 +96,7 @@ namespace FineUIPro.Web.common
},
projectInfo = new
{
workSafetyStartDateTip= $"安全生产开始日期：{workSafetyStartDate}",
workSafetyDay1 = (workSafetyDays % 10),
workSafetyDay10 = ((workSafetyDays % 100) / 10),
workSafetyDay100 = ((workSafetyDays % 1000) / 100),
@ -101,7 +116,14 @@ namespace FineUIPro.Web.common
endDate = p.EndDate != null ? ((DateTime)p.EndDate).ToString("yyyy-MM-dd") : string.Empty,
address = p.ProjectAddress,
value = p.MapCoordinates.Split(','),
}).ToList()
}).ToList(),
hazardFactor = new
{
lowRiskNum = lowRisk != null ? lowRisk.Num : 0,
generalRiskNum = generalRisk != null ? generalRisk.Num : 0,
largerRiskNum = largerRisk != null ? largerRisk.Num : 0,
majorRiskNum = majorRisk != null ? majorRisk.Num : 0,
}
}
};
}

67
SGGL/FineUIPro.Web/common/mainProject.aspx
View File

@ -199,6 +199,40 @@
</div>
</div>
<div class="site_500" style="height: 3.05rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">风险分级管控</span></h2>
<div id="risk" class="site_content">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>重大风险</h6>
<p><span>{{form?.hazardFactor?.majorRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>较大风险</h6>
<p><span>{{form?.hazardFactor?.largerRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>一般风险</h6>
<p><span>{{form?.hazardFactor?.generalRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>低风险</h6>
<p><span>{{form?.hazardFactor?.lowRiskNum}}</span></p>
</div>
</div>
</div>
</div>
<div class="site_500" style="height: 2.275rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">高风险作业许可</span></h2>
<div id="job" class="site_content">
@ -224,39 +258,6 @@
</div>
</div>
<div class="site_500" style="height: 3.05rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">风险分级管控</span></h2>
<div id="risk" class="site_content">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>重大风险</h6>
<p><span>0</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>较大风险</h6>
<p><span>0</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>一般风险</h6>
<p><span>0</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>低风险</h6>
<p><span>0</span></p>
</div>
</div>
</div>
</div>
<div class="site_500" style="height: 2.275rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">高风险作业许可</span></h2>
<div id="job" class="site_content">

16
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
View File

@ -68,6 +68,15 @@ namespace FineUIPro.Web.common
//事故事件
var list = AccidentWarningService.GetYearsTodayList();
var dateNow = DateTime.Now.ToString("yyyy-MM");
//风险
var getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], projectId).ToList();
var lowRisk = getHazardFactorList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRisk = getHazardFactorList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRisk = getHazardFactorList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRisk = getHazardFactorList.Where(x => x.Title == "重大风险").FirstOrDefault();
// 构造返回数据
return new
{
@ -84,6 +93,13 @@ namespace FineUIPro.Web.common
projectEndDate = project.EndDate != null ? string.Format("{0:yyyy-MM-dd}", project.EndDate) : string.Empty,//项目到期时间
projectEndDays = endDays > 0 ? endDays : 0,//合同倒计时
},
hazardFactor = new
{
lowRiskNum = lowRisk != null ? lowRisk.Num : 0,
generalRiskNum = generalRisk != null ? generalRisk.Num : 0,
largerRiskNum = largerRisk != null ? largerRisk.Num : 0,
majorRiskNum = majorRisk != null ? majorRisk.Num : 0,
}
//meetAnEmergency = new
//{
// //comprehensive = hsseData.CompanyComprehensivePlanNum + hsseData.ProjectComprehensivePlanNum,

1
SGGL/Model/Model.csproj
View File

@ -249,6 +249,7 @@
<Compile Include="JDGL\WBSSetItem.cs" />
<Compile Include="Model.cs" />
<Compile Include="ModelProc.cs" />
<Compile Include="Statistics.cs" />
<Compile Include="Num.cs" />
<Compile Include="Pie.cs" />
<Compile Include="PieData.cs" />

12
SGGL/Model/ModelProc.cs
View File

@ -8,6 +8,18 @@ namespace Model
public partial class CNPCDB : DataContext
{
/// <summary>
/// °²È«Î£º¦ÒòËØͳ¼Æ
/// </summary>
/// <param name="userId"></param>
/// <param name="projectId"></param>
/// <returns></returns>
[Function(Name = "[dbo].[Sp_HazardFactor_Statistics]")]
public IEnumerable<Statistics> Sp_HazardFactor_Statistics([Parameter(DbType = "nvarchar(20)")] string year, [Parameter(DbType = "nvarchar(20)")] string month, [Parameter(DbType = "nvarchar(200)")] string projectId)
{
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), year, month, projectId);
return (ISingleResult<Statistics>)result.ReturnValue;
}
/// <summary>
/// 获取当前用户在移动端待办事项

11
SGGL/Model/Statistics.cs Normal file
View File

@ -0,0 +1,11 @@
using System;
namespace Model
{
public class Statistics
{
public string Title { get; set; }
public int Num { get; set; }
}
}