zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

推送数据

Browse Source
This commit is contained in:
李超
2023-01-30 14:14:20 +08:00
parent 354f0ef6fe
commit 5c4b481651
49 changed files with 3905 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/Menu_DigData.xml
-2
View File
@@ -39,7 +39,5 @@
<TreeNode id="03F098CA-265B-42E2-9908-AF25EA3707B4" Text="进度公共资源库" NavigateUrl=""><TreeNode id="854B35DC-8EE8-4E30-2222-BC750F325A01" Text="WBS库维护" NavigateUrl="JDGL/WBS/WBSSet.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据库" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
</TreeNode>
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据作战室" NavigateUrl=""></TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+2 -6
View File
@@ -23,7 +23,8 @@
<TreeNode id="874B4232-E0AD-41CD-8C66-8A7FF2D79358" Text="项目安全协议清单" NavigateUrl="HSSE/QualityAudit/ProjectRecord.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="EE260447-028F-46AF-8864-9A5DC9DAA5BD" Text="人员培训" NavigateUrl=""><TreeNode id="1182E353-FAB9-4DB1-A1EC-F41A00892128" Text="培训记录" NavigateUrl="HSSE/EduTrain/TrainRecord.aspx"></TreeNode>
<TreeNode id="EE260447-028F-46AF-8864-9A5DC9DAA5BD" Text="人员培训" NavigateUrl=""><TreeNode id="AD6FC259-CF40-41C7-BA3F-15AC50C1DD20" Text="人员信息档案" NavigateUrl="HSSE/SitePerson/PersonList.aspx"></TreeNode>
<TreeNode id="1182E353-FAB9-4DB1-A1EC-F41A00892128" Text="培训记录" NavigateUrl="HSSE/EduTrain/TrainRecord.aspx"></TreeNode>
<TreeNode id="F81E3F54-B3A9-4DDB-9C8C-1574317E040F" Text="人员培训查询" NavigateUrl="HSSE/EduTrain/TrainFind.aspx"></TreeNode>
<TreeNode id="B782A26B-D85C-4F84-8B45-F7AA47B3159E" Text="培训计划" NavigateUrl="HSSE/EduTrain/Plan.aspx"></TreeNode>
<TreeNode id="E108F75D-89D0-4DCA-8356-A156C328805C" Text="培训任务" NavigateUrl="HSSE/EduTrain/Task.aspx"></TreeNode>
@@ -31,7 +32,6 @@
<TreeNode id="FAF7F4A4-A4BC-4D94-9E88-0CF5A380DB34" Text="考试计划" NavigateUrl="HSSE/EduTrain/TestPlan.aspx"></TreeNode>
<TreeNode id="0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A" Text="考试记录" NavigateUrl="HSSE/EduTrain/TestRecord.aspx"></TreeNode>
<TreeNode id="6FF941C1-8A00-4A74-8111-C892FC30A8DA" Text="考试统计" NavigateUrl="HSSE/EduTrain/TestStatistics.aspx"></TreeNode>
<TreeNode id="AD6FC259-CF40-41C7-BA3F-15AC50C1DD20" Text="人员信息档案" NavigateUrl="HSSE/SitePerson/PersonList.aspx"></TreeNode>
<TreeNode id="8F15D3BE-BE21-4A6F-AD5C-2BBECEE46149" Text="人工时日报" NavigateUrl="HSSE/SitePerson/DayReport.aspx"></TreeNode>
<TreeNode id="6C97E014-AF13-46E5-ADB2-03D327C560EC" Text="人工时月报" NavigateUrl="HSSE/SitePerson/MonthReport.aspx"></TreeNode>
<TreeNode id="7ACB0CB1-15D8-4E8E-A54D-0CDC5F69B39A" Text="发卡管理" NavigateUrl="HSSE/SitePerson/SendCard.aspx"></TreeNode>
@@ -42,12 +42,8 @@
<TreeNode id="750F5074-45B9-470E-AE1E-6204957421E6" Text="安管人员资质" NavigateUrl="HSSE/QualityAudit/SafePersonQuality.aspx"></TreeNode>
</TreeNode>
<TreeNode id="467A0CB9-737D-4451-965E-869EBC3A4BD6" Text="HSE检查" NavigateUrl=""><TreeNode id="2FC8AA2A-F421-4174-A05E-2711167AF141" Text="安全巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx"></TreeNode>
<TreeNode id="0E30F917-0C51-4C45-BD19-981039CA44F5" Text="日常巡检" NavigateUrl="HSSE/Check/CheckDayWH.aspx"></TreeNode>
<TreeNode id="1B08048F-93ED-4E84-AE65-DB7917EA2DFB" Text="专项检查" NavigateUrl="HSSE/Check/CheckSpecial.aspx"></TreeNode>
<TreeNode id="C198EBA8-9E23-4654-92E1-09C61105C522" Text="综合检查" NavigateUrl="HSSE/Check/CheckColligation.aspx"></TreeNode>
<TreeNode id="9212291A-FBC5-4F6D-A5F6-60BFF4E30F6F" Text="开工前检查" NavigateUrl="HSSE/Check/CheckWork.aspx"></TreeNode>
<TreeNode id="0D23A707-ADA0-4C2B-9665-611134243529" Text="季节性/节假日检查" NavigateUrl="HSSE/Check/CheckHoliday.aspx"></TreeNode>
<TreeNode id="F910062E-98B0-486F-A8BD-D5B0035F808F" Text="监理整改通知单" NavigateUrl="HSSE/Check/SupervisionNotice.aspx"></TreeNode>
<TreeNode id="80F786CB-E8CA-44AD-A08C-8E4D12BFDCA1" Text="总部检查" NavigateUrl="HSSE/Check/OfficeCheck.aspx"></TreeNode>
<TreeNode id="7B272C3F-39D2-496D-A87C-E2C89A20E4EF" Text="HSE巡检统计(图表)" NavigateUrl="HSSE/HiddenInspection/RiskAnalysisChart.aspx"></TreeNode>
</TreeNode>
SGGL/FineUIPro.Web/common/mainProject.aspx
+9 -9
View File
@@ -32,24 +32,24 @@
</div>
<div class="sd-security-calc">
<div class="sd-security-menus-label">安全检查</div>
<div class="sd-security-menus" onclick="toHsse()">
<div class="sd-security-menus" >
<div class="sd-security-menu">
<div class="sd-security-menu-img">
<div class="sd-security-menu-value" runat="server" id="divAllRectify">0</div>
<div class="sd-security-menu-value" onclick="toHsse()" runat="server" id="divAllRectify">0</div>
</div>
<div class="sd-security-menu-name">总数（个）</div>
<div class="sd-security-menu-name" onclick="toHsse()" >总数（个）</div>
</div>
<div class="sd-security-menu">
<div class="sd-security-menu-img">
<div class="sd-security-menu-value" runat="server" id="divCRectify">0</div>
<div class="sd-security-menu-value" onclick="toHsse()" runat="server" id="divCRectify">0</div>
</div>
<div class="sd-security-menu-name">已闭环（个）</div>
<div class="sd-security-menu-name" onclick="toHsse()" >已闭环（个）</div>
</div>
<div class="sd-security-menu">
<div class="sd-security-menu-img">
<div class="sd-security-menu-value" runat="server" id="divUCRectify">0</div>
<div class="sd-security-menu-value" onclick="toHsse()" runat="server" id="divUCRectify">0</div>
</div>
<div class="sd-security-menu-name">未闭环（个）</div>
<div class="sd-security-menu-name" onclick="toHsse()" >未闭环（个）</div>
</div>
</div>
@@ -409,8 +409,8 @@
<script type="text/javascript">
function toHsse() {
top.window.location.href = "indexProject.aspx?projectId="+<%=CurrUser.LoginProjectId%>;
function toHsse(){
top.window.location.href = "../indexProject.aspx?detailmenu=HiddenRectificationList&menuType=Menu_HSSE&projectId=<%=CurrUser.LoginProjectId%>";
}
function initOutPutEchart() {
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+28 -13
View File
@@ -3,6 +3,7 @@ using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
@@ -71,7 +72,7 @@ namespace FineUIPro.Web.common
var ProjectTotal = (from x in Funs.DB.HSSE_MonthReportItem
join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
where y.ProjectId == this.ProjectId && "安全生产人工时数" == x.ReportItem
select x.ProjectTotal).Sum();
select x.YearTotal).Sum();
if (ProjectTotal.HasValue)
{
@@ -117,19 +118,33 @@ namespace FineUIPro.Web.common
/// </summary>
private void getSitePerson()
{
int AllCount = 0;
int MCount = 0;
var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
AllCount = getallin.Count();
if (AllCount > 0)
string sql = @"select c.ConstText,b.PostType,count( *) num from SitePerson_Person a left join Base_WorkPost b on a.WorkPostId=b.WorkPostId
LEFT JOIN Sys_Const AS c ON c.ConstValue = b.PostType and c.GroupId = 'PostType' and IsUsed =1 and InTime<='" + DateTime.Now.ToString("yyyy-MM-dd") + "' and (OutTime is null or OutTime>'" + DateTime.Now.ToString("yyyy-MM-dd") + @"' )
where ProjectId='" + this.ProjectId + @"'
group by c.ConstText,b.PostType ";
List<SqlParameter> listStr = new List<SqlParameter>();
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
int allcount = 0;
int mcount = 0;
if (tb != null)
{
this.divALLPerson.InnerHtml = AllCount.ToString();
MCount = getallin.Where(x => x.PostType == Const.PostType_1).Count();
/////管理人数
this.divGLPerson.InnerHtml = MCount.ToString();
/////作业人数
this.divZYPerson.InnerHtml = (AllCount - MCount).ToString();
foreach (DataRow row in tb.Rows)
{
allcount += int.Parse(row["num"].ToString());
if (!string.IsNullOrEmpty(row["ConstText"].ToString()) && row["ConstText"].ToString().Contains("管理"))
{
mcount += int.Parse(row["num"].ToString());
}
}
}
this.divALLPerson.InnerHtml = allcount.ToString();
this.divGLPerson.InnerHtml = mcount.ToString();
this.divZYPerson.InnerHtml = (allcount - mcount).ToString();
var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
WorkPostS = "[]";
InPostCounts = "[]";
@@ -138,7 +153,7 @@ namespace FineUIPro.Web.common
List<int> InDutyCountList = new List<int>();
List<string> worksList = new List<string>();
var getPersons = Funs.DB.SitePerson_Person.Where(x => x.ProjectId == this.ProjectId && x.IsUsed == 1 && x.InTime <= DateTime.Now
&& !x.OutTime.HasValue && x.CardNo.Length > 1);
&& !x.OutTime.HasValue);
if (getPersons.Count() > 0)
{
var getWorkIds = getPersons.Where(x => x.WorkPostId != null).Select(x => x.WorkPostId).Distinct();