From fcab29b4fbbc760955b5157f741bfeb028609b84 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Fri, 14 Mar 2025 20:12:23 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BA=8B=E9=A1=B9?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B=E8=BF=9B=E5=BA=A6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=9C=88=E8=AE=A1=E5=88=92=E7=BB=9F=E8=AE=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql | 89 ++++++++++++ SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs | 7 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- .../JDGL/Check/MonthPlanStatisc.aspx | 2 +- .../JDGL/Check/MonthPlanStatisc.aspx.cs | 43 +++++- SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx | 2 +- .../FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs | 2 +- SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx | 2 +- .../PZHGL/GJSX/GJSXListEdit.aspx | 55 +++++-- .../PZHGL/GJSX/GJSXListEdit.aspx.cs | 134 ++++++++++-------- .../PZHGL/GJSX/GJSXListEdit.aspx.designer.cs | 81 +++++------ SGGL/FineUIPro.Web/common/Menu_PGJSX.xml | 3 +- SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx | 20 +-- SGGL/Model/Model.cs | 30 +++- 14 files changed, 335 insertions(+), 137 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql diff --git a/DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql new file mode 100644 index 00000000..61de85e9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2025-03-14-xiaj.sql @@ -0,0 +1,89 @@ + + +--ؼȫ˵ +update Sys_Menu set SuperMenu='168A94C7-E37D-4B9C-8684-51DF4F8C5134',SortIndex=1,IsUsed=1,MenuName='ȫ' where MenuId='5F3B18D6-9FBA-4EF5-A7E4-DC9F6A4EA680'; +GO + +--2 +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'GJSX_detail' AND COLUMN_NAME = 'ProgressStatus') +BEGIN + ALTER TABLE GJSX_detail ADD ProgressStatus nvarchar(20); +END +GO + + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +ALTER PROCEDURE [dbo].[Sp_GJSX_getlist] + -- Add the parameters for the stored procedure here + @ProjectId nvarchar(max), + @sql_where varchar(max) +AS +BEGIN + IF EXISTS(select * from tempdb..sysobjects where id=object_id('tempdb..#GJSX_List')) + BEGIN + DROP TABLE #GJSX_List + END + DECLARE @Sql NVARCHAR(max) + select * into #GJSX_List + from( + select + a.GJSXID + ,a.ProjectId + ,a.detail + ,b.username + ,a.createDate + ,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID + ',') >0 FOR XML PATH('')), 1, 1,'') + , CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID + ',') >0 FOR XML PATH('')), 1, 1,'') + ,Base_Project.ProjectName + ,Base_Unit.unitname + ,a.CloseDate + ,case a.state when 2 then 'ڽ' when 3 then '' when 0 then 'ѹر' when 1 then '' end as state + ,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID + ',') >0 FOR XML PATH('')), 1, 1,'') + ,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'') + ,a.IsManypeople + ,a.CompleteDate + ,a.AttachUrl + ,user_Acceptance =STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance + ',') >0 FOR XML PATH('')), 1, 1,'') + from GJSX as a left join Sys_User as b on a.UserId=b.UserId + left join [dbo].[Base_Project] on a.ProjectId =Base_Project.ProjectId + left join [dbo].[Base_Unit] on a.UnitId=Base_Unit.UnitId + --left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID + --left join[dbo].[Base_GJSXType] on a.GJSXTypeID = Base_GJSXType.GJSXTypeID + where a.ProjectId=@ProjectId + ) as a + + set @Sql ='select * from #GJSX_List where 1=1 ' +@sql_where + + exec(@Sql) + + + --select + --a.GJSXID + --,a.ProjectId + --,a.detail + --,b.username + --,a.createDate + --,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID + ',') >0 FOR XML PATH('')), 1, 1,'') + --, CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID + ',') >0 FOR XML PATH('')), 1, 1,'') + --,Base_Project.ProjectName + --,Base_Unit.unitname + --,a.CloseDate + --,case a.state when 2 then 'ڽ' when 3 then '' when 0 then 'ѹر' when 1 then '' end as state + --,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID + ',') >0 FOR XML PATH('')), 1, 1,'') + --,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'') + --,a.IsManypeople + --,a.CompleteDate + --,a.AttachUrl + --,user_Acceptance =STUFF(( SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance + ',') >0 FOR XML PATH('')), 1, 1,'') + --from GJSX as a left join Sys_User as b on a.UserId=b.UserId + --left join [dbo].[Base_Project] on a.ProjectId =Base_Project.ProjectId + --left join [dbo].[Base_Unit] on a.UnitId=Base_Unit.UnitId + ----left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID + ----left join[dbo].[Base_GJSXType] on a.GJSXTypeID = Base_GJSXType.GJSXTypeID + --where a.ProjectId=@ProjectId +END +GO + diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs index c206c13c..cc17cf6c 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs @@ -1,4 +1,5 @@ -using System; +using Model; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -61,6 +62,7 @@ namespace BLL newGJSXMX.Date = gjsxmx.Date; newGJSXMX.Sort = gjsxmx.Sort; newGJSXMX.FilePath = gjsxmx.FilePath; + newGJSXMX.ProgressStatus = gjsxmx.ProgressStatus; db.GJSX_detail.InsertOnSubmit(newGJSXMX); db.SubmitChanges(); @@ -111,7 +113,8 @@ namespace BLL newGJSX_detail.Progress_detail = _GJSX_detail.Progress_detail; newGJSX_detail.Sort = _GJSX_detail.Sort; newGJSX_detail.FilePath = _GJSX_detail.FilePath; - + newGJSX_detail.ProgressStatus = newGJSX_detail.ProgressStatus; + db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index fbb14cd0..3fa13380 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -19729,7 +19729,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 aae40e42..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 0447df07..c39cf555 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs @@ -59,15 +59,6 @@ namespace FineUIPro.Web /// protected global::FineUIPro.ContentPanel ContentPanel1; - /// - /// drpSelectLan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpSelectLan; - /// /// drpProject 控件。 /// @@ -105,13 +96,13 @@ namespace FineUIPro.Web protected global::FineUIPro.Button btnTodo; /// - /// lblName 控件。 + /// lName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label lblName; + protected global::System.Web.UI.WebControls.Literal lName; /// /// btnPersonal 控件。 @@ -132,22 +123,13 @@ 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 控件。 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 From 9a169d1711f2e21f3bd230f5e46599b47cdcb330 Mon Sep 17 00:00:00 2001 From: geh <1923421292@qq.com> Date: Fri, 21 Mar 2025 10:14:13 +0800 Subject: [PATCH 09/10] =?UTF-8?q?fix:=E5=B0=BE=E9=A1=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/Transfer/PunchlistFromService.cs | 96 +++++++++++++++++++ .../FineUIPro.Web/Transfer/PunchlistFrom.aspx | 13 ++- .../Transfer/PunchlistFrom.aspx.cs | 74 +++++++++++--- .../Transfer/PunchlistFrom.aspx.designer.cs | 12 +-- 4 files changed, 172 insertions(+), 23 deletions(-) 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/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx index f83ed14e..d98c2928 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx @@ -26,8 +26,9 @@ - - + <%-- --%> + + @@ -91,9 +92,13 @@ + + + + <%----%> - - + <%-- --%> + <%-- --%> diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs index 13f666e6..b09e45d1 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs @@ -33,6 +33,9 @@ namespace FineUIPro.Web.Transfer GetButtonPower(); BLL.PunchlistFromService.InitTurnoverSystemCodeUnitDropDownList(this.drpTurnoverSystemCode, this.CurrUser.LoginProjectId, false); BLL.PunchlistFromService.InitActionByUnitDropDownList(this.ddlAction_By, this.CurrUser.LoginProjectId, false); + BLL.PunchlistFromService.InitPICDropDownList(this.ddlPIC, this.CurrUser.LoginProjectId, false);//责任人PIC + BLL.PunchlistFromService.InitWUHPICDropDownList(this.ddlPIC_WUH, this.CurrUser.LoginProjectId, false);//责任人-五环/PIC-WUH + BLL.PunchlistFromService.InitDiscDropDownList(this.ddlDisc, this.CurrUser.LoginProjectId, false);//Disc BindGrid(); this.btnNew.OnClientClick = Window1.GetShowReference("PunchlistFromEdit.aspx") + "return false;"; @@ -109,11 +112,26 @@ namespace FineUIPro.Web.Transfer // strSql += " AND Actual_Date <= @EndActual_Date"; // listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim()))); //} - if (!string.IsNullOrEmpty(txtDisc.Text.Trim())) + if (this.ddlDisc.SelectedItemArray.Count() > 1 || (this.ddlDisc.SelectedValue != BLL.Const._Null && this.ddlDisc.SelectedItemArray.Count() == 1)) { - strSql += " AND Disc = @Disc"; - listStr.Add(new SqlParameter("@Disc", txtDisc.Text.Trim())); + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlDisc.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR Disc = @Disc" + i.ToString(); + listStr.Add(new SqlParameter("@Disc" + i.ToString(), item)); + } + i++; + } + strSql += ")"; } + // if (!string.IsNullOrEmpty(txtDisc.Text.Trim())) + // { + // strSql += " AND Disc = @Disc"; + // listStr.Add(new SqlParameter("@Disc", txtDisc.Text.Trim())); + // } if (!string.IsNullOrEmpty(ddlEng.SelectedValue.Trim())) { strSql += " AND IsEng = @IsEng"; @@ -160,22 +178,52 @@ namespace FineUIPro.Web.Transfer } strSql += ")"; } + if (this.ddlPIC.SelectedItemArray.Count() > 1 || (this.ddlPIC.SelectedValue != BLL.Const._Null && this.ddlPIC.SelectedItemArray.Count() == 1)) + { + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlPIC.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR PIC = @PIC" + i.ToString(); + listStr.Add(new SqlParameter("@PIC" + i.ToString(), item)); + } + i++; + } + strSql += ")"; + } + if (this.ddlPIC_WUH.SelectedItemArray.Count() > 1 || (this.ddlPIC_WUH.SelectedValue != BLL.Const._Null && this.ddlPIC_WUH.SelectedItemArray.Count() == 1)) + { + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlPIC_WUH.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR PIC_WUH = @PIC_WUH" + i.ToString(); + listStr.Add(new SqlParameter("@PIC_WUH" + i.ToString(), item)); + } + i++; + } + strSql += ")"; + } //if (ddlAction_By.SelectedValue != null && ddlAction_By.SelectedValue != BLL.Const._Null) //{ // strSql += " AND Action_By = @Action_By"; // listStr.Add(new SqlParameter("@Action_By", ddlAction_By.SelectedValue.Trim())); //} - if (!string.IsNullOrEmpty(txtPIC.Text.Trim())) - { - strSql += " AND PIC like @PIC"; - listStr.Add(new SqlParameter("@PIC", "%" + this.txtPIC.Text.Trim() + "%")); - } - if (!string.IsNullOrEmpty(txtPIC_WUH.Text.Trim())) - { - strSql += " AND PIC_WUH like @PIC_WUH"; - listStr.Add(new SqlParameter("@PIC_WUH", "%" + this.txtPIC_WUH.Text.Trim() + "%")); - } + // if (!string.IsNullOrEmpty(txtPIC.Text.Trim())) + // { + // strSql += " AND PIC like @PIC"; + // listStr.Add(new SqlParameter("@PIC", "%" + this.txtPIC.Text.Trim() + "%")); + // } + // if (!string.IsNullOrEmpty(txtPIC_WUH.Text.Trim())) + // { + // strSql += " AND PIC_WUH like @PIC_WUH"; + // listStr.Add(new SqlParameter("@PIC_WUH", "%" + this.txtPIC_WUH.Text.Trim() + "%")); + // } if (!string.IsNullOrEmpty(ddlStatus.SelectedValue.Trim())) { strSql += " AND Status = @Status"; diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs index 2962b7df..c20c7832 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs @@ -87,13 +87,13 @@ namespace FineUIPro.Web.Transfer protected global::FineUIPro.TextBox txtRaised_By; /// - /// txtDisc 控件。 + /// ddlDisc 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtDisc; + protected global::FineUIPro.DropDownList ddlDisc; /// /// btnSearch 控件。 @@ -222,22 +222,22 @@ namespace FineUIPro.Web.Transfer protected global::FineUIPro.DropDownList ddlAction_By; /// - /// txtPIC 控件。 + /// ddlPIC 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtPIC; + protected global::FineUIPro.DropDownList ddlPIC; /// - /// txtPIC_WUH 控件。 + /// ddlPIC_WUH 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtPIC_WUH; + protected global::FineUIPro.DropDownList ddlPIC_WUH; /// /// txtEndRequired_Date 控件。 From 28b9b2cfbadba2530325f11dd6f6dd9bd026b6d2 Mon Sep 17 00:00:00 2001 From: geh <1923421292@qq.com> Date: Fri, 21 Mar 2025 18:28:54 +0800 Subject: [PATCH 10/10] =?UTF-8?q?fix:=E6=96=BD=E5=B7=A5=E5=88=86=E5=8C=85?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=8F=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Transfer/PunchlistFromEdit.aspx.cs | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs index 7a8ab639..43e8d42c 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs @@ -47,6 +47,7 @@ namespace FineUIPro.Web.Transfer { this.Id = Request.Params["Id"]; this.ProjectId = this.CurrUser.LoginProjectId; + ProhibitedFields(); var TransferPunchlistFrom = Funs.DB.Transfer_PunchlistFrom.FirstOrDefault(p => p.Id == this.Id); if (TransferPunchlistFrom != null) { @@ -97,6 +98,37 @@ namespace FineUIPro.Web.Transfer } } + + + /// + /// 禁止编辑字段事件触发时。 + /// + /// + /// + protected void ProhibitedFields() + { + var query = (from projectUser in Funs.DB.Project_ProjectUser + join projectUnit in Funs.DB.Project_ProjectUnit on new { projectUser.UnitId, projectUser.ProjectId } + equals new { projectUnit.UnitId, projectUnit.ProjectId } into projectUnitJoin + from projectUnit in projectUnitJoin.DefaultIfEmpty() + join sysConst in Funs.DB.Sys_Const on new + { GroupId = "ProjectUnitType", ConstValue = projectUnit.UnitType } equals new + { sysConst.GroupId, sysConst.ConstValue } into sysConstJoin + from sysConst in sysConstJoin.DefaultIfEmpty() + where projectUser.UserId == this.CurrUser.UserId + select sysConst.ConstValue) + .Distinct().FirstOrDefault(); + + if (query != null && query == "2") + { + this.txtConfirmed_By.Readonly = true; + this.txtConfirmed_Date.Readonly = true; + this.txtVerified_By.Readonly = true; + this.txtVerified_Date.Readonly = true; + } + + } + /// /// Photoes附件上传 ///