1大屏

AGENTS.md

@@ -0,0 +1,8 @@
+## 知识体系
+
+* 启用：是
+* 项目名称：新疆油建
+* Vault根目录：D:\\ObsidianNoteHub\\项目代码
+* 自动加载：否
+* 自动收集：是
+

DataBase/版本日志/SGGLDB_V2026-10-10-xiaj（Sp_CheckProblem_Safety_Statistics]）.sql

@@ -0,0 +1,34 @@
+
+CREATE OR ALTER  PROCEDURE [dbo].[Sp_CheckProblem_Safety_Statistics]     
+	@unitId NVARCHAR(200)=NULL,
+	@projectId NVARCHAR(200)=NULL
+AS  
+BEGIN
+	SET NOCOUNT ON;
+	WITH CTE AS (
+		SELECT 
+			--ROW_NUMBER() OVER (
+			--	PARTITION BY tba.Description
+			--	ORDER BY CheckDate desc
+			--) as rn,
+			--tbb.ProjectName,
+			bspn.NatureId ,
+			bspn.NatureName 
+		FROM CheckProblem_Safety AS tba WITH(NOLOCK) 
+		--LEFT JOIN Base_Project AS tbb WITH(NOLOCK) ON tbb.ProjectId = tba.ProjectId 		
+		LEFT JOIN Base_SafetyProblemNature AS bspn WITH(NOLOCK) ON bspn.NatureId = tba.NatureId 
+		WHERE 1=1 
+			--AND tba.State = 1 
+			--单位条件：@unitId为空查所有，有值则过滤单位
+			AND (@unitId IS NULL OR @unitId = '' OR tba.UnitId = @unitId)
+			--项目条件：为空不过滤
+			AND (@projectId IS NULL OR @projectId = '' OR tba.ProjectId = @projectId)
+	) 
+	SELECT NatureName AS Title,COUNT(1) AS Num
+	FROM CTE 
+	--WHERE rn = 1
+	GROUP BY NatureName
+END
+GO
+
+

SGGL/BLL/SysManage/UnitService.cs

@@ -421,7 +421,7 @@ namespace BLL
         public static List<Model.Base_Unit> GetMainAndSubUnitList()
         {
             //return (from x in Funs.DB.Base_Unit where x.IsThisUnit == true || x.IsBranch == true orderby x.IsThisUnit descending select x).ToList();
-            return (from x in Funs.DB.Base_Unit where x.IsBranch == true  select x).ToList();
+            return (from x in Funs.DB.Base_Unit where x.IsThisUnit == true || x.IsBranch == true  select x).ToList();
         }
 
         #region 单位表下拉框

SGGL/FineUIPro.Web/DataShow/CheckProblemSafety.aspx

@@ -0,0 +1,174 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckProblemSafety.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.CheckProblemSafety" %>
+
+<!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="CheckId" DataIDField="CheckId" AllowSorting="true" SortField="CheckDate DESC,UnitName"
+                    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:TextBox runat="server" ID="txtSearch" Label="查询" EmptyText="问题描述、检查人、受检单位、项目"
+                                    Width="300px" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px" LabelAlign="right">
+                                </f:TextBox>
+                                <f:DropDownList ID="drpUnit" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" Hidden="true" runat="server"
+                                    Width="360px" LabelWidth="50px" Label="单位" OnSelectedIndexChanged="TextBox_TextChanged">
+                                </f:DropDownList>
+                                <%--<f:DropDownList ID="drpUnit" runat="server" Label="受检单位" EnableEdit="true" EmptyText="请选择受检单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
+                                    LabelAlign="right">
+                                </f:DropDownList>
+                                <f:DropDownList ID="drpProject" runat="server" Label="受检项目" EnableEdit="true" EmptyText="请选择受检项目" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
+                                    LabelAlign="right">
+                                </f:DropDownList>--%>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:RadioButtonList runat="server" ID="rblUnitType" Label="单位类型" LabelWidth="80px" Width="290px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    <f:RadioItem Value="" Text="全部" Selected="true" />
+                                    <f:RadioItem Value="承包商" Text="承包商" />
+                                    <f:RadioItem Value="项目部" Text="项目部" />
+                                </f:RadioButtonList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:DropDownList ID="drpClassify" runat="server" Label="问题分类" EnableEdit="true" EmptyText="请选择问题分类" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelAlign="right" LabelWidth="80px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="drpNature" runat="server" Label="问题性质" EnableEdit="true" EmptyText="请选择问题性质" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelAlign="right" LabelWidth="80px" Width="180px">
+                                </f:DropDownList>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnRset" OnClick="btnRset_Click" Text="重置查询" ToolTip="重置查询条件" Icon="ArrowUndo" EnablePostBack="true" runat="server">
+                                </f:Button>
+                                <f:Button ID="btnQuery" OnClick="btnQuery_Click" Text="查询" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
+                                </f:Button>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DatePicker runat="server" Label="检查日期" ID="txtStartTime" EmptyText="开始日期" LabelAlign="Right" LabelWidth="80px" Width="190px">
+                                </f:DatePicker>
+                                <f:Label ID="Label5" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" EmptyText="结束日期" Width="110px" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                                </f:DatePicker>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:RadioButtonList runat="server" ID="rblState" Label="整改状态" LabelWidth="80px" Width="290px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    <f:RadioItem Value="" Text="全部" Selected="true" />
+                                    <f:RadioItem Value="1" Text="整改中" />
+                                    <f:RadioItem Value="0" Text="已闭环" />
+                                </f:RadioButtonList>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%#  Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="160px" HeaderText="受检单位" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="220px" HeaderText="受检项目" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="160px" HeaderText="项目所在地址" ColumnID="Address" DataField="Address" SortField="Address" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="220px" HeaderText="问题描述" ColumnID="Description" DataField="Description" SortField="Description" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" HeaderText="单位类型" ColumnID="UnitType" DataField="UnitType" SortField="UnitType" FieldType="String" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="160px" HeaderText="机组名称" ColumnID="AssemblyName" DataField="AssemblyName" SortField="AssemblyName" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="tfState" Width="80px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lbState" runat="server" Text='<%# ConvertStates(Eval("State")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="140px" HeaderText="检查人" ColumnID="CheckTeamUser" DataField="CheckTeamUser" SortField="CheckTeamUser" FieldType="String" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" HeaderText="检查日期" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" HeaderText="截止日期" ColumnID="LimitDate" DataField="LimitDate" SortField="LimitDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="140px" HeaderText="整改人" ColumnID="RectificationUserName" DataField="RectificationUserName" SortField="RectificationUserName" FieldType="String" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" HeaderText="闭环时间" ColumnID="CloseTime" DataField="CloseTime" SortField="CloseTime" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="140px" HeaderText="项目经理" ColumnID="PMUserName" DataField="PMUserName" SortField="PMUserName" FieldType="String" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="140px" HeaderText="问题分类" ColumnID="ClassifyName" DataField="ClassifyName" SortField="ClassifyName" FieldType="String" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <%--<f:RenderField Width="200px" HeaderText="分类明细" ColumnID="ClassifyItemName" DataField="ClassifyItemName" SortField="ClassifyItemName" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>--%>
+                        <f:RenderField Width="200px" HeaderText="S1安全管理" ColumnID="S1Name" DataField="S1Name" SortField="S1Name" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" HeaderText="S2施工作业" ColumnID="S2Name" DataField="S2Name" SortField="S2Name" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="140px" HeaderText="问题性质" ColumnID="NatureName" DataField="NatureName" SortField="NatureName" FieldType="String" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <%--<f:RenderField Width="260px" HeaderText="性质明细" ColumnID="NatureItemContent" DataField="NatureItemContent" SortField="NatureItemContent" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>--%>
+                        <f:RenderField Width="260px" HeaderText="管控红线" ColumnID="N1Content" DataField="N1Content" SortField="N1Content" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="260px" HeaderText="危险作业许可" ColumnID="N2Content" DataField="N2Content" SortField="N2Content" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="260px" HeaderText="较大隐患" ColumnID="N3Content" DataField="N3Content" SortField="N3Content" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" HeaderText="备注" ColumnID="Remark" DataField="Remark" SortField="Remark" FieldType="String" 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/CheckProblemSafety.aspx.cs

@@ -0,0 +1,297 @@
+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 CheckProblemSafety : PageBase
+    {
+        /// <summary>
+        /// 单位id
+        /// </summary>
+        public string UnitId
+        {
+            get
+            {
+                return (string)ViewState["UnitId"];
+            }
+            set
+            {
+                ViewState["UnitId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                InitDropDownList();
+                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;
+                }
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                if (!string.IsNullOrWhiteSpace(this.ProjectId))
+                {
+                    this.drpUnit.Hidden = true;
+                }
+
+                //Funs.FineUIPleaseSelect(this.dpState);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+
+                // 绑定表格
+                BindGrid();
+                this.Panel1.Title = "安全危害因素";
+            }
+        }
+
+        /// <summary>
+        /// 初始化下拉框
+        /// </summary>
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitBranchUnitDropDownList(this.drpUnit, true, true);
+            ////受检单位
+            //UnitService.InitBranchUnitDropDownList(this.drpUnit, true);
+            ////受检项目
+            //ProjectService.InitProjectDropDownList(this.drpProject, true);
+            //问题分类
+            SafetyProblemClassifyService.InitClassifyDropDownList(this.drpClassify, true);
+            //问题性质
+            SafetyProblemNatureService.InitNatureDropDownList(this.drpNature, true);
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            StringBuilder sb = new StringBuilder();
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            sb.Append("SELECT spc.ClassifyName,s1.ClassifyItemName AS S1Name,s2.ClassifyItemName AS S2Name,spn.NatureName,n1.NatureItemContent AS N1Content,n2.NatureItemContent AS N2Content,n3.NatureItemContent AS N3Content,tba.*  ");
+            sb.Append("FROM CheckProblem_Safety AS tba WITH(NOLOCK) ");
+            sb.Append("LEFT JOIN Base_SafetyProblemClassify AS spc ON spc.ClassifyId=tba.ClassifyId ");
+            sb.Append($"LEFT JOIN Base_SafetyProblemClassifyItem AS s1 ON s1.ClassifyItemId=tba.ClassifyItemId and s1.ClassifyId='{Const.SafetyClassifyIdS1}' ");
+            sb.Append($"LEFT JOIN Base_SafetyProblemClassifyItem AS s2 ON s2.ClassifyItemId=tba.ClassifyItemId and s2.ClassifyId='{Const.SafetyClassifyIdS2}' ");
+            sb.Append("LEFT JOIN Base_SafetyProblemNature AS spn ON spn.NatureId=tba.NatureId ");
+            sb.Append($"LEFT JOIN Base_SafetyProblemNatureItem AS n1 ON n1.NatureItemId=tba.NatureItemId and n1.NatureId='{Const.SafetyNatureIdN1}' ");
+            sb.Append($"LEFT JOIN Base_SafetyProblemNatureItem AS n2 ON n2.NatureItemId=tba.NatureItemId and n2.NatureId='{Const.SafetyNatureIdN2}' ");
+            sb.Append($"LEFT JOIN Base_SafetyProblemNatureItem AS n3 ON n3.NatureItemId=tba.NatureItemId and n3.NatureId='{Const.SafetyNatureIdN3}' ");
+            sb.Append("WHERE 1=1 ");
+
+            if (!string.IsNullOrWhiteSpace(this.ProjectId))
+            {//项目级只看本项目新增的数据
+                sb.Append("AND tba.ProjectId = @ProjectId ");
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+            }
+            else
+            {
+                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.txtSearch.Text.Trim()))
+            {
+                sb.Append("AND (tba.UnitName LIKE @SearchTxt OR tba.ProjectName LIKE @SearchTxt OR tba.Description LIKE @SearchTxt OR tba.CheckTeamUser LIKE @SearchTxt) ");
+                listStr.Add(new SqlParameter("@SearchTxt", "%" + this.txtSearch.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrWhiteSpace(this.drpClassify.SelectedValue) && this.drpClassify.SelectedValue != Const._Null)
+            {
+                sb.Append("AND tba.ClassifyId=@ClassifyId ");
+                listStr.Add(new SqlParameter("@ClassifyId", this.drpClassify.SelectedValue));
+            }
+            if (!string.IsNullOrWhiteSpace(this.drpNature.SelectedValue) && this.drpNature.SelectedValue != Const._Null)
+            {
+                sb.Append("AND tba.NatureId=@NatureId ");
+                listStr.Add(new SqlParameter("@NatureId", this.drpNature.SelectedValue));
+            }
+            if (!string.IsNullOrWhiteSpace(this.rblState.SelectedValue))
+            {
+                sb.Append("AND tba.State=@State ");
+                listStr.Add(new SqlParameter("@State", this.rblState.SelectedValue));
+            }
+            if (!string.IsNullOrWhiteSpace(this.rblUnitType.SelectedValue))
+            {
+                sb.Append("AND tba.UnitType=@UnitType ");
+                listStr.Add(new SqlParameter("@UnitType", this.rblUnitType.SelectedValue));
+            }
+            string startDate = this.txtStartTime.Text.Trim();
+            string endDate = this.txtEndTime.Text.Trim();
+            if (!string.IsNullOrWhiteSpace(startDate))
+            {
+                sb.Append("AND tba.CheckDate >= @StartDate ");
+                listStr.Add(new SqlParameter("@StartDate", startDate));
+            }
+            if (!string.IsNullOrWhiteSpace(endDate))
+            {
+                sb.Append("AND tba.CheckDate <= @EndDate ");
+                listStr.Add(new SqlParameter("@EndDate", $"{endDate} 23:59:59"));
+            }
+
+            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="obj"></param>
+        /// <returns></returns>
+        public string ConvertStates(Object obj)
+        {
+            string result = "整改中";
+            string state = obj.ToString();
+            if (state == "0")
+            {
+                result = "已闭环";
+            }
+            else
+            { //闭环
+                result = "整改中";
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 条件重置
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnRset_Click(object sender, EventArgs e)
+        {
+            rblUnitType.SelectedIndex = 0;
+            drpClassify.SelectedIndex = 0;
+            drpNature.SelectedIndex = 0;
+            rblState.SelectedIndex = 0;
+            txtSearch.Text = "";
+            txtStartTime.Text = "";
+            txtEndTime.Text = "";
+            BindGrid();
+        }
+
+        #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/CheckProblemSafety.aspx.designer.cs

@@ -0,0 +1,224 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class CheckProblemSafety
+    {
+
+        /// <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>
+        /// txtSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSearch;
+
+        /// <summary>
+        /// drpUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+
+        /// <summary>
+        /// rblUnitType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblUnitType;
+
+        /// <summary>
+        /// drpClassify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpClassify;
+
+        /// <summary>
+        /// drpNature 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpNature;
+
+        /// <summary>
+        /// btnRset 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRset;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label5;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// rblState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblState;
+
+        /// <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/HazardFactor.aspx

@@ -23,10 +23,10 @@
                         <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">
+                                    Width="180px" 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">
+                                    Width="180px" 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">

SGGL/FineUIPro.Web/DataShow/HazardFactor.aspx.cs

@@ -24,6 +24,21 @@ namespace FineUIPro.Web.DataShow
             }
         }
 
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -49,6 +64,15 @@ namespace FineUIPro.Web.DataShow
                 {
                     this.drpUnit.SelectedValue = this.UnitId;
                 }
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                if (!string.IsNullOrWhiteSpace(this.ProjectId))
+                {
+                    this.drpUnit.Hidden = true;
+                }
                 var dateYearMon = DateTime.Now.ToString("yyyy-M");
                 this.drpYear.SelectedValue = dateYearMon.Split('-')[0];
                 this.drpMonth.SelectedValue = dateYearMon.Split('-')[1];
@@ -91,6 +115,13 @@ namespace FineUIPro.Web.DataShow
             //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.ProjectId))
+            {//项目级只看本项目新增的数据
+                sb.Append("AND tba.ProjectId = @ProjectId ");
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+            }
+            else
+            {
                 if (!string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_XJYJ)
                 {//分公司只能查看本单位的数据
                     sb.Append("AND tba.UnitId = @UnitId ");
@@ -104,6 +135,7 @@ namespace FineUIPro.Web.DataShow
                         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 ");

SGGL/FineUIPro.Web/DataShow/HazardFactorOccHealth.aspx

@@ -23,10 +23,10 @@
                         <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">
+                                    Width="180px" 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">
+                                    Width="180px" 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">

SGGL/FineUIPro.Web/DataShow/HazardFactorOccHealth.aspx.cs

@@ -24,6 +24,21 @@ namespace FineUIPro.Web.DataShow
             }
         }
 
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -49,6 +64,15 @@ namespace FineUIPro.Web.DataShow
                 {
                     this.drpUnit.SelectedValue = this.UnitId;
                 }
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                if (!string.IsNullOrWhiteSpace(this.ProjectId))
+                {
+                    this.drpUnit.Hidden = true;
+                }
                 var dateYearMon = DateTime.Now.ToString("yyyy-M");
                 this.drpYear.SelectedValue = dateYearMon.Split('-')[0];
                 this.drpMonth.SelectedValue = dateYearMon.Split('-')[1];
@@ -91,6 +115,13 @@ namespace FineUIPro.Web.DataShow
             //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.ProjectId))
+            {//项目级只看本项目新增的数据
+                sb.Append("AND tba.ProjectId = @ProjectId ");
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+            }
+            else
+            {
                 if (!string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_XJYJ)
                 {//分公司只能查看本单位的数据
                     sb.Append("AND tba.UnitId = @UnitId ");
@@ -104,6 +135,7 @@ namespace FineUIPro.Web.DataShow
                         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 ");

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -624,6 +624,7 @@
     <Content Include="CQMS\WBS\WorkPackageSet2In.aspx" />
     <Content Include="DataShow\Accident.aspx" />
     <Content Include="DataShow\Check.aspx" />
+    <Content Include="DataShow\CheckProblemSafety.aspx" />
     <Content Include="DataShow\HazardFactorOccHealth.aspx" />
     <Content Include="DataShow\HazardFactor.aspx" />
     <Content Include="DataShow\CompanyPerson.aspx" />
@@ -10110,6 +10111,13 @@
     <Compile Include="DataShow\Check.aspx.designer.cs">
       <DependentUpon>Check.aspx</DependentUpon>
     </Compile>
+    <Compile Include="DataShow\CheckProblemSafety.aspx.cs">
+      <DependentUpon>CheckProblemSafety.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\CheckProblemSafety.aspx.designer.cs">
+      <DependentUpon>CheckProblemSafety.aspx</DependentUpon>
+    </Compile>
     <Compile Include="DataShow\HazardFactorOccHealth.aspx.cs">
       <DependentUpon>HazardFactorOccHealth.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/common/main.aspx

@@ -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=202609" />
+    <link rel="stylesheet" href="../res/homecss/index.css?v=202610" />
     <%--<link rel="stylesheet" href="../res/homecss/safe.css?v=202603" />--%>
 </head>
 <body style="background-color: #001B35;">
@@ -77,10 +77,39 @@
                         </div>
                     </div>
                 </div>
-                <div class="site_500" style="height: 3.1rem; margin-bottom: 0.25rem">
+                <div class="site_500 jshover" style="height: 3.05rem; margin-bottom: 0.25rem" data-type="CheckProblemSafety">
-                    <h2><span class="gradient_white_blue">安全隐患排查治理</span></h2>
+                    <h2><span class="gradient_white_blue">安全不符合项清单</span></h2>
-                    <div id="safety1" class="site_content">
+                    <div id="safety11" class="site_content risk">
-                        <div>
+                        <div class="flex_row_center_center">
+                            <i></i>
+                            <div class="flex_column_between_start">
+                                <h6>管控红线</h6>
+                                <p><span>{{form?.checkProblemSafety?.redProblemNum}}</span></p>
+                            </div>
+                        </div>
+                        <div class="flex_row_center_center">
+                            <i></i>
+                            <div class="flex_column_between_start">
+                                <h6>危险作业许可</h6>
+                                <p><span>{{form?.checkProblemSafety?.dangerProblemNum}}</span></p>
+                            </div>
+                        </div>
+                        <div class="flex_row_center_center">
+                            <i></i>
+                            <div class="flex_column_between_start">
+                                <h6>较大隐患</h6>
+                                <p><span>{{form?.checkProblemSafety?.largerProblemNum}}</span></p>
+                            </div>
+                        </div>
+                        <div class="flex_row_center_center">
+                            <i></i>
+                            <div class="flex_column_between_start">
+                                <h6>一般隐患</h6>
+                                <p><span>{{form?.checkProblemSafety?.generalProblemNum}}</span></p>
+                            </div>
+                        </div>
+                    </div>
+                       <%--<div id="safety1" class="site_content"> <div>
                             <h3 class="tit"><span>企业级检查</span></h3>
                             <div class="flex_column_start_start">
                                 <div class="flex_row_between_center">
@@ -105,8 +134,7 @@
                                     <p><span>整改率</span><span>0</span><span>%</span></p>
                                 </div>
                             </div>
-                        </div>
+                        </div> </div>--%>
-                    </div>
                 </div>
                 <div class="site_500" style="height: 2.15rem; margin-bottom: 0.25rem">
                     <h2><span class="gradient_white_blue">安全费用</span></h2>
@@ -775,6 +803,9 @@
             let type = this.getAttribute("data-type")
             let iframe = $('iframe')
             switch (type) {
+                case "CheckProblemSafety"://安全不符合项清单
+                    window.open('../DataShow/CheckProblemSafety.aspx')
+                    break
                 case "HazardFactor"://安全危害因素
                     window.open('../DataShow/HazardFactor.aspx')
                     break

SGGL/FineUIPro.Web/common/main.aspx.cs

@@ -98,6 +98,12 @@ namespace FineUIPro.Web.common
 
                 var dateNow = DateTime.Now.ToString("yyyy-MM");
                 string hfUnitId = !string.IsNullOrWhiteSpace(unitId) && unitId == Const.UnitId_XJYJ ? string.Empty : unitId;
+                //安全不符合项清单
+                var getSafetyProblemList = Funs.DB.Sp_CheckProblem_Safety_Statistics(hfUnitId, string.Empty).ToList();
+                var redProblem = getSafetyProblemList.Where(x => x.Title == "管控红线").FirstOrDefault();
+                var dangerProblem = getSafetyProblemList.Where(x => x.Title == "危险作业许可").FirstOrDefault();
+                var largerProblem = getSafetyProblemList.Where(x => x.Title == "较大隐患").FirstOrDefault();
+                var generalProblem = getSafetyProblemList.Where(x => x.Title == "一般隐患").FirstOrDefault();
                 //安全危害因素
                 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();
@@ -157,6 +163,13 @@ namespace FineUIPro.Web.common
                             address = p.ProjectAddress,
                             value = p.MapCoordinates.Split(','),
                         }).ToList(),
+                        checkProblemSafety = new
+                        {//安全不符合项清单
+                            redProblemNum = redProblem != null ? redProblem.Num : 0,
+                            dangerProblemNum = dangerProblem != null ? dangerProblem.Num : 0,
+                            largerProblemNum = largerProblem != null ? largerProblem.Num : 0,
+                            generalProblemNum = generalProblem != null ? generalProblem.Num : 0,
+                        },
                         hazardFactor = new
                         {//安全危害因素
                             lowRiskNum = lowRisk != null ? lowRisk.Num : 0,

SGGL/FineUIPro.Web/common/mainProject.aspx

@@ -69,9 +69,39 @@
                         </div>
                     </div>
                 </div>
-                <div class="site_500" style="height: 3.1rem; margin-bottom: 0.25rem">
+                <div class="site_500 jshover" style="height: 3.1rem; margin-bottom: 0.25rem" data-type="CheckProblemSafety">
-                    <h2><span class="gradient_white_blue">安全隐患排查治理</span></h2>
+                    <h2><span class="gradient_white_blue">安全不符合项清单</span></h2>
-                    <div id="safety1" class="site_content">
+                    <div id="safety11" class="site_content risk">
+                        <div class="flex_row_center_center">
+                            <i></i>
+                            <div class="flex_column_between_start">
+                                <h6>管控红线</h6>
+                                <p><span>{{form?.checkProblemSafety?.redProblemNum}}</span></p>
+                            </div>
+                        </div>
+                        <div class="flex_row_center_center">
+                            <i></i>
+                            <div class="flex_column_between_start">
+                                <h6>危险作业许可</h6>
+                                <p><span>{{form?.checkProblemSafety?.dangerProblemNum}}</span></p>
+                            </div>
+                        </div>
+                        <div class="flex_row_center_center">
+                            <i></i>
+                            <div class="flex_column_between_start">
+                                <h6>较大隐患</h6>
+                                <p><span>{{form?.checkProblemSafety?.largerProblemNum}}</span></p>
+                            </div>
+                        </div>
+                        <div class="flex_row_center_center">
+                            <i></i>
+                            <div class="flex_column_between_start">
+                                <h6>一般隐患</h6>
+                                <p><span>{{form?.checkProblemSafety?.generalProblemNum}}</span></p>
+                            </div>
+                        </div>
+                    </div>
+                    <%--<div id="safety1" class="site_content">
                         <div>
                             <h3 class="tit"><span>项目级检查</span></h3>
                             <div class="flex_column_start_start">
@@ -85,7 +115,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
+                    </div>--%>
                 </div>
                 <div class="site_500" style="height: 2.15rem; margin-bottom: 0.25rem">
                     <h2><span class="gradient_white_blue">安全费用</span></h2>
@@ -199,7 +229,7 @@
                     </div>
                 </div>
 
-                <div class="site_500" style="height: 3.05rem; margin-bottom: 0.25rem">
+                <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">
@@ -233,7 +263,7 @@
                     </div>
                 </div>
                 
-                <div class="site_500 jshover" style="height: 3.05rem; margin-bottom: 0.25rem" >
+                <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">
@@ -394,10 +424,10 @@
         }
     })
 
-    function hoverEvent() {
-        $(".jshover").click(function (e) {
-            e.stopPropagation()
 
+function hoverEvent() {
+    $(".jshover").click(function(e) {
+        e.stopPropagation()
         if ($(".popu").css("display") == "block") {
             $(".popu").hide()
             return
@@ -405,55 +435,22 @@
         let type = this.getAttribute("data-type")
         let iframe = $('iframe')
         switch (type) {
-                case "1":
+            case "CheckProblemSafety"://安全不符合项清单
-                    // 组织人员
+                window.open('../DataShow/CheckProblemSafety.aspx')
-                    // iframe.attr('src', '../DataShow/CompanyPerson.aspx')
-                    window.open('../DataShow/CompanyPerson.aspx')
                 break
-                case "2":
+            case "HazardFactor"://安全危害因素
-                    // 教育培训/安全工时
+                window.open('../DataShow/HazardFactor.aspx')
-                    // iframe.attr('src', '../DataShow/EduTrain.aspx')
-                    window.open('../DataShow/EduTrain.aspx')
                 break
-                case "3":
+            case "HazardFactorOccHealth"://职业健康危害因素
-                    // 安全隐患排查治理
+                window.open('../DataShow/HazardFactorOccHealth.aspx')
-                    // 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')
                 break
         }
-            // $("#hover").hide()
         $(".popu").show()
     })
     $(".container").css({
         position: "relative",
     })
-        $(".container")
+    $(".container").click(function(e) {
-            .click(function (e) {
         $(".popu").hide()
         })
     }

SGGL/FineUIPro.Web/common/mainProject.aspx.cs

@@ -69,6 +69,12 @@ namespace FineUIPro.Web.common
                 var list = AccidentWarningService.GetYearsTodayList();
 
                 var dateNow = DateTime.Now.ToString("yyyy-MM");     
+                //安全HSE不符合项清单
+                var getSafetyProblemList = Funs.DB.Sp_CheckProblem_Safety_Statistics(string.Empty, projectId).ToList();
+                var redProblem = getSafetyProblemList.Where(x => x.Title == "管控红线").FirstOrDefault();
+                var dangerProblem = getSafetyProblemList.Where(x => x.Title == "危险作业许可").FirstOrDefault();
+                var largerProblem = getSafetyProblemList.Where(x => x.Title == "较大隐患").FirstOrDefault();
+                var generalProblem = getSafetyProblemList.Where(x => x.Title == "一般隐患").FirstOrDefault();
                 //安全危害因素
                 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();
@@ -98,6 +104,13 @@ namespace FineUIPro.Web.common
                             projectEndDate = project != null && project.EndDate != null ? string.Format("{0:yyyy-MM-dd}", project.EndDate) : string.Empty,//项目到期时间
                             projectEndDays = endDays > 0 ? endDays : 0,//合同倒计时
                         },
+                        checkProblemSafety = new
+                        {//安全不符合项清单
+                            redProblemNum = redProblem != null ? redProblem.Num : 0,
+                            dangerProblemNum = dangerProblem != null ? dangerProblem.Num : 0,
+                            largerProblemNum = largerProblem != null ? largerProblem.Num : 0,
+                            generalProblemNum = generalProblem != null ? generalProblem.Num : 0,
+                        },
                         hazardFactor = new
                         {
                             lowRiskNum = lowRisk != null ? lowRisk.Num : 0,

SGGL/Model/ModelProc.cs

@@ -8,6 +8,19 @@ namespace Model
 
     public partial class CNPCDB : DataContext
     {
+        /// <summary>
+        /// 安全HSE不符合清单统计
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        [Function(Name = "[dbo].[Sp_CheckProblem_Safety_Statistics]")]
+        public IEnumerable<Statistics> Sp_CheckProblem_Safety_Statistics([Parameter(DbType = "nvarchar(200)")] string unitId, [Parameter(DbType = "nvarchar(200)")] string projectId)
+        {
+            IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), unitId, projectId);
+            return (ISingleResult<Statistics>)result.ReturnValue;
+        }
+
         /// <summary>
         /// 安全危害因素统计
         /// </summary>