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

数据大屏优化

Browse Source
This commit is contained in:
夏菊
2026-09-23 17:55:18 +08:00
parent 147121cdb2
commit 4bb579d661
39 changed files with 2012 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2026-09-19-xiaj.sql
+11
View File
@@ -0,0 +1,11 @@
--人员补充：公司级选择的分公司Id
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Sys_User' AND COLUMN_NAME = 'LastUnitId')
BEGIN
--公司级最后选择的UnitId
ALTER TABLE Sys_User ADD LastUnitId nvarchar(50);
EXEC sp_addextendedproperty 'MS_Description', N'公司级最后选择的UnitId','SCHEMA', N'dbo','TABLE', N'Sys_User','COLUMN', N'LastUnitId';
END
GO
DataBase/版本日志/SGGLDB_V2026-09-21-xiaj（Sp_HazardFactorOccHealth_Statistics）.sql
+39
View File
@@ -0,0 +1,39 @@
CREATE OR ALTER PROCEDURE [dbo].[Sp_HazardFactorOccHealth_Statistics]
@year NVARCHAR(20)=NULL,
@month NVARCHAR(20)=NULL,
@unitId NVARCHAR(200)=NULL,
@projectId NVARCHAR(200)=NULL
AS
BEGIN
SET NOCOUNT ON;
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_OccHealth 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
--单位条件：@unitId为空查所有，有值则过滤单位
AND (@unitId IS NULL OR @unitId = '' OR tba.UnitId = @unitId)
--项目条件：为空不过滤
AND (@projectId IS NULL OR @projectId = '' OR tba.ProjectId = @projectId)
)
SELECT BaseRiskLevel AS Title,COUNT(1) AS Num
FROM CTE
WHERE rn = 1
GROUP BY BaseRiskLevel
END
GO
DataBase/版本日志/SGGLDB_V2026-09-21-xiaj（Sp_HazardFactor_Statistics）.sql
+35
View File
@@ -0,0 +1,35 @@
CREATE OR ALTER PROCEDURE [dbo].[Sp_HazardFactor_Statistics]
@year NVARCHAR(20)=NULL,
@month NVARCHAR(20)=NULL,
@unitId NVARCHAR(200)=NULL,
@projectId NVARCHAR(200)=NULL
AS
BEGIN
SET NOCOUNT ON;
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
--单位条件：@unitId为空查所有，有值则过滤单位
AND (@unitId IS NULL OR @unitId = '' OR tba.UnitId = @unitId)
--项目条件：为空不过滤
AND (@projectId IS NULL OR @projectId = '' OR tba.ProjectId = @projectId)
)
SELECT BaseRiskLevel AS Title,COUNT(1) AS Num
FROM CTE
WHERE rn = 1
GROUP BY BaseRiskLevel
END
SGGL/BLL/Common/CommonService.cs
+42 -4
View File
@@ -137,8 +137,6 @@ namespace BLL
{
int result = 0;
var user = UserService.GetUserByUserId(userId);
if ((userId == Const.hfnbdId || userId == Const.sysglyId) || (!string.IsNullOrEmpty(user.UnitId) && user.UnitId == CommonService.GetThisUnitId()))//公司级别
{
result = 0;
@@ -154,6 +152,30 @@ namespace BLL
return result;
}
/// <summary>
/// 根据unitId获取当前的单位类型（0总公司，1分公司，2其他）
/// </summary>
/// <param name="unitId"></param>
/// <returns></returns>
public static int GetUnitTypeByUnitId(string unitId)
{
int result = 0;
//var unit = UnitService.GetUnitByUnitId(unitId);
if (!string.IsNullOrEmpty(unitId) && unitId == CommonService.GetThisUnitId())//公司级别
{
result = 0;
}
else if (!string.IsNullOrEmpty(unitId) && UnitService.GetUnitByUnitId(unitId).IsBranch == true) //子公司级数据
{
result = 1;
}
else //外来账户
{
result = 2;
}
return result;
}
#region 根据登陆id菜单id判断是否有权限
/// <summary>
/// 根据登陆id菜单id判断是否有权限
@@ -265,11 +287,12 @@ namespace BLL
#region 用户Id判断
#region 根据用户ID判断是超管
/// <summary>
/// 根据用户ID判断是超管
/// 部分人员账号给超管权限控制
/// </summary>
/// <returns></returns>
public static bool IsSuperAdminManage(string userId)
public static bool IsSuperAdminManageAuth(string userId)
{
bool result = false;
if (userId == Const.luofeiId || userId == Const.shizhiyangId || userId == Const.hfnbdId || userId == Const.sysglyId)
@@ -278,6 +301,21 @@ namespace BLL
}
return result;
}
/// <summary>
/// 根据用户ID判断是超管
/// </summary>
/// <returns></returns>
public static bool IsSuperAdminManage(string userId)
{
bool result = false;
if (userId == Const.hfnbdId || userId == Const.sysglyId)
{//JT、管理员账号
result = true;
}
return result;
}
#endregion
#region 获取当前人是否具有按钮操作权限
SGGL/BLL/Common/Funs.cs
+1
View File
@@ -1267,6 +1267,7 @@ namespace BLL
int weekOfYear = gc.GetWeekOfYear(dtWeek, System.Globalization.CalendarWeekRule.FirstDay, DayOfWeek.Monday);
return weekOfYear;
}
}
}
SGGL/BLL/SysManage/UserService.cs
+10 -2
View File
@@ -82,7 +82,7 @@ namespace BLL
/// </summary>
/// <param name="userId">用户Id</param>
/// <returns>用户信息</returns>
public static void UpdateLastUserInfo(string userId, string LastMenuType, bool LastIsOffice, string LastProjectId)
public static void UpdateLastUserInfo(string userId, string LastMenuType, bool LastIsOffice, string LastProjectId, string LastUnitId)
{
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
{
@@ -92,7 +92,15 @@ namespace BLL
uU.LastMenuType = LastMenuType;
uU.LastIsOffice = LastIsOffice;
uU.LastMenuType = LastMenuType;
uU.LastProjectId = LastProjectId;
if (!string.IsNullOrWhiteSpace(LastProjectId))
{
uU.LastProjectId = LastProjectId;
uU.LoginProjectId = LastProjectId;
}
if (!string.IsNullOrWhiteSpace(LastUnitId))
{
uU.LastUnitId = LastUnitId;
}
db.SubmitChanges();
}
}
SGGL/FineUIPro.Web/DataShow/HazardFactor.aspx
+175
View File
@@ -0,0 +1,175 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardFactor.aspx.cs"
Inherits="FineUIPro.Web.DataShow.HazardFactor" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<title>安全危害因素</title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全危害因素"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true" SortField="CompileDate"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowColumnLocking="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpYear" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="160px" LabelWidth="50px" Label="年度" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpMonth" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="160px" LabelWidth="50px" Label="月份" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpUnit" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" Hidden="true" runat="server"
Width="220px" LabelWidth="50px" Label="单位" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<%--<f:DropDownList ID="drpProject" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="220px" LabelWidth="50px" Label="项目" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>--%>
<f:DropDownList ID="drpBaseRiskLevel" runat="server" Label="固有风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpNetRiskLevel" runat="server" Label="残留风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<%--<f:RadioButtonList runat="server" ID="rbState" Label="状态" Width="260px" LabelWidth="50px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="全部" Value="" Selected="true" />
<f:RadioItem Text="未提交" Value="0" />
<f:RadioItem Text="已提交" Value="1" />
</f:RadioButtonList>--%>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList runat="server" ID="rbIllegality" Label="违法" Width="220px" LabelWidth="50px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="全部" Value="" Selected="true" />
<f:RadioItem Text="是" Value="1" />
<f:RadioItem Text="否" Value="0" />
</f:RadioButtonList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList runat="server" ID="rbDedupe" Label="去重" Width="320px" LabelWidth="50px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="不去重" Value="" />
<f:RadioItem Text="按年去重" Value="1" />
<f:RadioItem Text="按月去重" Value="0" Selected="true" />
</f:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" Locked="true">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="60px" ColumnID="Year" DataField="Year" SortField="Year" FieldType="String" HeaderText="年度" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="60px" ColumnID="Month" DataField="Month" SortField="Month" FieldType="String" HeaderText="月份" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate" FieldType="Date" HeaderText="上报时间" RendererArgument="yyyy-MM-dd HH:mm" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CompileManName" DataField="CompileManName" FieldType="String" HeaderText="上报人" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:TemplateField ColumnID="tfState" MinWidth="50px" HeaderText="状态" Locked="true" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbState" runat="server" Text='<%# ConvertDataState(Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:RenderField Width="180px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>--%><%--单位项目名称--%>
<f:RenderField Width="180px" ColumnID="UnitProjectName" DataField="UnitProjectName" FieldType="String" HeaderText="单位名称/部门名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="WorkPlace" DataField="WorkPlace" SortField="WorkPlace" FieldType="String" HeaderText="活动区域/场所/设备" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="JobStep" DataField="JobStep" SortField="JobStep" FieldType="String" HeaderText="作业内容/步骤" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="Hazard" DataField="Hazard" FieldType="String" HeaderText="危害因素描述" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Consequence" DataField="Consequence" SortField="Consequence" FieldType="String" HeaderText="主要后果" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="AccidentType" DataField="AccidentType" SortField="AccidentType" FieldType="String" HeaderText="事故分类" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="50px" RenderAsStaticField="true" DataField="Illegality" SortField="Illegality" HeaderText="违法" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
<f:GroupField ColumnID="GroupField2" runat="server" HeaderText="固有风险评价" HeaderTextAlign="Center">
<Columns>
<f:RenderField Width="70px" ColumnID="BaseRiskSeverity" DataField="BaseRiskSeverity" SortField="BaseRiskSeverity" FieldType="int" HeaderText="严重性" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="BaseRiskProbability" DataField="BaseRiskProbability" SortField="BaseRiskProbability" FieldType="int" HeaderText="可能性" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="BaseRiskScore" DataField="BaseRiskScore" SortField="BaseRiskScore" FieldType="int" HeaderText="得分" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="BaseRiskLevel" DataField="BaseRiskLevel" SortField="BaseRiskLevel" FieldType="String" HeaderText="风险级别" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="65px" RenderAsStaticField="true" DataField="BaseRiskAcceptabity" SortField="BaseRiskAcceptabity" HeaderText="可接受" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</Columns>
</f:GroupField>
<f:GroupField ColumnID="GroupField2" runat="server" HeaderText="残留风险评价" HeaderTextAlign="Center">
<Columns>
<f:RenderField Width="220px" ColumnID="NetRiskControlMeasures" DataField="NetRiskControlMeasures" FieldType="String" HeaderText="现有控制措施" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="NetRiskSeverity" DataField="NetRiskSeverity" SortField="NetRiskSeverity" FieldType="int" HeaderText="严重性" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="NetRiskProbability" DataField="NetRiskProbability" SortField="NetRiskProbability" FieldType="int" HeaderText="可能性" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="NetRiskScore" DataField="NetRiskScore" SortField="NetRiskScore" FieldType="int" HeaderText="得分" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="NetRiskLevel" DataField="NetRiskLevel" SortField="NetRiskLevel" FieldType="String" HeaderText="风险级别" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="65px" RenderAsStaticField="true" DataField="NetRiskAcceptabity" SortField="NetRiskAcceptabity" HeaderText="可接受" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</Columns>
</f:GroupField>
<f:RenderField Width="220px" ColumnID="AdditionalControlMeasures" DataField="AdditionalControlMeasures" FieldType="String" HeaderText="新增或变更的控制措施" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="ResponsibleDepartment" DataField="ResponsibleDepartment" SortField="ResponsibleDepartment" FieldType="String" HeaderText="责任部门" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</form>
<script type="text/javascript">
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
// F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
// 点击标题栏工具图标 - 退出
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
}
</script>
</body>
</html>
SGGL/FineUIPro.Web/DataShow/HazardFactor.aspx.cs
+234
View File
@@ -0,0 +1,234 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Text;
namespace FineUIPro.Web.DataShow
{
public partial class HazardFactor : PageBase
{
/// <summary>
/// 单位id
/// </summary>
public string UnitId
{
get
{
return (string)ViewState["UnitId"];
}
set
{
ViewState["UnitId"] = value;
}
}
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, true);
BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, true);
BLL.UnitService.InitBranchUnitDropDownList(this.drpUnit, true, true);
BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpBaseRiskLevel, true);
BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpNetRiskLevel, true);
this.UnitId = this.CurrUser.UnitId;
if (CommonService.IsSuperAdminManage(this.CurrUser.UserId) || (!string.IsNullOrWhiteSpace(this.UnitId) && this.UnitId == Const.UnitId_XJYJ))
{
this.drpUnit.Hidden = false;
this.UnitId = this.CurrUser.LastUnitId;
}
if (!string.IsNullOrWhiteSpace(this.UnitId))
{
this.drpUnit.SelectedValue = this.UnitId;
}
var dateYearMon = DateTime.Now.ToString("yyyy-M");
this.drpYear.SelectedValue = dateYearMon.Split('-')[0];
this.drpMonth.SelectedValue = dateYearMon.Split('-')[1];
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
this.Panel1.Title = "安全危害因素";
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
StringBuilder sb = new StringBuilder();
List<SqlParameter> listStr = new List<SqlParameter>();
string dedupe = rbDedupe.SelectedValue;
if (!string.IsNullOrWhiteSpace(dedupe))
{
sb.Append("WITH CTE AS ( ");
if (dedupe == "0")
{//按月
sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,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,tba.* ");
}
else
{//按年
sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,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,tba.* ");
}
}
else
{
sb.Append("SELECT tba.* ");
}
sb.Append("FROM HazardFactor_Safety AS tba WITH(NOLOCK) ");
//sb.Append("LEFT JOIN Base_Project AS tbb WITH(NOLOCK) ON tbb.ProjectId = tba.ProjectId ");
sb.Append("WHERE 1=1 AND tba.State = 1 ");//取已提交数据
if (!string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_XJYJ)
{//分公司只能查看本单位的数据
sb.Append("AND tba.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
}
else
{
if (!string.IsNullOrWhiteSpace(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != Const._Null && this.drpUnit.SelectedValue != Const.UnitId_XJYJ)
{
sb.Append("AND tba.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue));
}
}
//if (!string.IsNullOrWhiteSpace(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
//{
// sb.Append("AND tba.ProjectId = @ProjectId ");
// listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
//}
if (!string.IsNullOrWhiteSpace(this.drpYear.SelectedValue) && this.drpYear.SelectedValue != Const._Null)
{
sb.Append("AND tba.Year = @Year ");
listStr.Add(new SqlParameter("@Year", this.drpYear.SelectedValue));
}
if (!string.IsNullOrWhiteSpace(this.drpMonth.SelectedValue) && this.drpMonth.SelectedValue != Const._Null)
{
string month = this.drpMonth.SelectedValue;
sb.Append("AND tba.Month = @Month ");
listStr.Add(new SqlParameter("@Month", month.Length == 1 ? $"0{month}" : month));
}
if (!string.IsNullOrWhiteSpace(this.drpBaseRiskLevel.SelectedValue) && this.drpBaseRiskLevel.SelectedValue != Const._Null)
{
sb.Append("AND tba.BaseRiskLevel = @BaseRiskLevel ");
listStr.Add(new SqlParameter("@BaseRiskLevel", this.drpBaseRiskLevel.SelectedValue));
}
if (!string.IsNullOrWhiteSpace(this.drpNetRiskLevel.SelectedValue) && this.drpNetRiskLevel.SelectedValue != Const._Null)
{
sb.Append("AND tba.NetRiskLevel = @NetRiskLevel ");
listStr.Add(new SqlParameter("@NetRiskLevel", this.drpNetRiskLevel.SelectedValue));
}
//if (!string.IsNullOrEmpty(this.rbState.SelectedValue))
//{
// sb.Append("AND tba.State = @State ");
// listStr.Add(new SqlParameter("@State", this.rbState.SelectedValue));
//}
if (!string.IsNullOrEmpty(this.rbIllegality.SelectedValue))
{
sb.Append("AND tba.Illegality = @Illegality ");
listStr.Add(new SqlParameter("@Illegality", this.rbIllegality.SelectedValue == "1" ? true : false));
}
if (!string.IsNullOrWhiteSpace(dedupe))
{
sb.Append(") ");
sb.Append("SELECT * FROM CTE WHERE rn = 1; ");
}
string sqlStr = sb.ToString();
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sqlStr, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
/// <summary>
/// 格式化数据
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
protected string ConvertDataState(object data)
{
string result = string.Empty;
string dataStr = data.ToString();
if (data != null)
{
result = dataStr == "1" ? "已提交" : "未提交";
}
return result;
}
#endregion
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#endregion
#region 表排序、分页、关闭窗口
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页显示条数下拉框
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 关闭弹出窗
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
#endregion
}
}
SGGL/FineUIPro.Web/DataShow/HazardFactor.aspx.designer.cs
Generated
+179
View File
@@ -0,0 +1,179 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.DataShow
{
public partial class HazardFactor
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpYear 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpYear;
/// <summary>
/// drpMonth 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMonth;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpBaseRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpBaseRiskLevel;
/// <summary>
/// drpNetRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpNetRiskLevel;
/// <summary>
/// rbIllegality 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbIllegality;
/// <summary>
/// rbDedupe 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbDedupe;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// lbState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbState;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
}
}
SGGL/FineUIPro.Web/DataShow/HazardFactorOccHealth.aspx
+175
View File
@@ -0,0 +1,175 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardFactorOccHealth.aspx.cs"
Inherits="FineUIPro.Web.DataShow.HazardFactorOccHealth" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<title>职业健康危害因素</title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="职业健康危害因素"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true" SortField="CompileDate"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowColumnLocking="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpYear" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="160px" LabelWidth="50px" Label="年度" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpMonth" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="160px" LabelWidth="50px" Label="月份" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpUnit" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" Hidden="true" runat="server"
Width="220px" LabelWidth="50px" Label="单位" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<%--<f:DropDownList ID="drpProject" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="220px" LabelWidth="50px" Label="项目" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>--%>
<f:DropDownList ID="drpBaseRiskLevel" runat="server" Label="固有风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpNetRiskLevel" runat="server" Label="残留风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<%--<f:RadioButtonList runat="server" ID="rbState" Label="状态" Width="260px" LabelWidth="50px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="全部" Value="" Selected="true" />
<f:RadioItem Text="未提交" Value="0" />
<f:RadioItem Text="已提交" Value="1" />
</f:RadioButtonList>--%>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList runat="server" ID="rbIllegality" Label="违法" Width="220px" LabelWidth="50px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="全部" Value="" Selected="true" />
<f:RadioItem Text="是" Value="1" />
<f:RadioItem Text="否" Value="0" />
</f:RadioButtonList>
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
<f:RadioButtonList runat="server" ID="rbDedupe" Label="去重" Width="320px" LabelWidth="50px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="不去重" Value="" />
<f:RadioItem Text="按年去重" Value="1" />
<f:RadioItem Text="按月去重" Value="0" Selected="true" />
</f:RadioButtonList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" Locked="true">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="60px" ColumnID="Year" DataField="Year" SortField="Year" FieldType="String" HeaderText="年度" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="60px" ColumnID="Month" DataField="Month" SortField="Month" FieldType="String" HeaderText="月份" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate" FieldType="Date" HeaderText="上报时间" RendererArgument="yyyy-MM-dd HH:mm" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CompileManName" DataField="CompileManName" FieldType="String" HeaderText="上报人" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:TemplateField ColumnID="tfState" MinWidth="50px" HeaderText="状态" Locked="true" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbState" runat="server" Text='<%# ConvertDataState(Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:RenderField Width="180px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>--%><%--单位项目名称--%>
<f:RenderField Width="180px" ColumnID="UnitProjectName" DataField="UnitProjectName" FieldType="String" HeaderText="单位名称/部门名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="WorkPlace" DataField="WorkPlace" SortField="WorkPlace" FieldType="String" HeaderText="活动区域/场所/设备" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="JobStep" DataField="JobStep" SortField="JobStep" FieldType="String" HeaderText="作业内容/步骤" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="Hazard" DataField="Hazard" FieldType="String" HeaderText="危害因素描述" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Consequence" DataField="Consequence" SortField="Consequence" FieldType="String" HeaderText="主要后果" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="AccidentType" DataField="AccidentType" SortField="AccidentType" FieldType="String" HeaderText="事故分类" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="50px" RenderAsStaticField="true" DataField="Illegality" SortField="Illegality" HeaderText="违法" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
<f:GroupField ColumnID="GroupField2" runat="server" HeaderText="固有风险评价" HeaderTextAlign="Center">
<Columns>
<f:RenderField Width="70px" ColumnID="BaseRiskSeverity" DataField="BaseRiskSeverity" SortField="BaseRiskSeverity" FieldType="int" HeaderText="严重性" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="BaseRiskProbability" DataField="BaseRiskProbability" SortField="BaseRiskProbability" FieldType="int" HeaderText="可能性" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="BaseRiskScore" DataField="BaseRiskScore" SortField="BaseRiskScore" FieldType="int" HeaderText="得分" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="BaseRiskLevel" DataField="BaseRiskLevel" SortField="BaseRiskLevel" FieldType="String" HeaderText="风险级别" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="65px" RenderAsStaticField="true" DataField="BaseRiskAcceptabity" SortField="BaseRiskAcceptabity" HeaderText="可接受" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</Columns>
</f:GroupField>
<f:GroupField ColumnID="GroupField2" runat="server" HeaderText="残留风险评价" HeaderTextAlign="Center">
<Columns>
<f:RenderField Width="220px" ColumnID="NetRiskControlMeasures" DataField="NetRiskControlMeasures" FieldType="String" HeaderText="现有控制措施" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="NetRiskSeverity" DataField="NetRiskSeverity" SortField="NetRiskSeverity" FieldType="int" HeaderText="严重性" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="NetRiskProbability" DataField="NetRiskProbability" SortField="NetRiskProbability" FieldType="int" HeaderText="可能性" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="70px" ColumnID="NetRiskScore" DataField="NetRiskScore" SortField="NetRiskScore" FieldType="int" HeaderText="得分" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="NetRiskLevel" DataField="NetRiskLevel" SortField="NetRiskLevel" FieldType="String" HeaderText="风险级别" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="65px" RenderAsStaticField="true" DataField="NetRiskAcceptabity" SortField="NetRiskAcceptabity" HeaderText="可接受" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</Columns>
</f:GroupField>
<f:RenderField Width="220px" ColumnID="AdditionalControlMeasures" DataField="AdditionalControlMeasures" FieldType="String" HeaderText="新增或变更的控制措施" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="ResponsibleDepartment" DataField="ResponsibleDepartment" SortField="ResponsibleDepartment" FieldType="String" HeaderText="责任部门" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
</form>
<script type="text/javascript">
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
// F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
// 点击标题栏工具图标 - 退出
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
}
</script>
</body>
</html>
SGGL/FineUIPro.Web/DataShow/HazardFactorOccHealth.aspx.cs
+234
View File
@@ -0,0 +1,234 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Text;
namespace FineUIPro.Web.DataShow
{
public partial class HazardFactorOccHealth : PageBase
{
/// <summary>
/// 单位id
/// </summary>
public string UnitId
{
get
{
return (string)ViewState["UnitId"];
}
set
{
ViewState["UnitId"] = value;
}
}
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, true);
BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, true);
BLL.UnitService.InitBranchUnitDropDownList(this.drpUnit, true, true);
BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpBaseRiskLevel, true);
BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpNetRiskLevel, true);
this.UnitId = this.CurrUser.UnitId;
if (CommonService.IsSuperAdminManage(this.CurrUser.UserId) || (!string.IsNullOrWhiteSpace(this.UnitId) && this.UnitId == Const.UnitId_XJYJ))
{
this.drpUnit.Hidden = false;
this.UnitId = this.CurrUser.LastUnitId;
}
if (!string.IsNullOrWhiteSpace(this.UnitId))
{
this.drpUnit.SelectedValue = this.UnitId;
}
var dateYearMon = DateTime.Now.ToString("yyyy-M");
this.drpYear.SelectedValue = dateYearMon.Split('-')[0];
this.drpMonth.SelectedValue = dateYearMon.Split('-')[1];
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
this.Panel1.Title = "职业健康危害因素";
}
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
StringBuilder sb = new StringBuilder();
List<SqlParameter> listStr = new List<SqlParameter>();
string dedupe = rbDedupe.SelectedValue;
if (!string.IsNullOrWhiteSpace(dedupe))
{
sb.Append("WITH CTE AS ( ");
if (dedupe == "0")
{//按月
sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,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,tba.* ");
}
else
{//按年
sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,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,tba.* ");
}
}
else
{
sb.Append("SELECT tba.* ");
}
sb.Append("FROM HazardFactor_OccHealth AS tba WITH(NOLOCK) ");
//sb.Append("LEFT JOIN Base_Project AS tbb WITH(NOLOCK) ON tbb.ProjectId = tba.ProjectId ");
sb.Append("WHERE 1=1 AND tba.State = 1 ");//取已提交数据
if (!string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_XJYJ)
{//分公司只能查看本单位的数据
sb.Append("AND tba.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
}
else
{
if (!string.IsNullOrWhiteSpace(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != Const._Null && this.drpUnit.SelectedValue != Const.UnitId_XJYJ)
{
sb.Append("AND tba.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue));
}
}
//if (!string.IsNullOrWhiteSpace(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
//{
// sb.Append("AND tba.ProjectId = @ProjectId ");
// listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
//}
if (!string.IsNullOrWhiteSpace(this.drpYear.SelectedValue) && this.drpYear.SelectedValue != Const._Null)
{
sb.Append("AND tba.Year = @Year ");
listStr.Add(new SqlParameter("@Year", this.drpYear.SelectedValue));
}
if (!string.IsNullOrWhiteSpace(this.drpMonth.SelectedValue) && this.drpMonth.SelectedValue != Const._Null)
{
string month = this.drpMonth.SelectedValue;
sb.Append("AND tba.Month = @Month ");
listStr.Add(new SqlParameter("@Month", month.Length == 1 ? $"0{month}" : month));
}
if (!string.IsNullOrWhiteSpace(this.drpBaseRiskLevel.SelectedValue) && this.drpBaseRiskLevel.SelectedValue != Const._Null)
{
sb.Append("AND tba.BaseRiskLevel = @BaseRiskLevel ");
listStr.Add(new SqlParameter("@BaseRiskLevel", this.drpBaseRiskLevel.SelectedValue));
}
if (!string.IsNullOrWhiteSpace(this.drpNetRiskLevel.SelectedValue) && this.drpNetRiskLevel.SelectedValue != Const._Null)
{
sb.Append("AND tba.NetRiskLevel = @NetRiskLevel ");
listStr.Add(new SqlParameter("@NetRiskLevel", this.drpNetRiskLevel.SelectedValue));
}
//if (!string.IsNullOrEmpty(this.rbState.SelectedValue))
//{
// sb.Append("AND tba.State = @State ");
// listStr.Add(new SqlParameter("@State", this.rbState.SelectedValue));
//}
if (!string.IsNullOrEmpty(this.rbIllegality.SelectedValue))
{
sb.Append("AND tba.Illegality = @Illegality ");
listStr.Add(new SqlParameter("@Illegality", this.rbIllegality.SelectedValue == "1" ? true : false));
}
if (!string.IsNullOrWhiteSpace(dedupe))
{
sb.Append(") ");
sb.Append("SELECT * FROM CTE WHERE rn = 1; ");
}
string sqlStr = sb.ToString();
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sqlStr, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
/// <summary>
/// 格式化数据
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
protected string ConvertDataState(object data)
{
string result = string.Empty;
string dataStr = data.ToString();
if (data != null)
{
result = dataStr == "1" ? "已提交" : "未提交";
}
return result;
}
#endregion
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#endregion
#region 表排序、分页、关闭窗口
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页显示条数下拉框
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 关闭弹出窗
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
#endregion
}
}
SGGL/FineUIPro.Web/DataShow/HazardFactorOccHealth.aspx.designer.cs
Generated
+179
View File
@@ -0,0 +1,179 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.DataShow
{
public partial class HazardFactorOccHealth
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpYear 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpYear;
/// <summary>
/// drpMonth 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMonth;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpBaseRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpBaseRiskLevel;
/// <summary>
/// drpNetRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpNetRiskLevel;
/// <summary>
/// rbIllegality 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbIllegality;
/// <summary>
/// rbDedupe 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbDedupe;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// lbState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbState;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
}
}
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+16
View File
@@ -624,6 +624,8 @@
<Content Include="CQMS\WBS\WorkPackageSet2In.aspx" />
<Content Include="DataShow\Accident.aspx" />
<Content Include="DataShow\Check.aspx" />
<Content Include="DataShow\HazardFactorOccHealth.aspx" />
<Content Include="DataShow\HazardFactor.aspx" />
<Content Include="DataShow\CompanyPerson.aspx" />
<Content Include="DataShow\ConstructionEquipment.aspx" />
<Content Include="DataShow\EduTrain.aspx" />
@@ -10108,6 +10110,20 @@
<Compile Include="DataShow\Check.aspx.designer.cs">
<DependentUpon>Check.aspx</DependentUpon>
</Compile>
<Compile Include="DataShow\HazardFactorOccHealth.aspx.cs">
<DependentUpon>HazardFactorOccHealth.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="DataShow\HazardFactorOccHealth.aspx.designer.cs">
<DependentUpon>HazardFactorOccHealth.aspx</DependentUpon>
</Compile>
<Compile Include="DataShow\HazardFactor.aspx.cs">
<DependentUpon>HazardFactor.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="DataShow\HazardFactor.aspx.designer.cs">
<DependentUpon>HazardFactor.aspx</DependentUpon>
</Compile>
<Compile Include="DataShow\CompanyPerson.aspx.cs">
<DependentUpon>CompanyPerson.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+3 -3
View File
@@ -68,7 +68,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
//权限按钮方法
this.GetButtonPower();
}
if (CommonService.IsSuperAdminManage(this.CurrUser.UserId))
if (CommonService.IsSuperAdminManageAuth(this.CurrUser.UserId))
{
//权限按钮方法
this.GetButtonPower();
@@ -92,7 +92,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.InitTreeMenu();
this.BindGrid();
this.GetButtonPower();
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId) && !CommonService.IsSuperAdminManage(this.CurrUser.UserId))
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId) && !CommonService.IsSuperAdminManageAuth(this.CurrUser.UserId))
{
btnNew.Hidden = true;
btnImport.Hidden = true;
@@ -806,7 +806,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.btnPersonUnit.Hidden = false;
}
}
if (CommonService.IsSuperAdminManage(this.CurrUser.UserId))
if (CommonService.IsSuperAdminManageAuth(this.CurrUser.UserId))
{//罗菲、史志扬、管理员账号
this.btnSearchUserAdd.Hidden = false;
}
SGGL/FineUIPro.Web/Login.aspx.cs
+27 -20
View File
@@ -69,25 +69,25 @@ namespace FineUIPro.Web
if (!IsPostBack)
{
bool IsSSO = false;
Sys_User user=new Sys_User();
string message="";
Sys_User user = new Sys_User();
string message = "";
var ThisUnit = CommonService.GetIsThisUnit();
string token;
switch (ThisUnit.CollCropCode)
{
case "913201001349030968":
token = Request.Params["token"];
if (string.IsNullOrEmpty(token)) return;
IsSSO = true;
break;
}
if (IsSSO )
if (IsSSO)
{
if (message != "")
{
{
Response.Write("<script language=javascript>alert('" + message + "');</script>");
}
else
@@ -97,9 +97,10 @@ namespace FineUIPro.Web
string url = "";
//Funs.SystemUrl = "http://" + HttpContext.Current.Request.Url.Host + ":" + HttpContext.Current.Request.Url.Port + "/cncechsse/";
BLL.LogService.AddLog(this.CurrUser.UserId, "登录成功！");
if (this.CurrUser.IsOffice==true) //本部人员跳转到公司级
{
url = "index.aspx";
if (this.CurrUser.IsOffice == true) //本部人员跳转到公司级
{
//url = "index.aspx";
url = "index.aspx?unitId=" + this.CurrUser.UnitId;
}
else //非本部人员跳转到项目级
{
@@ -116,24 +117,24 @@ namespace FineUIPro.Web
//// 项目菜单
url = "indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
}
HttpContext.Current.Response.Write("<script> top.window.location.href='" + url + "';</script>");
HttpContext.Current.Response.End();
// Response.Redirect( url);
// Server.Execute( url);
// Response.Write("<script language='javascript'>window.open('" + url + "');</script>");
// Server.Execute( url);
// Response.Write("<script language='javascript'>window.open('" + url + "');</script>");
}
}
}
}
}
#endregion
[WebMethod]
public static string LoginPost(string user, string pwd,string rbSys)
public static string LoginPost(string user, string pwd, string rbSys)
{
return new Login().btnLogin_Click(user, pwd, rbSys);
}
@@ -240,11 +241,17 @@ namespace FineUIPro.Web
//}
if (rbSys == "工程")
{
this.SysType = "GONGCHENG";
this.SysType = "GONGCHENG";
}
else if (rbSys == "公司/分公司")
{
url = "index.aspx";
//url = "index.aspx";
string unitId = Const.UnitId_XJYJ;
if (!string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.Base_Unit.IsBranch == true)
{
unitId = this.CurrUser.UnitId;
}
url = "index.aspx?unitId=" + unitId;
this.SysType = "GONGCHENG";
}
else if (rbSys == "实业")
@@ -262,7 +269,7 @@ namespace FineUIPro.Web
}
if (string.IsNullOrEmpty(error))
{
{
return url;
}
else
@@ -282,11 +289,11 @@ namespace FineUIPro.Web
[WebMethod]
public static string ResetPost(string accout, string name, string idcard)
{
Model.Sys_User sysUser = (from y in Funs.DB.Sys_User
where y.Account == accout && y.IsPost == true
select y).FirstOrDefault();
if (sysUser ==null)
if (sysUser == null)
{
return "用户名或密码错误，请重新输入";
}
@@ -294,7 +301,7 @@ namespace FineUIPro.Web
{
return "用户名或密码错误，请重新输入";
}
else if(name != sysUser.UserName)
else if (name != sysUser.UserName)
{
return "用户名或密码错误，请重新输入";
}
SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs
+1 -1
View File
@@ -80,7 +80,7 @@ namespace FineUIPro.Web.ProjectData
if (this.tvControlItem.SelectedNode != null )
{
string url = "~/indexProject.aspx?projectId=" + this.tvControlItem.SelectedNode.NodeID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, this.tvControlItem.SelectedNode.NodeID);
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, this.tvControlItem.SelectedNode.NodeID,string.Empty);
PageContext.Redirect(url, "_top");
}
else
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
+1 -1
View File
@@ -288,7 +288,7 @@ namespace FineUIPro.Web.ProjectData
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID, string.Empty);
PageContext.Redirect(url, "_top");
}
else
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
+1 -1
View File
@@ -423,7 +423,7 @@ namespace FineUIPro.Web.ProjectData
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID, string.Empty);
PageContext.Redirect(url, "_top");
}
else
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx
+5 -2
View File
@@ -40,9 +40,12 @@
<f:DropDownList ID="drpMonth" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="160px" LabelWidth="50px" Label="月份" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpProject" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="220px" LabelWidth="50px" Label="项目" OnSelectedIndexChanged="TextBox_TextChanged">
<f:DropDownList ID="drpUnit" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" Hidden="true" runat="server"
Width="220px" LabelWidth="50px" Label="单位" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<%--<f:DropDownList ID="drpProject" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="220px" LabelWidth="50px" Label="项目" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>--%>
<f:DropDownList ID="drpBaseRiskLevel" runat="server" Label="固有风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpNetRiskLevel" runat="server" Label="残留风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.cs
+17 -4
View File
@@ -35,7 +35,12 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
{
if (!IsPostBack)
{
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
//BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
if (string.IsNullOrWhiteSpace(this.CurrUser.UnitId) || this.CurrUser.UnitId == Const.UnitId_XJYJ)
{
this.drpUnit.Hidden = false;
UnitService.InitBranchUnitDropDownList(this.drpUnit, true, true);
}
BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, true);
BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, true);
BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpBaseRiskLevel, true);
@@ -85,11 +90,19 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
sb.Append("AND tba.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
}
if (!string.IsNullOrWhiteSpace(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
else
{
sb.Append("AND tba.ProjectId = @ProjectId ");
listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
if (!string.IsNullOrWhiteSpace(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != Const._Null)
{
sb.Append("AND tba.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue));
}
}
//if (!string.IsNullOrWhiteSpace(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
//{
// sb.Append("AND tba.ProjectId = @ProjectId ");
// listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
//}
if (!string.IsNullOrWhiteSpace(this.drpYear.SelectedValue) && this.drpYear.SelectedValue != Const._Null)
{
sb.Append("AND tba.Year = @Year ");
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.designer.cs
Generated
+2 -2
View File
@@ -78,13 +78,13 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
protected global::FineUIPro.DropDownList drpMonth;
/// <summary>
/// drpProject 控件。
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpBaseRiskLevel 控件。
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx
+5 -2
View File
@@ -40,9 +40,12 @@
<f:DropDownList ID="drpMonth" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="160px" LabelWidth="50px" Label="月份" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpProject" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="220px" LabelWidth="50px" Label="项目" OnSelectedIndexChanged="TextBox_TextChanged">
<f:DropDownList ID="drpUnit" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" Hidden="true" runat="server"
Width="220px" LabelWidth="50px" Label="单位" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<%--<f:DropDownList ID="drpProject" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="220px" LabelWidth="50px" Label="项目" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>--%>
<f:DropDownList ID="drpBaseRiskLevel" runat="server" Label="固有风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpNetRiskLevel" runat="server" Label="残留风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs
+17 -4
View File
@@ -35,7 +35,12 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
{
if (!IsPostBack)
{
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
//BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
if (string.IsNullOrWhiteSpace(this.CurrUser.UnitId) || this.CurrUser.UnitId == Const.UnitId_XJYJ)
{
this.drpUnit.Hidden = false;
UnitService.InitBranchUnitDropDownList(this.drpUnit, true, true);
}
BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, true);
BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, true);
BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpBaseRiskLevel, true);
@@ -85,11 +90,19 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
sb.Append("AND tba.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
}
if (!string.IsNullOrWhiteSpace(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
else
{
sb.Append("AND tba.ProjectId = @ProjectId ");
listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
if (!string.IsNullOrWhiteSpace(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != Const._Null)
{
sb.Append("AND tba.UnitId = @UnitId ");
listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue));
}
}
//if (!string.IsNullOrWhiteSpace(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
//{
// sb.Append("AND tba.ProjectId = @ProjectId ");
// listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
//}
if (!string.IsNullOrWhiteSpace(this.drpYear.SelectedValue) && this.drpYear.SelectedValue != Const._Null)
{
sb.Append("AND tba.Year = @Year ");
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.designer.cs
Generated
+2 -2
View File
@@ -78,13 +78,13 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
protected global::FineUIPro.DropDownList drpMonth;
/// <summary>
/// drpProject 控件。
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpBaseRiskLevel 控件。
SGGL/FineUIPro.Web/ReportManage/SafeEnvBudget/SafeEnvBudgetEdit.aspx.cs
-5
View File
@@ -43,7 +43,6 @@ namespace FineUIPro.Web.ReportManage.SafeEnvBudget
#endregion
#region 加载页面
/// <summary>
/// 加载页面
@@ -189,10 +188,6 @@ namespace FineUIPro.Web.ReportManage.SafeEnvBudget
}
#endregion
#region 提交按钮
/// <summary>
/// 提交按钮
SGGL/FineUIPro.Web/common/PageBase.cs
+79 -76
View File
@@ -28,13 +28,16 @@ namespace FineUIPro.Web
{
string account = string.Empty;
string password = string.Empty;
if (Request.Cookies["u"] != null)
if (HttpContext.Current != null && HttpContext.Current.Request != null)
{
account = HttpUtility.UrlDecode(Request.Cookies["u"].Value);
}
if (Request.Cookies["p"] != null)
{
password = Request.Cookies["p"].Value;
if (Request.Cookies["u"] != null)
{
account = HttpUtility.UrlDecode(Request.Cookies["u"].Value);
}
if (Request.Cookies["p"] != null)
{
password = Request.Cookies["p"].Value;
}
}
Session["CurrUser"] = BLL.Funs.DB.Sys_User.FirstOrDefault(x => x.Account == account && x.Password == Funs.EncryptionPassword(password));
}
@@ -58,66 +61,66 @@ namespace FineUIPro.Web
#region OnInit
protected override void OnInit(EventArgs e)
{
if (Session["CurrUser"] == null && !Request.Path.Contains("/Login.aspx") && !Request.Path.Contains("DataShow"))
{
//string ticket = Request.Params["ticket"];
//if (!string.IsNullOrEmpty(ticket))
//{
// string jsonCameras = APIGetHttpService.Http("https://=" + ticket);
{
if (Session["CurrUser"] == null && !Request.Path.Contains("/Login.aspx") && !Request.Path.Contains("DataShow"))
{
//string ticket = Request.Params["ticket"];
//if (!string.IsNullOrEmpty(ticket))
//{
// string jsonCameras = APIGetHttpService.Http("https://=" + ticket);
// XmlDocument xml = new XmlDocument();
// xml.LoadXml(jsonCameras);
// XmlElement root = xml.DocumentElement;
// XmlNode node = root.ChildNodes[0];//遍历输出.
// if (node.LocalName == "authenticationSuccess")
// {
// string user = node.ChildNodes[0].InnerText;//InnerText节点包合的所有文本内容
// //if ("zyk" == user)
// //{
// // user = "hfnbd";
// //}
// Model.Sys_User sysUser = (from y in Funs.DB.Sys_User
// where (y.DomainAccount == user || y.Account ==user) && y.IsPost == true
// select y).FirstOrDefault();
// if (user != null)
// {
// string accValue = HttpUtility.UrlEncode(user);
// FormsAuthentication.SetAuthCookie(accValue, false);
// Page.Session[SessionName.CurrUser] = sysUser;
// string url = "";
// this.CurrUser.RoleType = RoleService.GetRoleTypeByRoleId(this.CurrUser.RoleId);
// if (!this.CurrUser.LastIsOffice.HasValue)
// {
// this.CurrUser.LastIsOffice = this.CurrUser.IsOffice;
// }
// if (this.CurrUser.LastIsOffice == true)
// {
// this.CurrUser.LoginProjectId = null;
// ////本部菜单
// url = "index.aspx";
// }
// else
// {
// this.CurrUser.LoginProjectId = this.CurrUser.LastProjectId;
// //// 项目菜单
// url = "indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
// }
// this.SysType = "GONGCHENG";
// Response.Redirect(url);
// }
// else
// {
// Response.Redirect("Login.aspx");
// }
// }
//}
//else
//{
// Response.Redirect("https://sggl/indexProject.aspx");
//}
}
var pm = PageManager.Instance;
// XmlDocument xml = new XmlDocument();
// xml.LoadXml(jsonCameras);
// XmlElement root = xml.DocumentElement;
// XmlNode node = root.ChildNodes[0];//遍历输出.
// if (node.LocalName == "authenticationSuccess")
// {
// string user = node.ChildNodes[0].InnerText;//InnerText节点包合的所有文本内容
// //if ("zyk" == user)
// //{
// // user = "hfnbd";
// //}
// Model.Sys_User sysUser = (from y in Funs.DB.Sys_User
// where (y.DomainAccount == user || y.Account ==user) && y.IsPost == true
// select y).FirstOrDefault();
// if (user != null)
// {
// string accValue = HttpUtility.UrlEncode(user);
// FormsAuthentication.SetAuthCookie(accValue, false);
// Page.Session[SessionName.CurrUser] = sysUser;
// string url = "";
// this.CurrUser.RoleType = RoleService.GetRoleTypeByRoleId(this.CurrUser.RoleId);
// if (!this.CurrUser.LastIsOffice.HasValue)
// {
// this.CurrUser.LastIsOffice = this.CurrUser.IsOffice;
// }
// if (this.CurrUser.LastIsOffice == true)
// {
// this.CurrUser.LoginProjectId = null;
// ////本部菜单
// url = "index.aspx";
// }
// else
// {
// this.CurrUser.LoginProjectId = this.CurrUser.LastProjectId;
// //// 项目菜单
// url = "indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
// }
// this.SysType = "GONGCHENG";
// Response.Redirect(url);
// }
// else
// {
// Response.Redirect("Login.aspx");
// }
// }
//}
//else
//{
// Response.Redirect("https://sggl/indexProject.aspx");
//}
}
var pm = PageManager.Instance;
if (pm != null)
{
HttpCookie themeCookie = Request.Cookies["Theme"];
@@ -248,15 +251,15 @@ namespace FineUIPro.Web
/// <param name="e"></param>
protected void PageBase_Load(object sender, EventArgs e)
{
//这是后置式的权限管理策略.
//页面装载完成以后才检查是否有权限打开此页....
//anyway,its ok.
//这是后置式的权限管理策略.
//页面装载完成以后才检查是否有权限打开此页....
//anyway,its ok.
this.Title = BLL.Funs.SystemName;
this.Title = BLL.Funs.SystemName;
//if (CurrUser == null)
//{
// if (this.Page.Request.AppRelativeCurrentExecutionFilePath != "~/Login.aspx")
@@ -557,12 +560,12 @@ namespace FineUIPro.Web
/// <returns>数据表</returns>
protected DataTable GetPagedDataTable(FineUIPro.Grid Grid1, DataTable tb)
{
int pageIndex = Grid1.PageIndex;
int pageIndex = Grid1.PageIndex;
int pageSize = Grid1.PageSize;
string sortField = Grid1.SortField;
string sortDirection = Grid1.SortDirection;
//DataTable table2 = DataSourceUtil.GetDataTable2();
DataView view = tb.DefaultView;
// view.Sort = String.Format("{0} {1}", sortField, sortDirection);
@@ -957,7 +960,7 @@ namespace FineUIPro.Web
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
sb.AppendFormat("<td x:str>{0}</td>", column.HeaderText);
@@ -968,8 +971,8 @@ namespace FineUIPro.Web
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber" && (row.FindControl("lblNumber") as AspNet.Label) != null)
{
html = (row.FindControl("lblNumber") as AspNet.Label).Text;
@@ -995,7 +998,7 @@ namespace FineUIPro.Web
}
}
sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
// sb.AppendFormat("<td>{0}</td>", html);
// sb.AppendFormat("<td>{0}</td>", html);
}
sb.Append("</tr>");
SGGL/FineUIPro.Web/common/main.aspx
+88 -77
View File
@@ -10,7 +10,7 @@
<script src="../res/lib/flex.js"></script>
<link rel="stylesheet" href="../res/homecss/common.css?v=202603" />
<link rel="stylesheet" href="../res/homecss/layout.css?v=202603" />
<link rel="stylesheet" href="../res/homecss/index.css?v=202604" />
<link rel="stylesheet" href="../res/homecss/index.css?v=202609" />
<%--<link rel="stylesheet" href="../res/homecss/safe.css?v=202603" />--%>
</head>
<body style="background-color: #001B35;">
@@ -170,7 +170,6 @@
</div>
</div>
</div>
<%--<div id="map"></div>--%>
<div class="map">
<div id="map"></div>
<div class="change-map" @click="handleChangeMap">{{mapType ? '中国地图' : '世界地图'}}</div>
@@ -186,10 +185,10 @@
</ul>
</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>
<div class="site_500 jshover" style="height: 3.05rem; margin-bottom: 0.25rem" data-type="HazardFactor">
<h2><span class="gradient_white_blue">安全危害因素</span></h2>
<div id="risk" class="site_content risk">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
@@ -220,27 +219,36 @@
</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">
<div class="flex_row_end_center">
<div class="site_500 jshover" style="height: 3.05rem; margin-bottom: 0.25rem" data-type="HazardFactorOccHealth">
<h2><span class="gradient_white_blue">职业健康危害因素</span></h2>
<div id="riskHazard" class="site_content risk">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>许可</h6>
<p>
<span class="gradient_white_yellow">0</span><span>项</span>
</p>
<h6>重大风险</h6>
<p><span>{{form?.hazardFactorOcc?.majorRiskNum}}</span></p>
</div>
</div>
<i></i>
<div class="flex_row_start_center">
<div class="flex_column_between_start">
<h6>关闭</h6>
<p>
<span class="gradient_white_blue">0</span><span>项</span>
</p>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>较大风险</h6>
<p><span>{{form?.hazardFactorOcc?.largerRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>一般风险</h6>
<p><span>{{form?.hazardFactorOcc?.generalRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>低风险</h6>
<p><span>{{form?.hazardFactorOcc?.lowRiskNum}}</span></p>
</div>
</div>
</div>
</div>
@@ -311,11 +319,11 @@
}
},
mounted() {
// 组件挂载后执行的操作
this.show = true; // 显示内容
hoverEvent();
//组件挂载后执行的操作
this.show = true; //显示内容
this.createChinaMap();
this.loadData(); // 加载数据
this.loadData(); //加载数据
hoverEvent();//模块数据穿透
// this.startTimer(); //启动时间定时器
},
methods: {
@@ -328,6 +336,9 @@
url: "main.aspx/GetMainData", //调用后台WebMethod
contentType: "application/json; charset=utf-8",
dataType: "json",
<%--data: JSON.stringify({
unitId: '<%=UnitId%>'
}),--%>
success: function (response) {
//console.log("请求结果：", response.d)
if (response.d.success) {
@@ -383,7 +394,7 @@
this.createChinaMap(this.chinaData)
}
},
// 创建中国地图
//创建中国地图
createChinaMap(data) {
let list = data || [];
//console.log("地图数据", data);
@@ -470,8 +481,10 @@
borderColor: '#fff',
borderWidth: 1,
padding: 10,
formatter: function (params) {
console.log("地图数据明细", params)
formatter: function(params) {
// debugger
// console.log("地图数据明细", params)
// console.log("地图数据明细", params)
// 自定义 tooltip 内容
if (params.seriesType === 'effectScatter') {
return `<div style="color: white;">
@@ -541,12 +554,47 @@
this.chainaMap.setOption(chinaOption);
this.chainaMap.on('click', function (params) {
// 控制台打印点击的地区名称
//if (params.seriesType == 'effectScatter') {
// alert('点击了' + params.name);
//}
if (params.seriesType == 'effectScatter') {
// alert('点击了' + params.name + ';' + params.data.id);
// debugger;
$.ajax({
type: "POST",
url: "main.aspx/ViewProject", //调用后台WebMethod
contentType: "application/json; charset=utf-8",
dataType: "json",
data: JSON.stringify({
projectId: params.data.id
}),
success: function (response) {
//console.log("请求结果：", response.d)
if (response.d.success) {
var url = response.d.data;
var msg = response.d.msg;
if (url != "") {
// 当前页面跳转
top.window.location.href = url;
} else {
alert("跳转失败：" + msg);
}
} else {
// 更新数据失败
alert("跳转失败：" + response.d.msg);
}
// $(".loading").hide()
},
error: function(xhr, status, error) {
// AJAX请求错误处理
// $(".loading").hide()
alert("请求失败：" + error);
}
});
}
// 你可以在这里添加你的逻辑代码
});
},
//创建世界地图
createWorldMap(data) {
//let data = list || [
// { value: [116.407394, 39.904211], name: "北京" }, // 北京
@@ -713,14 +761,13 @@
//}
//// 你可以在这里添加你的逻辑代码
})
},
}
}
})
function hoverEvent() {
$(".jshover").click(function (e) {
e.stopPropagation()
if ($(".popu").css("display") == "block") {
$(".popu").hide()
return
@@ -728,57 +775,21 @@
let type = this.getAttribute("data-type")
let iframe = $('iframe')
switch (type) {
case "1":
// 组织人员
// iframe.attr('src', '../DataShow/CompanyPerson.aspx')
window.open('../DataShow/CompanyPerson.aspx')
case "HazardFactor"://安全危害因素
window.open('../DataShow/HazardFactor.aspx')
break
case "2":
// 教育培训/安全工时
// iframe.attr('src', '../DataShow/EduTrain.aspx')
window.open('../DataShow/EduTrain.aspx')
break
case "3":
// 安全隐患排查治理
// iframe.attr('src', '../DataShow/HiddenRectification.aspx')//一般隐患
window.open('../DataShow/HiddenRectification.aspx')
break
case "4":
// 费用及机具
// iframe.attr('src', '../DataShow/SecurityCost.aspx')
window.open('../DataShow/SecurityCost.aspx')
break
case "5":
// 危大工程管控数据
// iframe.attr('src', '../DataShow/LargeEngineering.aspx')
window.open('../DataShow/LargeEngineering.aspx')
break
case "6":
// 风险分级管控
// iframe.attr('src', '../DataShow/SecurityRisk.aspx')
window.open('../DataShow/SecurityRisk.aspx')
break
case "7":
// 高风险作业许可
// iframe.attr('src', '../DataShow/License.aspx')
window.open('../DataShow/License.aspx')
break
case "8":
// 应急管理数据
// iframe.attr('src', '../DataShow/Emergency.aspx')
window.open('../DataShow/Emergency.aspx')
case "HazardFactorOccHealth"://职业健康危害因素
window.open('../DataShow/HazardFactorOccHealth.aspx')
break
}
// $("#hover").hide()
$(".popu").show()
})
$(".container").css({
position: "relative",
})
$(".container")
.click(function (e) {
$(".popu").hide()
})
$(".container").click(function (e) {
$(".popu").hide()
})
}
</script>
SGGL/FineUIPro.Web/common/main.aspx.cs
+88 -12
View File
@@ -1,14 +1,11 @@
using BLL;
using FineUIPro.Web.DataShow;
using FineUIPro.Web.SysManage;
using FineUIPro.Web.ZHGL.DataSync;
using Model;
using NPOI.SS.Formula.Functions;
using NPOI.POIFS.Crypt.Dsig;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.Threading.Tasks;
using System.Web.Services;
using System.Web.UI.WebControls;
@@ -17,11 +14,40 @@ namespace FineUIPro.Web.common
{
public partial class main : PageBase
{
///// <summary>
///// 单位id
///// </summary>
//public string UnitId
//{
// get
// {
// return (string)ViewState["UnitId"];
// }
// set
// {
// ViewState["UnitId"] = value;
// }
//}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
//var ssss = Request;
//string unitId = string.Empty;
//unitId = this.CurrUser.LastUnitId;
//string unitIdw = string.Empty;
//string urlReferrer = Request.UrlReferrer.ToString();
//if (!string.IsNullOrWhiteSpace(urlReferrer))
//{
// unitId = urlReferrer.Split('=')[1];
// this.UnitId = unitId;
//}
//var sss = this.CurrUser;
//if (!string.IsNullOrEmpty(Request.QueryString["unitId"]))
//{
// this.UnitId = Request.QueryString["unitId"];
//}
}
}
@@ -37,12 +63,19 @@ namespace FineUIPro.Web.common
var page = new main();
MainSevice mainSevice = new MainSevice(page.CurrUser.UserId);
string unitId = page.CurrUser.UnitId;
if (CommonService.IsSuperAdminManage(page.CurrUser.UserId) || (!string.IsNullOrWhiteSpace(unitId) && unitId == Const.UnitId_XJYJ))
{
unitId = !string.IsNullOrWhiteSpace(page.CurrUser.LastUnitId) ? page.CurrUser.LastUnitId : Const.UnitId_XJYJ;
}
//获取数据
var hsseData = Task.Run(() => mainSevice.GetHsseData()).Result;
//var hiddenDangerList = mainSevice.GetDataHiddenDangerDetailItems();
//获取项目数据
int unitType = CommonService.GetUnitTypeByUserId(page.CurrUser.UserId);
//int unitType = CommonService.GetUnitTypeByUserId(page.CurrUser.UserId);
int unitType = CommonService.GetUnitTypeByUnitId(unitId);
var projects = new List<Base_Project>();
if (unitType == 0)
@@ -51,7 +84,8 @@ namespace FineUIPro.Web.common
}
else if (unitType == 1)
{
projects = Funs.DB.Base_Project.Where(x => x.UnitId == page.CurrUser.UnitId && x.MapCoordinates != null && (x.IsDelete == null || x.IsDelete == false)).ToList();
projects = Funs.DB.Base_Project.Where(x => x.UnitId == unitId && x.MapCoordinates != null && (x.IsDelete == null || x.IsDelete == false)).ToList();
//projects = Funs.DB.Base_Project.Where(x => x.UnitId == page.CurrUser.UnitId && x.MapCoordinates != null && (x.IsDelete == null || x.IsDelete == false)).ToList();
}
//获取安全生产开始日期
@@ -62,14 +96,20 @@ 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], "").ToList();
string hfUnitId = !string.IsNullOrWhiteSpace(unitId) && unitId == Const.UnitId_XJYJ ? string.Empty : unitId;
//安全危害因素
var getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], hfUnitId, string.Empty).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();
//职业健康危害因素
var getHazardFactorOccHealthList = Funs.DB.Sp_HazardFactorOccHealth_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], hfUnitId, string.Empty).ToList();
var lowRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "重大风险").FirstOrDefault();
//构造返回数据
return new
@@ -96,7 +136,7 @@ namespace FineUIPro.Web.common
},
projectInfo = new
{
workSafetyStartDateTip= $"安全生产开始日期：{workSafetyStartDate}",
workSafetyStartDateTip = $"安全生产开始日期：{workSafetyStartDate}",
workSafetyDay1 = (workSafetyDays % 10),
workSafetyDay10 = ((workSafetyDays % 100) / 10),
workSafetyDay100 = ((workSafetyDays % 1000) / 100),
@@ -118,11 +158,18 @@ namespace FineUIPro.Web.common
value = p.MapCoordinates.Split(','),
}).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,
},
hazardFactorOcc = new
{//职业健康危害因素
lowRiskNum = lowRiskOcc != null ? lowRiskOcc.Num : 0,
generalRiskNum = generalRiskOcc != null ? generalRiskOcc.Num : 0,
largerRiskNum = largerRiskOcc != null ? largerRiskOcc.Num : 0,
majorRiskNum = majorRiskOcc != null ? majorRiskOcc.Num : 0,
}
}
};
@@ -132,5 +179,34 @@ namespace FineUIPro.Web.common
return new { success = false, msg = ex.Message };
}
}
/// <summary>
/// 获取项目跳转地址
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
[WebMethod]
public static object ViewProject(string projectId)
{
try
{
var page = new main();
string url = string.Empty;
string msg = string.Empty;
if ((page.CurrUser.IsOffice == true && !string.IsNullOrEmpty(page.CurrUser.RoleId)) || (page.CurrUser.IsOffice == false || !page.CurrUser.IsOffice.HasValue))
{
url = "../indexProject.aspx?projectId=" + projectId;
}
else
{
msg = "您没有权限进入项目管理模块！";
}
return new { success = true, data = url, msg = msg };
}
catch (Exception ex)
{
return new { success = false, msg = ex.Message };
}
}
}
}
SGGL/FineUIPro.Web/common/mainProject.aspx
+28 -19
View File
@@ -200,8 +200,8 @@
</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">
<h2><span class="gradient_white_blue">安全危害因素</span></h2>
<div id="risk" class="site_content risk">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
@@ -232,28 +232,37 @@
</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">
<div class="flex_row_end_center">
<div class="site_500 jshover" style="height: 3.05rem; margin-bottom: 0.25rem" >
<h2><span class="gradient_white_blue">职业健康危害因素</span></h2>
<div id="riskHazard" class="site_content risk">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>许可</h6>
<p>
<span class="gradient_white_yellow">0</span><span>项</span>
</p>
<h6>重大风险</h6>
<p><span>{{form?.hazardFactorOcc?.majorRiskNum}}</span></p>
</div>
</div>
<i></i>
<div class="flex_row_start_center">
<div class="flex_column_between_start">
<h6>关闭</h6>
<p>
<span class="gradient_white_blue">0</span><span>项</span>
</p>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>较大风险</h6>
<p><span>{{form?.hazardFactorOcc?.largerRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>一般风险</h6>
<p><span>{{form?.hazardFactorOcc?.generalRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>低风险</h6>
<p><span>{{form?.hazardFactorOcc?.lowRiskNum}}</span></p>
</div>
</div>
</div>
</div>
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+17 -5
View File
@@ -38,11 +38,10 @@ namespace FineUIPro.Web.common
// 获取项目数据
var project = ProjectService.GetProjectByProjectId(projectId);
//项目总工期
int projectDays = 0;
int endDays = 0;
if (project.StartDate.HasValue && project.EndDate.HasValue)
if (project != null && project.StartDate.HasValue && project.EndDate.HasValue)
{
int pdays = (project.EndDate.Value - project.StartDate.Value).Days;
if (pdays >= 0)
@@ -70,12 +69,18 @@ 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 getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], string.Empty, 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();
//职业健康危害因素
var getHazardFactorOccHealthList = Funs.DB.Sp_HazardFactorOccHealth_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], string.Empty, projectId).ToList();
var lowRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "重大风险").FirstOrDefault();
// 构造返回数据
return new
@@ -90,7 +95,7 @@ namespace FineUIPro.Web.common
participateInNum = hsseData != null ? hsseData.JoinConstructionPersonNum ?? 0 : 0,
dangerousProject = hsseData != null ? hsseData.MajorProjectsUnderConstructionNum ?? 0 : 0,
projectDays = projectDays,//项目总工期
projectEndDate = project.EndDate != null ? string.Format("{0:yyyy-MM-dd}", project.EndDate) : string.Empty,//项目到期时间
projectEndDate = project != null && project.EndDate != null ? string.Format("{0:yyyy-MM-dd}", project.EndDate) : string.Empty,//项目到期时间
projectEndDays = endDays > 0 ? endDays : 0,//合同倒计时
},
hazardFactor = new
@@ -99,6 +104,13 @@ namespace FineUIPro.Web.common
generalRiskNum = generalRisk != null ? generalRisk.Num : 0,
largerRiskNum = largerRisk != null ? largerRisk.Num : 0,
majorRiskNum = majorRisk != null ? majorRisk.Num : 0,
},
hazardFactorOcc = new
{//职业健康危害因素
lowRiskNum = lowRiskOcc != null ? lowRiskOcc.Num : 0,
generalRiskNum = generalRiskOcc != null ? generalRiskOcc.Num : 0,
largerRiskNum = largerRiskOcc != null ? largerRiskOcc.Num : 0,
majorRiskNum = majorRiskOcc != null ? majorRiskOcc.Num : 0,
}
//meetAnEmergency = new
//{
SGGL/FineUIPro.Web/index.aspx
+85 -3
View File
@@ -24,6 +24,47 @@
color: white !important;
}
#index .selectedStyle {
margin: 0;
padding: 0;
background-color: transparent;
}
#index .set .f-widget-content {
border: none;
padding: 0;
margin: 0;
background-color: transparent;
color: #ffffff;
}
#index .gridStyle {
background-color: #01284f;
border-radius: 0;
}
#index .gridStyle .f-state-default, .f-widget-content .f-state-default, .f-widget-header .f-state-default {
background-color: #01284f;
color: #ffffff;
}
#index .gridStyle .f-grid-bodyct::-webkit-scrollbar {
display: none;
}
#index .gridStyle .f-grid-table .f-grid-row, #index .gridStyle .f-grid-row-alt {
background-color: #01284f;
color: #ffffff;
}
#index .gridStyle .f-grid-table .f-state-hover, #index .gridStyle .f-state-active, #index .gridStyle .f-widget-content .f-state-active, #index .gridStyle .f-widget-header .f-state-active {
color: #2694e8;
}
#index .gridStyle .f-grid-column-lines .f-grid-cell {
border: none;
}
#index .f-widget-content {
border: none;
}
@@ -196,9 +237,42 @@
</div>
</div>
<div class="set">
<div >
<div>
<f:DropDownBox runat="server" CssClass="selectedStyle" ID="drpUnit" Hidden="true" Label="" EmptyText="请从下拉表格中选择" MatchFieldWidth="false" LabelAlign="Right"
AutoPostBack="true" OnTextChanged="drpUnit_SelectedIndexChanged" Width="300px">
<PopPanel>
<f:Grid ID="Grid1" CssClass="gridStyle" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="UnitId" DataTextField="UnitName"
DataKeyNames="UnitId" AllowSorting="true" EnableColumnLines="true"
Hidden="true" Width="800px" Height="400px" PageSize="300">
<%--<Toolbars >
<f:Toolbar CssStyle="background-color: #01284f;" ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" CssClass="s" ID="txtUnitName" EmptyText="按名称查询" FocusOnPageLoad="true"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>--%>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField Width="140px" ColumnID="UnitCode" DataField="UnitCode"
FieldType="String" HeaderText="单位代码" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField MinWidth="250px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="dataload" Handler="onGridDataLoad" />
</Listeners>
</f:Grid>
</PopPanel>
</f:DropDownBox>
</div>
<%--<div >
<f:Button ID="btnIcon1" Text="视频" IconFont="VideoCamera" runat="server" CssClass="libtn" OnClientClick="openVideo()" />
</div>
</div>--%>
<div >
<f:Button ID="userName" runat="server" Text="用户" IconFont="User" runat="server" CssClass="libtn" Badge="true" BadgeText="0" BadgeType="Error" OnClientClick="parent.removeActiveTab();" OnClick="btnPersonal_Click" />
</div>
@@ -295,8 +369,11 @@
ShowBorder="true" EnableTabCloseMenu="true" runat="server">
<Tabs>
<%--.f-tabstrip-noheader>.f-panel-header--%>
<f:Tab ID="Tab1" Title="首页" IconFont="Home"
<%--<f:Tab ID="Tab1" Title="首页" IconFont="Home"
EnableIFrame="true" IFrameUrl="~/common/main_Hsse.aspx" runat="server">
</f:Tab>--%>
<f:Tab ID="Tab1" Title="首页" IconFont="Home"
EnableIFrame="true" IFrameUrl="~/common/main.aspx" runat="server">
</f:Tab>
</Tabs>
<Tools>
@@ -751,6 +828,11 @@
document.msExitFullscreen();
}
}
function onGridDataLoad(event) {
this.mergeColumns(['UnitName'], {
depends: true
});
}
</script>
</body>
</html>
SGGL/FineUIPro.Web/index.aspx.cs
+91 -4
View File
@@ -58,10 +58,66 @@ namespace FineUIPro.Web
if (!IsPostBack)
{
this.CurrUser.LoginProjectId = null;
}
}
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox_TextChanged(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 分公司下拉框绑定数据
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
if (!string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.Base_Unit.IsBranch == true)
{//当前人员为分公司人员
return;
}
string userId = this.CurrUser.UserId;
string unitName = string.Empty;
//string unitName = this.txtUnitName.Text.Trim();
var getUser = UserService.GetUserByUserId(userId);
var unitlist = BLL.UnitService.GetBranchUnitList(true);
//if (!string.IsNullOrWhiteSpace(unitName))
//{
// unitlist = unitlist.Where(x => x.UnitName.Contains(unitName)).ToList();
//}
unitlist = unitlist.OrderBy(x => x.UnitCode).ToList();
Grid1.RecordCount = unitlist.Count;
Grid1.DataSource = unitlist;
Grid1.DataBind();
}
#endregion
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
this.Tab1.RefreshIFrame();
string dUnitId = this.drpUnit.Value;
if (!string.IsNullOrEmpty(dUnitId))
{
this.CurrUser.LastUnitId = this.drpUnit.Value;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, true, string.Empty, this.drpUnit.Value);
}
PageContext.Redirect("~/index.aspx?unitId=" + this.drpUnit.Value, "_top");
PageContext.RegisterStartupScript("parent.removeActiveTab();");
//this.CurrUser.LoginProjectId = this.drpProject.Value;
//PageContext.RegisterStartupScript("parent.removeActiveTab();");
//MenuSwitchMethod(this.CurrUser.LastMenuType);
}
#endregion
#region InitTreeMenu
@@ -290,7 +346,11 @@ namespace FineUIPro.Web
{
if (!IsPostBack)
{
//string menuType = Request.Params["menuType"] != null ? Request.Params["menuType"].ToString() : string.Empty;
//if (!string.IsNullOrWhiteSpace(menuType))
//{
this.MenuSwitchMethod(Request.Params["menuType"]);
//}
this.InitMenuStyleButton();
this.InitMenuModeButton();
this.InitLangMenuButton();
@@ -314,6 +374,33 @@ namespace FineUIPro.Web
// //divWeather.InnerHtml = getW.WeatherRef + " " + getW.CurrTem+ "°C";
//}
this.CurrUser.LoginProjectId = null;
this.drpUnit.Hidden = true;
if (CommonService.IsSuperAdminManage(this.CurrUser.UserId) || !string.IsNullOrWhiteSpace(this.CurrUser.UnitId))
{
if (CommonService.IsSuperAdminManage(this.CurrUser.UserId) || this.CurrUser.UnitId == Const.UnitId_XJYJ)
{
this.drpUnit.Hidden = false;
BindGrid();
string dUnitId = Const.UnitId_XJYJ;
if (!string.IsNullOrEmpty(this.CurrUser.LastUnitId))
{
dUnitId = this.CurrUser.LastUnitId;
}
//var su = UserService.GetUserByUserId(this.CurrUser.UserId);
//if (!string.IsNullOrEmpty(su.LastUnitId))
//{
// dUnitId = su.LastUnitId;
//}
this.drpUnit.Value = dUnitId;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, true, string.Empty, dUnitId);
}
else if (this.CurrUser.Base_Unit.IsBranch == true)
{
this.drpUnit.Hidden = true;
}
}
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && this.CurrUser.UnitId != CommonService.GetThisUnitId())
{
this.Title = "安全数据采集平台（分公司）";
@@ -393,7 +480,7 @@ namespace FineUIPro.Web
/// 功能模块切换方法
/// </summary>
/// <param name="type"></param>
protected void MenuSwitchMethod(string type)
protected void MenuSwitchMethod(string type)
{
if (!string.IsNullOrEmpty(type))
{
@@ -421,7 +508,7 @@ namespace FineUIPro.Web
this.Tab1.IFrameUrl = "~/common/main.aspx";
}
UserService.UpdateLastUserInfo(this.CurrUser.UserId, type, true, string.Empty);
//UserService.UpdateLastUserInfo(this.CurrUser.UserId, type, true, string.Empty, this.CurrUser.UnitId);
InitTreeMenu();
}
@@ -442,7 +529,7 @@ namespace FineUIPro.Web
if ((this.CurrUser.IsOffice == true && !string.IsNullOrEmpty(this.CurrUser.RoleId)) || (this.CurrUser.IsOffice == false || !this.CurrUser.IsOffice.HasValue))
{
string url = "~/indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, this.CurrUser.LastProjectId);
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, this.CurrUser.LastProjectId, string.Empty);
PageContext.Redirect(url, "_top");
}
else
SGGL/FineUIPro.Web/index.aspx.designer.cs
Generated
+11 -2
View File
@@ -123,13 +123,22 @@ namespace FineUIPro.Web
protected global::FineUIPro.Button btnSysSet;
/// <summary>
/// btnIcon1 控件。
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnIcon1;
protected global::FineUIPro.DropDownBox drpUnit;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// userName 控件。
SGGL/FineUIPro.Web/indexProject.aspx
+2 -1
View File
@@ -186,7 +186,8 @@
a {
text-decoration: none;
}
.centerregion{
.centerregion {
border: none !important;
}
</style>
SGGL/FineUIPro.Web/indexProject.aspx.cs
+7 -4
View File
@@ -728,7 +728,7 @@ namespace FineUIPro.Web
}
this.CurrUser.LastMenuType = type;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, type, false, this.CurrUser.LoginProjectId);
UserService.UpdateLastUserInfo(this.CurrUser.UserId, type, false, this.CurrUser.LoginProjectId, string.Empty);
InitTreeMenu();
}
@@ -737,12 +737,15 @@ namespace FineUIPro.Web
if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
&& ((this.CurrUser.UnitId == Const.UnitId_XJYJ && this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
{
UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId);
this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
PageContext.Redirect("~/index.aspx", "_top");
UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId, this.CurrUser.UnitId);
this.CurrUser.LastUnitId = this.CurrUser.UnitId;
PageContext.Redirect("~/index.aspx?unitId=" + this.CurrUser.UnitId, "_top");
//PageContext.Redirect("~/index.aspx", "_top");
}
else
{
UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId, string.Empty);
this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
//this.MenuSwitchMethod(string.Empty);
PageContext.Redirect("~/indexProject.aspx?projectId=" + this.CurrUser.LoginProjectId, "_top");
}
SGGL/FineUIPro.Web/res/homecss/index.css
+18 -18
View File
@@ -376,7 +376,7 @@
color: #C2D5E7;
}
#risk {
.risk {
padding: 0.25rem;
display: grid;
grid-template-columns: 1fr 1fr;
@@ -385,83 +385,83 @@
row-gap: 0.25rem;
}
#risk > div > i {
.risk > div > i {
height: 0.825rem;
width: 0.9375rem;
}
#risk > div > div {
.risk > div > div {
margin-left: 0.125rem;
height: 0.825rem;
}
#risk > div > div > h6 {
.risk > div > div > h6 {
font-size: 0.225rem;
font-weight: bold;
}
#risk > div > div > p {
.risk > div > div > p {
font-size: 0.3rem;
}
#risk > div > div > p > span:nth-child(1) {
.risk > div > div > p > span:nth-child(1) {
font-size: 0.3rem;
color: #C2D5E7;
}
#risk > div:nth-child(1) > i {
.risk > div:nth-child(1) > i {
background-image: url(../images/1-2/r5.png);
}
#risk > div:nth-child(1) > div > h6 {
.risk > div:nth-child(1) > div > h6 {
background: linear-gradient(180deg, #FFFFFF 0%, #EF3B49 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
#risk > div:nth-child(1) > div > p > span:nth-child(1) {
.risk > div:nth-child(1) > div > p > span:nth-child(1) {
color: #EF3B49;
}
#risk > div:nth-child(2) > i {
.risk > div:nth-child(2) > i {
background-image: url(../images/1-2/r6.png);
}
#risk > div:nth-child(2) > div > h6 {
.risk > div:nth-child(2) > div > h6 {
background: linear-gradient(180deg, #FFFFFF 0%, #EF893B 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
#risk > div:nth-child(2) > div > p > span:nth-child(1) {
.risk > div:nth-child(2) > div > p > span:nth-child(1) {
color: #EF893B;
}
#risk > div:nth-child(3) > i {
.risk > div:nth-child(3) > i {
background-image: url(../images/1-2/r7.png);
}
#risk > div:nth-child(3) > div > h6 {
.risk > div:nth-child(3) > div > h6 {
background: linear-gradient(180deg, #FFFFFF 0%, #EFCB3B 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
#risk > div:nth-child(3) > div > p > span:nth-child(1) {
.risk > div:nth-child(3) > div > p > span:nth-child(1) {
color: #EFCB3B;
}
#risk > div:nth-child(4) > i {
.risk > div:nth-child(4) > i {
background-image: url(../images/1-2/r8.png);
}
#risk > div:nth-child(4) > div > h6 {
.risk > div:nth-child(4) > div > h6 {
background: linear-gradient(180deg, #FFFFFF 0%, #3B8CEF 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
#risk > div:nth-child(4) > div > p > span:nth-child(1) {
.risk > div:nth-child(4) > div > p > span:nth-child(1) {
color: #3B8CEF;
}
SGGL/FineUIPro.Web/res/homecss/safe.css
+18 -18
View File
@@ -389,7 +389,7 @@
color: #C2D5E7;
}
#risk {
.risk {
padding: 0.25rem;
display: grid;
grid-template-columns: 1fr 1fr;
@@ -398,83 +398,83 @@
row-gap: 0.25rem;
}
#risk > div > i {
.risk > div > i {
height: 0.825rem;
width: 0.9375rem;
}
#risk > div > div {
.risk > div > div {
margin-left: 0.125rem;
height: 0.825rem;
}
#risk > div > div > h6 {
.risk > div > div > h6 {
font-size: 0.225rem;
font-weight: bold;
}
#risk > div > div > p {
.risk > div > div > p {
font-size: 0.3rem;
}
#risk > div > div > p > span:nth-child(1) {
.risk > div > div > p > span:nth-child(1) {
font-size: 0.3rem;
color: #C2D5E7;
}
#risk > div:nth-child(1) > i {
.risk > div:nth-child(1) > i {
background-image: url(../images/1-2/r5.png);
}
#risk > div:nth-child(1) > div > h6 {
.risk > div:nth-child(1) > div > h6 {
background: linear-gradient(180deg, #FFFFFF 0%, #EF3B49 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
#risk > div:nth-child(1) > div > p > span:nth-child(1) {
.risk > div:nth-child(1) > div > p > span:nth-child(1) {
color: #EF3B49;
}
#risk > div:nth-child(2) > i {
.risk > div:nth-child(2) > i {
background-image: url(../images/1-2/r6.png);
}
#risk > div:nth-child(2) > div > h6 {
.risk > div:nth-child(2) > div > h6 {
background: linear-gradient(180deg, #FFFFFF 0%, #EF893B 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
#risk > div:nth-child(2) > div > p > span:nth-child(1) {
.risk > div:nth-child(2) > div > p > span:nth-child(1) {
color: #EF893B;
}
#risk > div:nth-child(3) > i {
.risk > div:nth-child(3) > i {
background-image: url(../images/1-2/r7.png);
}
#risk > div:nth-child(3) > div > h6 {
.risk > div:nth-child(3) > div > h6 {
background: linear-gradient(180deg, #FFFFFF 0%, #EFCB3B 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
#risk > div:nth-child(3) > div > p > span:nth-child(1) {
.risk > div:nth-child(3) > div > p > span:nth-child(1) {
color: #EFCB3B;
}
#risk > div:nth-child(4) > i {
.risk > div:nth-child(4) > i {
background-image: url(../images/1-2/r8.png);
}
#risk > div:nth-child(4) > div > h6 {
.risk > div:nth-child(4) > div > h6 {
background: linear-gradient(180deg, #FFFFFF 0%, #3B8CEF 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
#risk > div:nth-child(4) > div > p > span:nth-child(1) {
.risk > div:nth-child(4) > div > p > span:nth-child(1) {
color: #3B8CEF;
}
SGGL/Model/Model.cs
+48 -24
View File
@@ -156047,9 +156047,9 @@ namespace Model
private string _ProjectId;
private System.Nullable<int> _EnergySavingIndex;
private System.Nullable<decimal> _EnergySavingIndex;
private System.Nullable<int> _WaterSavingIndex;
private System.Nullable<decimal> _WaterSavingIndex;
private string _EnergySavingSchemes;
@@ -156061,13 +156061,13 @@ namespace Model
private string _SupportingDocuments;
private System.Nullable<int> _ActualEnergySaving;
private System.Nullable<decimal> _ActualEnergySaving;
private System.Nullable<int> _ActualWaterSaving;
private System.Nullable<decimal> _ActualWaterSaving;
private System.Nullable<int> _EnergySavingCompletionRate;
private System.Nullable<decimal> _EnergySavingCompletionRate;
private System.Nullable<int> _WaterSavingCompletionRate;
private System.Nullable<decimal> _WaterSavingCompletionRate;
private string _CompileMan;
@@ -156087,9 +156087,9 @@ namespace Model
partial void OnEnergyWaterConservationIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnEnergySavingIndexChanging(System.Nullable<int> value);
partial void OnEnergySavingIndexChanging(System.Nullable<decimal> value);
partial void OnEnergySavingIndexChanged();
partial void OnWaterSavingIndexChanging(System.Nullable<int> value);
partial void OnWaterSavingIndexChanging(System.Nullable<decimal> value);
partial void OnWaterSavingIndexChanged();
partial void OnEnergySavingSchemesChanging(string value);
partial void OnEnergySavingSchemesChanged();
@@ -156101,13 +156101,13 @@ namespace Model
partial void OnSummaryChanged();
partial void OnSupportingDocumentsChanging(string value);
partial void OnSupportingDocumentsChanged();
partial void OnActualEnergySavingChanging(System.Nullable<int> value);
partial void OnActualEnergySavingChanging(System.Nullable<decimal> value);
partial void OnActualEnergySavingChanged();
partial void OnActualWaterSavingChanging(System.Nullable<int> value);
partial void OnActualWaterSavingChanging(System.Nullable<decimal> value);
partial void OnActualWaterSavingChanged();
partial void OnEnergySavingCompletionRateChanging(System.Nullable<int> value);
partial void OnEnergySavingCompletionRateChanging(System.Nullable<decimal> value);
partial void OnEnergySavingCompletionRateChanged();
partial void OnWaterSavingCompletionRateChanging(System.Nullable<int> value);
partial void OnWaterSavingCompletionRateChanging(System.Nullable<decimal> value);
partial void OnWaterSavingCompletionRateChanged();
partial void OnCompileManChanging(string value);
partial void OnCompileManChanged();
@@ -156168,8 +156168,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingIndex", DbType="Int")]
public System.Nullable<int> EnergySavingIndex
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingIndex", DbType="Decimal(18,2)")]
public System.Nullable<decimal> EnergySavingIndex
{
get
{
@@ -156188,8 +156188,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingIndex", DbType="Int")]
public System.Nullable<int> WaterSavingIndex
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingIndex", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WaterSavingIndex
{
get
{
@@ -156308,8 +156308,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualEnergySaving", DbType="Int")]
public System.Nullable<int> ActualEnergySaving
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualEnergySaving", DbType="Decimal(18,2)")]
public System.Nullable<decimal> ActualEnergySaving
{
get
{
@@ -156328,8 +156328,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualWaterSaving", DbType="Int")]
public System.Nullable<int> ActualWaterSaving
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualWaterSaving", DbType="Decimal(18,2)")]
public System.Nullable<decimal> ActualWaterSaving
{
get
{
@@ -156348,8 +156348,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingCompletionRate", DbType="Int")]
public System.Nullable<int> EnergySavingCompletionRate
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingCompletionRate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> EnergySavingCompletionRate
{
get
{
@@ -156368,8 +156368,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingCompletionRate", DbType="Int")]
public System.Nullable<int> WaterSavingCompletionRate
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingCompletionRate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WaterSavingCompletionRate
{
get
{
@@ -375141,6 +375141,8 @@ namespace Model
private System.Nullable<System.DateTime> _GetStarTime;
private string _LastUnitId;
private EntitySet<Comprehensive_NCRManagement> _Comprehensive_NCRManagement;
private EntitySet<Comprehensive_PressurePipe> _Comprehensive_PressurePipe;
@@ -375939,6 +375941,8 @@ namespace Model
partial void OnStarLevelIdChanged();
partial void OnGetStarTimeChanging(System.Nullable<System.DateTime> value);
partial void OnGetStarTimeChanged();
partial void OnLastUnitIdChanging(string value);
partial void OnLastUnitIdChanged();
#endregion
public Sys_User()
@@ -377442,6 +377446,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastUnitId", DbType="NVarChar(50)")]
public string LastUnitId
{
get
{
return this._LastUnitId;
}
set
{
if ((this._LastUnitId != value))
{
this.OnLastUnitIdChanging(value);
this.SendPropertyChanging();
this._LastUnitId = value;
this.SendPropertyChanged("LastUnitId");
this.OnLastUnitIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Comprehensive_NCRManagement", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
public EntitySet<Comprehensive_NCRManagement> Comprehensive_NCRManagement
{
SGGL/Model/ModelProc.cs
+21 -4
View File
@@ -11,13 +11,30 @@ namespace Model
/// <summary>
/// °²È«Î£º¦ÒòËØͳ¼Æ
/// </summary>
/// <param name="userId"></param>
/// <param name="year"></param>
/// <param name="month"></param>
/// <param name="unitId"></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)
public IEnumerable<Statistics> Sp_HazardFactor_Statistics([Parameter(DbType = "nvarchar(20)")] string year, [Parameter(DbType = "nvarchar(20)")] string month, [Parameter(DbType = "nvarchar(200)")] string unitId, [Parameter(DbType = "nvarchar(200)")] string projectId)
{
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), year, month, projectId);
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), year, month, unitId, projectId);
return (ISingleResult<Statistics>)result.ReturnValue;
}
/// <summary>
/// Ö°Òµ½¡¿µÎ£º¦ÒòËØͳ¼Æ
/// </summary>
/// <param name="year"></param>
/// <param name="month"></param>
/// <param name="unitId"></param>
/// <param name="projectId"></param>
/// <returns></returns>
[Function(Name = "[dbo].[Sp_HazardFactorOccHealth_Statistics]")]
public IEnumerable<Statistics> Sp_HazardFactorOccHealth_Statistics([Parameter(DbType = "nvarchar(20)")] string year, [Parameter(DbType = "nvarchar(20)")] string month, [Parameter(DbType = "nvarchar(200)")] string unitId, [Parameter(DbType = "nvarchar(200)")] string projectId)
{
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), year, month, unitId, projectId);
return (ISingleResult<Statistics>)result.ReturnValue;
}
@@ -86,7 +103,7 @@ namespace Model
[Function(Name = "[dbo].[spInOutManHoursReport]")]
public IEnumerable<InOutstatisticsItem> spInOutManHoursReport([Parameter(DbType = "nvarchar(50)")] string projectId, [Parameter(DbType = "nvarchar(max)")] string unitId, [Parameter(DbType = "nvarchar(max)")] string postId, [Parameter(DbType = "DateTime")] DateTime? startTime, [Parameter(DbType = "DateTime")] DateTime? endTime)
{
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, unitId, postId, startTime,endTime);
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, unitId, postId, startTime, endTime);
return (ISingleResult<InOutstatisticsItem>)result.ReturnValue;
}