diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo index 64fed920..65891f11 100644 Binary files a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo and b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo differ diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.backup.json b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.backup.json index 0ee74a3a..ee21c543 100644 --- a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.backup.json +++ b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.backup.json @@ -59,10 +59,6 @@ "$type": "Bookmark", "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" }, - { - "$type": "Bookmark", - "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" - }, { "$type": "Bookmark", "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}" @@ -70,6 +66,14 @@ { "$type": "Bookmark", "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{e1b7d1f8-9b3c-49b1-8f4f-bfc63a88835d}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" } ] } diff --git a/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql b/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql new file mode 100644 index 00000000..13dede19 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql @@ -0,0 +1,329 @@ +alter table BS_Welder alter column WED_WorkCode nvarchar(100) +go + +--ȡǰ˴ +ALTER PROCEDURE [dbo].[Sp_Project_GetToDoItems] + @projectId NVARCHAR(50)=NULL, + @userId NVARCHAR(200)=NULL +AS +/*ȡǰ˴*/ +BEGIN +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲ' AS MenuName + ,register.RegisterDef AS Content + ,UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'../HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE register.ProjectId=@projectId AND +((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') )) +) +UNION ALL + +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲȷ' AS MenuName + ,register.RegisterDef AS Content + ,UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'../HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE register.ProjectId=@projectId AND +register.states = '2' AND register.CheckManId =@userId + +UNION ALL +SELECT CheckControlCode AS DataId + ,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId + ,'Ѳ' AS MenuName + ,checkControl.QuestionDef AS Content + ,UserId + ,users.UserName + ,checkControl.CheckDate AS DataTime + ,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr + ,'../CQMS/Check/ChecklistEdit.aspx?ToDo=ToDo&CheckControlCode='+checkControl.CheckControlCode AS PCUrl +FROM Check_CheckControl AS checkControl +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE checkControl.ProjectId=@projectId AND +checkControl.State != '7' AND checkControl.CheckControlCode in (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) + +UNION ALL +SELECT GJSXID AS DataId + ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId + ,'ؼ' AS MenuName + ,GJSX.Detail AS Content + ,users.UserId + ,users.UserName + ,GJSX.CreateDate AS DataTime + ,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr + ,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl +FROM GJSX +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE GJSX.ProjectId=@projectId AND +GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0 +and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0) +or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID)) +) + +--UNION ALL +--SELECT InspectionEquipmentId AS DataId +-- ,'6c2c1e5e-1812-4e1c-a683-7125518e28c7' AS MenuId +-- ,'豸ϱȷ' AS MenuName +-- ,Equipment.InspectionName AS Content +-- ,UserId +-- ,users.UserName +-- ,Equipment.InspectionDate AS DataTime +-- ,CONVERT(varchar(100),Equipment.InspectionDate, 23) AS DataTimeStr +-- ,'../CQMS/Comprehensive/InspectionEquipmentEdit.aspx?ToDo=ToDo&InspectionEquipmentId='+Equipment.InspectionEquipmentId AS PCUrl +--FROM Comprehensive_InspectionEquipment AS Equipment +--LEFT JOIN Sys_User AS users ON users.UserId =@userId +--WHERE Equipment.ProjectId=@projectId and +--Equipment.Status!='3' AND Equipment.InspectionEquipmentId in (select InspectionEquipmentId from Comprehensive_InspectionEquipmentApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) +--UNION ALL +--SELECT InspectionPersonId AS DataId +-- ,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId +-- ,'Աȷ' AS MenuName +-- ,Person.PersonName AS Content +-- ,UserId +-- ,users.UserName +-- ,Person.CompileDate AS DataTime +-- ,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr +-- ,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl +--FROM Comprehensive_InspectionPerson AS Person +--LEFT JOIN Sys_User AS users ON users.UserId =@userId +--WHERE Person.ProjectId=@projectId and +--Person.Status!='3' AND Person.InspectionPersonId in (select InspectionPersonId from Comprehensive_InspectionPersonApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) +--UNION ALL +--SELECT InspectionMachineId AS DataId +-- ,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId +-- ,'߱ȷ' AS MenuName +-- ,Machine.InspectionMachineName AS Content +-- ,UserId +-- ,users.UserName +-- ,Machine.CompileDate AS DataTime +-- ,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr +-- ,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl +--FROM Comprehensive_InspectionMachine AS Machine +--LEFT JOIN Sys_User AS users ON users.UserId =@userId +--WHERE Machine.ProjectId=@projectId and +--Machine.Status!='3' AND Machine.InspectionMachineId in (select InspectionMachineId from Comprehensive_InspectionMachineApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) +UNION ALL +SELECT ConstructSolutionId AS DataId + ,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId + ,'ʩ' AS MenuName + ,Solution.SolutionName AS Content + ,UserId + ,users.UserName + ,Solution.CompileDate AS DataTime + ,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr + ,'../CQMS/Solution/EditConstructSolution.aspx?ToDo=ToDo&ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl +FROM Solution_CQMSConstructSolution AS Solution +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Solution.ProjectId=@projectId and +Solution.State!='3' +AND Solution.ConstructSolutionId in +(select top 1 ConstructSolutionId from ( +SELECT Solution_CQMSConstructSolutionApprove.* +FROM Solution_CQMSConstructSolutionApprove, +(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' and ApproveDate is null GROUP BY ConstructSolutionId )b +WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] and Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId + ) approve +where approve.ApproveMan=@userId ) + +UNION ALL +SELECT InspectionId AS DataId + ,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId + ,'֪ͨ' AS MenuName + ,InspectionManagement.AcceptanceSite AS Content + ,UserId + ,users.UserName + ,InspectionManagement.CompileDate AS DataTime + ,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr + ,'../CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl +FROM ProcessControl_InspectionManagement AS InspectionManagement +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE InspectionManagement.ProjectId=@projectId and +dateadd(day,3,InspectionManagement.CompileDate)>getdate() and InspectionManagement.AcceptanceCheckMan like '%'+@userId+'%' +UNION ALL +SELECT CheckSpecialId AS DataId + ,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId + ,'ר' AS MenuName + ,CheckItemSet.CheckItemName AS Content + ,UserId + ,users.UserName + ,CheckSpecial.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr + ,'../HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl +FROM Check_CheckSpecial AS CheckSpecial +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId +WHERE CheckSpecial.ProjectId=@projectId and +dateadd(day,3,CheckSpecial.CheckTime)>getdate() and CheckSpecial.PartInPersonIds like '%'+@userId+'%' +UNION ALL +SELECT CheckColligationId AS DataId + ,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId + ,'ۺϼ' AS MenuName + ,case CheckType when '0' then 'ܼ' when '1' then '¼' else '' end AS Content + ,users.UserId + ,users.UserName + ,CheckColligation.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr + ,'../HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl +FROM Check_CheckColligation AS CheckColligation +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId +LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId +WHERE CheckColligation.ProjectId=@projectId and FlowOperate.IsClosed <> 1 and FlowOperate.OperaterId=@userId +UNION ALL +SELECT PatrolPlanId AS DataId + ,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId + ,'Ѳ' AS MenuName + ,HazardListItem.HazardItems AS Content + ,UserId + ,users.UserName + ,PatrolPlan.LimitCheckDate AS DataTime + ,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr + ,'../HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl +FROM Hazard_PatrolPlan AS PatrolPlan +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId +WHERE HazardListItem.ProjectId=@projectId and +dateadd(day,-3,PatrolPlan.LimitCheckDate)=22 and (select COUNT(*) from JDGL_QuantityCompletion WHERE ProjectId=@projectId and DATENAME(year,GETDATE())=DATENAME(year,EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0) +--or (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))=22 and +DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate) + + +ORDER BY DataTime DESC +END + + + + + +GO + + diff --git a/SGGL/BLL/API/HSSE/APIPageDataService.cs b/SGGL/BLL/API/HSSE/APIPageDataService.cs index 0652f686..596dfd88 100644 --- a/SGGL/BLL/API/HSSE/APIPageDataService.cs +++ b/SGGL/BLL/API/HSSE/APIPageDataService.cs @@ -16,34 +16,108 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - List getSiteInOutList = new List(); - var getDayAll = from x in db.SitePerson_PersonInOutNow - join y in db.SitePerson_Person on x.PersonId equals y.PersonId - join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId - where x.ProjectId == projectId - && x.ChangeTime.Value.Year == dateValue.Year - && x.ChangeTime.Value.Month == dateValue.Month - && x.ChangeTime.Value.Day == dateValue.Day - select new { x.PersonId, x.ChangeTime, x.IsIn, z.PostType }; - if (getDayAll.Count() > 0) - { - var getInMaxs = from x in getDayAll - group x by x.PersonId into g - select new Model.PageDataPersonInOutItem - { - PersonId = g.First().PersonId, - ChangeTime = g.Max(x => x.ChangeTime), - IsIn = g.First().IsIn, - PostType = g.First().PostType - }; - if (getInMaxs.Count() > 0) + var startDate = dateValue.Date; + var endDate = startDate.AddDays(1); + var query = + from x in db.SitePerson_PersonInOutNow + where x.ChangeTime >= startDate && x.ChangeTime < endDate && x.ProjectId == projectId + group x by new { x.PersonId, x.ProjectId } into g + select new + { + g.Key.PersonId, + g.Key.ProjectId, + MaxChangeTime = g.Max(x => x.ChangeTime) + }; + var finalQuery = + from record in query + join detail in db.SitePerson_PersonInOutNow + on new { record.PersonId, record.ProjectId, record.MaxChangeTime } + equals new { detail.PersonId, detail.ProjectId, MaxChangeTime = detail.ChangeTime } + join y in db.SitePerson_Person on record.PersonId equals y.PersonId + join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId + where detail.IsIn == true + select new Model.PageDataPersonInOutItem { - getSiteInOutList = getInMaxs.Where(x => x.IsIn == true).ToList(); - } - } - return getSiteInOutList; + PersonId = record.PersonId, + ProjectId = record.ProjectId, + ChangeTime = record.MaxChangeTime, + IsIn = true, + PostType = z.PostType + }; + + return finalQuery.ToList(); } } + + public static List getPersonNum(List projectIds, DateTime dateValue) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var startDate = dateValue.Date; + var endDate = startDate.AddDays(1); + /* List getSiteInOutList = new List(); + var getDayAll = from x in db.SitePerson_PersonInOutNow + join y in db.SitePerson_Person on x.PersonId equals y.PersonId + join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId + where x.ChangeTime >= startDate && + x.ChangeTime < endDate + select new { x.PersonId, x.ChangeTime, x.IsIn, z.PostType,x.ProjectId }; + if (projectIds.Any()) + { + getDayAll= getDayAll.Where(x => projectIds.Contains(x.ProjectId)); + } + if (getDayAll.Any()) + { + var getInMaxs = from x in getDayAll + group x by new {x.PersonId,x.ProjectId} into g + select new Model.PageDataPersonInOutItem + { + PersonId = g.First().PersonId, + ProjectId = g.First().ProjectId, + ChangeTime = g.Max(x => x.ChangeTime), + IsIn = g.First().IsIn, + PostType = g.First().PostType + }; + getSiteInOutList = getInMaxs.Where(x => x.IsIn == true).ToList(); + + }*/ + + var query = + from x in db.SitePerson_PersonInOutNow + where x.ChangeTime >= startDate && x.ChangeTime < endDate + group x by new { x.PersonId, x.ProjectId } into g + select new + { + g.Key.PersonId, + g.Key.ProjectId, + MaxChangeTime = g.Max(x => x.ChangeTime) + }; + + if (projectIds.Any()) + { + query = query.Where(x => projectIds.Contains(x.ProjectId)); + } + var finalQuery = + from record in query + join detail in db.SitePerson_PersonInOutNow + on new { record.PersonId, record.ProjectId, record.MaxChangeTime } + equals new { detail.PersonId, detail.ProjectId, MaxChangeTime = detail.ChangeTime } + join y in db.SitePerson_Person on record.PersonId equals y.PersonId + join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId + where detail.IsIn == true + select new Model.PageDataPersonInOutItem + { + PersonId= record.PersonId, + ProjectId = record.ProjectId, + ChangeTime = record.MaxChangeTime, + IsIn = true, + PostType = z.PostType + }; + + return finalQuery.ToList(); + } + } + #endregion #region 获取当前人工时 @@ -150,7 +224,7 @@ namespace BLL where x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month && x.ChangeTime.Value.Day == dateValue.Day select new { x.PersonId, x.ChangeTime, x.IsIn, z.PostType }; - if (getDayAll.Count() > 0) + if (getDayAll.Any()) { var getInMaxs = from x in getDayAll group x by x.PersonId into g @@ -161,7 +235,7 @@ namespace BLL IsIn = g.First().IsIn, PostType = g.First().PostType }; - if (getInMaxs.Count() > 0) + if (getInMaxs.Any()) { getSiteInOutList = getInMaxs.Where(x => x.IsIn == true).ToList(); } @@ -174,16 +248,17 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { + DateTime dt1 = dateValue.Date; + DateTime dt2= dateValue.Date.AddDays(1); List getSiteInOutList = new List(); var getDayAll = from x in db.SitePerson_PersonInOutNow join y in db.SitePerson_Person on x.PersonId equals y.PersonId join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId - where x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month - && x.ChangeTime.Value.Day == dateValue.Day && pids.Contains(x.ProjectId) + where pids.Contains(x.ProjectId) && x.ChangeTime<= dt2 && x.ChangeTime>= dt1 select new { x.PersonId, x.ChangeTime, x.IsIn, z.PostType }; - if (getDayAll.Count() > 0) + if (getDayAll.Any()) { - var getInMaxs = from x in getDayAll + var getInMaxs = from x in getDayAll.ToList() group x by x.PersonId into g select new Model.PageDataPersonInOutItem { @@ -192,7 +267,7 @@ namespace BLL IsIn = g.First().IsIn, PostType = g.First().PostType }; - if (getInMaxs.Count() > 0) + if (getInMaxs.Any()) { getSiteInOutList = getInMaxs.Where(x => x.IsIn == true).ToList(); } diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index bcb0fd7f..047eb338 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -1114,6 +1114,9 @@ 4.5.0 + + 6.0.0 + 4.5.3 diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 7504055c..9a04a61c 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -10,6 +10,7 @@ namespace BLL /// 时间书签（用于筛选数据范围）修改日期 2024-10-19 18:55:14 由2023改成2020 /// public static DateTime DtmarkTime = DateTime.Parse("2020-01-01"); + public static int CacheMinutes = 10; #region 查询字段：系统设置 /// /// 系统管理员ID diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs index 132bf99b..7722f561 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs @@ -113,7 +113,7 @@ namespace BLL { foreach (var item in acceptanceItems) { - tbodyStr.Append($"{index}本人负责{item.UnitName}{item.Detail}{item.GJSXTypeName}{item.UserName}{item.User_AcceptanceUserName}{item.CompleteDate.ToShortDateString()}{(item.DateDiffDays > 0 ? item.DateDiffDays : "半")}"); + tbodyStr.Append($"{index}本人负责{item.UnitName}{item.Detail}{item.GJSXTypeName}{item.UserName}{item.User_AcceptanceUserName}{item.CompleteDate.ToShortDateString()}{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}"); index++; } } @@ -123,7 +123,7 @@ namespace BLL { foreach (var item in userItems) { - tbodyStr.Append($"{index}本人发起{item.UnitName}{item.Detail}{item.GJSXTypeName}{item.UserName}{item.User_AcceptanceUserName}{item.CompleteDate.ToShortDateString()}{(item.DateDiffDays > 0 ? item.DateDiffDays : "半")}"); + tbodyStr.Append($"{index}本人发起{item.UnitName}{item.Detail}{item.GJSXTypeName}{item.UserName}{item.User_AcceptanceUserName}{item.CompleteDate.ToShortDateString()}{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}"); index++; } } @@ -133,7 +133,7 @@ namespace BLL { foreach (var item in receiveItems) { - tbodyStr.Append($"{index}本人跟踪{item.UnitName}{item.Detail}{item.GJSXTypeName}{item.UserName}{item.User_AcceptanceUserName}{item.CompleteDate.ToShortDateString()}{(item.DateDiffDays > 0 ? item.DateDiffDays : "半")}"); + tbodyStr.Append($"{index}本人跟踪{item.UnitName}{item.Detail}{item.GJSXTypeName}{item.UserName}{item.User_AcceptanceUserName}{item.CompleteDate.ToShortDateString()}{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}"); index++; } } @@ -143,7 +143,7 @@ namespace BLL { foreach (var item in csUserItems) { - tbodyStr.Append($"{index}抄送本人{item.UnitName}{item.Detail}{item.GJSXTypeName}{item.UserName}{item.User_AcceptanceUserName}{item.CompleteDate.ToShortDateString()}{(item.DateDiffDays > 0 ? item.DateDiffDays : "半")}"); + tbodyStr.Append($"{index}抄送本人{item.UnitName}{item.Detail}{item.GJSXTypeName}{item.UserName}{item.User_AcceptanceUserName}{item.CompleteDate.ToShortDateString()}{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}"); index++; } } diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 3edb8d1f..a44ad576 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -1,10 +1,11 @@ namespace BLL { + using Model; + using Newtonsoft.Json; + using System; using System.Collections.Generic; using System.Linq; - using Model; - using System; - using Newtonsoft.Json; + using System.Runtime.Caching; public static class ProjectService { @@ -256,22 +257,44 @@ /// public static List GetAllProjectDropDownList(string[] pids = null) { - if (pids == null) + string cacheKey = "allProjects"; + var memoryCache = MemoryCache.Default; + if (memoryCache.Get(cacheKey) != null) { - var list = (from x in Funs.DB.Base_Project - orderby x.ProjectCode descending - select x).ToList(); - return list; + var result = (List)memoryCache.Get(cacheKey); + if (pids == null) + { + return result; + } + else + { + result = result.Where(e => pids.Contains(e.ProjectId)).ToList(); + return result; + } } else { - var list = (from x in Funs.DB.Base_Project - where pids.Contains(x.ProjectId) - orderby x.ProjectCode descending - select x).ToList(); - return list; - } + var list = (from x in Funs.DB.Base_Project + where x.ProjectState == Const.ProjectState_1 || x.ProjectState == null + orderby x.ProjectCode descending + select x).ToList(); + var policy = new CacheItemPolicy + { + AbsoluteExpiration = DateTimeOffset.Now.AddMinutes(Const.CacheMinutes), + }; + memoryCache.Set(cacheKey, list, policy); + + if (pids == null) + { + return list; + } + else + { + var result = list.Where(e => pids.Contains(e.ProjectId)).ToList(); + return result; + } + } } diff --git a/SGGL/BLL/Transfer/PunchlistFromService.cs b/SGGL/BLL/Transfer/PunchlistFromService.cs index 63724288..83a4af46 100644 --- a/SGGL/BLL/Transfer/PunchlistFromService.cs +++ b/SGGL/BLL/Transfer/PunchlistFromService.cs @@ -67,5 +67,101 @@ namespace BLL select x.Action_By).Distinct().OrderBy(x => x).ToList(); return list; } + + + /// + /// 责任人pic下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitPICDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetPICDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 获取责任人pic下拉选项 + /// + /// 项目id + /// + public static List GetPICDropDownList(string projectId) + { + var list = (from x in Funs.DB.Transfer_PunchlistFrom + where x.ProjectId == projectId + select x.PIC).Distinct().OrderBy(x => x).ToList(); + return list; + } + + + /// + /// 责任人-五环/PIC-WUH下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitWUHPICDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetWUHPICDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 获取责任人-五环/PIC-WUH下拉选项 + /// + /// 项目id + /// + public static List GetWUHPICDropDownList(string projectId) + { + var list = (from x in Funs.DB.Transfer_PunchlistFrom + where x.ProjectId == projectId + select x.PIC_WUH).Distinct().OrderBy(x => x).ToList(); + return list; + } + + + /// + /// disc下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitDiscDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetDiscDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 获取disc下拉选项 + /// + /// 项目id + /// + public static List GetDiscDropDownList(string projectId) + { + var list = (from x in Funs.DB.Transfer_PunchlistFrom + where x.ProjectId == projectId + select x.Disc).Distinct().OrderBy(x => x).ToList(); + return list; + } } } diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx index f14cd232..2fef81b0 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx @@ -310,7 +310,7 @@ 重大风险 - Total number of managers + Total managers 管理人员总数 @@ -382,7 +382,7 @@ 风险管控 - Safe labor hours + safe man-hours 安全人工时 @@ -480,7 +480,7 @@ 安全问题统计 - Cumulative safety labor hours + Cumulative safe man-hours 累计安全人工时 @@ -645,10 +645,10 @@ Safe Work Hours This Month - Total Safe Training Personnel + Total safety training personnel - Safe Management Personnel + safety management personnel Near Miss Incidents @@ -793,4 +793,551 @@ total 总计 + + my + 我的 + + + Project Profile + 项目概况 + + + Safe production + 安全生产 + + + Bolt + + + Project + + + Pipe + + + Pipe Fitting + + + Valve + + + Safe Training Cumulative Personnel + + + Safety Management Personnel + + + Near Miss Events + + + Ongoing Projects + + + Projects + + + Remaining Days + + + Progress + + + Project Details + + + Quality Issues Rectification Rate + + + First Inspection Pass Rate + + + Welding First Pass Rate + + + Total + + + Completed + + + Quality Management Personnel + + + Quality Training Cumulative Personnel + + + Overdue + + + Rectification Rate + + + Quality Overview + + + Equipment Materials + + + Home + + + Safety Data Statistics + + + Safe Man Hours + + + Safety Hazard Rectification Orders + + + Total (items) + + + Completed (items) + + + Incomplete (items) + + + Quality First Acceptance Pass Rate + + + Welding First Pass Rate Statistics + + + Monitoring + + + Progress Statistics + + + Project Site Name + + + Status + + + Progress + + + Under Construction + + + Suspended + + + Completed Project + + + Units: (items) + + + Project Personnel + + + Current On-site Personnel + + + Total Number of Workers + + + Total Number of Managers + + + Welding Statistics + + + Welds + + + Welding + + + Points + + + Inspection + + + Rework + + + Number of Welds + + + Dyne + + + Arrival of materials + 材料到货 + + + Due should be completed + 到期应完成 + + + Key item total + 关键事项总计 + + + Not finished on time + 未准点完成 + + + On-time rate + 准点率 + + + Percentage of progress + 进度百分比 + + + progress + 进度情况 + + + Safety rectification data + 安全整改数据 + + + Production Safety + + + Head Office Personnel + + + Director + + + Full-Time + + + Branch + + + Director + + + Full-Time + + + Project Personnel + + + Director + + + Full-Time + + + Participants + + + Safety Engineer + + + Total + + + Safety Meeting Data + + + Company Safety Committee + + + Company Special Topic + + + Project Safety Leadership Group + + + Project Safety Meeting + + + Under Construction Projects + + + Shutdown Projects + + + Major Projects Under Construction + + + Safety Working Hours + + + Safety Cloud Monitoring + + + Real-Time Video: Line 1 + + + Safety Cost Data + + + Cost Extraction (10,000 RMB) + + + Cost Usage + + + Construction Equipment Data + + + In Use + + + Special Equipment + + + High-Risk Work Permit Data + + + Permit Items + + + Closed Items + + + Hidden Hazard Inspection Data + + + General Hidden Hazard + + + Major Hidden Hazard + + + Closed Items + + + Unfinished Items + + + Safety Supervision and Inspection Data + + + Accident Event Data + + + Near Miss + + + Recordable Event + + + Emergency Management Data + + + Comprehensive Plan + + + Special Plan + + + On-Site Disposal Plan + + + Drill Number + + + Safety Training Data + + + Level Three Training + + + Special Training + + + Special Operation Training + + + Risk Analysis Data + + + Emergency Management Data + + + Large Engineering + + + Super Large Engineering + + + Completed Items + + + Training Person Number + + + Construction Number + + + Finished Number + + + Quality Management + + + Quality Management Personnel Data + + + Company Head Office Personnel + + + Branch Personnel + + + Project Department Personnel + + + Measuring Instruments Data + + + In-Use Measuring Instruments + + + Calibration Qualified + + + Qualification Warning + + + Mechanical Warning + + + Quality Training Data + + + Quality Training Person Count + + + Technical Disclosure Person Count + + + Quality Inspection Data + + + Total Inspection Count + + + First-Time Qualified Count + + + First-Time Inspection Pass Rate + + + Welding Data + + + Total Welders + + + Total Dine Factor + + + Completed Dine Factor + + + Total Radiographs + + + Qualified Radiographs + + + First-Time Radiograph Pass Rate + + + Quality Inspection Problem Management Data + + + Closed Loop Items + + + Unfinished Items + + + Closure Rate + + + NCR Data + + + Closed Loop Items + + + Unfinished Items + + + Closure Rate + + + Accident event data + 事故事件数据 + + + All + 全部 + + + The pass rate of construction quality in one test + 施工质量一次合格率 + + + Emergency management data + 应急管理数据 + + + General accident + 一般事故 + + + Hidden danger investigation and management data + 隐患排除治理数据 + + + High risk + 高风险 + + + Major accident + 重大事故 + + + Medium risk + 中风险 + + + Number of corrections completed + 整改完成数 + + + Number of questions + 问题个数 + + + Particularly serious accident + 特别重大事故 + + + Relatively major accident + 较大事故 + + + Safety supervision personnel data + 安监人员数据 + + + To be rectified + 待整改 + + + Uncorrected number + 未整改数 + + + Up to standard + 合格 + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx index 3b65cf19..dc4f33c7 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx @@ -663,4 +663,526 @@ 总计 + + 我的 + + + 项目概况 + + + 安全生产 + + + 垫片 + + + 紧固件 + + + 项目 + + + 管子 + + + 管件 + + + 阀门 + + + 安全培训累计人员 + + + 安全管理人员 + + + 未遂事件 + + + 在建项目 + + + 项目 + + + 剩余天数 + + + 进度 + + + 项目详情 + + + 质量问题整改率 + + + 一次共检合格率 + + + 焊接一次合格率 + + + 总计 + + + 完成 + + + 质量管理人员 + + + 质量培训累计人员 + + + 未完成 + + + 整改率 + + + 质量概况 + + + 设备材料 + + + 首页 + + + 安全数据统计 + + + 安全人工时 + + + 安全隐患整改单 + + + 总数（个） + + + 已完成（个） + + + 未完成（个） + + + 质量一次验收合格率 + + + 焊接一次合格率统计 + + + 监控 + + + 进度统计 + + + 工地名称 + + + 状态 + + + 进度 + + + 在建 + + + 停工 + + + 竣工 + + + 单位：(个) + + + 项目人员 + + + 当前现场人数 + + + 作业人员总数 + + + 管理人员总数 + + + 焊接统计 + + + 焊口 + + + 焊接 + + + 点口 + + + 检测 + + + 返修 + + + 焊口数 + + + 达因 + + + 材料到货 + + + 到期应完成 + + + 关键事项总计 + + + 未准点完成 + + + 准点率 + + + 进度百分比 + + + 进度情况 + + + 安全整改数据 + + + 安全生产 + + + 企业总部人数 + + + 总监 + + + 专职 + + + 分支机构 + + + 总监 + + + 专职 + + + 项目人数 + + + 总监 + + + 专职 + + + 参建人数 + + + 注安师 + + + 总数 + + + 安全会议数据 + + + 企业安委会 + + + 企业专题 + + + 项目安全领导小组 + + + 项目安全例会 + + + 在建项目 + + + 停工项目 + + + 在施危大工程 + + + 安全工时 + + + 安全云监控 + + + 实时视频：线路1 + + + 安全费用数据 + + + 费用提取（万元） + + + 费用使用 + + + 施工机具设备数据 + + + 在用 + + + 特种设备 + + + 高风险作业许可数据 + + + 许可项 + + + 关闭项 + + + 隐患排查治理数据 + + + 一般隐患 + + + 重大隐患 + + + 整改闭环项 + + + 未整改完成项 + + + 安全监督检查数据 + + + 事故事件数据 + + + 未遂事件 + + + 可记录 + + + 应急管理数据 + + + 综合预案 + + + 专项预案 + + + 现场处置预案 + + + 演练次数 + + + 安全教育培训人次数数据 + + + 三级安全教育培训 + + + 专项培训 + + + 特种作业培训 + + + 风险数据分析 + + + 应急管理数据 + + + 危大工程 + + + 超危大工程 + + + 审批完成 + + + 培训人次数 + + + 施工个数 + + + 完工个数 + + + 质量管理 + + + 质量管理人员数据 + + + 企业总部人数 + + + 分支机构人数 + + + 项目部人数 + + + 计量器具数据 + + + 在用计量器具 + + + 校准合格 + + + 资质预警 + + + 机械预警 + + + 质量培训数据 + + + 质量培训人次数 + + + 技术交底人次数 + + + 质量验收数据 + + + 共检总数 + + + 一次合格数量 + + + 施工质量一次共检合格率 + + + 焊接数据 + + + 焊工总数 + + + 总达因数 + + + 完成达因数 + + + 拍片总数 + + + 合格片数 + + + 一次拍片合格率 + + + 质量巡检问题治理数据 + + + 整改闭环项 + + + 未整改完成项 + + + 整改率 + + + NCR数据 + + + 整改闭环项 + + + 未整改完成项 + + + 整改率 + + + 事故事件数据 + + + 全部 + + + 施工质量一次合格率 + + + 应急管理数据 + + + 一般事故 + + + 隐患排除治理数据 + + + 高风险 + + + 重大事故 + + + 中风险 + + + 整改完成数 + + + 问题个数 + + + 特别重大事故 + + + 较大事故 + + + 安监人员数据 + + + 待整改 + + + 未整改数 + + + 合格 + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx index 7a0ef950..1eaf9d2d 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx @@ -663,4 +663,526 @@ 总计 + + 我的 + + + 项目概况 + + + 安全生产 + + + 垫片 + + + 紧固件 + + + 项目 + + + 管子 + + + 管件 + + + 阀门 + + + 安全培训累计人员 + + + 安全管理人员 + + + 未遂事件 + + + 在建项目 + + + 项目 + + + 剩余天数 + + + 进度 + + + 项目详情 + + + 质量问题整改率 + + + 一次共检合格率 + + + 焊接一次合格率 + + + 总计 + + + 完成 + + + 质量管理人员 + + + 质量培训累计人员 + + + 未完成 + + + 整改率 + + + 质量概况 + + + 设备材料 + + + 首页 + + + 安全数据统计 + + + 安全人工时 + + + 安全隐患整改单 + + + 总数（个） + + + 已完成（个） + + + 未完成（个） + + + 质量一次验收合格率 + + + 焊接一次合格率统计 + + + 监控 + + + 进度统计 + + + 工地名称 + + + 状态 + + + 进度 + + + 在建 + + + 停工 + + + 竣工 + + + 单位：(个) + + + 项目人员 + + + 当前现场人数 + + + 作业人员总数 + + + 管理人员总数 + + + 焊接统计 + + + 焊口 + + + 焊接 + + + 点口 + + + 检测 + + + 返修 + + + 焊口数 + + + 达因 + + + 材料到货 + + + 到期应完成 + + + 关键事项总计 + + + 未准点完成 + + + 准点率 + + + 进度百分比 + + + 进度情况 + + + 安全整改数据 + + + 安全生产 + + + 企业总部人数 + + + 总监 + + + 专职 + + + 分支机构 + + + 总监 + + + 专职 + + + 项目人数 + + + 总监 + + + 专职 + + + 参建人数 + + + 注安师 + + + 总数 + + + 安全会议数据 + + + 企业安委会 + + + 企业专题 + + + 项目安全领导小组 + + + 项目安全例会 + + + 在建项目 + + + 停工项目 + + + 在施危大工程 + + + 安全工时 + + + 安全云监控 + + + 实时视频：线路1 + + + 安全费用数据 + + + 费用提取（万元） + + + 费用使用 + + + 施工机具设备数据 + + + 在用 + + + 特种设备 + + + 高风险作业许可数据 + + + 许可项 + + + 关闭项 + + + 隐患排查治理数据 + + + 一般隐患 + + + 重大隐患 + + + 整改闭环项 + + + 未整改完成项 + + + 安全监督检查数据 + + + 事故事件数据 + + + 未遂事件 + + + 可记录 + + + 应急管理数据 + + + 综合预案 + + + 专项预案 + + + 现场处置预案 + + + 演练次数 + + + 安全教育培训人次数数据 + + + 三级安全教育培训 + + + 专项培训 + + + 特种作业培训 + + + 风险数据分析 + + + 应急管理数据 + + + 危大工程 + + + 超危大工程 + + + 审批完成 + + + 培训人次数 + + + 施工个数 + + + 完工个数 + + + 质量管理 + + + 质量管理人员数据 + + + 企业总部人数 + + + 分支机构人数 + + + 项目部人数 + + + 计量器具数据 + + + 在用计量器具 + + + 校准合格 + + + 资质预警 + + + 机械预警 + + + 质量培训数据 + + + 质量培训人次数 + + + 技术交底人次数 + + + 质量验收数据 + + + 共检总数 + + + 一次合格数量 + + + 施工质量一次共检合格率 + + + 焊接数据 + + + 焊工总数 + + + 总达因数 + + + 完成达因数 + + + 拍片总数 + + + 合格片数 + + + 一次拍片合格率 + + + 质量巡检问题治理数据 + + + 整改闭环项 + + + 未整改完成项 + + + 整改率 + + + NCR数据 + + + 整改闭环项 + + + 未整改完成项 + + + 整改率 + + + 事故事件数据 + + + 全部 + + + 施工质量一次合格率 + + + 应急管理数据 + + + 一般事故 + + + 隐患排查治理数据 + + + 高风险 + + + 重大事故 + + + 中风险 + + + 整改完成数 + + + 问题个数 + + + 特别重大事故 + + + 较大事故 + + + 安监人员数据 + + + 待整改 + + + 未整改数 + + + 合格 + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs index 591860a1..0de2311d 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs @@ -60,6 +60,15 @@ namespace Resources { } } + /// + /// 查找类似 事故事件数据 的本地化字符串。 + /// + internal static string Accident_event_data { + get { + return ResourceManager.GetString("Accident_event_data", resourceCulture); + } + } + /// /// 查找类似 实际值 的本地化字符串。 /// @@ -69,6 +78,15 @@ namespace Resources { } } + /// + /// 查找类似 全部 的本地化字符串。 + /// + internal static string All { + get { + return ResourceManager.GetString("All", resourceCulture); + } + } + /// /// 查找类似 高处 的本地化字符串。 /// @@ -87,6 +105,15 @@ namespace Resources { } } + /// + /// 查找类似 材料到货 的本地化字符串。 + /// + internal static string Arrival_of_materials { + get { + return ResourceManager.GetString("Arrival_of_materials", resourceCulture); + } + } + /// /// 查找类似 竣工 的本地化字符串。 /// @@ -186,6 +213,15 @@ namespace Resources { } } + /// + /// 查找类似 施工质量一次合格率 的本地化字符串。 + /// + internal static string construction_quality_pass_rate { + get { + return ResourceManager.GetString("construction_quality_pass_rate", resourceCulture); + } + } + /// /// 查找类似 合同到期时间 的本地化字符串。 /// @@ -249,6 +285,24 @@ namespace Resources { } } + /// + /// 查找类似 到期应完成 的本地化字符串。 + /// + internal static string Due_should_be_completed { + get { + return ResourceManager.GetString("Due_should_be_completed", resourceCulture); + } + } + + /// + /// 查找类似 应急管理数据 的本地化字符串。 + /// + internal static string Emergency_management_data { + get { + return ResourceManager.GetString("Emergency_management_data", resourceCulture); + } + } + /// /// 查找类似 员工管理 的本地化字符串。 /// @@ -321,6 +375,15 @@ namespace Resources { } } + /// + /// 查找类似 一般事故 的本地化字符串。 + /// + internal static string General_accident { + get { + return ResourceManager.GetString("General_accident", resourceCulture); + } + } + /// /// 查找类似 较大风险 的本地化字符串。 /// @@ -357,6 +420,24 @@ namespace Resources { } } + /// + /// 查找类似 隐患排除治理数据 的本地化字符串。 + /// + internal static string HiddenData { + get { + return ResourceManager.GetString("HiddenData", resourceCulture); + } + } + + /// + /// 查找类似 高风险 的本地化字符串。 + /// + internal static string High_risk { + get { + return ResourceManager.GetString("High_risk", resourceCulture); + } + } + /// /// 查找类似 首页 的本地化字符串。 /// @@ -402,6 +483,15 @@ namespace Resources { } } + /// + /// 查找类似 关键事项总计 的本地化字符串。 + /// + internal static string Key_item_total { + get { + return ResourceManager.GetString("Key_item_total", resourceCulture); + } + } + /// /// 查找类似 在施危大工程数 的本地化字符串。 /// @@ -465,6 +555,276 @@ namespace Resources { } } + /// + /// 查找类似 已完成（个） 的本地化字符串。 + /// + internal static string mainI_completed { + get { + return ResourceManager.GetString("mainI_completed", resourceCulture); + } + } + + /// + /// 查找类似 竣工 的本地化字符串。 + /// + internal static string mainI_completedProject { + get { + return ResourceManager.GetString("mainI_completedProject", resourceCulture); + } + } + + /// + /// 查找类似 当前现场人数 的本地化字符串。 + /// + internal static string mainI_currentOnSitePersonnel { + get { + return ResourceManager.GetString("mainI_currentOnSitePersonnel", resourceCulture); + } + } + + /// + /// 查找类似 达因 的本地化字符串。 + /// + internal static string mainI_dyne { + get { + return ResourceManager.GetString("mainI_dyne", resourceCulture); + } + } + + /// + /// 查找类似 首页 的本地化字符串。 + /// + internal static string mainI_home { + get { + return ResourceManager.GetString("mainI_home", resourceCulture); + } + } + + /// + /// 查找类似 未完成（个） 的本地化字符串。 + /// + internal static string mainI_incomplete { + get { + return ResourceManager.GetString("mainI_incomplete", resourceCulture); + } + } + + /// + /// 查找类似 检测 的本地化字符串。 + /// + internal static string mainI_inspection { + get { + return ResourceManager.GetString("mainI_inspection", resourceCulture); + } + } + + /// + /// 查找类似 监控 的本地化字符串。 + /// + internal static string mainI_monitoring { + get { + return ResourceManager.GetString("mainI_monitoring", resourceCulture); + } + } + + /// + /// 查找类似 焊口数 的本地化字符串。 + /// + internal static string mainI_numberOfWelds { + get { + return ResourceManager.GetString("mainI_numberOfWelds", resourceCulture); + } + } + + /// + /// 查找类似 点口 的本地化字符串。 + /// + internal static string mainI_points { + get { + return ResourceManager.GetString("mainI_points", resourceCulture); + } + } + + /// + /// 查找类似 进度 的本地化字符串。 + /// + internal static string mainI_progress { + get { + return ResourceManager.GetString("mainI_progress", resourceCulture); + } + } + + /// + /// 查找类似 进度统计 的本地化字符串。 + /// + internal static string mainI_progressStatistics { + get { + return ResourceManager.GetString("mainI_progressStatistics", resourceCulture); + } + } + + /// + /// 查找类似 项目人员 的本地化字符串。 + /// + internal static string mainI_projectPersonnel { + get { + return ResourceManager.GetString("mainI_projectPersonnel", resourceCulture); + } + } + + /// + /// 查找类似 工地名称 的本地化字符串。 + /// + internal static string mainI_projectSiteName { + get { + return ResourceManager.GetString("mainI_projectSiteName", resourceCulture); + } + } + + /// + /// 查找类似 质量一次验收合格率 的本地化字符串。 + /// + internal static string mainI_qualityFirstAcceptancePassRate { + get { + return ResourceManager.GetString("mainI_qualityFirstAcceptancePassRate", resourceCulture); + } + } + + /// + /// 查找类似 返修 的本地化字符串。 + /// + internal static string mainI_rework { + get { + return ResourceManager.GetString("mainI_rework", resourceCulture); + } + } + + /// + /// 查找类似 安全人工时 的本地化字符串。 + /// + internal static string mainI_safeManHours { + get { + return ResourceManager.GetString("mainI_safeManHours", resourceCulture); + } + } + + /// + /// 查找类似 安全数据统计 的本地化字符串。 + /// + internal static string mainI_safetyDataStatistics { + get { + return ResourceManager.GetString("mainI_safetyDataStatistics", resourceCulture); + } + } + + /// + /// 查找类似 安全隐患整改单 的本地化字符串。 + /// + internal static string mainI_safetyHazardRectificationOrders { + get { + return ResourceManager.GetString("mainI_safetyHazardRectificationOrders", resourceCulture); + } + } + + /// + /// 查找类似 状态 的本地化字符串。 + /// + internal static string mainI_status { + get { + return ResourceManager.GetString("mainI_status", resourceCulture); + } + } + + /// + /// 查找类似 停工 的本地化字符串。 + /// + internal static string mainI_suspended { + get { + return ResourceManager.GetString("mainI_suspended", resourceCulture); + } + } + + /// + /// 查找类似 总数（个） 的本地化字符串。 + /// + internal static string mainI_total { + get { + return ResourceManager.GetString("mainI_total", resourceCulture); + } + } + + /// + /// 查找类似 管理人员总数 的本地化字符串。 + /// + internal static string mainI_totalNumberOfManagers { + get { + return ResourceManager.GetString("mainI_totalNumberOfManagers", resourceCulture); + } + } + + /// + /// 查找类似 作业人员总数 的本地化字符串。 + /// + internal static string mainI_totalNumberOfWorkers { + get { + return ResourceManager.GetString("mainI_totalNumberOfWorkers", resourceCulture); + } + } + + /// + /// 查找类似 在建 的本地化字符串。 + /// + internal static string mainI_underConstruction { + get { + return ResourceManager.GetString("mainI_underConstruction", resourceCulture); + } + } + + /// + /// 查找类似 单位：(个) 的本地化字符串。 + /// + internal static string mainI_units { + get { + return ResourceManager.GetString("mainI_units", resourceCulture); + } + } + + /// + /// 查找类似 焊接 的本地化字符串。 + /// + internal static string mainI_welding { + get { + return ResourceManager.GetString("mainI_welding", resourceCulture); + } + } + + /// + /// 查找类似 焊接一次合格率统计 的本地化字符串。 + /// + internal static string mainI_weldingFirstPassRateStatistics { + get { + return ResourceManager.GetString("mainI_weldingFirstPassRateStatistics", resourceCulture); + } + } + + /// + /// 查找类似 焊接统计 的本地化字符串。 + /// + internal static string mainI_weldingStatistics { + get { + return ResourceManager.GetString("mainI_weldingStatistics", resourceCulture); + } + } + + /// + /// 查找类似 焊口 的本地化字符串。 + /// + internal static string mainI_welds { + get { + return ResourceManager.GetString("mainI_welds", resourceCulture); + } + } + /// /// 查找类似 高空 的本地化字符串。 /// @@ -951,6 +1311,1050 @@ namespace Resources { } } + /// + /// 查找类似 事故事件数据 的本地化字符串。 + /// + internal static string main_new0_AccidentEventData_Label { + get { + return ResourceManager.GetString("main_new0_AccidentEventData_Label", resourceCulture); + } + } + + /// + /// 查找类似 未遂事件 的本地化字符串。 + /// + internal static string main_new0_AccidentEventData_NearMiss { + get { + return ResourceManager.GetString("main_new0_AccidentEventData_NearMiss", resourceCulture); + } + } + + /// + /// 查找类似 可记录 的本地化字符串。 + /// + internal static string main_new0_AccidentEventData_RecordableEvent { + get { + return ResourceManager.GetString("main_new0_AccidentEventData_RecordableEvent", resourceCulture); + } + } + + /// + /// 查找类似 在建项目 的本地化字符串。 + /// + internal static string main_new0_BeUnderConstructionNum_Label { + get { + return ResourceManager.GetString("main_new0_BeUnderConstructionNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 总监 的本地化字符串。 + /// + internal static string main_new0_Branch_Director { + get { + return ResourceManager.GetString("main_new0_Branch_Director", resourceCulture); + } + } + + /// + /// 查找类似 专职 的本地化字符串。 + /// + internal static string main_new0_Branch_FullTime { + get { + return ResourceManager.GetString("main_new0_Branch_FullTime", resourceCulture); + } + } + + /// + /// 查找类似 分支机构 的本地化字符串。 + /// + internal static string main_new0_Branch_Label { + get { + return ResourceManager.GetString("main_new0_Branch_Label", resourceCulture); + } + } + + /// + /// 查找类似 企业安委会 的本地化字符串。 + /// + internal static string main_new0_CompanySafetyCommittee { + get { + return ResourceManager.GetString("main_new0_CompanySafetyCommittee", resourceCulture); + } + } + + /// + /// 查找类似 企业专题 的本地化字符串。 + /// + internal static string main_new0_CompanySpecialTopic { + get { + return ResourceManager.GetString("main_new0_CompanySpecialTopic", resourceCulture); + } + } + + /// + /// 查找类似 在用 的本地化字符串。 + /// + internal static string main_new0_ConstructionEquipment_InUse { + get { + return ResourceManager.GetString("main_new0_ConstructionEquipment_InUse", resourceCulture); + } + } + + /// + /// 查找类似 施工机具设备数据 的本地化字符串。 + /// + internal static string main_new0_ConstructionEquipment_Label { + get { + return ResourceManager.GetString("main_new0_ConstructionEquipment_Label", resourceCulture); + } + } + + /// + /// 查找类似 特种设备 的本地化字符串。 + /// + internal static string main_new0_ConstructionEquipment_SpecialEquipment { + get { + return ResourceManager.GetString("main_new0_ConstructionEquipment_SpecialEquipment", resourceCulture); + } + } + + /// + /// 查找类似 综合预案 的本地化字符串。 + /// + internal static string main_new0_EmergencyManagementData_ComprehensivePlan { + get { + return ResourceManager.GetString("main_new0_EmergencyManagementData_ComprehensivePlan", resourceCulture); + } + } + + /// + /// 查找类似 演练次数 的本地化字符串。 + /// + internal static string main_new0_EmergencyManagementData_DrillNum { + get { + return ResourceManager.GetString("main_new0_EmergencyManagementData_DrillNum", resourceCulture); + } + } + + /// + /// 查找类似 应急管理数据 的本地化字符串。 + /// + internal static string main_new0_EmergencyManagementData_Label { + get { + return ResourceManager.GetString("main_new0_EmergencyManagementData_Label", resourceCulture); + } + } + + /// + /// 查找类似 现场处置预案 的本地化字符串。 + /// + internal static string main_new0_EmergencyManagementData_OnSiteDisposalPlan { + get { + return ResourceManager.GetString("main_new0_EmergencyManagementData_OnSiteDisposalPlan", resourceCulture); + } + } + + /// + /// 查找类似 专项预案 的本地化字符串。 + /// + internal static string main_new0_EmergencyManagementData_SpecialPlan { + get { + return ResourceManager.GetString("main_new0_EmergencyManagementData_SpecialPlan", resourceCulture); + } + } + + /// + /// 查找类似 总监 的本地化字符串。 + /// + internal static string main_new0_HeadOfficeNum_Director { + get { + return ResourceManager.GetString("main_new0_HeadOfficeNum_Director", resourceCulture); + } + } + + /// + /// 查找类似 专职 的本地化字符串。 + /// + internal static string main_new0_HeadOfficeNum_FullTime { + get { + return ResourceManager.GetString("main_new0_HeadOfficeNum_FullTime", resourceCulture); + } + } + + /// + /// 查找类似 企业总部人数 的本地化字符串。 + /// + internal static string main_new0_HeadOfficeNum_Label { + get { + return ResourceManager.GetString("main_new0_HeadOfficeNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 整改闭环项 的本地化字符串。 + /// + internal static string main_new0_HiddenHazardInspectionData_ClosedItems { + get { + return ResourceManager.GetString("main_new0_HiddenHazardInspectionData_ClosedItems", resourceCulture); + } + } + + /// + /// 查找类似 一般隐患 的本地化字符串。 + /// + internal static string main_new0_HiddenHazardInspectionData_GeneralHiddenHazard { + get { + return ResourceManager.GetString("main_new0_HiddenHazardInspectionData_GeneralHiddenHazard", resourceCulture); + } + } + + /// + /// 查找类似 隐患排查治理数据 的本地化字符串。 + /// + internal static string main_new0_HiddenHazardInspectionData_Label { + get { + return ResourceManager.GetString("main_new0_HiddenHazardInspectionData_Label", resourceCulture); + } + } + + /// + /// 查找类似 重大隐患 的本地化字符串。 + /// + internal static string main_new0_HiddenHazardInspectionData_MajorHiddenHazard { + get { + return ResourceManager.GetString("main_new0_HiddenHazardInspectionData_MajorHiddenHazard", resourceCulture); + } + } + + /// + /// 查找类似 未整改完成项 的本地化字符串。 + /// + internal static string main_new0_HiddenHazardInspectionData_UnfinishedItems { + get { + return ResourceManager.GetString("main_new0_HiddenHazardInspectionData_UnfinishedItems", resourceCulture); + } + } + + /// + /// 查找类似 关闭项 的本地化字符串。 + /// + internal static string main_new0_HighRiskWorkPermit_ClosedItems { + get { + return ResourceManager.GetString("main_new0_HighRiskWorkPermit_ClosedItems", resourceCulture); + } + } + + /// + /// 查找类似 许可项 的本地化字符串。 + /// + internal static string main_new0_HighRiskWorkPermit_Items { + get { + return ResourceManager.GetString("main_new0_HighRiskWorkPermit_Items", resourceCulture); + } + } + + /// + /// 查找类似 高风险作业许可数据 的本地化字符串。 + /// + internal static string main_new0_HighRiskWorkPermit_Label { + get { + return ResourceManager.GetString("main_new0_HighRiskWorkPermit_Label", resourceCulture); + } + } + + /// + /// 查找类似 审批完成 的本地化字符串。 + /// + internal static string main_new0_LargeEngineeringData_CompletedItems { + get { + return ResourceManager.GetString("main_new0_LargeEngineeringData_CompletedItems", resourceCulture); + } + } + + /// + /// 查找类似 施工个数 的本地化字符串。 + /// + internal static string main_new0_LargeEngineeringData_ConstructionNum { + get { + return ResourceManager.GetString("main_new0_LargeEngineeringData_ConstructionNum", resourceCulture); + } + } + + /// + /// 查找类似 完工个数 的本地化字符串。 + /// + internal static string main_new0_LargeEngineeringData_FinishedNum { + get { + return ResourceManager.GetString("main_new0_LargeEngineeringData_FinishedNum", resourceCulture); + } + } + + /// + /// 查找类似 应急管理数据 的本地化字符串。 + /// + internal static string main_new0_LargeEngineeringData_Label { + get { + return ResourceManager.GetString("main_new0_LargeEngineeringData_Label", resourceCulture); + } + } + + /// + /// 查找类似 危大工程 的本地化字符串。 + /// + internal static string main_new0_LargeEngineeringData_LargeEngineering { + get { + return ResourceManager.GetString("main_new0_LargeEngineeringData_LargeEngineering", resourceCulture); + } + } + + /// + /// 查找类似 超危大工程 的本地化字符串。 + /// + internal static string main_new0_LargeEngineeringData_SuperLargeEngineering { + get { + return ResourceManager.GetString("main_new0_LargeEngineeringData_SuperLargeEngineering", resourceCulture); + } + } + + /// + /// 查找类似 培训人次数 的本地化字符串。 + /// + internal static string main_new0_LargeEngineeringData_TrainingPersonNum { + get { + return ResourceManager.GetString("main_new0_LargeEngineeringData_TrainingPersonNum", resourceCulture); + } + } + + /// + /// 查找类似 在施危大工程 的本地化字符串。 + /// + internal static string main_new0_MajorProjectsUnderConstructionNum_Label { + get { + return ResourceManager.GetString("main_new0_MajorProjectsUnderConstructionNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 总监 的本地化字符串。 + /// + internal static string main_new0_ProjectNum_Director { + get { + return ResourceManager.GetString("main_new0_ProjectNum_Director", resourceCulture); + } + } + + /// + /// 查找类似 专职 的本地化字符串。 + /// + internal static string main_new0_ProjectNum_FullTime { + get { + return ResourceManager.GetString("main_new0_ProjectNum_FullTime", resourceCulture); + } + } + + /// + /// 查找类似 项目人数 的本地化字符串。 + /// + internal static string main_new0_ProjectNum_Label { + get { + return ResourceManager.GetString("main_new0_ProjectNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 参建人数 的本地化字符串。 + /// + internal static string main_new0_ProjectNum_Participants { + get { + return ResourceManager.GetString("main_new0_ProjectNum_Participants", resourceCulture); + } + } + + /// + /// 查找类似 项目安全领导小组 的本地化字符串。 + /// + internal static string main_new0_ProjectSafetyLeadershipGroup { + get { + return ResourceManager.GetString("main_new0_ProjectSafetyLeadershipGroup", resourceCulture); + } + } + + /// + /// 查找类似 项目安全例会 的本地化字符串。 + /// + internal static string main_new0_ProjectSafetyMeeting { + get { + return ResourceManager.GetString("main_new0_ProjectSafetyMeeting", resourceCulture); + } + } + + /// + /// 查找类似 风险数据分析 的本地化字符串。 + /// + internal static string main_new0_RiskAnalysisData_Label { + get { + return ResourceManager.GetString("main_new0_RiskAnalysisData_Label", resourceCulture); + } + } + + /// + /// 查找类似 费用提取（万元） 的本地化字符串。 + /// + internal static string main_new0_SafeCost_Extraction { + get { + return ResourceManager.GetString("main_new0_SafeCost_Extraction", resourceCulture); + } + } + + /// + /// 查找类似 安全费用数据 的本地化字符串。 + /// + internal static string main_new0_SafeCost_Label { + get { + return ResourceManager.GetString("main_new0_SafeCost_Label", resourceCulture); + } + } + + /// + /// 查找类似 费用使用 的本地化字符串。 + /// + internal static string main_new0_SafeCost_Usage { + get { + return ResourceManager.GetString("main_new0_SafeCost_Usage", resourceCulture); + } + } + + /// + /// 查找类似 注安师 的本地化字符串。 + /// + internal static string main_new0_SafetyInjectionEngineer_Label { + get { + return ResourceManager.GetString("main_new0_SafetyInjectionEngineer_Label", resourceCulture); + } + } + + /// + /// 查找类似 总数 的本地化字符串。 + /// + internal static string main_new0_SafetyInjectionEngineer_Total { + get { + return ResourceManager.GetString("main_new0_SafetyInjectionEngineer_Total", resourceCulture); + } + } + + /// + /// 查找类似 安全会议数据 的本地化字符串。 + /// + internal static string main_new0_SafetyMeetingData_Label { + get { + return ResourceManager.GetString("main_new0_SafetyMeetingData_Label", resourceCulture); + } + } + + /// + /// 查找类似 安全监督检查数据 的本地化字符串。 + /// + internal static string main_new0_SafetySupervisionAndInspectionData_Label { + get { + return ResourceManager.GetString("main_new0_SafetySupervisionAndInspectionData_Label", resourceCulture); + } + } + + /// + /// 查找类似 安全教育培训人次数数据 的本地化字符串。 + /// + internal static string main_new0_SafetyTrainingData_Label { + get { + return ResourceManager.GetString("main_new0_SafetyTrainingData_Label", resourceCulture); + } + } + + /// + /// 查找类似 三级安全教育培训 的本地化字符串。 + /// + internal static string main_new0_SafetyTrainingData_LevelThreeTraining { + get { + return ResourceManager.GetString("main_new0_SafetyTrainingData_LevelThreeTraining", resourceCulture); + } + } + + /// + /// 查找类似 特种作业培训 的本地化字符串。 + /// + internal static string main_new0_SafetyTrainingData_SpecialOperationTraining { + get { + return ResourceManager.GetString("main_new0_SafetyTrainingData_SpecialOperationTraining", resourceCulture); + } + } + + /// + /// 查找类似 专项培训 的本地化字符串。 + /// + internal static string main_new0_SafetyTrainingData_SpecialTraining { + get { + return ResourceManager.GetString("main_new0_SafetyTrainingData_SpecialTraining", resourceCulture); + } + } + + /// + /// 查找类似 停工项目 的本地化字符串。 + /// + internal static string main_new0_ShutdownNum_Label { + get { + return ResourceManager.GetString("main_new0_ShutdownNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 安全生产 的本地化字符串。 + /// + internal static string main_new0_Title { + get { + return ResourceManager.GetString("main_new0_Title", resourceCulture); + } + } + + /// + /// 查找类似 实时视频：线路1 的本地化字符串。 + /// + internal static string main_new0_Video_RealTimeVideo { + get { + return ResourceManager.GetString("main_new0_Video_RealTimeVideo", resourceCulture); + } + } + + /// + /// 查找类似 安全云监控 的本地化字符串。 + /// + internal static string main_new0_Video_Title { + get { + return ResourceManager.GetString("main_new0_Video_Title", resourceCulture); + } + } + + /// + /// 查找类似 安全工时 的本地化字符串。 + /// + internal static string main_new0_WorkingHourData_Label { + get { + return ResourceManager.GetString("main_new0_WorkingHourData_Label", resourceCulture); + } + } + + /// + /// 查找类似 完成达因数 的本地化字符串。 + /// + internal static string main_new1_HjData_CompleteDineNum_Label { + get { + return ResourceManager.GetString("main_new1_HjData_CompleteDineNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 拍片总数 的本地化字符串。 + /// + internal static string main_new1_HjData_HjallNumber_Label { + get { + return ResourceManager.GetString("main_new1_HjData_HjallNumber_Label", resourceCulture); + } + } + + /// + /// 查找类似 合格片数 的本地化字符串。 + /// + internal static string main_new1_HjData_HjfinishNumber_Label { + get { + return ResourceManager.GetString("main_new1_HjData_HjfinishNumber_Label", resourceCulture); + } + } + + /// + /// 查找类似 一次拍片合格率 的本地化字符串。 + /// + internal static string main_new1_HjData_Hjzgl_Label { + get { + return ResourceManager.GetString("main_new1_HjData_Hjzgl_Label", resourceCulture); + } + } + + /// + /// 查找类似 焊接数据 的本地化字符串。 + /// + internal static string main_new1_HjData_Label { + get { + return ResourceManager.GetString("main_new1_HjData_Label", resourceCulture); + } + } + + /// + /// 查找类似 总达因数 的本地化字符串。 + /// + internal static string main_new1_HjData_TotalDineNum_Label { + get { + return ResourceManager.GetString("main_new1_HjData_TotalDineNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 焊工总数 的本地化字符串。 + /// + internal static string main_new1_HjData_WelderNum_Label { + get { + return ResourceManager.GetString("main_new1_HjData_WelderNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 分支机构人数 的本地化字符串。 + /// + internal static string main_new1_ManagerData_BranchPersonNum_Label { + get { + return ResourceManager.GetString("main_new1_ManagerData_BranchPersonNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 企业总部人数 的本地化字符串。 + /// + internal static string main_new1_ManagerData_CompanyPersonNum_Label { + get { + return ResourceManager.GetString("main_new1_ManagerData_CompanyPersonNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 质量管理人员数据 的本地化字符串。 + /// + internal static string main_new1_ManagerData_Label { + get { + return ResourceManager.GetString("main_new1_ManagerData_Label", resourceCulture); + } + } + + /// + /// 查找类似 项目部人数 的本地化字符串。 + /// + internal static string main_new1_ManagerData_ProjectPersonNum_Label { + get { + return ResourceManager.GetString("main_new1_ManagerData_ProjectPersonNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 机械预警 的本地化字符串。 + /// + internal static string main_new1_MeasuringInstrumentsData_JxyjNum_Label { + get { + return ResourceManager.GetString("main_new1_MeasuringInstrumentsData_JxyjNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 计量器具数据 的本地化字符串。 + /// + internal static string main_new1_MeasuringInstrumentsData_Label { + get { + return ResourceManager.GetString("main_new1_MeasuringInstrumentsData_Label", resourceCulture); + } + } + + /// + /// 查找类似 校准合格 的本地化字符串。 + /// + internal static string main_new1_MeasuringInstrumentsData_OKNum_Label { + get { + return ResourceManager.GetString("main_new1_MeasuringInstrumentsData_OKNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 资质预警 的本地化字符串。 + /// + internal static string main_new1_MeasuringInstrumentsData_QualityChartAnalysis_Label { + get { + return ResourceManager.GetString("main_new1_MeasuringInstrumentsData_QualityChartAnalysis_Label", resourceCulture); + } + } + + /// + /// 查找类似 在用计量器具 的本地化字符串。 + /// + internal static string main_new1_MeasuringInstrumentsData_UseNum_Label { + get { + return ResourceManager.GetString("main_new1_MeasuringInstrumentsData_UseNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 NCR数据 的本地化字符串。 + /// + internal static string main_new1_NCRData_Label { + get { + return ResourceManager.GetString("main_new1_NCRData_Label", resourceCulture); + } + } + + /// + /// 查找类似 未整改完成项 的本地化字符串。 + /// + internal static string main_new1_NCRData_NcrwZgbhx_Label { + get { + return ResourceManager.GetString("main_new1_NCRData_NcrwZgbhx_Label", resourceCulture); + } + } + + /// + /// 查找类似 整改闭环项 的本地化字符串。 + /// + internal static string main_new1_NCRData_NcrZgbhx_Label { + get { + return ResourceManager.GetString("main_new1_NCRData_NcrZgbhx_Label", resourceCulture); + } + } + + /// + /// 查找类似 整改率 的本地化字符串。 + /// + internal static string main_new1_NCRData_NcrZgl_Label { + get { + return ResourceManager.GetString("main_new1_NCRData_NcrZgl_Label", resourceCulture); + } + } + + /// + /// 查找类似 共检总数 的本地化字符串。 + /// + internal static string main_new1_QualityInspection_AllInspectionManagement_Label { + get { + return ResourceManager.GetString("main_new1_QualityInspection_AllInspectionManagement_Label", resourceCulture); + } + } + + /// + /// 查找类似 施工质量一次共检合格率 的本地化字符串。 + /// + internal static string main_new1_QualityInspection_InspectionManagementZgl_Label { + get { + return ResourceManager.GetString("main_new1_QualityInspection_InspectionManagementZgl_Label", resourceCulture); + } + } + + /// + /// 查找类似 一次合格数量 的本地化字符串。 + /// + internal static string main_new1_QualityInspection_IsOnceInspectionManagement_Label { + get { + return ResourceManager.GetString("main_new1_QualityInspection_IsOnceInspectionManagement_Label", resourceCulture); + } + } + + /// + /// 查找类似 质量验收数据 的本地化字符串。 + /// + internal static string main_new1_QualityInspection_Label { + get { + return ResourceManager.GetString("main_new1_QualityInspection_Label", resourceCulture); + } + } + + /// + /// 查找类似 质量巡检问题治理数据 的本地化字符串。 + /// + internal static string main_new1_QualityProblem_Label { + get { + return ResourceManager.GetString("main_new1_QualityProblem_Label", resourceCulture); + } + } + + /// + /// 查找类似 整改闭环项 的本地化字符串。 + /// + internal static string main_new1_QualityProblem_ProblemCompletedNum_Label { + get { + return ResourceManager.GetString("main_new1_QualityProblem_ProblemCompletedNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 未整改完成项 的本地化字符串。 + /// + internal static string main_new1_QualityProblem_ProblemNotCompletedNum_Label { + get { + return ResourceManager.GetString("main_new1_QualityProblem_ProblemNotCompletedNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 整改率 的本地化字符串。 + /// + internal static string main_new1_QualityProblem_ProblemZgl_Label { + get { + return ResourceManager.GetString("main_new1_QualityProblem_ProblemZgl_Label", resourceCulture); + } + } + + /// + /// 查找类似 质量培训数据 的本地化字符串。 + /// + internal static string main_new1_QualityTrainingData_Label { + get { + return ResourceManager.GetString("main_new1_QualityTrainingData_Label", resourceCulture); + } + } + + /// + /// 查找类似 技术交底人次数 的本地化字符串。 + /// + internal static string main_new1_QualityTrainingData_TechnicalDisclosePersonNum_Label { + get { + return ResourceManager.GetString("main_new1_QualityTrainingData_TechnicalDisclosePersonNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 质量培训人次数 的本地化字符串。 + /// + internal static string main_new1_QualityTrainingData_TrainPersonNum_Label { + get { + return ResourceManager.GetString("main_new1_QualityTrainingData_TrainPersonNum_Label", resourceCulture); + } + } + + /// + /// 查找类似 质量管理 的本地化字符串。 + /// + internal static string main_new1_Title { + get { + return ResourceManager.GetString("main_new1_Title", resourceCulture); + } + } + + /// + /// 查找类似 紧固件 的本地化字符串。 + /// + internal static string main_new_bolt { + get { + return ResourceManager.GetString("main_new_bolt", resourceCulture); + } + } + + /// + /// 查找类似 完成 的本地化字符串。 + /// + internal static string main_new_completed { + get { + return ResourceManager.GetString("main_new_completed", resourceCulture); + } + } + + /// + /// 查找类似 设备材料 的本地化字符串。 + /// + internal static string main_new_equipmentMaterials { + get { + return ResourceManager.GetString("main_new_equipmentMaterials", resourceCulture); + } + } + + /// + /// 查找类似 一次共检合格率 的本地化字符串。 + /// + internal static string main_new_firstInspectionPassRate { + get { + return ResourceManager.GetString("main_new_firstInspectionPassRate", resourceCulture); + } + } + + /// + /// 查找类似 垫片 的本地化字符串。 + /// + internal static string main_new_gasket { + get { + return ResourceManager.GetString("main_new_gasket", resourceCulture); + } + } + + /// + /// 查找类似 未遂事件 的本地化字符串。 + /// + internal static string main_new_nearMissEvents { + get { + return ResourceManager.GetString("main_new_nearMissEvents", resourceCulture); + } + } + + /// + /// 查找类似 在建项目 的本地化字符串。 + /// + internal static string main_new_ongoingProjects { + get { + return ResourceManager.GetString("main_new_ongoingProjects", resourceCulture); + } + } + + /// + /// 查找类似 未完成 的本地化字符串。 + /// + internal static string main_new_overdue { + get { + return ResourceManager.GetString("main_new_overdue", resourceCulture); + } + } + + /// + /// 查找类似 管子 的本地化字符串。 + /// + internal static string main_new_pipe { + get { + return ResourceManager.GetString("main_new_pipe", resourceCulture); + } + } + + /// + /// 查找类似 管件 的本地化字符串。 + /// + internal static string main_new_pipeFitting { + get { + return ResourceManager.GetString("main_new_pipeFitting", resourceCulture); + } + } + + /// + /// 查找类似 进度 的本地化字符串。 + /// + internal static string main_new_progress { + get { + return ResourceManager.GetString("main_new_progress", resourceCulture); + } + } + + /// + /// 查找类似 项目 的本地化字符串。 + /// + internal static string main_new_project { + get { + return ResourceManager.GetString("main_new_project", resourceCulture); + } + } + + /// + /// 查找类似 项目详情 的本地化字符串。 + /// + internal static string main_new_projectDetails { + get { + return ResourceManager.GetString("main_new_projectDetails", resourceCulture); + } + } + + /// + /// 查找类似 项目 的本地化字符串。 + /// + internal static string main_new_projects { + get { + return ResourceManager.GetString("main_new_projects", resourceCulture); + } + } + + /// + /// 查找类似 质量问题整改率 的本地化字符串。 + /// + internal static string main_new_qualityIssuesRectificationRate { + get { + return ResourceManager.GetString("main_new_qualityIssuesRectificationRate", resourceCulture); + } + } + + /// + /// 查找类似 质量管理人员 的本地化字符串。 + /// + internal static string main_new_qualityManagementPersonnel { + get { + return ResourceManager.GetString("main_new_qualityManagementPersonnel", resourceCulture); + } + } + + /// + /// 查找类似 质量概况 的本地化字符串。 + /// + internal static string main_new_qualityOverview { + get { + return ResourceManager.GetString("main_new_qualityOverview", resourceCulture); + } + } + + /// + /// 查找类似 质量培训累计人员 的本地化字符串。 + /// + internal static string main_new_qualityTrainingCumulativePersonnel { + get { + return ResourceManager.GetString("main_new_qualityTrainingCumulativePersonnel", resourceCulture); + } + } + + /// + /// 查找类似 整改率 的本地化字符串。 + /// + internal static string main_new_rectificationRate { + get { + return ResourceManager.GetString("main_new_rectificationRate", resourceCulture); + } + } + + /// + /// 查找类似 剩余天数 的本地化字符串。 + /// + internal static string main_new_remainingDays { + get { + return ResourceManager.GetString("main_new_remainingDays", resourceCulture); + } + } + + /// + /// 查找类似 安全培训累计人员 的本地化字符串。 + /// + internal static string main_new_safeTrainingCumulativePersonnel { + get { + return ResourceManager.GetString("main_new_safeTrainingCumulativePersonnel", resourceCulture); + } + } + + /// + /// 查找类似 安全管理人员 的本地化字符串。 + /// + internal static string main_new_safetyManagementPersonnel { + get { + return ResourceManager.GetString("main_new_safetyManagementPersonnel", resourceCulture); + } + } + + /// + /// 查找类似 总计 的本地化字符串。 + /// + internal static string main_new_total { + get { + return ResourceManager.GetString("main_new_total", resourceCulture); + } + } + + /// + /// 查找类似 阀门 的本地化字符串。 + /// + internal static string main_new_valve { + get { + return ResourceManager.GetString("main_new_valve", resourceCulture); + } + } + + /// + /// 查找类似 焊接一次合格率 的本地化字符串。 + /// + internal static string main_new_weldingFirstPassRate { + get { + return ResourceManager.GetString("main_new_weldingFirstPassRate", resourceCulture); + } + } + /// /// 查找类似 重大风险 的本地化字符串。 /// @@ -960,6 +2364,15 @@ namespace Resources { } } + /// + /// 查找类似 重大事故 的本地化字符串。 + /// + internal static string Major_accident { + get { + return ResourceManager.GetString("Major_accident", resourceCulture); + } + } + /// /// 查找类似 管理人员总数 的本地化字符串。 /// @@ -1014,6 +2427,15 @@ namespace Resources { } } + /// + /// 查找类似 中风险 的本地化字符串。 + /// + internal static string Medium_risk { + get { + return ResourceManager.GetString("Medium_risk", resourceCulture); + } + } + /// /// 查找类似 消息 的本地化字符串。 /// @@ -1023,6 +2445,15 @@ namespace Resources { } } + /// + /// 查找类似 我的 的本地化字符串。 + /// + internal static string mine { + get { + return ResourceManager.GetString("mine", resourceCulture); + } + } + /// /// 查找类似 更多 的本地化字符串。 /// @@ -1068,6 +2499,15 @@ namespace Resources { } } + /// + /// 查找类似 未准点完成 的本地化字符串。 + /// + internal static string Not_finished_on_time { + get { + return ResourceManager.GetString("Not_finished_on_time", resourceCulture); + } + } + /// /// 查找类似 完工个数 的本地化字符串。 /// @@ -1095,6 +2535,24 @@ namespace Resources { } } + /// + /// 查找类似 整改完成数 的本地化字符串。 + /// + internal static string Number_of_corrections_completed { + get { + return ResourceManager.GetString("Number_of_corrections_completed", resourceCulture); + } + } + + /// + /// 查找类似 问题个数 的本地化字符串。 + /// + internal static string Number_of_questions { + get { + return ResourceManager.GetString("Number_of_questions", resourceCulture); + } + } + /// /// 查找类似 一次共检合格率 的本地化字符串。 /// @@ -1122,6 +2580,15 @@ namespace Resources { } } + /// + /// 查找类似 准点率 的本地化字符串。 + /// + internal static string On_time_rate { + get { + return ResourceManager.GetString("On_time_rate", resourceCulture); + } + } + /// /// 查找类似 在新标签页中打开 的本地化字符串。 /// @@ -1149,6 +2616,15 @@ namespace Resources { } } + /// + /// 查找类似 特别重大事故 的本地化字符串。 + /// + internal static string Particularly_serious_accident { + get { + return ResourceManager.GetString("Particularly_serious_accident", resourceCulture); + } + } + /// /// 查找类似 合格率 的本地化字符串。 /// @@ -1158,6 +2634,15 @@ namespace Resources { } } + /// + /// 查找类似 进度百分比 的本地化字符串。 + /// + internal static string Percentage_of_progress { + get { + return ResourceManager.GetString("Percentage_of_progress", resourceCulture); + } + } + /// /// 查找类似 桩基施工 的本地化字符串。 /// @@ -1203,6 +2688,15 @@ namespace Resources { } } + /// + /// 查找类似 进度情况 的本地化字符串。 + /// + internal static string progress { + get { + return ResourceManager.GetString("progress", resourceCulture); + } + } + /// /// 查找类似 项目地址 的本地化字符串。 /// @@ -1230,6 +2724,15 @@ namespace Resources { } } + /// + /// 查找类似 项目概况 的本地化字符串。 + /// + internal static string ProjectProfile { + get { + return ResourceManager.GetString("ProjectProfile", resourceCulture); + } + } + /// /// 查找类似 项目进度计划 的本地化字符串。 /// @@ -1383,6 +2886,15 @@ namespace Resources { } } + /// + /// 查找类似 较大事故 的本地化字符串。 + /// + internal static string Relatively_major_accident { + get { + return ResourceManager.GetString("Relatively_major_accident", resourceCulture); + } + } + /// /// 查找类似 距竣工剩余 的本地化字符串。 /// @@ -1419,6 +2931,15 @@ namespace Resources { } } + /// + /// 查找类似 安全生产 的本地化字符串。 + /// + internal static string SafeProduction { + get { + return ResourceManager.GetString("SafeProduction", resourceCulture); + } + } + /// /// 查找类似 安全问题统计 的本地化字符串。 /// @@ -1446,6 +2967,24 @@ namespace Resources { } } + /// + /// 查找类似 安全整改数据 的本地化字符串。 + /// + internal static string Safety_rectification_data { + get { + return ResourceManager.GetString("Safety_rectification_data", resourceCulture); + } + } + + /// + /// 查找类似 安监人员数据 的本地化字符串。 + /// + internal static string Safety_supervision_personnel_data { + get { + return ResourceManager.GetString("Safety_supervision_personnel_data", resourceCulture); + } + } + /// /// 查找类似 进度管理 的本地化字符串。 /// @@ -1617,6 +3156,15 @@ namespace Resources { } } + /// + /// 查找类似 待整改 的本地化字符串。 + /// + internal static string To_be_rectified { + get { + return ResourceManager.GetString("To_be_rectified", resourceCulture); + } + } + /// /// 查找类似 移交管理 的本地化字符串。 /// @@ -1635,6 +3183,15 @@ namespace Resources { } } + /// + /// 查找类似 未整改数 的本地化字符串。 + /// + internal static string Uncorrected_number { + get { + return ResourceManager.GetString("Uncorrected_number", resourceCulture); + } + } + /// /// 查找类似 在建 的本地化字符串。 /// @@ -1644,6 +3201,15 @@ namespace Resources { } } + /// + /// 查找类似 合格 的本地化字符串。 + /// + internal static string Up_to_standard { + get { + return ResourceManager.GetString("Up_to_standard", resourceCulture); + } + } + /// /// 查找类似 用户 的本地化字符串。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx index 71938b0b..9e06427f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx @@ -28,7 +28,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -74,7 +74,7 @@ + LabelWidth="150px" LabelAlign="Right"> @@ -109,9 +109,7 @@ - --%> - - + --%> @@ -121,7 +119,7 @@ - <%-- + <%-- --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index d0112b53..ceed9497 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -1,5 +1,6 @@ using BLL; using BLL.CQMS.Comprehensive; +using FineUIPro.Web.Comprehensive; using System; using System.Linq; @@ -46,7 +47,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive var inspectionEquipment = BLL.InspectionEquipmentService.GetInspectionEquipmentById(this.InspectionEquipmentId); if (inspectionEquipment != null) { - this.InspectionEquipmentId = inspectionEquipment.InspectionEquipmentId; + this.InspectionEquipmentId = inspectionEquipment.InspectionEquipmentId; + this.hdAttachUrl.Text = this.InspectionEquipmentId; if (!string.IsNullOrEmpty(inspectionEquipment.UnitId)) { this.drpUnitId.SelectedValue = inspectionEquipment.UnitId; @@ -287,7 +289,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive } if (string.IsNullOrEmpty(this.InspectionEquipmentId)) - { newInspectionEquipment.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson)); + { + if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + { + newInspectionEquipment.InspectionEquipmentId = this.hdAttachUrl.Text; + } + else + { + newInspectionEquipment.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson)); + this.hdAttachUrl.Text = newInspectionEquipment.InspectionEquipmentId; + } newInspectionEquipment.CompileMan = this.CurrUser.UserId; newInspectionEquipment.CompileDate = DateTime.Now; newInspectionEquipment.Status = BLL.Const.Comprehensive_Compile; @@ -502,18 +513,18 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// protected void btnAttach_Click(object sender, EventArgs e) { - if (string.IsNullOrEmpty(this.InspectionEquipmentId)) //新增记录 + if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录 { - this.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment)); + this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment)); } - //var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault(); - //if (oldInspectionEquipment.Status == BLL.Const.Comprehensive_Complete) + //Model.Comprehensive_InspectionPerson inspectionPerson = BLL.InspectionPersonService.GetInspectionPersonById(this.InspectionPersonId); + //if (inspectionPerson.Status == BLL.Const.Comprehensive_Complete) //{ - // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId))); + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionPerson&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionPersonMenuId))); //} //else //{ - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionEquipmentMenuId))); //} } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx index f66409a9..9be113a7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx @@ -22,7 +22,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs index 12c49d5a..4f7aca93 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs @@ -41,8 +41,8 @@ namespace FineUIPro.Web.Comprehensive listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); if (sdrpUnitId.SelectedValue != BLL.Const._Null) { - strSql += " AND C.SendUnit=@UnitId"; - listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue)); + strSql += " AND C.ReceiveUnit like @UnitId"; + listStr.Add(new SqlParameter("@UnitId", "%" + sdrpUnitId.SelectedValue + "%")); } if (this.drpProfessionalId.SelectedValue != BLL.Const._Null) { @@ -348,7 +348,7 @@ namespace FineUIPro.Web.Comprehensive select x); if (sdrpUnitId.SelectedValue != BLL.Const._Null) { - lists = lists.Where(x => x.SendUnit == sdrpUnitId.SelectedValue); + lists = lists.Where(x => x.ReceiveUnit.Contains(sdrpUnitId.SelectedValue)); } if (this.drpProfessionalId.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs index abb39d36..8f0fcaf5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs @@ -49,6 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive if (specialEquipment != null) { this.SpecialEquipmentId = specialEquipment.SpecialEquipmentId; + this.hdAttachUrl.Text = this.SpecialEquipmentId; if (!string.IsNullOrEmpty(specialEquipment.UnitId)) { this.drpUnit.SelectedValue = specialEquipment.UnitId; diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs index d2d91704..eb6b11b9 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs @@ -295,8 +295,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew var getPUser = Funs.DB.Project_ProjectUser.Where(x => x.ProjectId == weekModel.ProjectId); ////质量经理 var qa = getPUser.FirstOrDefault(x => x.RoleId.Contains(BLL.Const.QAManager)); - - bkmark.Text = db.Sys_User.FirstOrDefault(x => x.UserId == qa.UserId).UserName; + if (qa != null) + { + bkmark.Text = db.Sys_User.FirstOrDefault(x => x.UserId == qa.UserId).UserName; + } } bkmark = doc.Range.Bookmarks["reportAlldate"]; @@ -2970,140 +2972,153 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 23.施工照片 string imageUrl = "res/images/R-C.png"; - var imageUrl1 = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl; - if (!string.IsNullOrWhiteSpace(imageUrl1) && imageUrl1 != imageUrl) + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null) { - string rootPathUrl = rootPath.Replace("\\", "/"); - string url = rootPathUrl + imageUrl1; - //DocumentBuilder builder = new DocumentBuilder(doc); - builder.MoveToBookmark("ImageUrl1"); - if (!string.IsNullOrEmpty(url)) + var imageUrl1 = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl; + if (!string.IsNullOrWhiteSpace(imageUrl1) && imageUrl1 != imageUrl) { - System.Drawing.Size JpgSize; - float Wpx; - float Hpx; - UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl1, out JpgSize, out Wpx, out Hpx); - //double w = 1; - //w = JpgSize.Width / 50.0; - if (File.Exists(url)) + string rootPathUrl = rootPath.Replace("\\", "/"); + string url = rootPathUrl + imageUrl1; + //DocumentBuilder builder = new DocumentBuilder(doc); + builder.MoveToBookmark("ImageUrl1"); + if (!string.IsNullOrEmpty(url)) { - //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); - builder.InsertImage(url, 200, 150); + System.Drawing.Size JpgSize; + float Wpx; + float Hpx; + UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl1, out JpgSize, out Wpx, out Hpx); + //double w = 1; + //w = JpgSize.Width / 50.0; + if (File.Exists(url)) + { + //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); + builder.InsertImage(url, 200, 150); + } } } } - - var imageUrl2 = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl; - if (!string.IsNullOrWhiteSpace(imageUrl2) && imageUrl2 != imageUrl) + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null) { - string rootPathUrl = rootPath.Replace("\\", "/"); - string url = rootPathUrl + imageUrl2; - //DocumentBuilder builder = new DocumentBuilder(doc); - builder.MoveToBookmark("ImageUrl2"); - if (!string.IsNullOrEmpty(url)) + var imageUrl2 = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl; + if (!string.IsNullOrWhiteSpace(imageUrl2) && imageUrl2 != imageUrl) { - System.Drawing.Size JpgSize; - float Wpx; - float Hpx; - UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl2, out JpgSize, out Wpx, out Hpx); - //double w = 1; - //w = JpgSize.Width / 50.0; - if (File.Exists(url)) + string rootPathUrl = rootPath.Replace("\\", "/"); + string url = rootPathUrl + imageUrl2; + //DocumentBuilder builder = new DocumentBuilder(doc); + builder.MoveToBookmark("ImageUrl2"); + if (!string.IsNullOrEmpty(url)) { - //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); - builder.InsertImage(url, 200, 150); + System.Drawing.Size JpgSize; + float Wpx; + float Hpx; + UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl2, out JpgSize, out Wpx, out Hpx); + //double w = 1; + //w = JpgSize.Width / 50.0; + if (File.Exists(url)) + { + //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); + builder.InsertImage(url, 200, 150); + } } } } - - var imageUrl3 = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl; - if (!string.IsNullOrWhiteSpace(imageUrl3) && imageUrl3 != imageUrl) + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null) { - string rootPathUrl = rootPath.Replace("\\", "/"); - string url = rootPathUrl + imageUrl3; - //DocumentBuilder builder = new DocumentBuilder(doc); - builder.MoveToBookmark("ImageUrl3"); - if (!string.IsNullOrEmpty(url)) + var imageUrl3 = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl; + if (!string.IsNullOrWhiteSpace(imageUrl3) && imageUrl3 != imageUrl) { - System.Drawing.Size JpgSize; - float Wpx; - float Hpx; - UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl3, out JpgSize, out Wpx, out Hpx); - //double w = 1; - //w = JpgSize.Width / 50.0; - if (File.Exists(url)) + string rootPathUrl = rootPath.Replace("\\", "/"); + string url = rootPathUrl + imageUrl3; + //DocumentBuilder builder = new DocumentBuilder(doc); + builder.MoveToBookmark("ImageUrl3"); + if (!string.IsNullOrEmpty(url)) { - //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); - builder.InsertImage(url, 200, 150); + System.Drawing.Size JpgSize; + float Wpx; + float Hpx; + UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl3, out JpgSize, out Wpx, out Hpx); + //double w = 1; + //w = JpgSize.Width / 50.0; + if (File.Exists(url)) + { + //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); + builder.InsertImage(url, 200, 150); + } } } } - - var imageUrl4 = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl; - if (!string.IsNullOrWhiteSpace(imageUrl4) && imageUrl4 != imageUrl) + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null) { - string rootPathUrl = rootPath.Replace("\\", "/"); - string url = rootPathUrl + imageUrl4; - //DocumentBuilder builder = new DocumentBuilder(doc); - builder.MoveToBookmark("ImageUrl4"); - if (!string.IsNullOrEmpty(url)) + var imageUrl4 = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl; + if (!string.IsNullOrWhiteSpace(imageUrl4) && imageUrl4 != imageUrl) { - System.Drawing.Size JpgSize; - float Wpx; - float Hpx; - UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl4, out JpgSize, out Wpx, out Hpx); - //double w = 1; - //w = JpgSize.Width / 50.0; - if (File.Exists(url)) + string rootPathUrl = rootPath.Replace("\\", "/"); + string url = rootPathUrl + imageUrl4; + //DocumentBuilder builder = new DocumentBuilder(doc); + builder.MoveToBookmark("ImageUrl4"); + if (!string.IsNullOrEmpty(url)) { - //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); - builder.InsertImage(url, 200, 150); + System.Drawing.Size JpgSize; + float Wpx; + float Hpx; + UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl4, out JpgSize, out Wpx, out Hpx); + //double w = 1; + //w = JpgSize.Width / 50.0; + if (File.Exists(url)) + { + //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); + builder.InsertImage(url, 200, 150); + } } } } - - var imageUrl5 = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl; - if (!string.IsNullOrWhiteSpace(imageUrl5) && imageUrl5 != imageUrl) + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null) { - string rootPathUrl = rootPath.Replace("\\", "/"); - string url = rootPathUrl + imageUrl5; - //DocumentBuilder builder = new DocumentBuilder(doc); - builder.MoveToBookmark("ImageUrl5"); - if (!string.IsNullOrEmpty(url)) + var imageUrl5 = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl; + if (!string.IsNullOrWhiteSpace(imageUrl5) && imageUrl5 != imageUrl) { - System.Drawing.Size JpgSize; - float Wpx; - float Hpx; - UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl5, out JpgSize, out Wpx, out Hpx); - //double w = 1; - //w = JpgSize.Width / 50.0; - if (File.Exists(url)) + string rootPathUrl = rootPath.Replace("\\", "/"); + string url = rootPathUrl + imageUrl5; + //DocumentBuilder builder = new DocumentBuilder(doc); + builder.MoveToBookmark("ImageUrl5"); + if (!string.IsNullOrEmpty(url)) { - //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); - builder.InsertImage(url, 200, 150); + System.Drawing.Size JpgSize; + float Wpx; + float Hpx; + UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl5, out JpgSize, out Wpx, out Hpx); + //double w = 1; + //w = JpgSize.Width / 50.0; + if (File.Exists(url)) + { + //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); + builder.InsertImage(url, 200, 150); + } } } } - - var imageUrl6 = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl; - if (!string.IsNullOrWhiteSpace(imageUrl6) && imageUrl6 != imageUrl) + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null) { - string rootPathUrl = rootPath.Replace("\\", "/"); - string url = rootPathUrl + imageUrl6; - //DocumentBuilder builder = new DocumentBuilder(doc); - builder.MoveToBookmark("ImageUrl6"); - if (!string.IsNullOrEmpty(url)) + var imageUrl6 = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl; + if (!string.IsNullOrWhiteSpace(imageUrl6) && imageUrl6 != imageUrl) { - System.Drawing.Size JpgSize; - float Wpx; - float Hpx; - UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl6, out JpgSize, out Wpx, out Hpx); - //double w = 1; - //w = JpgSize.Width / 50.0; - if (File.Exists(url)) + string rootPathUrl = rootPath.Replace("\\", "/"); + string url = rootPathUrl + imageUrl6; + //DocumentBuilder builder = new DocumentBuilder(doc); + builder.MoveToBookmark("ImageUrl6"); + if (!string.IsNullOrEmpty(url)) { - //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); - builder.InsertImage(url, 200, 150); + System.Drawing.Size JpgSize; + float Wpx; + float Hpx; + UploadAttachmentService.getJpgSize(rootPathUrl + imageUrl6, out JpgSize, out Wpx, out Hpx); + //double w = 1; + //w = JpgSize.Width / 50.0; + if (File.Exists(url)) + { + //builder.InsertImage(url, JpgSize.Width / w, JpgSize.Height / w); + builder.InsertImage(url, 200, 150); + } } } } @@ -3111,37 +3126,55 @@ namespace FineUIPro.Web.CQMS.ManageReportNew bkmark = doc.Range.Bookmarks["ImageContent1"]; if (bkmark != null) { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText; + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null) + { + bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText; + } } bkmark = doc.Range.Bookmarks["ImageContent2"]; if (bkmark != null) { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText; + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null) + { + bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText; + } } bkmark = doc.Range.Bookmarks["ImageContent3"]; if (bkmark != null) { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText; + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null) + { + bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText; + } } bkmark = doc.Range.Bookmarks["ImageContent4"]; if (bkmark != null) { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText; + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null) + { + bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText; + } } bkmark = doc.Range.Bookmarks["ImageContent5"]; if (bkmark != null) { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText; + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null) + { + bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText; + } } bkmark = doc.Range.Bookmarks["ImageContent6"]; if (bkmark != null) { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText; + if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null) + { + bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText; + } } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 917d1479..6da8ad1a 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -2212,7 +2212,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew var query = from c in db.Comprehensive_NCRManagement join u in db.Base_Unit on c.SendUnit equals u.UnitId into unitJoin from u in unitJoin.DefaultIfEmpty() - where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit == item.UnitId + where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit.Contains(item.UnitId) select new { c.NCRManagementId, diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs index 31034041..b3854711 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs @@ -2167,7 +2167,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew var query = from c in db.Comprehensive_NCRManagement join u in db.Base_Unit on c.SendUnit equals u.UnitId into unitJoin from u in unitJoin.DefaultIfEmpty() - where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit == item.UnitId + where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit.Contains(item.UnitId) select new { c.NCRManagementId, diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index b892df02..3966232c 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -46,6 +46,7 @@ AnyCPU false MinimumRecommendedRules.ruleset + 7.2 pdbonly @@ -56,6 +57,7 @@ 4 false MinimumRecommendedRules.ruleset + 7.2 false @@ -128,6 +130,7 @@ + @@ -19769,7 +19772,7 @@ - +
-
安监人员数据
+
-
企业总部人数
+
0
-
总监
+
0
-
专职
+
-
分支机构
+
0
-
总监
+
0
-
专职
+
@@ -49,28 +49,28 @@
-
项目人数
+
0
-
总监
+
0
-
专职
+
0
-
参建人数
+
-
注安师
+
0
-
总数
+
@@ -78,19 +78,19 @@
-
项目人数
+
0
-
总监
+
0
-
专职
+
0
-
参建人数
+
@@ -99,16 +99,16 @@
-
安全会议数据
+
-
企业安委会
+
0
-
企业专题
+
0
@@ -117,13 +117,13 @@
0
-
项目安全领导小组
+
0
-
项目安全例会
+
@@ -134,49 +134,49 @@
-
在建项目
+
0
-
停工项目
+
0
-
在施危大工程
+
0
-
安全工时
+
0
-
安全云监控
+
-
实时视频：线路12020-10-10 12:40:26
+
2020-10-10 12:40:26
-
安全云监控
+
-
实时视频：线路12020-10-10 12:40:26
+
2020-10-10 12:40:26
-
安全云监控
+
-
实时视频：线路12020-10-10 12:40:26
+
2020-10-10 12:40:26
-
安全云监控
+
-
实时视频：线路12020-10-10 12:40:26
+
2020-10-10 12:40:26
@@ -184,56 +184,56 @@
-
安全费用数据
+
-
费用提取（万元）
+
0
-
费用使用
+
<%=GetCostUse() %>
-
施工机具设备数据
+
-
在用
+
<%=GetUseEquipmentNum() %>
-
特种设备
+
<%=GetSpecialEquipmentNum() %>
-
高风险作业许可数据
+
-
许可项
+
<%=GetLicensesNum() %>
-
关闭项
+
<%=GetLicensesCloseNum() %>
-
隐患排查治理数据 +
- 一般隐患 - 重大隐患 + +
-
整改闭环项
+
<%=GetGeneralClosedNum() %>
-
未整改完成项
+
<%=GetGeneralNotClosedNum() %>
@@ -249,11 +249,11 @@
-
安全监督检查数据
+
-
事故事件数据 +
<%--
企业级 项目级 @@ -262,11 +262,11 @@
-
未遂事件
+
<%=GetNearMissNum() %>
-
可记录
+
<%=GetRecordableEventNum() %>
@@ -274,71 +274,71 @@
-
应急管理数据
+
<%=GetCompanyComprehensivePlanNum() %>
-
综合预案
+
<%=GetCompanySpecialPlanNum() %>
-
专项预案
+
<%=GetCompanyOnSiteDisposalPlan() %>
-
现场处置预案
+
<%=GetCompanyDrillNum() %>
-
演练次数
+
-
安全教育培训人次数数据
+
-
三级安全教育培训
+
<%=GetSafeTrainNum() %>
-
专项培训
+
<%=GetSpecialTrainNum() %>
-
特种作业培训
+
<%=GetSpecialOperationTrainNum() %>
-
风险数据分析
+
-
应急管理数据 +
- 危大工程 - 超危大工程 + +
-
审批完成
+
<%=GetCompletedNum() %>
-
培训人次数
+
<%=GetTrainPersonNum() %>
<%=GetConstructionNum() %>
-
施工个数
+
<%=GetFinishedNum() %>
-
完工个数
+
@@ -584,7 +584,7 @@ series: [ { center: ['50%', '50%'], - id: '整改率', + id: '<%=main_new_rectificationRate%>', radius: '75%', type: 'gauge', startAngle: 225, @@ -635,7 +635,7 @@ data: [ { value: value, - name: '整改率', + name: '<%=main_new_rectificationRate%>', title: { color: '#63CAFF', offsetCenter: ['0%', '110%'], @@ -693,7 +693,7 @@ legend: { top: fontSize(10), left: 'center', - data: [{ name: '全部', textStyle: { color: '#2F69D6' } }, { name: '待整改', textStyle: { color: '#FFA602' } }] + data: [{ name: '<%=All%>', textStyle: { color: '#2F69D6' } }, { name: '<%=To_be_rectified%>', textStyle: { color: '#FFA602' } }] }, grid: { top: fontSize(60), @@ -772,7 +772,7 @@ }, series: [ { - name: '全部', + name: '<%=All%>', data: value, type: 'bar', barWidth: fontSize(20), @@ -791,7 +791,7 @@ }, }, { - name: '待整改', + name: '<%=To_be_rectified%>', data: value1, type: 'bar', barWidth: fontSize(20), @@ -901,10 +901,10 @@ sjmap() function sjmap() { let data = [ - { value: <%=GetSpecialSeriousAccidentNum()%>, name: '特别重大事故', label: { color: '#FF7473' }, itemStyle: { color: '#FF7473' }, labelLine: { lineStyle: { color: '#FF7473' } } }, - { value:<%=GetGeneralAccidentNum()%>, name: '一般事故', label: { color: '#5C5AFF' }, itemStyle: { color: '#5C5AFF' }, labelLine: { lineStyle: { color: '#5C5AFF' } } }, - { value:<%=GetSeriousAccidentNum()%>, name: '重大事故', label: { color: '#FFA502' }, itemStyle: { color: '#FFA502' }, labelLine: { lineStyle: { color: '#FFA502' } } }, - { value: <%=GetMajorAccidentNum()%>, name: '较大事故', label: { color: '#E7EA2E' }, itemStyle: { color: '#E7EA2E' }, labelLine: { lineStyle: { color: '#E7EA2E' } } }, + { value: <%=GetSpecialSeriousAccidentNum()%>, name: '<%=Particularly_serious_accident%>', label: { color: '#FF7473' }, itemStyle: { color: '#FF7473' }, labelLine: { lineStyle: { color: '#FF7473' } } }, + { value:<%=GetGeneralAccidentNum()%>, name: '<%=General_accident%>', label: { color: '#5C5AFF' }, itemStyle: { color: '#5C5AFF' }, labelLine: { lineStyle: { color: '#5C5AFF' } } }, + { value:<%=GetSeriousAccidentNum()%>, name: '<%=Major_accident%>', label: { color: '#FFA502' }, itemStyle: { color: '#FFA502' }, labelLine: { lineStyle: { color: '#FFA502' } } }, + { value: <%=GetMajorAccidentNum()%>, name: '<%=Relatively_major_accident%>', label: { color: '#E7EA2E' }, itemStyle: { color: '#E7EA2E' }, labelLine: { lineStyle: { color: '#E7EA2E' } } }, ] let opt = { @@ -970,10 +970,10 @@ fontSize:fontSize(12) }, data: [ - { value: <%=GetGeneralRiskNum()%>, name: '高风险' }, - { value: <%=GetMediumRiskNum()%>, name: '中风险' }, - { value: <%=GetLowRiskNum()%>, name: '低风险' }, - { value: <%=GetHighRiskNum()%>, name: '一般风险' }, + { value: <%=GetGeneralRiskNum()%>, name: '<%=High_risk%>' }, + { value: <%=GetMediumRiskNum()%>, name: '<%=Medium_risk%>' }, + { value: <%=GetLowRiskNum()%>, name: '<%=LowRisk%>' }, + { value: <%=GetHighRiskNum()%>, name: '<%=GeneralRisk%>' }, ] } ] diff --git a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs index 7758e0f3..cf0636c2 100644 --- a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs @@ -154,6 +154,8 @@ namespace FineUIPro.Web.common //加载项目全部和待整改的 getProjectYh(); + + getCNEN(); } } @@ -1388,5 +1390,37 @@ namespace FineUIPro.Web.common } } #endregion + + #region 中英文翻译 + protected string main_new_rectificationRate = string.Empty; + protected string All = string.Empty; + protected string To_be_rectified = string.Empty; + protected string Accident_event_data = string.Empty; + protected string Emergency_management_data = string.Empty; + protected string Particularly_serious_accident = string.Empty; + protected string General_accident = string.Empty; + protected string Major_accident = string.Empty; + protected string Relatively_major_accident = string.Empty; + protected string High_risk = string.Empty; + protected string Medium_risk = string.Empty; + protected string LowRisk = string.Empty; + protected string GeneralRisk = string.Empty; + protected void getCNEN() + { + main_new_rectificationRate = Resources.Lan.main_new_rectificationRate; + All = Resources.Lan.All; + To_be_rectified = Resources.Lan.To_be_rectified; + Accident_event_data = Resources.Lan.Accident_event_data; + Emergency_management_data = Resources.Lan.Emergency_management_data; + Particularly_serious_accident = Resources.Lan.Particularly_serious_accident; + General_accident = Resources.Lan.General_accident; + Major_accident = Resources.Lan.Major_accident; + Relatively_major_accident = Resources.Lan.Relatively_major_accident; + High_risk = Resources.Lan.High_risk; + Medium_risk = Resources.Lan.Medium_risk; + LowRisk = Resources.Lan.LowRisk; + GeneralRisk = Resources.Lan.GeneralRisk; + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx b/SGGL/FineUIPro.Web/common/main_new1.aspx index b7ba157b..527bf28d 100644 --- a/SGGL/FineUIPro.Web/common/main_new1.aspx +++ b/SGGL/FineUIPro.Web/common/main_new1.aspx @@ -5,7 +5,7 @@ - 质量管理 + <asp:Literal runat="server" Text="<%$ Resources:Lan,main_new1_Title%>"/> @@ -43,70 +43,70 @@
-
质量管理人员数据
+

<%=GetCompanyPersonNum() %>

-
企业总部人数
+

<%=GetBranchPersonNum() %>

-
分支机构人数
+

<%=GetProjectPersonNum() %>

-
项目部人数
+
-
计量器具数据
+

<%=GetUseNum() %>台

-

在用计量器具

+

<%=GetOKNum() %>台

-

校准合格

+

7

-

资质预警

+

<%=GetJxyjNum() %>

-

机械预警

+

-
质量培训数据
+
<%=GetTrainPersonNum() %>
-
质量培训人次数
+
<%=GetTechnicalDisclosePersonNum() %>
-
技术交底人次数
+
@@ -134,19 +134,19 @@
-
质量验收数据
+
-
共检总数
+
<%=getAllInspectionManagement() %>
-
一次合格数量
+
<%=getIsOnceInspectionManagement() %>
-
施工质量一次共检合格率
+
<%=GetInspectionManagementZgl() %>
@@ -156,49 +156,49 @@
-
焊接数据
+
<%=GetWelderNum() %>
-
焊工总数
+
<%=GetTotalDineNum() %>
-
总达因数
+
<%=GetCompleteDineNum() %>
-
完成达因数
+
<%=hjallNumber %>
-
拍片总数
+
<%=hjfinishNumber %>
-
合格片数
+
<%=hjzgl %>
-
一次拍片合格率
+
-
质量巡检问题治理数据
+
-
整改闭环项
+
<%=GetProblemCompletedNum() %>
-
未整改完成项
+
<%=GetProblemNotCompletedNum() %>
-
整改率
+
<%=GetProblemZgl() %>
@@ -206,19 +206,19 @@
-
NCR数据
+
-
整改闭环项
+
<%=ncrZgbhx %>
-
未整改完成项
+
<%=ncrwZgbhx %>
-
整改率
+
<%=ncrZgl %>
@@ -276,7 +276,7 @@ zlmap() function zlmap() { let value = [<%=ProblemNum%>] - let label = ['问题个数', '整改完成数', '未整改数', '整改率'] + let label = ['<%=Number_of_questions%>', '<%=Number_of_corrections_completed%>', '<%=Uncorrected_number%>', '<%=RectificationRate%>'] let opt = { grid: { top: fontSize(30), @@ -330,7 +330,7 @@ formatter: (params) => { let str = params.value; console.log(params) - if (params.name === '整改率') { + if (params.name === '<%=RectificationRate%>') { str = str + '%' } return str @@ -402,7 +402,7 @@ formatter: (params) => { let str = params.value; console.log(params.name) - if (params.name == '整改率') { + if (params.name == '<%=RectificationRate%>') { str = str + '%' } return str @@ -434,7 +434,7 @@ legend: { top: fontSize(10), left: 'center', - data: [{ name: '总计', textStyle: { color: '#20AFFF' } }, { name: '合格', textStyle: { color: '#12CDA2' } }, { name: '施工质量一次共检合格率', textStyle: { color: '#FFA602' } }] + data: [{ name: '<%=total%>', textStyle: { color: '#20AFFF' } }, { name: '<%=Up_to_standard%>', textStyle: { color: '#12CDA2' } }, { name: '<%=construction_quality_pass_rate%>', textStyle: { color: '#FFA602' } }] }, xAxis: { type: 'category', @@ -468,7 +468,7 @@ }, series: [ { - name: '总计', + name: '<%=total%>', data: value, type: 'bar', barWidth: fontSize(20), @@ -484,7 +484,7 @@ formatter: (params) => { let str = params.value; console.log(params.name) - if (params.name == '整改率') { + if (params.name == '<%=RectificationRate%>') { str = str + '%' } return str @@ -492,7 +492,7 @@ }, }, { - name: '合格', + name: '<%=Up_to_standard%>', data: value1, type: 'bar', barWidth: fontSize(20), @@ -508,7 +508,7 @@ formatter: (params) => { let str = params.value; console.log(params.name) - if (params.name == '整改率') { + if (params.name == '<%=RectificationRate%>') { str = str + '%' } return str @@ -516,7 +516,7 @@ }, }, { - name: '施工质量一次共检合格率', + name: '<%=construction_quality_pass_rate%>', data: value2, type: 'line', itemStyle: { diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs index eddc0f93..9b8b6cb7 100644 --- a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs @@ -65,6 +65,7 @@ namespace FineUIPro.Web.common //资质预警 getEarlyWarningCounts(); + getCNEN(); //在建项目 var allProjects = ProjectService.GetAllProjectDropDownList(); //焊接数据 @@ -948,5 +949,23 @@ namespace FineUIPro.Web.common PageContext.RegisterStartupScript(script2); } + + protected string Number_of_questions = string.Empty; + protected string Number_of_corrections_completed = string.Empty; + protected string Uncorrected_number = string.Empty; + protected string RectificationRate = string.Empty; + protected string total = string.Empty; + protected string Up_to_standard = string.Empty; + protected string construction_quality_pass_rate = string.Empty; + protected void getCNEN() + { + Number_of_questions = Resources.Lan.Number_of_questions; + Number_of_corrections_completed = Resources.Lan.Number_of_corrections_completed; + Uncorrected_number = Resources.Lan.Uncorrected_number; + RectificationRate = Resources.Lan.RectificationRate; + total = Resources.Lan.total; + Up_to_standard = Resources.Lan.Up_to_standard; + construction_quality_pass_rate = Resources.Lan.construction_quality_pass_rate; + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/index.aspx b/SGGL/FineUIPro.Web/index.aspx index dd8ae329..a95afab2 100644 --- a/SGGL/FineUIPro.Web/index.aspx +++ b/SGGL/FineUIPro.Web/index.aspx @@ -194,15 +194,16 @@ padding-right: 23px; font-size: 14px; padding: 0; - border:none; - color:#ffffff; - padding-left: 10px; - background: rgba(0,0,0,0); - + border: none; + color: #ffffff; + padding-left: 10px; + background: rgba(0,0,0,0); } - .projcet-select input::placeholder { - color: #ffffff; -} + + .projcet-select input::placeholder { + color: #ffffff; + } + .projcet-select .f-field-triggerbox-icons { font-size: 16px; position: absolute; @@ -210,82 +211,84 @@ margin: 0; padding: 0; } - .projcet-select .f-field-triggerbox-icons i{ - position: absolute; - bottom: 0; - right: 0; + + .projcet-select .f-field-triggerbox-icons i { + position: absolute; + bottom: 0; + right: 0; + } + + .projcet-select .f-state-hover, .f-widget-content .f-state-hover, .f-widget-header .f-state-hover, .f-state-focus, .f-widget-content .f-state-focus, .f-widget-header .f-state-focus { + background: rgba(0,0,0,0); + border: none } - .projcet-select .f-state-hover, .f-widget-content .f-state-hover, .f-widget-header .f-state-hover, .f-state-focus, .f-widget-content .f-state-focus, .f-widget-header .f-state-focus{ - background: rgba(0,0,0,0); - border:none + .projcet-select .f-panel.f-panel-noheader.f-panel-noborder, .f-panel.f-panel-noheader.f-panel-noborder > .f-panel-bodyct > .f-panel-body { + font-size: 14px; } - .projcet-select .f-panel.f-panel-noheader.f-panel-noborder, .f-panel.f-panel-noheader.f-panel-noborder>.f-panel-bodyct>.f-panel-body{ - font-size: 14px; - } - - .f-field-body-cell-inner{ - font-size: 14px; - } - .grid1_class .f-field-body-cell-inner input{ - padding: 2px 10px; - } + + .f-field-body-cell-inner { + font-size: 14px; + } + + .grid1_class .f-field-body-cell-inner input { + padding: 2px 10px; + } + .grid1_class .f-state-hover { - border: none; + border: none; } + .grid1_toolbar { - background:#000231 + background: #000231 } - - .grid1_class thead{ - background: #d7ebf9; - color: #18A6F1; + + .grid1_class thead { + background: #d7ebf9; + color: #18A6F1; } .grid1_toolbar input { - background:#000231 - } - .grid1_toolbar .f-corner-all { - background:#000231 + background: #000231 } - /*表格第一行颜色*/ - .f-grid-row-selected{ - background-color:#E4F2FF !important; - color:black; - - } - /*表格单行颜色*/ - .f-grid-row{ - background-color:#E4F2FF; - color:black; + .grid1_toolbar .f-corner-all { + background: #000231 + } + + /*表格第一行颜色*/ + .f-grid-row-selected { + background-color: #E4F2FF !important; + color: black; + } + /*表格单行颜色*/ + .f-grid-row { + background-color: #E4F2FF; + color: black; } /*各行颜色*/ .f-grid-row-alt { background-color: #ffffff !important; - color:black; + color: black; } .f-state-active, .f-widget-content .f-state-active, .f-widget-header .f-state-active { - - color:black; + color: black; } - .f-state-active .f-icon { - color: darkcyan; -} + .f-state-active .f-icon { + color: darkcyan; + } .grid1_class .f-state-hover { - color:black; + color: black; background: #99e7ff !important; background: none; - } .grid1_class .f-grid-bodyct { - - background:#000231 !important + background: #000231 !important } @@ -301,21 +304,21 @@
- 项目概况 +
- 安全生产 +
- 质量管理 +
-
-
-
@@ -348,7 +351,7 @@
- 我的 - + + +
@@ -409,8 +413,8 @@
-
- 退出 + <%--
+ -
+
--%>
全屏 -
+
+ + + + +
@@ -432,17 +442,17 @@
-
-
-
@@ -887,18 +897,18 @@ $(".n-btn-l,.n-btn-r").click(function () { var $item = $('.f-tabstrip-header') $item.attr('style', ";display:block !important;") - + $('.n-btn-r').each(function (index) { console.log($(this)) $(this).removeClass('n-btn-l-act') }) - $('.n-btn-l').each(function (index) { + $('.n-btn-l').each(function (index) { console.log($(this)) $(this).removeClass('n-btn-l-act') }) - $(this).addClass('n-btn-l-act') + $(this).addClass('n-btn-l-act') + - }); $(".icon-shezhi").click(function () { diff --git a/SGGL/FineUIPro.Web/index.aspx.cs b/SGGL/FineUIPro.Web/index.aspx.cs index 275f44bd..d01dc061 100644 --- a/SGGL/FineUIPro.Web/index.aspx.cs +++ b/SGGL/FineUIPro.Web/index.aspx.cs @@ -1,5 +1,6 @@ using BLL; using System; +using System.Configuration; using System.Linq; using System.Web; using System.Web.UI.WebControls; @@ -25,7 +26,8 @@ namespace FineUIPro.Web { //////////////////////////////////////////////////////////////// string themeStr = Request.QueryString["theme"]; - string menuStr = Request.QueryString["menu"]; + string menuStr = Request.QueryString["menu"]; + string https = ConfigurationManager.AppSettings["Https"]; if (!String.IsNullOrEmpty(themeStr) || !String.IsNullOrEmpty(menuStr)) { if (!String.IsNullOrEmpty(themeStr)) @@ -43,6 +45,10 @@ namespace FineUIPro.Web { Expires = DateTime.Now.AddYears(1) }; + if (https == "true") + { + cookie.Secure = true; + } Response.Cookies.Add(cookie); } @@ -323,7 +329,15 @@ namespace FineUIPro.Web this.Tab1.IFrameUrl = "~/common/main2.aspx"; this.hdHomePage.Text = "2"; } - + if (Request.Cookies["SelectLan"] != null) + { + HttpCookie lanCookie = Request.Cookies["SelectLan"]; + if (lanCookie["lan"] != null) + { + drpSelectLan.SelectedValue = lanCookie["lan"]; + } + } + this.lName.Text = BLL.UserService.GetUserNameByUserId(this.CurrUser.UserId); BindGrid(this.ckState.SelectedValue, this.txtProjectName.Text.Trim(), txtProjectCode.Text.Trim()); } } @@ -601,5 +615,19 @@ namespace FineUIPro.Web Grid1.DataBind(); } #endregion + + protected void drpSelectLan_SelectedIndexChanged(object sender, EventArgs e) + { + string https = ConfigurationManager.AppSettings["Https"]; + HttpCookie lanCookie = Request.Cookies["SelectLan"]; + lanCookie["lan"] = drpSelectLan.SelectedValue; + lanCookie.Expires = DateTime.Now.AddDays(1); + if (https == "true") + { + lanCookie.Secure = true; + } + Response.Cookies.Add(lanCookie); + Response.Redirect(Request.UrlReferrer.ToString());//刷新当前页面 + } } } diff --git a/SGGL/FineUIPro.Web/index.aspx.designer.cs b/SGGL/FineUIPro.Web/index.aspx.designer.cs index 7797a36a..fc7191b9 100644 --- a/SGGL/FineUIPro.Web/index.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/index.aspx.designer.cs @@ -176,6 +176,15 @@ namespace FineUIPro.Web /// protected global::FineUIPro.RadioButtonList ckState; + /// + /// lName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Literal lName; + /// /// btnPersonal 控件。 /// @@ -195,13 +204,13 @@ namespace FineUIPro.Web protected global::FineUIPro.Button btnSysSet; /// - /// Button18 控件。 + /// drpSelectLan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button Button18; + protected global::FineUIPro.DropDownList drpSelectLan; /// /// btnRetweet 控件。 diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index 28c9bcbe..9bffc642 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -236,19 +236,10 @@
-
- - - - -
- -
在建
停工
@@ -256,13 +247,19 @@
-
+ +
-
-
-
-
-
+ +
+
+
+
+
+
+
+
+
@@ -274,9 +271,10 @@
- + +
@@ -290,9 +288,11 @@
- 个人 + + +
@@ -301,13 +301,13 @@
-
+ <%--
-
-
+
--%> + <%--
-
+
--%>
全屏
+
+ + + + +
-
-
-
-
-
- +
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index ff7f125c..d57bd68f 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -317,7 +317,7 @@ namespace FineUIPro.Web this.drpProject.SelectedValue = this.CurrUser.LoginProjectId; } this.CurrUser.LoginProjectId = this.drpProject.SelectedValue; - this.lblName.Text = BLL.UserService.GetUserNameByUserId(this.CurrUser.UserId); + this.lName.Text = BLL.UserService.GetUserNameByUserId(this.CurrUser.UserId); this.MenuSwitchMethod(Request.Params["menuType"]); this.InitMenuStyleButton(); this.InitMenuModeButton(); diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs index a13b715c..c39cf555 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web { - - - public partial class indexProject { - +namespace FineUIPro.Web +{ + + + public partial class indexProject + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// topPanel 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel topPanel; - + /// /// ContentPanel1 控件。 /// @@ -56,16 +58,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel ContentPanel1; - - /// - /// drpSelectLan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpSelectLan; - + /// /// drpProject 控件。 /// @@ -74,7 +67,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProject; - + /// /// Button21 控件。 /// @@ -83,7 +76,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button Button21; - + /// /// btnCall 控件。 /// @@ -92,7 +85,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnCall; - + /// /// btnTodo 控件。 /// @@ -101,16 +94,16 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnTodo; - + /// - /// lblName 控件。 + /// lName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label lblName; - + protected global::System.Web.UI.WebControls.Literal lName; + /// /// btnPersonal 控件。 /// @@ -119,7 +112,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnPersonal; - + /// /// btnProjectSet 控件。 /// @@ -128,25 +121,16 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnProjectSet; - + /// - /// btnHelp 控件。 + /// drpSelectLan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnHelp; - - /// - /// Button18 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button Button18; - + protected global::FineUIPro.DropDownList drpSelectLan; + /// /// leftPanel 控件。 /// @@ -155,7 +139,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel leftPanel; - + /// /// leftPanelToolCollapse 控件。 /// @@ -164,7 +148,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tool leftPanelToolCollapse; - + /// /// leftPanelToolGear 控件。 /// @@ -173,7 +157,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tool leftPanelToolGear; - + /// /// btnExpandAll 控件。 /// @@ -182,7 +166,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnExpandAll; - + /// /// btnCollapseAll 控件。 /// @@ -191,7 +175,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnCollapseAll; - + /// /// MenuMode 控件。 /// @@ -200,7 +184,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton MenuMode; - + /// /// MenuModeNormal 控件。 /// @@ -209,7 +193,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuCheckBox MenuModeNormal; - + /// /// MenuModeCompact 控件。 /// @@ -218,7 +202,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuCheckBox MenuModeCompact; - + /// /// MenuModeLarge 控件。 /// @@ -227,7 +211,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuCheckBox MenuModeLarge; - + /// /// MenuStyle 控件。 /// @@ -236,7 +220,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton MenuStyle; - + /// /// MenuStyleTree 控件。 /// @@ -245,7 +229,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuCheckBox MenuStyleTree; - + /// /// MenuStyleMiniModeTree 控件。 /// @@ -254,7 +238,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuCheckBox MenuStyleMiniModeTree; - + /// /// MenuStylePlainTree 控件。 /// @@ -263,7 +247,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuCheckBox MenuStylePlainTree; - + /// /// MenuLang 控件。 /// @@ -272,7 +256,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton MenuLang; - + /// /// MenuLangZHCN 控件。 /// @@ -281,7 +265,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuCheckBox MenuLangZHCN; - + /// /// mainTabStrip 控件。 /// @@ -290,7 +274,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TabStrip mainTabStrip; - + /// /// Tab1 控件。 /// @@ -299,7 +283,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tab Tab1; - + /// /// toolRefresh 控件。 /// @@ -308,7 +292,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tool toolRefresh; - + /// /// toolNewWindow 控件。 /// @@ -317,7 +301,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tool toolNewWindow; - + /// /// toolMaximize 控件。 /// @@ -326,7 +310,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tool toolMaximize; - + /// /// toolSignOut 控件。 /// @@ -335,7 +319,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tool toolSignOut; - + /// /// windowCustomQuery 控件。 /// @@ -344,7 +328,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window windowCustomQuery; - + /// /// WindowAtt 控件。 /// @@ -353,7 +337,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - + /// /// Window1 控件。 /// @@ -362,7 +346,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -371,7 +355,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// XmlDataSource1 控件。 /// @@ -380,7 +364,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.XmlDataSource XmlDataSource1; - + /// /// ProjectZJ 控件。 /// @@ -389,7 +373,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button ProjectZJ; - + /// /// ProjectTG 控件。 /// @@ -398,7 +382,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button ProjectTG; - + /// /// ProjectJG 控件。 /// @@ -407,7 +391,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button ProjectJG; - + /// /// btnCQMS 控件。 /// @@ -416,7 +400,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnCQMS; - + /// /// btnHSSE 控件。 /// @@ -425,7 +409,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnHSSE; - + /// /// btnJDGL 控件。 /// @@ -434,7 +418,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnJDGL; - + /// /// btnHJGL 控件。 /// @@ -443,7 +427,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnHJGL; - + /// /// btnCLGL 控件。 /// @@ -452,7 +436,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnCLGL; - + /// /// btnTestRun 控件。 /// @@ -461,7 +445,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnTestRun; - + /// /// btnTransfer 控件。 /// @@ -470,7 +454,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnTransfer; - + /// /// btnPGJSX 控件。 /// @@ -479,7 +463,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnPGJSX; - + /// /// btnDigitalSite 控件。 /// @@ -488,7 +472,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDigitalSite; - + /// /// btnPDigData 控件。 /// @@ -497,7 +481,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnPDigData; - + /// /// btnOpinion 控件。 /// @@ -506,7 +490,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOpinion; - + /// /// btnDoc 控件。 /// @@ -515,7 +499,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDoc; - + /// /// SimpleForm1 控件。 /// @@ -524,7 +508,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.SimpleForm SimpleForm1; - + /// /// hfProjectCode 控件。 /// @@ -533,7 +517,7 @@ namespace FineUIPro.Web { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hfProjectCode; - + /// /// hfMonitorPW 控件。 /// diff --git a/SGGL/FineUIPro.Web/packages.config b/SGGL/FineUIPro.Web/packages.config index 2469db08..e17e423b 100644 --- a/SGGL/FineUIPro.Web/packages.config +++ b/SGGL/FineUIPro.Web/packages.config @@ -9,6 +9,7 @@ + diff --git a/SGGL/Model/APIItem/HSSE/LicenseItem.cs b/SGGL/Model/APIItem/HSSE/LicenseItem.cs index e520c709..3a45d871 100644 --- a/SGGL/Model/APIItem/HSSE/LicenseItem.cs +++ b/SGGL/Model/APIItem/HSSE/LicenseItem.cs @@ -68,4 +68,12 @@ namespace Model set; } } + + public class LicenseDto + { + public string ProjectId { get; set; } + public string WorkStates { get; set; } + public string LicenseTypeName { get; set; } + public string WorkStatesStr { get; set; } + } } diff --git a/SGGL/Model/HSSE/PageDataPersonInOutItem.cs b/SGGL/Model/HSSE/PageDataPersonInOutItem.cs index d5f0f7b0..ccab5a81 100644 --- a/SGGL/Model/HSSE/PageDataPersonInOutItem.cs +++ b/SGGL/Model/HSSE/PageDataPersonInOutItem.cs @@ -12,7 +12,11 @@ namespace Model get; set; } - + public string ProjectId + { + get; + set; + } public DateTime? ChangeTime { get; diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 556827c1..285eec39 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true