From 55944d732aac5029017bc612d23db3da66a705a9 Mon Sep 17 00:00:00 2001 From: Zones <765289303@qq.com> Date: Mon, 24 Aug 2026 11:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E6=BA=90=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=85=A5=E7=9C=9F=E5=AE=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=8D=B1=E5=A4=A7?= =?UTF-8?q?/=E8=B6=85=E5=8D=B1=E5=B7=A5=E7=A8=8B=E3=80=81=E9=A3=8E?= =?UTF-8?q?=E9=99=A9=E6=8E=A7=E5=88=B6=E6=B8=85=E5=8D=95=E3=80=81=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E9=AA=8C=E6=94=B6=E3=80=81=E5=AE=89=E5=85=A8=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E3=80=81=E4=B8=B4=E6=97=B6=E7=94=A8=E7=94=B5=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=88=E5=90=AB=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E3=80=81BLL/API=E6=9C=8D=E5=8A=A1=E3=80=81WebAPI=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E3=80=81Model=E9=A1=B9=E3=80=81SQL=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E4=B8=8E=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 排除 CreateModel.bat（含明文sa密码与本地服务器名，未入库） --- .gitignore | 3 + AGENTS.md | 38 + .../版本日志/SGGLDB_V2026-08-13-001-zones.sql | 94 + .../版本日志/SGGLDB_V2026-08-13-002-zones.sql | 78 + .../版本日志/SGGLDB_V2026-08-15-002-zones.sql | 94 + .../版本日志/SGGLDB_V2026-08-18-001-zones.sql | 78 + .../版本日志/SGGLDB_V2026-08-19-001-zones.sql | 78 + DataBase/菜单初始化脚本/危大、超危清单.sql | 8 + SGGL/BLL/API/APIBaseInfoService.cs | 2 +- SGGL/BLL/API/APIUnitService.cs | 1 - SGGL/BLL/API/APIUpLoadFileService.cs | 4 +- .../HSSE/APIGeneralEquipmentQualityService.cs | 2 +- SGGL/BLL/API/HSSE/APIHazardProjectService.cs | 76 + SGGL/BLL/API/HSSE/APIMeetingService.cs | 21 +- .../API/HSSE/APISafetyAcceptanceService.cs | 128 ++ SGGL/BLL/API/HSSE/APISafetyPatrolService.cs | 138 ++ SGGL/BLL/BLL.csproj | 6 + .../CQMSConstructSolutionApproveService.cs | 32 +- SGGL/BLL/CQMS/WBS/ProjectQualityService.cs | 4 +- SGGL/BLL/Common/AttachFileService.cs | 9 +- SGGL/BLL/Common/CommonService.cs | 2 +- SGGL/BLL/Common/Const.cs | 10 +- SGGL/BLL/Common/NPOIExcel.cs | 1 - SGGL/BLL/Common/NPOIHelper.cs | 2 +- SGGL/BLL/Common/UpLoadImageService.cs | 2 +- SGGL/BLL/Common/UploadAttachmentService.cs | 4 +- SGGL/BLL/Common/WordHelp.cs | 2 +- .../HJGL_EMaterialRegistService.cs | 4 - .../PMI_MaterialTemplateService.cs | 2 +- .../BLL/HJGL/WeldingManage/PipelineService.cs | 2 +- SGGL/BLL/HSSE/Hazard/HazardProjectService.cs | 118 ++ .../BLL/HSSE/Hazard/RiskControlListService.cs | 97 ++ .../HSSE/Hazard/SafetyAcceptanceService.cs | 93 + SGGL/BLL/HSSE/Hazard/SafetyPatrolService.cs | 93 + SGGL/BLL/HSSE/Hazard/SpecialPlanService.cs | 92 + .../HSSEConstructSolutionApproveService.cs | 30 +- SGGL/BLL/OpenService/GetDataService.cs | 14 +- SGGL/BLL/OpenService/MonitorService.cs | 10 +- SGGL/BLL/ProjectData/TeamGroupService.cs | 2 +- SGGL/BLL/SysManage/UserService.cs | 2 +- SGGL/BLL/ZHGL/DataSync/MainSevice.cs | 2 +- SGGL/BLL/ZHGL/DataSync/ServerService.cs | 4 +- .../ZHGL/RealName/RealNameMonitorService.cs | 2 +- SGGL/CLAUDE.md | 40 + .../AttachFile/webuploader.aspx.cs | 83 +- .../BaseInfo/BaseFactory.aspx.cs | 2 +- .../CQMS/Check/CheckFineList.aspx.cs | 7 +- .../CQMS/Check/CheckFineListEdit.aspx.cs | 1 - .../CQMS/Check/CheckList.aspx.cs | 10 +- .../Check/JointCheckUnitStatistics.aspx.cs | 2 +- .../CQMS/Check/SpecialCheckIn.aspx.cs | 4 +- .../CQMS/Check/SpecialCheckList.aspx.cs | 8 +- .../ConstructionLog/ConstructionLog.aspx.cs | 2 +- .../CQMS/Foreign/ControlPointCheck.aspx.cs | 2 +- .../CQMS/Foreign/ForeignWBSOut.aspx.cs | 2 +- .../CQMS/Foreign/ITPList.aspx.cs | 2 +- .../CQMS/Foreign/ITPListProject.aspx.cs | 2 +- .../CQMS/Information/CostReportEdit.aspx.cs | 1 - .../CQMS/ManageReport/CheckStatisc.aspx.cs | 2 +- .../ManageReport/DesignChangeStatisc.aspx.cs | 2 +- .../CQMS/ManageReport/HJGLStatisc.aspx.cs | 2 +- .../CQMS/ManageReport/NCRStatisc.aspx.cs | 2 +- .../InspectionNoticeEdit.aspx.cs | 2 - .../CQMS/Solution/ConstructSolution.aspx.cs | 2 +- .../Solution/EditConstructSolution.aspx.cs | 2 +- .../CQMS/WBS/ProjectQuality.aspx.cs | 4 - SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs | 1 - SGGL/FineUIPro.Web/ErrLog.txt | 249 --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 119 ++ .../HJGL/CheckManage/CheckManage.aspx.cs | 1 - .../HJGL/CheckManage/CheckManageAudit.aspx.cs | 1 - .../CheckManage/CheckManageImport.aspx.cs | 18 +- .../HJGL/CheckManage/CheckManageList.aspx.cs | 2 +- .../EMaterialRegistEditNew.aspx.cs | 1 - .../ElectrodeBackRecovery.aspx.cs | 2 +- .../ElectrodeBakeRecordEditNew.aspx.cs | 1 - .../MaterialManage/ElectrodeRecovery.aspx.cs | 2 +- .../ElectrodeRecoveryBack.aspx.cs | 2 +- ...lectrodeSecondaryBakeRecordEditNew.aspx.cs | 1 - .../HJGL/MaterialManage/StockSelect.aspx.cs | 2 +- .../MaterialManage/WeldMatStatistics.aspx.cs | 2 +- .../HJGL/MaterialManage/WeldUseAmount.aspx.cs | 2 +- .../HJGL/PersonManage/PersonManage.aspx.cs | 6 +- .../HJGL/PersonManage/PersonManageIn.aspx.cs | 4 +- .../HJGL/PersonManage/TestApplication.aspx.cs | 2 +- .../RepairManage/RepairManageAudit.aspx.cs | 1 - .../RepairManage/RepairManageEdit.aspx.cs | 9 +- .../TestPackageImport.aspx.cs | 83 +- .../TestPackageManageAudit.aspx.cs | 96 +- .../HJGL/TrustManage/ShowTrustSearch.aspx.cs | 2 +- .../HJGL/TrustManage/TrustManageAudit.aspx.cs | 1 - .../HJGL/TrustManage/TrustManageEdit.aspx.cs | 1 - .../HJGL/TrustManage/TrustManageSet.aspx.cs | 6 +- .../HJGL/WeldingManage/JointInfo.aspx.cs | 5 +- .../HJGL/WeldingManage/JointInfoOut.aspx.cs | 4 +- .../HJGL/WeldingManage/PipelineManage.aspx.cs | 5 +- .../WeldingManage/PmiMaterialTemplate.aspx.cs | 5 - .../HJGL/WeldingManage/PointManage.aspx.cs | 4 +- .../WeldingManage/PointShowSearch.aspx.cs | 4 +- .../HJGL/WeldingManage/WeldReport.aspx.cs | 2 +- .../WeldingManage/WeldReportItemEdit.aspx.cs | 2 +- .../HJGL/WeldingReport/ArriveDetail.aspx.cs | 4 +- .../HJGL/WeldingReport/ArriveStatic.aspx.cs | 4 +- .../WeldingReport/CheckStatistics.aspx.cs | 2 +- .../WeldingReport/DetectionAnalyze.aspx.cs | 4 +- .../WeldingReport/FilmJointStatistics.aspx.cs | 12 +- .../WeldingReport/IsoCmprehensive.aspx.cs | 4 +- .../HJGL/WeldingReport/IsoCompreInfo.aspx.cs | 8 +- .../WeldingReport/JointComprehensive.aspx.cs | 18 +- .../WeldingReport/MediaComprehensive.aspx.cs | 4 +- .../HJGL/WeldingReport/NDTMonthReport.aspx.cs | 42 +- .../HJGL/WeldingReport/NDTTotalReport.aspx.cs | 8 +- .../HJGL/WeldingReport/NDTWeekReport.aspx.cs | 6 +- .../HJGL/WeldingReport/OneDayReport.aspx.cs | 18 +- .../WeldingReport/OneDayTrustReport.aspx.cs | 10 +- .../HJGL/WeldingReport/OneMonthReport.aspx.cs | 49 +- .../WeldingReport/OneWeekDeviceReport.aspx.cs | 4 +- .../HJGL/WeldingReport/OneWeekReport.aspx.cs | 50 +- .../PointTrustCheckTaskList.aspx.cs | 2 +- .../PrefabricatedInstall.aspx.cs | 4 +- .../WeldingReport/RepairStatistics.aspx.cs | 2 +- .../HJGL/WeldingReport/TrustCheck.aspx.cs | 4 +- .../WeldingReport/UnitWorkAreaQuality.aspx.cs | 4 +- .../WeldingReport/UnitWorkareaAnalyze.aspx.cs | 4 +- .../WelderDynamicStatistics.aspx.cs | 4 +- .../WeldingReport/WelderPerformance.aspx.cs | 4 +- .../WeldingReport/WeldingStatistical.aspx.cs | 4 +- .../HSSE/ActionPlan/ActionPlanSummary.aspx.cs | 2 +- .../HSSE/Administrative/CarManager.aspx.cs | 2 +- .../HSSE/Administrative/DriverManager.aspx.cs | 2 +- .../HSSE/Check/CheckDayWH.aspx.cs | 2 +- .../HSSE/Check/CheckHoliday.aspx.cs | 2 +- .../HSSE/Check/CheckSpecial.aspx.cs | 2 +- .../HSSE/Check/CheckWork.aspx.cs | 2 +- .../HSSE/Check/ContactList.aspx.cs | 2 +- .../HSSE/Check/HSECertificate.aspx.cs | 2 +- .../Check/RectifyNoticesStatistics.aspx.cs | 2 +- .../HSSE/Check/SupervisionNotice.aspx.cs | 2 +- .../HSSE/Check/ViolationPerson.aspx.cs | 2 +- .../HSSE/CostGoods/GoodsManage.aspx.cs | 2 +- .../HSSE/CostGoods/MeasuresPlan.aspx.cs | 2 +- .../HSSE/CostGoods/PayRegistration.aspx.cs | 2 +- .../HSSE/CostGoods/SubPayRegistration.aspx.cs | 2 +- .../HSSE/Emergency/DrillRecordList.aspx.cs | 2 +- .../Hazard/ConstructionRiskDataIn.aspx.cs | 4 +- .../HSSE/Hazard/MajorHazardList.aspx.cs | 2 +- .../HSSE/Hazard/OtherHazard.aspx.cs | 2 +- .../HSSE/HazardousMG/HazardProject.aspx | 157 ++ .../HSSE/HazardousMG/HazardProject.aspx.cs | 341 ++++ .../HazardProject.aspx.designer.cs | 242 +++ .../HSSE/HazardousMG/HazardProjectDataIn.aspx | 34 + .../HazardousMG/HazardProjectDataIn.aspx.cs | 210 +++ .../HazardProjectDataIn.aspx.designer.cs | 62 + .../HSSE/HazardousMG/HazardProjectEdit.aspx | 73 + .../HazardousMG/HazardProjectEdit.aspx.cs | 113 ++ .../HazardProjectEdit.aspx.designer.cs | 87 + .../HSSE/HazardousMG/RiskControlList.aspx | 132 ++ .../HSSE/HazardousMG/RiskControlList.aspx.cs | 176 ++ .../RiskControlList.aspx.designer.cs | 102 ++ .../HSSE/HazardousMG/RiskControlListEdit.aspx | 96 + .../HazardousMG/RiskControlListEdit.aspx.cs | 111 ++ .../RiskControlListEdit.aspx.designer.cs | 107 ++ .../HSSE/HazardousMG/SafetyAcceptance.aspx | 120 ++ .../HSSE/HazardousMG/SafetyAcceptance.aspx.cs | 189 ++ .../SafetyAcceptance.aspx.designer.cs | 170 ++ .../HazardousMG/SafetyAcceptanceEdit.aspx | 75 + .../HazardousMG/SafetyAcceptanceEdit.aspx.cs | 130 ++ .../SafetyAcceptanceEdit.aspx.designer.cs | 87 + .../HSSE/HazardousMG/SafetyPatrol.aspx | 139 ++ .../HSSE/HazardousMG/SafetyPatrol.aspx.cs | 223 +++ .../HazardousMG/SafetyPatrol.aspx.designer.cs | 206 +++ .../HSSE/HazardousMG/SafetyPatrolEdit.aspx | 80 + .../HSSE/HazardousMG/SafetyPatrolEdit.aspx.cs | 151 ++ .../SafetyPatrolEdit.aspx.designer.cs | 161 ++ .../HSSE/HazardousMG/SpecialPlanEdit.aspx | 78 + .../HSSE/HazardousMG/SpecialPlanEdit.aspx.cs | 111 ++ .../SpecialPlanEdit.aspx.designer.cs | 161 ++ .../HiddenRectificationList.aspx.cs | 2 +- .../HiddenInspection/RishAnalysis.aspx.cs | 2 +- .../HSSE/InformationProject/Notice.aspx.cs | 2 +- .../PromotionalActivities.aspx.cs | 2 +- .../HSSE/KqShowScreen/JZYScreen.aspx.cs | 1 - .../HSSE/License/EquipmentSafetyList.aspx.cs | 2 +- .../HSSE/License/SecurityLicense.aspx.cs | 2 +- .../HSSE/Manager/HSSELogMonth.aspx.cs | 2 +- .../HSSE/Manager/HSSELogMonthView.aspx.cs | 29 + .../HSSE/Manager/ManagerMonthB.aspx.cs | 2 +- .../HSSE/Manager/ManagerMonthC.aspx.cs | 2 +- .../HSSE/Manager/ManagerWeek.aspx.cs | 2 +- .../HSSE/Manager/MonthReportBEdit.aspx.cs | 2 +- .../HSSE/Manager/MonthReportCEdit6.aspx.cs | 2 +- .../HSSE/Manager/SubManagerMonth.aspx.cs | 2 +- .../HSSE/Manager/SubManagerWeek.aspx.cs | 2 +- .../Material/MaterPhyQuantityList.aspx.cs | 2 +- .../HSSE/Meeting/ClassMeeting.aspx.cs | 4 +- .../HSSE/Meeting/ClassMeetingView.aspx.cs | 5 +- SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx | 150 ++ .../HSSE/PowerMG/PowerBox.aspx.cs | 315 ++++ .../HSSE/PowerMG/PowerBox.aspx.designer.cs | 188 ++ .../HSSE/PowerMG/PowerBoxEdit.aspx | 106 ++ .../HSSE/PowerMG/PowerBoxEdit.aspx.cs | 162 ++ .../PowerMG/PowerBoxEdit.aspx.designer.cs | 188 ++ .../QualityAudit/EquipmentQuality.aspx.cs | 4 +- .../EquipmentQualityDataIn.aspx.cs | 8 +- .../GeneralEquipmentQuality.aspx.cs | 6 +- .../GeneralEquipmentQualityDataIn.aspx.cs | 4 +- .../HSSE/QualityAudit/InUnit.aspx.cs | 2 +- .../HSSE/QualityAudit/ProjectRecord.aspx.cs | 2 +- .../QualityAudit/SafePersonQuality.aspx.cs | 2 +- .../HSSE/QualityAudit/VehicleInOut.aspx.cs | 2 - .../HSSE/QualityAudit/VehicleList.aspx.cs | 2 - .../SafetyOrganizationPic.aspx.cs | 1 - .../SitePerson/PersonAskForLeaveList.aspx.cs | 2 +- .../HSSE/SitePerson/PersonList.aspx.cs | 2 +- .../SolutionNew/ConstructSolution.aspx.cs | 2 +- .../SolutionNew/EditConstructSolution.aspx.cs | 2 +- SGGL/FineUIPro.Web/JDGL/WBS/WBSOut.aspx.cs | 2 +- SGGL/FineUIPro.Web/JDGL/WBS/WBSSet.aspx.cs | 3 - .../ProjectData/MainDataProjectList.aspx.cs | 5 - .../ProjectData/WorkArea.aspx.cs | 2 +- .../Data_EnvironmentProtectionDataIn.aspx.cs | 4 +- SGGL/FineUIPro.Web/SysManage/HttpLog.aspx.cs | 2 +- .../DataStatistics/CheckStatistics.aspx.cs | 2 +- .../DataStatistics/MeetStatistics.aspx.cs | 2 +- .../ProjectPersonStatics.aspx.cs | 2 +- .../RectifyNoticesStatistics.aspx.cs | 2 +- .../ZHGL/DataSync/CQMSData_CQMS.aspx.cs | 2 +- .../ZHGL/DataSync/HJGLData_HJGL.aspx.cs | 2 +- .../ZHGL/DataSync/HSSEData_HSSE.aspx.cs | 2 +- .../Project_CQMSData_CQMS.aspx.cs | 2 +- .../Project_HJGLData_HJGL.aspx.cs | 2 +- .../Project_HSSEData_HSSE.aspx.cs | 2 +- .../Project_SYHSEData_SYHSE.aspx.cs | 2 +- .../ZHGL/DataSync/SYHSEData_Data.aspx.cs | 2 +- .../ZHGL/DataSync/SYHSEData_SYHSE.aspx.cs | 2 +- .../ZHGL/Emergency/DrillRecordList.aspx.cs | 2 +- .../Environmental/ArchitectureReport.aspx.cs | 2 +- .../ZHGL/Environmental/ChemicalReport.aspx.cs | 2 +- .../Environmental/ChemicalReportSave.aspx.cs | 1 - .../ZHGL/Environmental/EIAReport.aspx.cs | 2 +- .../ZHGL/Environmental/EnergyReport.aspx.cs | 2 +- .../EnvironmentalEmergencyPlan.aspx.cs | 2 +- .../EnvironmentalMonitoring.aspx.cs | 2 +- .../ProjectArchitectureReport.aspx.cs | 2 +- .../ProjectChemicalReport.aspx.cs | 2 +- .../Environmental/ProjectEnergyReport.aspx.cs | 2 +- .../UnexpectedEnvironmental.aspx.cs | 2 +- .../ZHGL/HSSESystem/HSSEManage.aspx.cs | 2 +- .../ZHGL/HSSESystem/SafetyInstitution.aspx.cs | 2 +- .../Information/AccidentCauseReport.aspx.cs | 2 +- .../DrillConductedQuarterlyReport.aspx.cs | 2 +- .../DrillPlanHalfYearReport.aspx.cs | 2 +- .../Information/MillionsMonthlyReport.aspx.cs | 2 +- .../ZHGL/InformationProject/Picture.aspx.cs | 2 +- .../ManagementReport/MonthReportB.aspx.cs | 2 +- .../ZHGL/ManagementReport/ReportCheck.aspx.cs | 2 +- .../ManagementReport/ReportRemind.aspx.cs | 2 +- .../OccupationHealth/HazardDetection.aspx.cs | 2 +- .../OccupationalDiseaseAccident.aspx.cs | 2 +- .../PhysicalExamination.aspx.cs | 2 +- .../ProjectAccident/AccidentAnalysis.aspx.cs | 2 +- .../ZHGL/ProjectAccident/AccidentData.aspx.cs | 2 +- .../ProjectAccident/AccidentReport.aspx.cs | 2 +- .../AccidentStatistics.aspx.cs | 2 +- .../ZHGL/RealName/OnPost.aspx.cs | 2 +- .../ZHGL/RealName/SynchroRecord.aspx.cs | 2 +- .../ZHGL/RealName/SynchroSet.aspx.cs | 2 +- .../ZHGL/ServerCheck/CheckInfoReport.aspx.cs | 2 +- .../ZHGL/ServerCheck/CheckRectify.aspx.cs | 2 +- .../ZHGL/ServerCheck/UpCheckReport.aspx.cs | 2 +- .../SubPackManage/BaseBranchTeamList.aspx.cs | 1 - .../BaseBranchTeamListTeam.aspx.cs | 1 - .../SubPackManage/BaseLaborTeamList.aspx.cs | 1 - .../BaseSubPackBlackLaborTeam.aspx.cs | 1 - .../BaseSubPackBlackPersonnel.aspx.cs | 1 - .../BaseSubPackBlackTeam.aspx.cs | 1 - .../BaseSubPackBlackTeamlist.aspx.cs | 1 - .../BaseSubPackPersonnel.aspx.cs | 1 - SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 5 + SGGL/FineUIPro.Web/common/Menu_HSSE.xml | 13 +- SGGL/FineUIPro.Web/common/main0.aspx.cs | 3 +- SGGL/FineUIPro.Web/common/main3.aspx.cs | 4 +- SGGL/FineUIPro.Web/common/mainI.aspx.cs | 3 +- SGGL/FineUIPro.Web/common/mainIII.aspx.cs | 10 +- .../common/mainMenu_CQMS.aspx.cs | 1 - .../common/mainMenu_HJGL.aspx.cs | 2 +- .../common/mainMenu_JDGL.aspx.cs | 8 - SGGL/FineUIPro.Web/common/mainProject.aspx.cs | 6 +- .../FineUIPro.Web/common/mainProject0.aspx.cs | 4 +- .../common/main_copy_index.aspx.cs | 2 +- SGGL/FineUIPro.Web/index.aspx.cs | 5 + SGGL/FineUIPro.Web/index4.aspx.cs | 5 + SGGL/FineUIPro.Web/indexProject.aspx.cs | 89 +- SGGL/FineUIPro.Web/indexShiYe.aspx.cs | 3 - SGGL/FineUIPro.Web/indexs.aspx.cs | 5 + SGGL/FineUIPro.Web/res/css/common.css | 5 + SGGL/Model/APIItem/CQMS/BeanUtil.cs | 2 +- SGGL/Model/APIItem/HSSE/HazardProjectItem.cs | 100 ++ .../APIItem/HSSE/SafetyAcceptanceItem.cs | 91 + SGGL/Model/APIItem/HSSE/SafetyPatrolItem.cs | 91 + SGGL/Model/Model.cs | 1542 +++++++++++++++++ SGGL/Model/Model.csproj | 9 +- SGGL/Model/ZHGL/DataSync/AccidentOutput.cs | 2 +- SGGL/SgManager.AI/ConfigAppSetting.cs | 2 +- SGGL/SgManager.AI/FaceClass.cs | 4 +- SGGL/SgManager.AI/IDCardRecognition.cs | 4 - .../Controllers/CQMS/ContactController.cs | 1 - .../CQMS/InspectionManagementController.cs | 10 +- .../Controllers/CQMS/JointCheckController.cs | 4 +- .../Controllers/CQMS/SpotCheckController.cs | 8 +- .../CQMS/TechnicalContactController.cs | 2 +- SGGL/WebAPI/Controllers/FaceController.cs | 4 +- .../HJGL/ElectrodeRecoveryController.cs | 2 +- .../HJGL/PersonEntranceController.cs | 14 +- .../HazardousMG/HazardProjectController.cs | 66 + .../HazardousMG/SafetyAcceptanceController.cs | 141 ++ .../HazardousMG/SafetyPatrolController.cs | 141 ++ .../HSSE/ImageRecognitionController.cs | 2 +- .../Controllers/HSSE/MeetingController.cs | 33 +- SGGL/WebAPI/Controllers/UserController.cs | 4 +- SGGL/WebAPI/SafetyPatrol_API.md | 168 ++ SGGL/WebAPI/WebAPI.csproj | 3 + reasonix.toml | 2 + 323 files changed, 9806 insertions(+), 922 deletions(-) create mode 100644 AGENTS.md create mode 100644 DataBase/版本日志/SGGLDB_V2026-08-13-001-zones.sql create mode 100644 DataBase/版本日志/SGGLDB_V2026-08-13-002-zones.sql create mode 100644 DataBase/版本日志/SGGLDB_V2026-08-15-002-zones.sql create mode 100644 DataBase/版本日志/SGGLDB_V2026-08-18-001-zones.sql create mode 100644 DataBase/版本日志/SGGLDB_V2026-08-19-001-zones.sql create mode 100644 DataBase/菜单初始化脚本/危大、超危清单.sql create mode 100644 SGGL/BLL/API/HSSE/APIHazardProjectService.cs create mode 100644 SGGL/BLL/API/HSSE/APISafetyAcceptanceService.cs create mode 100644 SGGL/BLL/API/HSSE/APISafetyPatrolService.cs create mode 100644 SGGL/BLL/HSSE/Hazard/HazardProjectService.cs create mode 100644 SGGL/BLL/HSSE/Hazard/RiskControlListService.cs create mode 100644 SGGL/BLL/HSSE/Hazard/SafetyAcceptanceService.cs create mode 100644 SGGL/BLL/HSSE/Hazard/SafetyPatrolService.cs create mode 100644 SGGL/BLL/HSSE/Hazard/SpecialPlanService.cs create mode 100644 SGGL/CLAUDE.md delete mode 100644 SGGL/FineUIPro.Web/ErrLog.txt create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx create mode 100644 SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx.designer.cs create mode 100644 SGGL/Model/APIItem/HSSE/HazardProjectItem.cs create mode 100644 SGGL/Model/APIItem/HSSE/SafetyAcceptanceItem.cs create mode 100644 SGGL/Model/APIItem/HSSE/SafetyPatrolItem.cs create mode 100644 SGGL/WebAPI/Controllers/HSSE/HazardousMG/HazardProjectController.cs create mode 100644 SGGL/WebAPI/Controllers/HSSE/HazardousMG/SafetyAcceptanceController.cs create mode 100644 SGGL/WebAPI/Controllers/HSSE/HazardousMG/SafetyPatrolController.cs create mode 100644 SGGL/WebAPI/SafetyPatrol_API.md create mode 100644 reasonix.toml diff --git a/.gitignore b/.gitignore index 0c2628a..f2fe579 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,6 @@ /SGGL/FineUIPro.Web/HJGL/MaterialManage/StockInEdit.aspx.cs /SGGL/FineUIPro.Web/HJGL/MaterialManage/StockInEdit.aspx.designer.cs /SGGLPackFile1 + +# 运行时错误日志（不应入库） +/SGGL/FineUIPro.Web/ErrLog.txt diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 0000000..a738740 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,38 @@ +# SGGL_HBAZ — 智慧施工管理信息系统（河北安装） + +施工管理信息系统（WebForms + Web API），.NET Framework 4.8，SQL Server，LINQ to SQL。解决方案在 `SGGL/SGGL.sln`（仓库根即本目录，与解决方案目录不同级）。 + +## Commands + +- 构建（msbuild 不在 PATH，用 VS2022 的 MSBuild）： + `& 'D:\Development Kit\MVStudio\2022\MSBuild\Current\Bin\MSBuild.exe' 'SGGL\SGGL.sln' /p:Configuration=Debug`（Release 同理，已验证可构建） +- 打发布包：`ReleasePacker.bat`（aspnet_compiler 预编译 + aspnet_merge 合并 → `SGGLPackFile/`；脚本引用 %VS100COMNTOOLS%，旧环境） +- 重新生成 Model：`CreateModel.bat`（SqlMetal 从 SQL2022 实例 / SGGLDB_HBAZ 库生成 `SGGL/Model/Model.cs`） +- 无测试项目 / 无测试命令（项目内没有单元测试）。 + +## Architecture + +- `SGGL/FineUIPro.Web/` — WebForms 主站。入口 `Login.aspx`、`index*.aspx`、`indexProject*.aspx`；基类 `common/PageBase.cs`（Session["CurrUser"] 鉴权）；业务模块按文件夹组织（BaseInfo、CQMS、HSSE、HJGL、JDGL、PZHGL、SHIYE、SYHSE、SysManage、TaskScheduling、ZHGL 等）。 +- `SGGL/BLL/` — 业务逻辑层。`Common/Funs.cs`（全局配置 + LINQ-to-SQL 上下文 Funs.DB）；`SQLHelper.cs` 原始 ADO.NET；`API/` 外部接口；`TaskScheduling/` Quartz 定时任务。业务类为 `public static class XxxService`。 +- `SGGL/Model/` — LINQ to SQL 实体，`Model.cs` 由 SqlMetal 生成（约 14MB，勿手改）；实体前缀 `Sys_`（Sys_User、Sys_Role、Sys_ErrLogInfo）。 +- `SGGL/WebAPI/` — 经典 ASP.NET Web API（System.Web.Http），`Controllers/` 供移动端/第三方调用（材料、人员、人脸、身份证、视频、车辆、用户等）。 +- `SGGL/SgManager.AI/` — AI 辅助库：百度 OCR/人脸（IDCardRecognition、FaceClass）、地图、邮件。被 BLL 与 FineUIPro.Web 引用。 +- `SGGL/FineUIPro/` — 商业 UI 框架 FineUIPro v6.3.0 的 DLL（非源码，勿改）。 +- `DataBase/版本日志/` — 数据库增量变更脚本，命名 `SGGLDB_V-<序号>-<作者>.sql`；`script/script.sql` 为库整体脚本；`SGGLPackFile/` 为发布包输出目录（ReleasePacker 产物）。 + +## Conventions + +- 中文注释，公共方法用 `/// ` XML 注释。 +- 数据访问优先 `Funs.DB`（LINQ to SQL，InsertOnSubmit/SubmitChanges），复杂 SQL 用 `SQLHelper`。 +- 错误记录走 `ErrLogInfo.WriteLog(...)`；Global.asax 的 Application_Error 落库 `Sys_ErrLogInfo`。 +- 连接字符串与第三方密钥（含明文密码/API Key）在 `FineUIPro.Web/Web.config` 的 AppSettings 中，`Application_Start` 赋值给 `Funs.*`——勿把凭据写进提交内容。 +- WebAPI 响应统一包装 `Model.ResponeData`，action 常用 `[HttpPost]` + `[FromBody]`。 +- `SGGL/Backup*` 是开发备份目录，不要在其中改代码；`packages/` 被 gitignore（NuGet 还原）。 + +## Notes + +- 构建警告基线（2026-02 优化后）：845 → 40，剩余 40 条均为 CS0618（Aspose.Words/Office Interop 过时 API，有意使用，勿自动改）。 +- `FineUIPro.Web/ErrLog.txt` 为运行时日志，已加入 .gitignore（git rm --cached 后本地保留）。 +- Web.config 含明文数据库密码与第三方 API Key，注意勿泄露/勿提交外发。 +- 测试 WebAPI 时注意：PowerShell 调用 `curl.exe -d '{"..."}'` 会剥掉 JSON 双引号导致反序列化失败，须用 `--data-binary '@body.json'`（文件方式）发 JSON body。 +- 本地运行验证：`iisexpress.exe /path:"SGGL\FineUIPro.Web" /port:4528`（WebForms）与 `/path:"SGGL\WebAPI" /port:7143`（WebAPI），数据库 SGGLDB_HBAZ 在本机 SQL Server 可用。 diff --git a/DataBase/版本日志/SGGLDB_V2026-08-13-001-zones.sql b/DataBase/版本日志/SGGLDB_V2026-08-13-001-zones.sql new file mode 100644 index 0000000..9f98dec --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-08-13-001-zones.sql @@ -0,0 +1,94 @@ +-- 危大、超危工程清单表 +CREATE TABLE [dbo].[HSSE_HazardProject] ( + [HazardProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [ProjectCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [ProjectName] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [WorkContent] nvarchar(1000) COLLATE Chinese_PRC_CI_AS NULL, + [RiskLevel] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [StartDate] datetime NULL, + [EndDate] datetime NULL, + [ManagerMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [Remark] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK_HSSE_HazardProject] PRIMARY KEY CLUSTERED ([HazardProjectId]) +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[HSSE_HazardProject] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'危大、超危工程清单', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'主键', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'HazardProjectId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'项目', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'ProjectId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'编号', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'ProjectCode' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'分部分项工程', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'ProjectName' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'施工内容', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'WorkContent' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'风险等级（危大工程/超危工程）', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'RiskLevel' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'开工时间', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'StartDate' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'结束时间', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'EndDate' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'现场负责人', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'ManagerMan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'备注', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_HazardProject', +'COLUMN', N'Remark' +GO diff --git a/DataBase/版本日志/SGGLDB_V2026-08-13-002-zones.sql b/DataBase/版本日志/SGGLDB_V2026-08-13-002-zones.sql new file mode 100644 index 0000000..3b21b11 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-08-13-002-zones.sql @@ -0,0 +1,78 @@ +-- 专项施工方案表 +CREATE TABLE [dbo].[HSSE_SpecialPlan] ( + [PlanId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [HazardProjectName] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [PlanName] nvarchar(200) COLLATE Chinese_PRC_CI_AS NULL, + [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [CompileDate] datetime NULL, + [UploadFile] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [Remark] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK_HSSE_SpecialPlan] PRIMARY KEY CLUSTERED ([PlanId]) +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[HSSE_SpecialPlan] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'专项施工方案', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SpecialPlan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'主键', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SpecialPlan', +'COLUMN', N'PlanId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'项目', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SpecialPlan', +'COLUMN', N'ProjectId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'工程名称', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SpecialPlan', +'COLUMN', N'HazardProjectName' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'方案名称', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SpecialPlan', +'COLUMN', N'PlanName' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'编制人', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SpecialPlan', +'COLUMN', N'CompileMan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'编制日期', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SpecialPlan', +'COLUMN', N'CompileDate' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'附件', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SpecialPlan', +'COLUMN', N'UploadFile' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'备注', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SpecialPlan', +'COLUMN', N'Remark' +GO diff --git a/DataBase/版本日志/SGGLDB_V2026-08-15-002-zones.sql b/DataBase/版本日志/SGGLDB_V2026-08-15-002-zones.sql new file mode 100644 index 0000000..9d69e60 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-08-15-002-zones.sql @@ -0,0 +1,94 @@ +-- 风险分级管控清单表 +CREATE TABLE [dbo].[HSSE_RiskControlList] ( + [RiskId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [RiskName] nvarchar(200) COLLATE Chinese_PRC_CI_AS NULL, + [RiskLevel] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [RiskType] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [ControlMeasure] nvarchar(1000) COLLATE Chinese_PRC_CI_AS NULL, + [ManagerUnit] nvarchar(200) COLLATE Chinese_PRC_CI_AS NULL, + [ManagerMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [Remark] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [UploadFile] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK_HSSE_RiskControlList] PRIMARY KEY CLUSTERED ([RiskId]) +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[HSSE_RiskControlList] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'风险分级管控清单', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'主键', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'RiskId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'项目', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'ProjectId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'风险点', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'RiskName' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'风险等级', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'RiskLevel' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'风险类别', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'RiskType' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'管控措施', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'ControlMeasure' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'责任单位', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'ManagerUnit' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'责任人', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'ManagerMan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'备注', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'Remark' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'附件', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_RiskControlList', +'COLUMN', N'UploadFile' +GO diff --git a/DataBase/版本日志/SGGLDB_V2026-08-18-001-zones.sql b/DataBase/版本日志/SGGLDB_V2026-08-18-001-zones.sql new file mode 100644 index 0000000..db71f3d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-08-18-001-zones.sql @@ -0,0 +1,78 @@ +-- 安全防护验收表 +CREATE TABLE [dbo].[HSSE_SafetyAcceptance] ( + [AcceptanceId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [HazardProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [HazardProjectName] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [AcceptanceResult] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [AcceptanceMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [AcceptanceDate] datetime NULL, + [Remark] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK_HSSE_SafetyAcceptance] PRIMARY KEY CLUSTERED ([AcceptanceId]) +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[HSSE_SafetyAcceptance] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'安全防护验收', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyAcceptance' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'主键', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyAcceptance', +'COLUMN', N'AcceptanceId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'项目', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyAcceptance', +'COLUMN', N'ProjectId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'危大、超危工程', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyAcceptance', +'COLUMN', N'HazardProjectId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'工程名称', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyAcceptance', +'COLUMN', N'HazardProjectName' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'验收结果', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyAcceptance', +'COLUMN', N'AcceptanceResult' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'验收人', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyAcceptance', +'COLUMN', N'AcceptanceMan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'验收时间', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyAcceptance', +'COLUMN', N'AcceptanceDate' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'情况说明', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyAcceptance', +'COLUMN', N'Remark' +GO diff --git a/DataBase/版本日志/SGGLDB_V2026-08-19-001-zones.sql b/DataBase/版本日志/SGGLDB_V2026-08-19-001-zones.sql new file mode 100644 index 0000000..2d0aea2 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-08-19-001-zones.sql @@ -0,0 +1,78 @@ +-- 安全巡检记录表 +CREATE TABLE [dbo].[HSSE_SafetyPatrol] ( + [PatrolId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [ProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL, + [HazardProjectId] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [HazardProjectName] nvarchar(500) COLLATE Chinese_PRC_CI_AS NULL, + [PatrolDate] datetime NULL, + [PatrolMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [PatrolStatus] nvarchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [Content] nvarchar(1000) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK_HSSE_SafetyPatrol] PRIMARY KEY CLUSTERED ([PatrolId]) +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[HSSE_SafetyPatrol] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'安全巡检记录', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyPatrol' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'主键', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyPatrol', +'COLUMN', N'PatrolId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'项目', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyPatrol', +'COLUMN', N'ProjectId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'危大、超危工程', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyPatrol', +'COLUMN', N'HazardProjectId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'工程名称', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyPatrol', +'COLUMN', N'HazardProjectName' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'巡检日期', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyPatrol', +'COLUMN', N'PatrolDate' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'巡检人', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyPatrol', +'COLUMN', N'PatrolMan' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'巡检状态（正常/待整改）', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyPatrol', +'COLUMN', N'PatrolStatus' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'巡检内容', +'SCHEMA', N'dbo', +'TABLE', N'HSSE_SafetyPatrol', +'COLUMN', N'Content' +GO diff --git a/DataBase/菜单初始化脚本/危大、超危清单.sql b/DataBase/菜单初始化脚本/危大、超危清单.sql new file mode 100644 index 0000000..e6fecc6 --- /dev/null +++ b/DataBase/菜单初始化脚本/危大、超危清单.sql @@ -0,0 +1,8 @@ +INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'81260A49-6DC1-4A2C-A8EB-A945BA6CA6A0', N'危大工程管控', NULL, NULL, 1, N'0', N'Menu_HSSE', '0', '0', '1', NULL); +INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'危大工程管控', NULL, NULL, 1, N'0', N'Menu_CQMS', '0', '0', '1', NULL); +INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'0F166DE2-6DF7-49A9-8E4A-93F5AE476F28', N'专项施工方案', NULL, N'HSSE/HazardousMG/SpecialPlan.aspx', 0, N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'Menu_CQMS', '0', '1', '1', NULL); +INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'1C0D9228-1548-47A8-9BC2-801CFED45915', N'安全技术交底', NULL, N'HSSE/HazardousMG/SafetyDisclosure.aspx', 0, N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'Menu_CQMS', '0', '1', '1', NULL); +INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'44A8CF73-7F23-40CB-9D64-FD05AB48522D', N'危大、超危清单', NULL, N'HSSE/HazardousMG/HazardProject.aspx', 1, N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'Menu_CQMS', '0', '1', '1', NULL); +INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'39C36EF6-A11E-4EA1-B78C-E0F59AAA6EB7', N'风险分级管控清单', NULL, N'HSSE/HazardousMG/RiskControlList.aspx', 2, N'E85CB915-FAC3-4E59-82E7-28DD5525CCB0', N'Menu_CQMS', '0', '1', '1', NULL); +INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'7962CE8E-C17C-4C50-962D-85687E2A2FC9', N'安全防护验收', NULL, N'HSSE/HazardousMG/SafetyAcceptance.aspx', 0, N'81260A49-6DC1-4A2C-A8EB-A945BA6CA6A0', N'Menu_HSSE', '0', '1', '1', NULL); +INSERT INTO [Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) VALUES (N'3EE924B8-DFB2-47DA-ADC1-FF8190E214F1', N'安全巡检', NULL, N'HSSE/HazardousMG/SafetyPatrol.aspx', 0, N'81260A49-6DC1-4A2C-A8EB-A945BA6CA6A0', N'Menu_HSSE', '0', '1', '1', NULL); diff --git a/SGGL/BLL/API/APIBaseInfoService.cs b/SGGL/BLL/API/APIBaseInfoService.cs index 6ce8c14..6a5fc08 100644 --- a/SGGL/BLL/API/APIBaseInfoService.cs +++ b/SGGL/BLL/API/APIBaseInfoService.cs @@ -860,7 +860,7 @@ namespace BLL res = tb.Rows[0][0].ToString(); } - catch (Exception e) { } + catch (Exception) { } } return res; } diff --git a/SGGL/BLL/API/APIUnitService.cs b/SGGL/BLL/API/APIUnitService.cs index 4e1514b..9e6cb18 100644 --- a/SGGL/BLL/API/APIUnitService.cs +++ b/SGGL/BLL/API/APIUnitService.cs @@ -116,7 +116,6 @@ namespace BLL SL_ScanUrl = x.SL_ScanUrl.Replace("\\", "/") }; return getData.ToList(); - return null; } } } diff --git a/SGGL/BLL/API/APIUpLoadFileService.cs b/SGGL/BLL/API/APIUpLoadFileService.cs index 89a1d74..96d7742 100644 --- a/SGGL/BLL/API/APIUpLoadFileService.cs +++ b/SGGL/BLL/API/APIUpLoadFileService.cs @@ -69,7 +69,7 @@ namespace BLL readStream.Close(); } } - catch (Exception ex) + catch (Exception) { returnValue = ""; } @@ -97,7 +97,7 @@ namespace BLL { mywebclient.DownloadFile(url, filepath); } - catch (Exception ex) + catch (Exception) { filepath = ""; } diff --git a/SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs b/SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs index 458e649..6a2837f 100644 --- a/SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs +++ b/SGGL/BLL/API/HSSE/APIGeneralEquipmentQualityService.cs @@ -119,7 +119,7 @@ namespace BLL { newEquipmentQuality.EquipmentCount = int.Parse(newItem.EquipmentCount); } - catch (Exception e) { } + catch (Exception) { } } var updateEquipmentQuality = db.QualityAudit_GeneralEquipmentQuality.FirstOrDefault(x => x.GeneralEquipmentQualityId == newItem.EquipmentQualityId); if (updateEquipmentQuality == null) diff --git a/SGGL/BLL/API/HSSE/APIHazardProjectService.cs b/SGGL/BLL/API/HSSE/APIHazardProjectService.cs new file mode 100644 index 0000000..ac0b5c1 --- /dev/null +++ b/SGGL/BLL/API/HSSE/APIHazardProjectService.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 危大、超危工程清单API服务 + /// + public static class APIHazardProjectService + { + /// + /// 根据项目获取危大、超危工程清单列表（按分部分项工程搜索） + /// + /// 项目主键 + /// 分部分项工程关键字 + /// + public static List getHazardProjectList(string projectId, string keyword) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + IQueryable query = db.HSSE_HazardProject.Where(x => x.ProjectId == projectId); + if (!string.IsNullOrEmpty(keyword)) + { + query = query.Where(x => x.ProjectName.Contains(keyword)); + } + var list = from x in query + orderby x.ProjectCode + select new Model.HazardProjectItem + { + HazardProjectId = x.HazardProjectId, + ProjectId = x.ProjectId, + ProjectCode = x.ProjectCode, + ProjectName = x.ProjectName, + WorkContent = x.WorkContent, + RiskLevel = x.RiskLevel, + StartDate = x.StartDate, + EndDate = x.EndDate, + ManagerMan = x.ManagerMan, + Remark = x.Remark + }; + return list.ToList(); + } + } + + /// + /// 根据主键获取危大、超危工程详情 + /// + /// 主键 + /// + public static Model.HazardProjectItem getHazardProjectById(string hazardProjectId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var x = db.HSSE_HazardProject.FirstOrDefault(e => e.HazardProjectId == hazardProjectId); + if (x == null) + { + return null; + } + return new Model.HazardProjectItem + { + HazardProjectId = x.HazardProjectId, + ProjectId = x.ProjectId, + ProjectCode = x.ProjectCode, + ProjectName = x.ProjectName, + WorkContent = x.WorkContent, + RiskLevel = x.RiskLevel, + StartDate = x.StartDate, + EndDate = x.EndDate, + ManagerMan = x.ManagerMan, + Remark = x.Remark + }; + } + } + } +} diff --git a/SGGL/BLL/API/HSSE/APIMeetingService.cs b/SGGL/BLL/API/HSSE/APIMeetingService.cs index 5ab9d58..1d0e133 100644 --- a/SGGL/BLL/API/HSSE/APIMeetingService.cs +++ b/SGGL/BLL/API/HSSE/APIMeetingService.cs @@ -202,17 +202,28 @@ namespace BLL /// /// 会议类型(C-班前会；W-周例会；M-例会；S-专题例会；A-其他会议) /// 状态（0-待提交；1-已提交） + /// 编制日期开始日期（yyyy-MM-dd，为空不限制） + /// 编制日期结束日期（yyyy-MM-dd，包含当天，为空不限制） /// - public static List getMeetingByProjectIdStates(string projectId, string meetingType, string states,int pageIndex) + public static List getMeetingByProjectIdStates(string projectId, string meetingType, string states,int pageIndex, string startDate, string endDate) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { List getMeetItem = new List(); + // 编制日期(CompileDate)范围过滤：startDate/endDate为空时不限制；endDate取整天（包含endDate当天） + DateTime? dStart = Funs.GetNewDateTime(startDate); + DateTime? dEnd = Funs.GetNewDateTime(endDate); + if (dEnd.HasValue) + { + dEnd = dEnd.Value.Date.AddDays(1); + } if (meetingType == "C") { getMeetItem = (from x in db.Meeting_ClassMeeting where x.ProjectId == projectId && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd)) orderby x.ClassMeetingDate descending select new Model.MeetingItem { @@ -247,6 +258,8 @@ namespace BLL getMeetItem = (from x in db.Meeting_WeekMeeting where x.ProjectId == projectId && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd)) orderby x.WeekMeetingDate descending select new Model.MeetingItem { @@ -278,6 +291,8 @@ namespace BLL getMeetItem = (from x in db.Meeting_MonthMeeting where x.ProjectId == projectId && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd)) orderby x.MonthMeetingDate descending select new Model.MeetingItem { @@ -310,6 +325,8 @@ namespace BLL getMeetItem = (from x in db.Meeting_SpecialMeeting where x.ProjectId == projectId && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd)) orderby x.SpecialMeetingDate descending select new Model.MeetingItem { @@ -342,6 +359,8 @@ namespace BLL getMeetItem = (from x in db.Meeting_AttendMeeting where x.ProjectId == projectId && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd)) orderby x.AttendMeetingDate descending select new Model.MeetingItem { diff --git a/SGGL/BLL/API/HSSE/APISafetyAcceptanceService.cs b/SGGL/BLL/API/HSSE/APISafetyAcceptanceService.cs new file mode 100644 index 0000000..2d94b0c --- /dev/null +++ b/SGGL/BLL/API/HSSE/APISafetyAcceptanceService.cs @@ -0,0 +1,128 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 安全防护验收API服务 + /// + public static class APISafetyAcceptanceService + { + /// + /// 根据项目获取安全防护验收列表（按工程名称搜索） + /// + /// 项目主键 + /// 工程名称关键字 + /// + public static List getSafetyAcceptanceList(string projectId, string keyword) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + IQueryable query = db.HSSE_SafetyAcceptance.Where(x => x.ProjectId == projectId); + if (!string.IsNullOrEmpty(keyword)) + { + query = query.Where(x => x.HazardProjectName.Contains(keyword)); + } + var list = from x in query + orderby x.AcceptanceDate descending + select new Model.SafetyAcceptanceItem + { + AcceptanceId = x.AcceptanceId, + ProjectId = x.ProjectId, + HazardProjectId = x.HazardProjectId, + HazardProjectName = x.HazardProjectName, + AcceptanceResult = x.AcceptanceResult, + AcceptanceMan = x.AcceptanceMan, + AcceptanceDate = x.AcceptanceDate, + Remark = x.Remark + }; + return list.ToList(); + } + } + + /// + /// 根据主键获取安全防护验收详情 + /// + /// 主键 + /// + public static Model.SafetyAcceptanceItem getSafetyAcceptanceById(string acceptanceId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var x = db.HSSE_SafetyAcceptance.FirstOrDefault(e => e.AcceptanceId == acceptanceId); + if (x == null) + { + return null; + } + return new Model.SafetyAcceptanceItem + { + AcceptanceId = x.AcceptanceId, + ProjectId = x.ProjectId, + HazardProjectId = x.HazardProjectId, + HazardProjectName = x.HazardProjectName, + AcceptanceResult = x.AcceptanceResult, + AcceptanceMan = x.AcceptanceMan, + AcceptanceDate = x.AcceptanceDate, + Remark = x.Remark + }; + } + } + + /// + /// 新增安全防护验收（返回主键） + /// + /// 验收项 + /// + public static string addSafetyAcceptance(Model.SafetyAcceptanceItem item) + { + if (string.IsNullOrEmpty(item.AcceptanceId)) + { + item.AcceptanceId = Guid.NewGuid().ToString(); + } + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.HSSE_SafetyAcceptance newItem = new Model.HSSE_SafetyAcceptance + { + AcceptanceId = item.AcceptanceId, + ProjectId = item.ProjectId, + HazardProjectId = item.HazardProjectId, + HazardProjectName = item.HazardProjectName, + AcceptanceResult = item.AcceptanceResult, + AcceptanceMan = item.AcceptanceMan, + AcceptanceDate = item.AcceptanceDate, + Remark = item.Remark + }; + db.HSSE_SafetyAcceptance.InsertOnSubmit(newItem); + db.SubmitChanges(); + } + return item.AcceptanceId; + } + + /// + /// 更新安全防护验收 + /// + /// 验收项 + /// 是否更新成功 + public static bool updateSafetyAcceptance(Model.SafetyAcceptanceItem item) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.HSSE_SafetyAcceptance newItem = db.HSSE_SafetyAcceptance.FirstOrDefault(x => x.AcceptanceId == item.AcceptanceId); + if (newItem == null) + { + return false; + } + newItem.ProjectId = item.ProjectId; + newItem.HazardProjectId = item.HazardProjectId; + newItem.HazardProjectName = item.HazardProjectName; + newItem.AcceptanceResult = item.AcceptanceResult; + newItem.AcceptanceMan = item.AcceptanceMan; + newItem.AcceptanceDate = item.AcceptanceDate; + newItem.Remark = item.Remark; + db.SubmitChanges(); + return true; + } + } + } +} diff --git a/SGGL/BLL/API/HSSE/APISafetyPatrolService.cs b/SGGL/BLL/API/HSSE/APISafetyPatrolService.cs new file mode 100644 index 0000000..5b90ff6 --- /dev/null +++ b/SGGL/BLL/API/HSSE/APISafetyPatrolService.cs @@ -0,0 +1,138 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 安全巡检API服务 + /// + public static class APISafetyPatrolService + { + /// + /// 根据项目获取安全巡检列表（按工程名称搜索） + /// + /// 项目主键 + /// 工程名称关键字 + /// + public static List getSafetyPatrolList(string projectId, string keyword) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + IQueryable query = db.HSSE_SafetyPatrol.Where(x => x.ProjectId == projectId); + if (!string.IsNullOrEmpty(keyword)) + { + query = query.Where(x => x.HazardProjectName.Contains(keyword)); + } + var list = from x in query + orderby x.PatrolDate descending + select new Model.SafetyPatrolItem + { + PatrolId = x.PatrolId, + ProjectId = x.ProjectId, + HazardProjectId = x.HazardProjectId, + HazardProjectName = x.HazardProjectName, + PatrolDate = x.PatrolDate, + PatrolMan = x.PatrolMan, + PatrolStatus = x.PatrolStatus, + Content = x.Content + }; + return list.ToList(); + } + } + + /// + /// 根据主键获取安全巡检详情 + /// + /// 主键 + /// + public static Model.SafetyPatrolItem getSafetyPatrolById(string patrolId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var x = db.HSSE_SafetyPatrol.FirstOrDefault(e => e.PatrolId == patrolId); + if (x == null) + { + return null; + } + return new Model.SafetyPatrolItem + { + PatrolId = x.PatrolId, + ProjectId = x.ProjectId, + HazardProjectId = x.HazardProjectId, + HazardProjectName = x.HazardProjectName, + PatrolDate = x.PatrolDate, + PatrolMan = x.PatrolMan, + PatrolStatus = x.PatrolStatus, + Content = x.Content + }; + } + } + + /// + /// 新增安全巡检（返回主键） + /// + /// 巡检项 + /// + public static string addSafetyPatrol(Model.SafetyPatrolItem item) + { + if (string.IsNullOrEmpty(item.PatrolId)) + { + item.PatrolId = Guid.NewGuid().ToString(); + } + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.HSSE_SafetyPatrol newItem = new Model.HSSE_SafetyPatrol + { + PatrolId = item.PatrolId, + ProjectId = item.ProjectId, + HazardProjectId = item.HazardProjectId, + HazardProjectName = item.HazardProjectName, + PatrolDate = item.PatrolDate, + PatrolMan = item.PatrolMan, + PatrolStatus = item.PatrolStatus, + Content = item.Content + }; + db.HSSE_SafetyPatrol.InsertOnSubmit(newItem); + db.SubmitChanges(); + } + ////保存巡检图片附件 + if (!string.IsNullOrEmpty(item.AttachUrl)) + { + APIUpLoadFileService.SaveAttachUrl(Const.SafetyPatrolMenuId, item.PatrolId, item.AttachUrl, "0"); + } + return item.PatrolId; + } + + /// + /// 更新安全巡检 + /// + /// 巡检项 + /// 是否更新成功 + public static bool updateSafetyPatrol(Model.SafetyPatrolItem item) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.HSSE_SafetyPatrol newItem = db.HSSE_SafetyPatrol.FirstOrDefault(x => x.PatrolId == item.PatrolId); + if (newItem == null) + { + return false; + } + newItem.ProjectId = item.ProjectId; + newItem.HazardProjectId = item.HazardProjectId; + newItem.HazardProjectName = item.HazardProjectName; + newItem.PatrolDate = item.PatrolDate; + newItem.PatrolMan = item.PatrolMan; + newItem.PatrolStatus = item.PatrolStatus; + newItem.Content = item.Content; + db.SubmitChanges(); + } + ////保存巡检图片附件 + if (!string.IsNullOrEmpty(item.AttachUrl)) + { + APIUpLoadFileService.SaveAttachUrl(Const.SafetyPatrolMenuId, item.PatrolId, item.AttachUrl, "0"); + } + return true; + } + } +} diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index f08afe5..5173c0e 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -192,6 +192,7 @@ + @@ -205,6 +206,8 @@ + + @@ -569,7 +572,10 @@ + + + diff --git a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs index a878b5a..72d7b09 100644 --- a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs +++ b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs @@ -10,7 +10,7 @@ namespace BLL { public static string ConvertAuditDate(object ConstructSolutionId) { - var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate != null select x.ApproveDate).FirstOrDefault(); + var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate != null select x.ApproveDate).FirstOrDefault(); if (approve != null) { return approve.Value.ToString("yyyy-MM-dd"); @@ -20,7 +20,7 @@ namespace BLL public static string ConvertToDo(object ConstructSolutionId) { string res = ""; - var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate == null select x); + var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate == null select x); if (approve != null) { foreach (var item in approve) @@ -33,14 +33,14 @@ namespace BLL public static Model.Solution_CQMSConstructSolutionApprove GetSee(string ConstructSolutionId, string userId) { Model.SGGLDB db = Funs.DB; - return db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); + return db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string ConstructSolutionId, string userId) { using (var db = new Model.SGGLDB(Funs.ConnString)) { - var res = db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); + var res = db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) { res.ApproveDate = DateTime.Now; @@ -56,7 +56,7 @@ namespace BLL public static List GetUserIdsApprovesBySignType(string ConstructSolutionId, string signType) { var edtion = GetUserIdsApprovesBySignTypeEditon(ConstructSolutionId); - return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList(); + return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList(); } public static int? GetUserIdsApprovesBySignTypeEditon(string ConstructSolutionId) @@ -113,14 +113,14 @@ namespace BLL public static List GetConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId, string state) { Model.SGGLDB db = Funs.DB; - var reDate = (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); + var reDate = (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); if (reDate == null) { - return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state select x).ToList(); + return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state select x).ToList(); } else { - return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList(); + return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList(); } } @@ -134,7 +134,7 @@ namespace BLL { Model.SGGLDB db = Funs.DB; var res = from x in db.Solution_CQMSConstructSolutionApprove - where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" && x.SignType != "S" + where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" && x.SignType != "S" orderby x.ApproveDate select x; @@ -156,7 +156,7 @@ namespace BLL { Model.SGGLDB db = Funs.DB; var res = from x in db.Solution_CQMSConstructSolutionApprove - where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" + where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveType, x.Edition select x; @@ -236,7 +236,7 @@ namespace BLL public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId) { Model.SGGLDB db = Funs.DB; - var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList(); + var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId select x).ToList(); db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); } @@ -248,17 +248,17 @@ namespace BLL public static Model.Solution_CQMSConstructSolutionApprove GetConstructSolutionApproveByApproveMan(string ConstructSolutionId, string approveMan) { - return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); + return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); } public static Model.Solution_CQMSConstructSolutionApprove GetConstructSoluAppByApproveMan(string ConstructSolutionId, string approveMan, int edtion) { - return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); + return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); } public static Model.Solution_CQMSConstructSolutionApprove GetConstructSolApproveByApproveMan(string ConstructSolutionId, string approveMan) { - return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); + return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); } @@ -325,7 +325,7 @@ namespace BLL using (var db = new Model.SGGLDB(Funs.ConnString)) { var q = from x in db.Solution_CQMSConstructSolutionApprove - where x.ConstructSolutionId == ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S" + where x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate select new { @@ -363,7 +363,7 @@ namespace BLL using (var db = new Model.SGGLDB(Funs.ConnString)) { var q = from x in db.Solution_CQMSConstructSolutionApprove - where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" + where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate select new { diff --git a/SGGL/BLL/CQMS/WBS/ProjectQualityService.cs b/SGGL/BLL/CQMS/WBS/ProjectQualityService.cs index 7d77bd6..8655b1b 100644 --- a/SGGL/BLL/CQMS/WBS/ProjectQualityService.cs +++ b/SGGL/BLL/CQMS/WBS/ProjectQualityService.cs @@ -76,7 +76,7 @@ namespace BLL } } - catch (Exception ex) + catch (Exception) { isok = false; } @@ -102,7 +102,7 @@ namespace BLL db.SubmitChanges(); } } - catch (Exception ex) + catch (Exception) { isok = false; } diff --git a/SGGL/BLL/Common/AttachFileService.cs b/SGGL/BLL/Common/AttachFileService.cs index 7ada4c2..ab86584 100644 --- a/SGGL/BLL/Common/AttachFileService.cs +++ b/SGGL/BLL/Common/AttachFileService.cs @@ -115,7 +115,7 @@ namespace BLL return res.Replace('\\', '/'); } } - catch (Exception e) + catch (Exception) { return ""; } @@ -140,7 +140,7 @@ namespace BLL return res.Replace('\\', '/'); } } - catch (Exception e) + catch (Exception) { return ""; } @@ -277,7 +277,6 @@ namespace BLL return true; } } - return false; } /// @@ -292,7 +291,6 @@ namespace BLL string res = ""; foreach (var item in urls) { - string size = "0"; int strInt = item.LastIndexOf("~"); if (strInt < 0) { @@ -317,7 +315,6 @@ namespace BLL /// public static string getAttachSource(string url, string fileDir) { - string res = ""; string attachSource = string.Empty; if (!string.IsNullOrEmpty(url)) { @@ -392,7 +389,7 @@ namespace BLL } return file; } - catch (Exception e) + catch (Exception) { return ""; diff --git a/SGGL/BLL/Common/CommonService.cs b/SGGL/BLL/Common/CommonService.cs index b25ef36..3c8b0d0 100644 --- a/SGGL/BLL/Common/CommonService.cs +++ b/SGGL/BLL/Common/CommonService.cs @@ -249,7 +249,7 @@ namespace BLL } } - catch (Exception e) { } + catch (Exception) { } return buttonList; } #endregion diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index d7a88e2..d007ae8 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -2597,7 +2597,15 @@ namespace BLL /// /// 安全技术交底 /// - public const string ProjectHSETechnicalMenuId = "49485F7E-8E71-4EED-87B4-BF6CC180C69C"; + public const string ProjectHSETechnicalMenuId = "49485F7E-8E71-4EED-87B4-BF6CC180C69C"; + /// + /// 安全防护验收 + /// + public const string SafetyAcceptanceMenuId = "7962CE8E-C17C-4C50-962D-85687E2A2FC9"; + /// + /// 安全巡检 + /// + public const string SafetyPatrolMenuId = "3EE924B8-DFB2-47DA-ADC1-FF8190E214F1"; /// /// 作业票申请 /// diff --git a/SGGL/BLL/Common/NPOIExcel.cs b/SGGL/BLL/Common/NPOIExcel.cs index 6286855..cc69145 100644 --- a/SGGL/BLL/Common/NPOIExcel.cs +++ b/SGGL/BLL/Common/NPOIExcel.cs @@ -378,7 +378,6 @@ namespace BLL.Common // 第三步：创建画部 IDrawing patriarch = ActiveSheet.CreateDrawingPatriarch(); // 第四步：设置锚点 - int rowline = 1; // y方向 // 参数说明：（在起始单元格的X坐标0-1023，Y的坐标0-255，在终止单元格的X坐标0-1023，Y的坐标0-255，起始单元格列数，行数，终止单元格列数，行数） IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, columnIndex, rowIndex, columnIndex+1, rowIndex + 1); // 第五步：把图片插到相应的位置+1 diff --git a/SGGL/BLL/Common/NPOIHelper.cs b/SGGL/BLL/Common/NPOIHelper.cs index 0e603b8..3c0ded2 100644 --- a/SGGL/BLL/Common/NPOIHelper.cs +++ b/SGGL/BLL/Common/NPOIHelper.cs @@ -159,7 +159,7 @@ namespace BLL.Common break; } } - catch (Exception ex) + catch (Exception) { } } diff --git a/SGGL/BLL/Common/UpLoadImageService.cs b/SGGL/BLL/Common/UpLoadImageService.cs index 3009f5a..9fbba70 100644 --- a/SGGL/BLL/Common/UpLoadImageService.cs +++ b/SGGL/BLL/Common/UpLoadImageService.cs @@ -118,7 +118,7 @@ namespace BLL } } } - catch (Exception ex) + catch (Exception) { //出错则删除  File.Delete(localRoot + sFilename); diff --git a/SGGL/BLL/Common/UploadAttachmentService.cs b/SGGL/BLL/Common/UploadAttachmentService.cs index 28057d0..e92698b 100644 --- a/SGGL/BLL/Common/UploadAttachmentService.cs +++ b/SGGL/BLL/Common/UploadAttachmentService.cs @@ -190,7 +190,7 @@ namespace BLL string fileName = subUrl[subUrl.Count() - 1]; string newFileName = fileName.Substring(fileName.IndexOf("~") + 1); - htmlStr += ""; + htmlStr += ""; } } @@ -458,7 +458,7 @@ namespace BLL string fileName = subUrl[subUrl.Count() - 1]; string newFileName = fileName.Substring(fileName.IndexOf("~") + 1); - htmlStr += ""; + htmlStr += ""; } } diff --git a/SGGL/BLL/Common/WordHelp.cs b/SGGL/BLL/Common/WordHelp.cs index dafde8e..829134d 100644 --- a/SGGL/BLL/Common/WordHelp.cs +++ b/SGGL/BLL/Common/WordHelp.cs @@ -440,7 +440,7 @@ namespace BLL sw.Write(html); sw.Close(); } - catch (Exception ex) + catch (Exception) { } diff --git a/SGGL/BLL/HJGL/MaterialManage/HJGL_EMaterialRegistService.cs b/SGGL/BLL/HJGL/MaterialManage/HJGL_EMaterialRegistService.cs index 52405a1..780599e 100644 --- a/SGGL/BLL/HJGL/MaterialManage/HJGL_EMaterialRegistService.cs +++ b/SGGL/BLL/HJGL/MaterialManage/HJGL_EMaterialRegistService.cs @@ -4,10 +4,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Collections; namespace BLL diff --git a/SGGL/BLL/HJGL/WeldingManage/PMI_MaterialTemplateService.cs b/SGGL/BLL/HJGL/WeldingManage/PMI_MaterialTemplateService.cs index 5b81929..59a00f0 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PMI_MaterialTemplateService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PMI_MaterialTemplateService.cs @@ -140,7 +140,7 @@ namespace BLL { db.SubmitChanges(System.Data.Linq.ConflictMode.ContinueOnConflict); } - catch (System.Data.Linq.ChangeConflictException ex) + catch (System.Data.Linq.ChangeConflictException) { foreach (System.Data.Linq.ObjectChangeConflict occ in db.ChangeConflicts) { diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs index bf5bbb0..dbc03f2 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs @@ -127,7 +127,7 @@ namespace BLL { db.SubmitChanges(System.Data.Linq.ConflictMode.ContinueOnConflict); } - catch (System.Data.Linq.ChangeConflictException ex) + catch (System.Data.Linq.ChangeConflictException) { foreach (System.Data.Linq.ObjectChangeConflict occ in db.ChangeConflicts) { diff --git a/SGGL/BLL/HSSE/Hazard/HazardProjectService.cs b/SGGL/BLL/HSSE/Hazard/HazardProjectService.cs new file mode 100644 index 0000000..0c0bb52 --- /dev/null +++ b/SGGL/BLL/HSSE/Hazard/HazardProjectService.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 危大、超危工程清单服务 + /// + public static class HazardProjectService + { + /// + /// 获取危大、超危工程清单列表 + /// + /// + public static List GetList(string projectId) + { + return Funs.DB.HSSE_HazardProject.Where(x => x.ProjectId == projectId).ToList(); + } + + /// + /// 根据主键获取危大、超危工程 + /// + /// 主键 + /// + public static Model.HSSE_HazardProject GetById(string hazardProjectId) + { + return Funs.DB.HSSE_HazardProject.FirstOrDefault(x => x.HazardProjectId == hazardProjectId); + } + + /// + /// 新增危大、超危工程 + /// + /// 实体 + public static void Add(Model.HSSE_HazardProject item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_HazardProject newItem = new Model.HSSE_HazardProject + { + HazardProjectId = item.HazardProjectId, + ProjectId = item.ProjectId, + ProjectCode = item.ProjectCode, + ProjectName = item.ProjectName, + WorkContent = item.WorkContent, + RiskLevel = item.RiskLevel, + StartDate = item.StartDate, + EndDate = item.EndDate, + ManagerMan = item.ManagerMan, + Remark = item.Remark + }; + db.HSSE_HazardProject.InsertOnSubmit(newItem); + db.SubmitChanges(); + } + + /// + /// 更新危大、超危工程 + /// + /// 实体 + public static void Update(Model.HSSE_HazardProject item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_HazardProject newItem = db.HSSE_HazardProject.FirstOrDefault(x => x.HazardProjectId == item.HazardProjectId); + if (newItem != null) + { + newItem.ProjectCode = item.ProjectCode; + newItem.ProjectName = item.ProjectName; + newItem.WorkContent = item.WorkContent; + newItem.RiskLevel = item.RiskLevel; + newItem.StartDate = item.StartDate; + newItem.EndDate = item.EndDate; + newItem.ManagerMan = item.ManagerMan; + newItem.Remark = item.Remark; + db.SubmitChanges(); + } + else + { + Add(item); + } + } + + /// + /// 删除危大、超危工程 + /// + /// 主键 + public static void Delete(string hazardProjectId) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_HazardProject item = db.HSSE_HazardProject.FirstOrDefault(x => x.HazardProjectId == hazardProjectId); + if (item != null) + { + db.HSSE_HazardProject.DeleteOnSubmit(item); + db.SubmitChanges(); + } + } + + /// + /// 自动生成工程编号（HD-XXX，取现有最大序号加1） + /// + /// + public static string GetNewCode() + { + int max = 0; + foreach (Model.HSSE_HazardProject item in Funs.DB.HSSE_HazardProject.ToList()) + { + string code = item.ProjectCode; + if (!string.IsNullOrEmpty(code) && code.StartsWith("HD-")) + { + int num = 0; + if (int.TryParse(code.Substring(3), out num) && num > max) + { + max = num; + } + } + } + return string.Format("HD-{0:D3}", max + 1); + } + } +} diff --git a/SGGL/BLL/HSSE/Hazard/RiskControlListService.cs b/SGGL/BLL/HSSE/Hazard/RiskControlListService.cs new file mode 100644 index 0000000..c935ef4 --- /dev/null +++ b/SGGL/BLL/HSSE/Hazard/RiskControlListService.cs @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 风险分级管控清单服务 + /// + public static class RiskControlListService + { + /// + /// 获取风险分级管控清单列表 + /// + /// 项目主键 + /// + public static List GetList(string projectId) + { + return Funs.DB.HSSE_RiskControlList.Where(x => x.ProjectId == projectId).ToList(); + } + + /// + /// 根据主键获取风险分级管控清单 + /// + /// 主键 + /// + public static Model.HSSE_RiskControlList GetById(string riskId) + { + return Funs.DB.HSSE_RiskControlList.FirstOrDefault(x => x.RiskId == riskId); + } + + /// + /// 新增风险分级管控清单 + /// + /// 实体 + public static void Add(Model.HSSE_RiskControlList item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_RiskControlList newItem = new Model.HSSE_RiskControlList + { + RiskId = item.RiskId, + ProjectId = item.ProjectId, + RiskName = item.RiskName, + RiskLevel = item.RiskLevel, + RiskType = item.RiskType, + ControlMeasure = item.ControlMeasure, + ManagerUnit = item.ManagerUnit, + ManagerMan = item.ManagerMan, + UploadFile = item.UploadFile, + Remark = item.Remark + }; + db.HSSE_RiskControlList.InsertOnSubmit(newItem); + db.SubmitChanges(); + } + + /// + /// 更新风险分级管控清单 + /// + /// 实体 + public static void Update(Model.HSSE_RiskControlList item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_RiskControlList newItem = db.HSSE_RiskControlList.FirstOrDefault(x => x.RiskId == item.RiskId); + if (newItem != null) + { + newItem.RiskName = item.RiskName; + newItem.RiskLevel = item.RiskLevel; + newItem.RiskType = item.RiskType; + newItem.ControlMeasure = item.ControlMeasure; + newItem.ManagerUnit = item.ManagerUnit; + newItem.ManagerMan = item.ManagerMan; + newItem.UploadFile = item.UploadFile; + newItem.Remark = item.Remark; + db.SubmitChanges(); + } + else + { + Add(item); + } + } + + /// + /// 删除风险分级管控清单 + /// + /// 主键 + public static void Delete(string riskId) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_RiskControlList item = db.HSSE_RiskControlList.FirstOrDefault(x => x.RiskId == riskId); + if (item != null) + { + db.HSSE_RiskControlList.DeleteOnSubmit(item); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/HSSE/Hazard/SafetyAcceptanceService.cs b/SGGL/BLL/HSSE/Hazard/SafetyAcceptanceService.cs new file mode 100644 index 0000000..bac40e0 --- /dev/null +++ b/SGGL/BLL/HSSE/Hazard/SafetyAcceptanceService.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 安全防护验收服务 + /// + public static class SafetyAcceptanceService + { + /// + /// 获取安全防护验收列表 + /// + /// 项目主键 + /// + public static List GetList(string projectId) + { + return Funs.DB.HSSE_SafetyAcceptance.Where(x => x.ProjectId == projectId).ToList(); + } + + /// + /// 根据主键获取安全防护验收 + /// + /// 主键 + /// + public static Model.HSSE_SafetyAcceptance GetById(string acceptanceId) + { + return Funs.DB.HSSE_SafetyAcceptance.FirstOrDefault(x => x.AcceptanceId == acceptanceId); + } + + /// + /// 新增安全防护验收 + /// + /// 实体 + public static void Add(Model.HSSE_SafetyAcceptance item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_SafetyAcceptance newItem = new Model.HSSE_SafetyAcceptance + { + AcceptanceId = item.AcceptanceId, + ProjectId = item.ProjectId, + HazardProjectId = item.HazardProjectId, + HazardProjectName = item.HazardProjectName, + AcceptanceResult = item.AcceptanceResult, + AcceptanceMan = item.AcceptanceMan, + AcceptanceDate = item.AcceptanceDate, + Remark = item.Remark + }; + db.HSSE_SafetyAcceptance.InsertOnSubmit(newItem); + db.SubmitChanges(); + } + + /// + /// 更新安全防护验收 + /// + /// 实体 + public static void Update(Model.HSSE_SafetyAcceptance item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_SafetyAcceptance newItem = db.HSSE_SafetyAcceptance.FirstOrDefault(x => x.AcceptanceId == item.AcceptanceId); + if (newItem != null) + { + newItem.HazardProjectId = item.HazardProjectId; + newItem.HazardProjectName = item.HazardProjectName; + newItem.AcceptanceResult = item.AcceptanceResult; + newItem.AcceptanceMan = item.AcceptanceMan; + newItem.AcceptanceDate = item.AcceptanceDate; + newItem.Remark = item.Remark; + db.SubmitChanges(); + } + else + { + Add(item); + } + } + + /// + /// 删除安全防护验收 + /// + /// 主键 + public static void Delete(string acceptanceId) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_SafetyAcceptance item = db.HSSE_SafetyAcceptance.FirstOrDefault(x => x.AcceptanceId == acceptanceId); + if (item != null) + { + db.HSSE_SafetyAcceptance.DeleteOnSubmit(item); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/HSSE/Hazard/SafetyPatrolService.cs b/SGGL/BLL/HSSE/Hazard/SafetyPatrolService.cs new file mode 100644 index 0000000..7a10a64 --- /dev/null +++ b/SGGL/BLL/HSSE/Hazard/SafetyPatrolService.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 安全巡检记录服务 + /// + public static class SafetyPatrolService + { + /// + /// 获取安全巡检记录列表 + /// + /// 项目主键 + /// + public static List GetList(string projectId) + { + return Funs.DB.HSSE_SafetyPatrol.Where(x => x.ProjectId == projectId).ToList(); + } + + /// + /// 根据主键获取安全巡检记录 + /// + /// 主键 + /// + public static Model.HSSE_SafetyPatrol GetById(string patrolId) + { + return Funs.DB.HSSE_SafetyPatrol.FirstOrDefault(x => x.PatrolId == patrolId); + } + + /// + /// 新增安全巡检记录 + /// + /// 实体 + public static void Add(Model.HSSE_SafetyPatrol item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_SafetyPatrol newItem = new Model.HSSE_SafetyPatrol + { + PatrolId = item.PatrolId, + ProjectId = item.ProjectId, + HazardProjectId = item.HazardProjectId, + HazardProjectName = item.HazardProjectName, + PatrolDate = item.PatrolDate, + PatrolMan = item.PatrolMan, + PatrolStatus = item.PatrolStatus, + Content = item.Content + }; + db.HSSE_SafetyPatrol.InsertOnSubmit(newItem); + db.SubmitChanges(); + } + + /// + /// 更新安全巡检记录 + /// + /// 实体 + public static void Update(Model.HSSE_SafetyPatrol item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_SafetyPatrol newItem = db.HSSE_SafetyPatrol.FirstOrDefault(x => x.PatrolId == item.PatrolId); + if (newItem != null) + { + newItem.HazardProjectId = item.HazardProjectId; + newItem.HazardProjectName = item.HazardProjectName; + newItem.PatrolDate = item.PatrolDate; + newItem.PatrolMan = item.PatrolMan; + newItem.PatrolStatus = item.PatrolStatus; + newItem.Content = item.Content; + db.SubmitChanges(); + } + else + { + Add(item); + } + } + + /// + /// 删除安全巡检记录 + /// + /// 主键 + public static void Delete(string patrolId) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_SafetyPatrol item = db.HSSE_SafetyPatrol.FirstOrDefault(x => x.PatrolId == patrolId); + if (item != null) + { + db.HSSE_SafetyPatrol.DeleteOnSubmit(item); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/HSSE/Hazard/SpecialPlanService.cs b/SGGL/BLL/HSSE/Hazard/SpecialPlanService.cs new file mode 100644 index 0000000..1907f81 --- /dev/null +++ b/SGGL/BLL/HSSE/Hazard/SpecialPlanService.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 专项施工方案服务 + /// + public static class SpecialPlanService + { + /// + /// 获取专项施工方案列表 + /// + /// + public static List GetList(string projectId) + { + return Funs.DB.HSSE_SpecialPlan.Where(x => x.ProjectId == projectId).ToList(); + } + + /// + /// 根据主键获取专项施工方案 + /// + /// 主键 + /// + public static Model.HSSE_SpecialPlan GetById(string planId) + { + return Funs.DB.HSSE_SpecialPlan.FirstOrDefault(x => x.PlanId == planId); + } + + /// + /// 新增专项施工方案 + /// + /// 实体 + public static void Add(Model.HSSE_SpecialPlan item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_SpecialPlan newItem = new Model.HSSE_SpecialPlan + { + PlanId = item.PlanId, + ProjectId = item.ProjectId, + HazardProjectName = item.HazardProjectName, + PlanName = item.PlanName, + CompileMan = item.CompileMan, + CompileDate = item.CompileDate, + UploadFile = item.UploadFile, + Remark = item.Remark + }; + db.HSSE_SpecialPlan.InsertOnSubmit(newItem); + db.SubmitChanges(); + } + + /// + /// 更新专项施工方案 + /// + /// 实体 + public static void Update(Model.HSSE_SpecialPlan item) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_SpecialPlan newItem = db.HSSE_SpecialPlan.FirstOrDefault(x => x.PlanId == item.PlanId); + if (newItem != null) + { + newItem.HazardProjectName = item.HazardProjectName; + newItem.PlanName = item.PlanName; + newItem.CompileMan = item.CompileMan; + newItem.CompileDate = item.CompileDate; + newItem.UploadFile = item.UploadFile; + newItem.Remark = item.Remark; + db.SubmitChanges(); + } + else + { + Add(item); + } + } + + /// + /// 删除专项施工方案 + /// + /// 主键 + public static void Delete(string planId) + { + Model.SGGLDB db = Funs.DB; + Model.HSSE_SpecialPlan item = db.HSSE_SpecialPlan.FirstOrDefault(x => x.PlanId == planId); + if (item != null) + { + db.HSSE_SpecialPlan.DeleteOnSubmit(item); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionApproveService.cs b/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionApproveService.cs index 8d1d235..7cb17a3 100644 --- a/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionApproveService.cs +++ b/SGGL/BLL/HSSE/Solution/HSSEConstructSolutionApproveService.cs @@ -10,7 +10,7 @@ namespace BLL { public static string ConvertAuditDate(object ConstructSolutionId) { - var approve= (from x in Funs.DB.Solution_HSSEConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate !=null select x.ApproveDate ).FirstOrDefault(); + var approve= (from x in Funs.DB.Solution_HSSEConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate !=null select x.ApproveDate ).FirstOrDefault(); if (approve != null) { return approve.Value.ToString("yyyy-MM-dd"); @@ -20,14 +20,14 @@ namespace BLL public static Model.Solution_HSSEConstructSolutionApprove GetSee(string ConstructSolutionId, string userId) { Model.SGGLDB db = Funs.DB; - return db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); + return db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string ConstructSolutionId, string userId) { using (var db = new Model.SGGLDB(Funs.ConnString)) { - var res = db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); + var res = db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); if (res != null) { res.ApproveDate = DateTime.Now; @@ -43,7 +43,7 @@ namespace BLL public static List GetUserIdsApprovesBySignType(string ConstructSolutionId, string signType) { var edtion = GetUserIdsApprovesBySignTypeEditon(ConstructSolutionId); - return (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList(); + return (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList(); } public static int? GetUserIdsApprovesBySignTypeEditon(string ConstructSolutionId) @@ -100,14 +100,14 @@ namespace BLL public static List GetConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId, string state) { Model.SGGLDB db = Funs.DB; - var reDate = (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); + var reDate = (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault(); if (reDate == null) { - return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state select x).ToList(); + return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state select x).ToList(); } else { - return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList(); + return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList(); } } @@ -121,7 +121,7 @@ namespace BLL { Model.SGGLDB db = Funs.DB; var res = from x in db.Solution_HSSEConstructSolutionApprove - where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" + where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate select x; @@ -143,7 +143,7 @@ namespace BLL { Model.SGGLDB db = Funs.DB; var res = from x in db.Solution_HSSEConstructSolutionApprove - where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" + where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveType,x.Edition select x; @@ -223,7 +223,7 @@ namespace BLL public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId) { Model.SGGLDB db = Funs.DB; - var q = (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList(); + var q = (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId select x).ToList(); db.Solution_HSSEConstructSolutionApprove.DeleteAllOnSubmit(q); db.SubmitChanges(); } @@ -235,17 +235,17 @@ namespace BLL public static Model.Solution_HSSEConstructSolutionApprove GetConstructSolutionApproveByApproveMan(string ConstructSolutionId, string approveMan) { - return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); + return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); } public static Model.Solution_HSSEConstructSolutionApprove GetConstructSoluAppByApproveMan(string ConstructSolutionId, string approveMan, int edtion) { - return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); + return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); } public static Model.Solution_HSSEConstructSolutionApprove GetConstructSolApproveByApproveMan(string ConstructSolutionId, string approveMan) { - return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); + return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null); } @@ -312,7 +312,7 @@ namespace BLL using (var db = new Model.SGGLDB(Funs.ConnString)) { var q = from x in db.Solution_HSSEConstructSolutionApprove - where x.ConstructSolutionId == ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S" + where x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate select new { @@ -350,7 +350,7 @@ namespace BLL using (var db = new Model.SGGLDB(Funs.ConnString)) { var q = from x in db.Solution_HSSEConstructSolutionApprove - where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" + where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate select new { diff --git a/SGGL/BLL/OpenService/GetDataService.cs b/SGGL/BLL/OpenService/GetDataService.cs index cc0cf41..30298a3 100644 --- a/SGGL/BLL/OpenService/GetDataService.cs +++ b/SGGL/BLL/OpenService/GetDataService.cs @@ -323,7 +323,7 @@ namespace BLL } } } - catch (Exception ex) + catch (Exception) { } } @@ -706,7 +706,7 @@ namespace BLL try { Thread.Sleep(sleepTime); - }catch(Exception ex) { } + }catch(Exception) { } //古雷 环境数据 returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=pcbpa2024&password=pcbpa2024", "GET", "application/json;charset=utf-8"); @@ -798,7 +798,7 @@ namespace BLL { Thread.Sleep(sleepTime); } - catch (Exception ex) { } + catch (Exception) { } //古雷焚烧 环境数据 returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=gufs2024&password=gufs2024", "GET", "application/json;charset=utf-8"); if (!string.IsNullOrEmpty(returndata)) @@ -890,7 +890,7 @@ namespace BLL { Thread.Sleep(sleepTime); } - catch (Exception ex) { } + catch (Exception) { } //天津南港LNG冷能利用 环境数据 returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=tjng2024&password=tjng2024", "GET", "application/json;charset=utf-8"); @@ -982,7 +982,7 @@ namespace BLL { Thread.Sleep(sleepTime); } - catch (Exception ex) { } + catch (Exception) { } //中煤气化、新增输煤栈桥项目 环境数据 returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=yltcqh2024&password=yltcqh2024", "GET", "application/json;charset=utf-8"); @@ -1074,7 +1074,7 @@ namespace BLL { Thread.Sleep(sleepTime); } - catch (Exception ex) { } + catch (Exception) { } //中煤全场系统工程 环境数据 returndata = APIGetHttpService.OutsideHttp("http://dust.0531yun.cn/api/getTokenByAcc?loginName=yltcxt2024&password=yltcxt2024", "GET", "application/json;charset=utf-8"); @@ -1167,7 +1167,7 @@ namespace BLL { Thread.Sleep(sleepTime); } - catch (Exception ex) { } + catch (Exception) { } //中沙古雷厂前区 环境数据 diff --git a/SGGL/BLL/OpenService/MonitorService.cs b/SGGL/BLL/OpenService/MonitorService.cs index 9e94007..ede7609 100644 --- a/SGGL/BLL/OpenService/MonitorService.cs +++ b/SGGL/BLL/OpenService/MonitorService.cs @@ -162,7 +162,7 @@ namespace BLL } } - catch (Exception ex) + catch (Exception) { ErrLogInfo.WriteLog("出入同步出错!"); } @@ -198,7 +198,7 @@ namespace BLL { GetDataService.SyncEnvironment(); } - catch (Exception ex) + catch (Exception) { ErrLogInfo.WriteLog("环境同步出错!"); } @@ -254,7 +254,7 @@ namespace BLL try { DoSynchData(); - }catch(Exception ex) + }catch(Exception) { } @@ -342,7 +342,7 @@ namespace BLL weather.WeaNight = j2.wea_night; list.Add(weather); } - catch (Exception ex) + catch (Exception) { } @@ -351,7 +351,7 @@ namespace BLL db.SubmitChanges(); } } - catch (Exception ex) { + catch (Exception) { } } #endregion diff --git a/SGGL/BLL/ProjectData/TeamGroupService.cs b/SGGL/BLL/ProjectData/TeamGroupService.cs index 6c9c52b..9c370e3 100644 --- a/SGGL/BLL/ProjectData/TeamGroupService.cs +++ b/SGGL/BLL/ProjectData/TeamGroupService.cs @@ -93,7 +93,7 @@ namespace BLL db.SubmitChanges(); } } - }catch(System.Exception ex) + }catch(System.Exception) { } diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index 936086d..f07acb5 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -295,7 +295,7 @@ namespace BLL db.SubmitChanges(); } } - catch (Exception e) + catch (Exception) { } } diff --git a/SGGL/BLL/ZHGL/DataSync/MainSevice.cs b/SGGL/BLL/ZHGL/DataSync/MainSevice.cs index f5522c5..565f4fe 100644 --- a/SGGL/BLL/ZHGL/DataSync/MainSevice.cs +++ b/SGGL/BLL/ZHGL/DataSync/MainSevice.cs @@ -319,7 +319,7 @@ public class MainSevice _hsseData = table; return _hsseData; } - catch (Exception ex) + catch (Exception) { throw; diff --git a/SGGL/BLL/ZHGL/DataSync/ServerService.cs b/SGGL/BLL/ZHGL/DataSync/ServerService.cs index eee78ad..ef92730 100644 --- a/SGGL/BLL/ZHGL/DataSync/ServerService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ServerService.cs @@ -53,7 +53,7 @@ namespace BLL } } - catch (Exception e) + catch (Exception) { } @@ -95,7 +95,7 @@ namespace BLL responeData.message = returnData.message; return responeData; } - catch (Exception ex) + catch (Exception) { throw; diff --git a/SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs b/SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs index 4d0a5bb..709402f 100644 --- a/SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs +++ b/SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs @@ -173,7 +173,7 @@ namespace BLL } } } - catch (Exception ex) + catch (Exception) { if (BLL.Funs.DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId)) { diff --git a/SGGL/CLAUDE.md b/SGGL/CLAUDE.md new file mode 100644 index 0000000..70136ba --- /dev/null +++ b/SGGL/CLAUDE.md @@ -0,0 +1,40 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +智慧施工管理信息系统（河北安装）：WebForms + ASP.NET Web API，.NET Framework 4.8，SQL Server，LINQ to SQL。解决方案 `SGGL.sln` 在本目录；仓库根是上一级 `SGGL_HBAZ/`，其中的 `AGENTS.md` 记录了更多运维细节，与本文件会同时被加载。 + +## Commands + +构建（`msbuild` 不在 PATH，用 VS2022 的 MSBuild）： +``` +& 'D:\Development Kit\MVStudio\2022\MSBuild\Current\Bin\MSBuild.exe' 'SGGL.sln' /p:Configuration=Debug +``` +`/p:Configuration=Release` 同理。 + +- 打发布包：仓库根 `ReleasePackerALL2022.bat`（aspnet_compiler 预编译 + aspnet_merge 合并 → `SGGLPackFile/`）。 +- 重新生成实体：仓库根 `CreateModel.bat`（SqlMetal 从 SQL2022 实例 / `SGGLDB_HBAZ` 库生成 `Model/Model.cs`）。 +- 无测试项目，无测试命令。 + +## Architecture + +- `FineUIPro.Web/` — WebForms 主站。入口 `Login.aspx`、`index*.aspx`；基类 `common/PageBase.cs`（`Session["CurrUser"]` 鉴权）。业务模块按文件夹组织：BaseInfo、CQMS、HSSE、HJGL、JDGL、PZHGL、SHIYE、SYHSE、SysManage、TaskScheduling、ZHGL、DigData、Door、Notice、OfficeCheck、Person、PersonManage、ProjectData、SubPackManage、Video 等。 +- `BLL/` — 业务逻辑层，业务类为 `public static class XxxService`。核心：`Common/Funs.cs`（全局配置 + LINQ-to-SQL 上下文 `Funs.DB`，类型 `Model.SGGLDB`，按线程 `ManagedThreadId` 缓存实例）；`SQLHelper.cs`（原始 ADO.NET）；`API/` 外部接口；`TaskScheduling/` Quartz 定时任务；`ErrLogInfo.cs`（错误落库）。 +- `Model/` — LINQ to SQL 实体。`Model.cs` 由 SqlMetal 生成（约 14MB，勿手改）；实体前缀 `Sys_`（`Sys_User`、`Sys_Role`、`Sys_ErrLogInfo`）。 +- `WebAPI/` — 经典 ASP.NET Web API（`System.Web.Http`），`Controllers/` 供移动端/第三方调用（材料、人员、人脸、身份证、视频、车辆、用户等）。 +- `SgManager.AI/` — AI 辅助库：百度 OCR/人脸（`IDCardRecognition`、`FaceClass`）、地图、邮件；被 BLL 与 FineUIPro.Web 引用。 +- `FineUIPro/` — 商业 UI 框架 FineUIPro v6.3.0 的 DLL（非源码，勿改）。 + +## Conventions + +- 中文注释；公共方法用 `/// ` XML 注释。 +- 数据访问优先 `Funs.DB`（LINQ to SQL，`InsertOnSubmit`/`SubmitChanges`），复杂 SQL 用 `SQLHelper`。 +- 错误记录走 `ErrLogInfo.WriteLog(...)`；`Global.asax` 的 `Application_Error` 落库 `Sys_ErrLogInfo`。 +- 连接字符串与第三方密钥（含明文密码/API Key）在 `FineUIPro.Web/Web.config` 的 AppSettings 中，`Application_Start` 赋值给 `Funs.*` —— 勿把凭据写进提交内容。 +- WebAPI 响应统一包装 `Model.ResponeData`，action 常用 `[HttpPost]` + `[FromBody]`。 +- `Backup*` 是开发备份目录，不要在其中改代码；`packages/` 被 gitignore（NuGet 还原）。 + +## 本地运行 / 联调注意 + +- WebForms 站点：`iisexpress.exe /path:"SGGL\FineUIPro.Web" /port:4528`；WebAPI：`/path:"SGGL\WebAPI" /port:7143`（数据库 `SGGLDB_HBAZ` 在本机 SQL Server）。 +- PowerShell 下用 `curl.exe -d '{"..."}'` 会把 JSON 双引号剥掉导致反序列化失败，须改用 `--data-binary '@body.json'` 文件方式发 JSON body。 diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs index 4797117..4bbfa1f 100644 --- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs +++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs @@ -150,7 +150,15 @@ namespace FineUIPro.Web.AttachFile { Grid1.DataSource = GetSourceData(); } - Grid1.DataBind(); + try + { + + Grid1.DataBind(); + } + catch (Exception ex) + { + + } } #endregion @@ -483,44 +491,61 @@ namespace FineUIPro.Web.AttachFile /// private JArray GetSourceData() { - if (Session[sessionName] == null && !string.IsNullOrEmpty(ToKeyId)) + try { - Session[sessionName] = new JArray(); - Model.AttachFile sour = new Model.AttachFile(); - if (this.MenuId == Const.ProjectPunishNoticeMenuId || this.MenuId == Const.ProjectPunishNoticeStatisticsMenuId) + if (Session[sessionName] == null && !string.IsNullOrEmpty(ToKeyId)) { - sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == ToKeyId && x.MenuId == this.MenuId); - } - else - { - sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == ToKeyId); - } - - if (sour != null) - { - string url = sour.AttachUrl.Replace('\\', '/'); - List list = Funs.GetStrListByStr(url, ','); - if (list.Count() > 0) + Session[sessionName] = new JArray(); + Model.AttachFile sour = new Model.AttachFile(); + if (this.MenuId == Const.ProjectPunishNoticeMenuId || this.MenuId == Const.ProjectPunishNoticeStatisticsMenuId) { - int i = 0; - foreach (var item in list) + sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == ToKeyId && x.MenuId == this.MenuId); + } + else + { + sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == ToKeyId); + } + + if (sour != null && !string.IsNullOrEmpty(sour.AttachUrl)) + { + string url = sour.AttachUrl.Replace('\\', '/'); + List list = Funs.GetStrListByStr(url, ','); + if (list.Count() > 0) { - string atturl = Funs.RootPath + item.Replace(';', ' ').Trim(); - if (File.Exists(atturl)) + int i = 0; + foreach (var item in list) { - i += 1; - break; + string relative = item.Replace(';', ' ').Trim(); + string atturl = Funs.RootPath + relative; + if (!File.Exists(atturl)) + { + string localRoot = System.Configuration.ConfigurationManager.AppSettings["localRoot"]; + if (!string.IsNullOrEmpty(localRoot)) + { + atturl = localRoot + relative; + } + } + if (File.Exists(atturl)) + { + i += 1; + break; + } + } + if (i > 0 && !string.IsNullOrEmpty(sour.AttachSource)) + { + Session[sessionName] = JArray.Parse(sour.AttachSource); } - } - if (i > 0) - { - Session[sessionName] = JArray.Parse(sour.AttachSource); } } } - } - return (JArray)Session[sessionName]; + return (JArray)Session[sessionName]; + } + catch (Exception ex) + { + ErrLogInfo.WriteLog("webuploader GetSourceData 异常!", ex); + throw; + } } /// diff --git a/SGGL/FineUIPro.Web/BaseInfo/BaseFactory.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/BaseFactory.aspx.cs index 2e48f26..e26a73d 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/BaseFactory.aspx.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/BaseFactory.aspx.cs @@ -213,7 +213,7 @@ namespace FineUIPro.Web.BaseInfo /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs index dc23c7b..05fffa8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckFineList.aspx.cs @@ -466,7 +466,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"]; if (bookmarkWorkArea != null) { - string option = ""; var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checkControl.UnitWorkId); if (unitWork != null) { @@ -724,7 +723,7 @@ namespace FineUIPro.Web.CQMS.Check if (bookmarkSendDate != null) { - if (checks.CheckDate.HasValue != null) + if (checks.CheckDate.HasValue) { bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日"); @@ -751,7 +750,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkWorkArea = doc.Range.Bookmarks["UnitWork"]; if (bookmarkWorkArea != null) { - string option = ""; var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId); if (unitWork != null) { @@ -761,7 +759,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkProblemType = doc.Range.Bookmarks["QuestionType"]; if (bookmarkProblemType != null) { - string option = ""; var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType); if (questionType != null) { @@ -792,7 +789,7 @@ namespace FineUIPro.Web.CQMS.Check if (bookmarkCheckDate != null) { - if (checks.CheckDate.HasValue != null) + if (checks.CheckDate.HasValue) { bookmarkCheckDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日"); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckFineListEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/CheckFineListEdit.aspx.cs index 066c4d0..40076b3 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckFineListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckFineListEdit.aspx.cs @@ -279,7 +279,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"]; if (bookmarkWorkArea != null) { - string option = ""; var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checkControl.UnitWorkId); if (unitWork != null) { diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs index 0444f0e..453e9d0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs @@ -244,7 +244,7 @@ namespace FineUIPro.Web.CQMS.Check /// /// /// - public static string GetGridTableHtml(Grid grid) + public new static string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); @@ -793,7 +793,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"]; if (bookmarkWorkArea != null) { - string option = ""; var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId); if (unitWork != null) { @@ -803,7 +802,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkProblemType = doc.Range.Bookmarks["ProblemType"]; if (bookmarkProblemType != null) { - string option = ""; var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType); if (questionType != null) { @@ -1066,7 +1064,7 @@ namespace FineUIPro.Web.CQMS.Check if (bookmarkSendDate != null) { - if (checks.CheckDate.HasValue != null) + if (checks.CheckDate.HasValue) { bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日"); @@ -1095,7 +1093,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkWorkArea = doc.Range.Bookmarks["UnitWork"]; if (bookmarkWorkArea != null) { - string option = ""; var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId); if (unitWork != null) { @@ -1105,7 +1102,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkProblemType = doc.Range.Bookmarks["QuestionType"]; if (bookmarkProblemType != null) { - string option = ""; var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType); if (questionType != null) { @@ -1136,7 +1132,7 @@ namespace FineUIPro.Web.CQMS.Check if (bookmarkCheckDate != null) { - if (checks.CheckDate.HasValue != null) + if (checks.CheckDate.HasValue) { bookmarkCheckDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日"); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs index b9ef5e0..c9558d2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckUnitStatistics.aspx.cs @@ -132,7 +132,7 @@ namespace FineUIPro.Web.CQMS.Check { /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckIn.aspx.cs index e839b64..8072edc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckIn.aspx.cs @@ -200,7 +200,7 @@ namespace FineUIPro.Web.CQMS.WBS specialDataIn.CheckTime = DateTime.Parse(pds.Rows[i][2].ToString().Trim()); } - catch (Exception e) + catch (Exception) { result += "第" + (i + 2).ToString() + "行," + "检查日期" + "," + "格式错误！" + "|"; } @@ -304,7 +304,7 @@ namespace FineUIPro.Web.CQMS.WBS specialDataIn.LimitedTime = DateTime.Parse(pds.Rows[i][15].ToString().Trim()); } - catch (Exception e) + catch (Exception) { result += "第" + (i + 2).ToString() + "行," + "现时日期" + "," + "格式错误！" + "|"; } diff --git a/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs index 3e86c55..4044b4a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs @@ -682,7 +682,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkWorkArea = doc.Range.Bookmarks["WorkArea"]; if (bookmarkWorkArea != null) { - string option = ""; var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId); if (unitWork != null) { @@ -692,7 +691,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkProblemType = doc.Range.Bookmarks["ProblemType"]; if (bookmarkProblemType != null) { - string option = ""; var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType); if (questionType != null) { @@ -955,7 +953,7 @@ namespace FineUIPro.Web.CQMS.Check if (bookmarkSendDate != null) { - if (checks.CheckDate.HasValue != null) + if (checks.CheckDate.HasValue) { bookmarkSendDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日"); @@ -984,7 +982,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkWorkArea = doc.Range.Bookmarks["UnitWork"]; if (bookmarkWorkArea != null) { - string option = ""; var unitWork = UnitWorkService.GetUnitWorkByUnitWorkId(checks.UnitWorkId); if (unitWork != null) { @@ -994,7 +991,6 @@ namespace FineUIPro.Web.CQMS.Check Bookmark bookmarkProblemType = doc.Range.Bookmarks["QuestionType"]; if (bookmarkProblemType != null) { - string option = ""; var questionType = QualityQuestionTypeService.GetQualityQuestionType(checks.QuestionType); if (questionType != null) { @@ -1025,7 +1021,7 @@ namespace FineUIPro.Web.CQMS.Check if (bookmarkCheckDate != null) { - if (checks.CheckDate.HasValue != null) + if (checks.CheckDate.HasValue) { bookmarkCheckDate.Text = checks.CheckDate.Value.ToString("yyyy年MM月dd日"); diff --git a/SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs index 4926f71..1c37944 100644 --- a/SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ConstructionLog/ConstructionLog.aspx.cs @@ -1604,7 +1604,7 @@ namespace FineUIPro.Web.CQMS.ConstructionLog picture.Resize(); } } - catch (Exception ex) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs index a4cd923..0697720 100644 --- a/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs @@ -268,7 +268,7 @@ namespace FineUIPro.Web.CQMS.Foreign /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/Foreign/ForeignWBSOut.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Foreign/ForeignWBSOut.aspx.cs index 27f2312..c6ce509 100644 --- a/SGGL/FineUIPro.Web/CQMS/Foreign/ForeignWBSOut.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Foreign/ForeignWBSOut.aspx.cs @@ -75,7 +75,7 @@ namespace FineUIPro.Web.CQMS.Foreign /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/Foreign/ITPList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Foreign/ITPList.aspx.cs index bbb0780..b4d828c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Foreign/ITPList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Foreign/ITPList.aspx.cs @@ -237,7 +237,7 @@ namespace FineUIPro.Web.CQMS.Foreign /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/Foreign/ITPListProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Foreign/ITPListProject.aspx.cs index 51192bb..430decc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Foreign/ITPListProject.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Foreign/ITPListProject.aspx.cs @@ -285,7 +285,7 @@ namespace FineUIPro.Web.CQMS.Foreign /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/Information/CostReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Information/CostReportEdit.aspx.cs index 57cb24e..87b2b2d 100644 --- a/SGGL/FineUIPro.Web/CQMS/Information/CostReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Information/CostReportEdit.aspx.cs @@ -214,7 +214,6 @@ namespace FineUIPro.Web.CQMS.Information private void OutputSummaryData() { decimal totalPlanCost = 0; - int i = 0; JArray mergedData = Grid1.GetMergedData(); if (mergedData.Count > 0) { diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs index f53ed95..3896cbc 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs @@ -412,7 +412,7 @@ namespace FineUIPro.Web.CQMS.ManageReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs index 99134d0..b29f83b 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/DesignChangeStatisc.aspx.cs @@ -214,7 +214,7 @@ namespace FineUIPro.Web.CQMS.ManageReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs index 3e201cf..c361ca9 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/HJGLStatisc.aspx.cs @@ -161,7 +161,7 @@ namespace FineUIPro.Web.CQMS.ManageReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs index a0154b5..c8c02bf 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs @@ -170,7 +170,7 @@ namespace FineUIPro.Web.CQMS.ManageReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs index da79317..043a5e1 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs @@ -187,7 +187,6 @@ namespace FineUIPro.Web.CQMS.ProcessControl } protected void btnSubmit_Click(object sender, EventArgs e) { - bool changeAudit = true; if (this.drpUnit.SelectedValue == BLL.Const._Null) { Alert.ShowInTop("请先选择施工分包商！", MessageBoxIcon.Warning); @@ -262,7 +261,6 @@ namespace FineUIPro.Web.CQMS.ProcessControl } if (oldInspectionManagement.AuditMan != inspectionManagement.AuditMan) { - changeAudit = true; inspectionManagement.Status = "2"; } diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs index b39b3cf..17bf24b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs @@ -748,7 +748,7 @@ namespace FineUIPro.Web.CQMS.Solution /// /// /// - public static string GetGridTableHtml(Grid grid) + public new static string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs index 31c22c7..bc41a20 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs @@ -1595,7 +1595,7 @@ namespace FineUIPro.Web.CQMS.Solution var ID = gvApprove.DataKeys[rowIndex][0]; - var approve = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(x => x.ConstructSolutionApproveId == ID).FirstOrDefault(); + var approve = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(x => x.ConstructSolutionApproveId == (string)ID).FirstOrDefault(); if (approve != null) { approve.ApproveDate = null; diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectQuality.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectQuality.aspx.cs index 3a2f1bb..9f374e1 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectQuality.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectQuality.aspx.cs @@ -14,10 +14,6 @@ namespace FineUIPro.Web.CQMS.WBS public partial class ProjectQuality : PageBase { #region 定义变量 - /// - /// 上传预设的虚拟路径 - /// - private string initPath = Const.ExcelUrl; #endregion protected void Page_Load(object sender, EventArgs e) diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs index 47ca9c5..18ca1f7 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WBSIn.aspx.cs @@ -117,7 +117,6 @@ namespace FineUIPro.Web.CQMS.WBS // 第二步：创建新数据行 NPOI.SS.UserModel.ISheet sheet = workbook.GetSheet("Sheet1"); NPOI.SS.UserModel.IRow row1 = sheet.CreateRow(1); - NPOI.SS.UserModel.ICell cell2; // 添加测试数据 //cell2 = row1.CreateCell(14); //cell2.CellStyle = cellStyle0; diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt deleted file mode 100644 index 4de38b8..0000000 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ /dev/null @@ -1,249 +0,0 @@ - -错误信息开始=====> -错误类型:FileLoadException -错误信息:未能加载文件或程序集“FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a”或它的某一个依赖项。找到的程序集清单定义与程序集引用不匹配。 (异常来自 HRESULT:0x80131040) -错误堆栈: - 在 System.Signature.GetSignature(Void* pCorSig, Int32 cCorSig, RuntimeFieldHandleInternal fieldHandle, IRuntimeMethodInfo methodHandle, RuntimeType declaringType) - 在 System.Signature..ctor(IRuntimeFieldInfo fieldHandle, RuntimeType declaringType) - 在 System.Reflection.RtFieldInfo.get_FieldType() - 在 System.Web.UI.Util.GetNonPrivateFieldType(Type classType, String fieldName) - 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder) - 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) - 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) - 在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse) - 在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers() - 在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers() - 在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree() - 在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath) - 在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder) - 在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider) -出错时间:05/12/2026 17:51:15 -出错文件:http://localhost:4528/indexProject.aspx -IP地址:::1 - -出错时间:05/12/2026 17:51:16 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 17:52:59 -出错文件:http://localhost:4528/indexProject.aspx -IP地址:::1 - -出错时间:05/12/2026 17:52:59 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 17:53:36 -出错文件:http://localhost:4528/indexProject.aspx -IP地址:::1 - -出错时间:05/12/2026 17:53:36 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 17:54:25 -出错文件:http://localhost:4528/indexProject.aspx -IP地址:::1 - -出错时间:05/12/2026 17:54:25 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 18:04:03 -出错文件:http://localhost:4528/indexProject.aspx?projectId=fe0f4acf-c173-4ee9-bed2-4fa05a700a96 -IP地址:::1 - -出错时间:05/12/2026 18:04:03 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 369 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 18:05:08 -出错文件:http://localhost:4528/indexProject.aspx -IP地址:::1 - -出错时间:05/12/2026 18:05:08 - - -错误信息开始=====> -错误类型:ChangeConflictException -错误信息:2 的 1 更新失败。 -错误堆栈: - 在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges() - 在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 18:07:59 -出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=aa38733a-68e3-4f81-be8b-36c4b2c17d0e -IP地址:::1 -操作人员:JT - -出错时间:05/12/2026 18:07:59 - - -错误信息开始=====> -错误类型:ChangeConflictException -错误信息:2 的 1 更新失败。 -错误堆栈: - 在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges() - 在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 18:08:14 -出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=aa38733a-68e3-4f81-be8b-36c4b2c17d0e -IP地址:::1 -操作人员:JT - -出错时间:05/12/2026 18:08:14 - - -错误信息开始=====> -错误类型:ChangeConflictException -错误信息:2 的 1 更新失败。 -错误堆栈: - 在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges() - 在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 18:09:02 -出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=aa38733a-68e3-4f81-be8b-36c4b2c17d0e -IP地址:::1 -操作人员:JT - -出错时间:05/12/2026 18:09:02 - - -错误信息开始=====> -错误类型:ChangeConflictException -错误信息:2 的 1 更新失败。 -错误堆栈: - 在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges() - 在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 18:10:33 -出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=3049dcc7-0557-48c5-a0c4-77967c50bc19 -IP地址:::1 -操作人员:JT - -出错时间:05/12/2026 18:10:33 - - -错误信息开始=====> -错误类型:ChangeConflictException -错误信息:2 的 1 更新失败。 -错误堆栈: - 在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges() - 在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 18:10:58 -出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=3049dcc7-0557-48c5-a0c4-77967c50bc19 -IP地址:::1 -操作人员:JT - -出错时间:05/12/2026 18:10:58 - - -错误信息开始=====> -错误类型:ChangeConflictException -错误信息:2 的 1 更新失败。 -错误堆栈: - 在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges() - 在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\BLL\ProjectData\ProjectService.cs:行号 177 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 287 - 在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 195 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:05/12/2026 18:13:39 -出错文件:http://localhost:4528/ProjectData/ProjectSetSave.aspx?ProjectId=3049dcc7-0557-48c5-a0c4-77967c50bc19 -IP地址:::1 -操作人员:JT - -出错时间:05/12/2026 18:13:39 - diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 65ac010..bd6e303 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1969,6 +1969,19 @@ + + + + + + + + + + + + + @@ -2216,6 +2229,8 @@ + + @@ -13398,6 +13413,97 @@ OwnerFinalFileView.aspx + + HazardProject.aspx + ASPXCodeBehind + + + HazardProject.aspx + + + HazardProjectEdit.aspx + ASPXCodeBehind + + + HazardProjectEdit.aspx + + + HazardProjectDataIn.aspx + ASPXCodeBehind + + + HazardProjectDataIn.aspx + + + RiskControlList.aspx + ASPXCodeBehind + + + RiskControlList.aspx + + + RiskControlListEdit.aspx + ASPXCodeBehind + + + RiskControlListEdit.aspx + + + SafetyAcceptance.aspx + ASPXCodeBehind + + + SafetyAcceptance.aspx + + + SafetyAcceptanceEdit.aspx + ASPXCodeBehind + + + SafetyAcceptanceEdit.aspx + + + SafetyDisclosure.aspx + ASPXCodeBehind + + + SafetyDisclosure.aspx + + + SafetyDisclosureEdit.aspx + ASPXCodeBehind + + + SafetyDisclosureEdit.aspx + + + SafetyPatrol.aspx + ASPXCodeBehind + + + SafetyPatrol.aspx + + + SafetyPatrolEdit.aspx + ASPXCodeBehind + + + SafetyPatrolEdit.aspx + + + SpecialPlan.aspx + ASPXCodeBehind + + + SpecialPlan.aspx + + + SpecialPlanEdit.aspx + ASPXCodeBehind + + + SpecialPlanEdit.aspx + ConstructionRisk.aspx ASPXCodeBehind @@ -15127,6 +15233,19 @@ PersonPerfomanceView.aspx + + PowerBox.aspx + + + PowerBox.aspx + + + PowerBoxEdit.aspx + ASPXCodeBehind + + + PowerBoxEdit.aspx + EquipmentPersonQuality.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs index afc36bf..d6a5ce8 100644 --- a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; diff --git a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.cs index 318ee66..398c61c 100644 --- a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageAudit.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; diff --git a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageImport.aspx.cs index bd9e82d..9ef9bc2 100644 --- a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageImport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageImport.aspx.cs @@ -397,7 +397,6 @@ namespace FineUIPro.Web.HJGL.CheckManage var dataInTemp = from x in Funs.DB.HJGL_CheckImportTemp where x.ProjectId == LoginProjectId && x.UserId == UserId select x; - int okCount = 0; int ir = dataInTemp.Count(); string erreMessage = ""; @@ -846,7 +845,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { checkitem.CHT_TotalFilm = int.Parse(allCheck.Value14); } - catch (Exception e) { } + catch (Exception) { } } if (!string.IsNullOrEmpty(allCheck.Value15)) { @@ -854,7 +853,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { checkitem.CHT_PassFilm = int.Parse(allCheck.Value15); } - catch (Exception e) { } + catch (Exception) { } } checkitem.CHT_CheckResult = allCheck.Value16; //checkitem.CHT_CheckNo = allCheck.Value8; @@ -873,7 +872,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { checkitem.DefectLength = decimal.Parse(allCheck.Value19); } - catch (Exception e) { } + catch (Exception) { } } if (!string.IsNullOrEmpty(joint.Extend_Length)) { @@ -921,7 +920,7 @@ namespace FineUIPro.Web.HJGL.CheckManage this.BindGrid(); } - catch (Exception e) + catch (Exception) { ErrLogInfo.WriteLog("新增检测记录错误"); } @@ -949,7 +948,6 @@ namespace FineUIPro.Web.HJGL.CheckManage var dataInTemp = from x in Funs.DB.HJGL_CheckImportTemp where x.ProjectId == LoginProjectId && x.UserId == UserId select x; - int okCount = 0; int ir = dataInTemp.Count(); string erreMessage = ""; @@ -1232,7 +1230,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { checkitem.CHT_TotalFilm = int.Parse(allCheck.Value14); } - catch (Exception e) { } + catch (Exception) { } } if (!string.IsNullOrEmpty(allCheck.Value15)) { @@ -1240,7 +1238,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { checkitem.CHT_PassFilm = int.Parse(allCheck.Value15); } - catch (Exception e) { } + catch (Exception) { } } checkitem.CHT_CheckResult = allCheck.Value16; //checkitem.CHT_CheckNo = allCheck.Value8; @@ -1259,7 +1257,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { checkitem.DefectLength = decimal.Parse(allCheck.Value19); } - catch (Exception e) { } + catch (Exception) { } } if (!string.IsNullOrEmpty(joint.Extend_Length)) { @@ -1267,7 +1265,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { checkitem.ExtendingRice = Decimal.Parse(joint.Extend_Length); } - catch (Exception e) { } + catch (Exception) { } } checkitem.Defects_Definition = allCheck.Value17; if (!hasitem) diff --git a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageList.aspx.cs index 38230da..85c1920 100644 --- a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManageList.aspx.cs @@ -176,7 +176,7 @@ namespace FineUIPro.Web.HJGL.CheckManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegistEditNew.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegistEditNew.aspx.cs index 1c710e6..2f058b7 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegistEditNew.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/EMaterialRegistEditNew.aspx.cs @@ -26,7 +26,6 @@ namespace FineUIPro.Web.HJGL.MaterialManage ViewState["EMaterialRegistId"] = value; } } - private bool AppendToEnd = false; #endregion #region 加载页面 diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBackRecovery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBackRecovery.aspx.cs index 2c236d8..5023773 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBackRecovery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBackRecovery.aspx.cs @@ -398,7 +398,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { this.Grid1.PageSize = 10000; BindGrid(); diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordEditNew.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordEditNew.aspx.cs index b6651f2..e49177f 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordEditNew.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordEditNew.aspx.cs @@ -38,7 +38,6 @@ namespace FineUIPro.Web.HJGL.MaterialManage } } - private bool AppendToEnd = false; #endregion #region 加载页面 diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecovery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecovery.aspx.cs index 81867a2..00e01bd 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecovery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecovery.aspx.cs @@ -396,7 +396,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { this.Grid1.PageSize = 10000; BindGrid(); diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs index 24ab25f..458b43b 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecoveryBack.aspx.cs @@ -396,7 +396,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { this.Grid1.PageSize = 10000; BindGrid(); diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeSecondaryBakeRecordEditNew.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeSecondaryBakeRecordEditNew.aspx.cs index 513cf49..b37ba55 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeSecondaryBakeRecordEditNew.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/ElectrodeSecondaryBakeRecordEditNew.aspx.cs @@ -38,7 +38,6 @@ namespace FineUIPro.Web.HJGL.MaterialManage } } - private bool AppendToEnd = false; #endregion #region 加载页面 diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/StockSelect.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/StockSelect.aspx.cs index 5128b55..5dc3c18 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/StockSelect.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/StockSelect.aspx.cs @@ -198,7 +198,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldMatStatistics.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldMatStatistics.aspx.cs index af196ae..0f9f5f4 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldMatStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldMatStatistics.aspx.cs @@ -175,7 +175,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldUseAmount.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldUseAmount.aspx.cs index bbe5fe0..02975c8 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldUseAmount.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/WeldUseAmount.aspx.cs @@ -149,7 +149,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs index 15926d2..205e212 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs @@ -381,7 +381,7 @@ namespace FineUIPro.Web.HJGL.PersonManage if (idcard != null) { - var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == idcard ); + var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == (string)idcard ); if (p != null&& p.InTime.HasValue) { inTime= p.InTime.Value.ToString("yyyy-MM-dd"); @@ -395,7 +395,7 @@ namespace FineUIPro.Web.HJGL.PersonManage if (idcard != null) { - var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == idcard); + var p = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.IdentityCard == (string)idcard); if (p != null && p.OutTime.HasValue) { inTime = p.OutTime.Value.ToString("yyyy-MM-dd"); @@ -470,7 +470,7 @@ namespace FineUIPro.Web.HJGL.PersonManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageIn.aspx.cs index 6e2dbec..2fb18cb 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageIn.aspx.cs @@ -266,7 +266,7 @@ namespace FineUIPro.Web.HJGL.PersonManage try { DateTime dateValue = DateTime.Parse(col6); - } catch (Exception e) + } catch (Exception) { result += "第" + (i + 2).ToString() + "行," + "出生日期" + "," + "[" + col6 + "]错误！" + "|"; } @@ -282,7 +282,7 @@ namespace FineUIPro.Web.HJGL.PersonManage { DateTime dateValue = DateTime.Parse(col7); } - catch (Exception e) + catch (Exception) { result += "第" + (i + 2).ToString() + "行," + "有效日期" + "," + "[" + col7 + "]错误！" + "|"; } diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs index 55acffd..1b27ec9 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs @@ -355,7 +355,7 @@ namespace FineUIPro.Web.HJGL.PersonManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; diff --git a/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageAudit.aspx.cs index 4bf31ec..99eca7e 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageAudit.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; diff --git a/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs index ef127b6..e424de8 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -863,7 +862,7 @@ namespace FineUIPro.Web.HJGL.RepairManage this.txtCH_TrustCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.CH_Trust", "CH_TrustCode", this.CurrUser.LoginProjectId, code) + "K"; } } - catch (Exception ee) { } + catch (Exception) { } } } else @@ -881,7 +880,7 @@ namespace FineUIPro.Web.HJGL.RepairManage string code = trustUnit.UnitCode + "-" + iso.ISO_IsoNo + "-" + NDTMethod.DetectionTypeCode + "-"; this.txtCH_TrustCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.CH_Trust", "CH_TrustCode", this.CurrUser.LoginProjectId, code) + "K"; } - catch (Exception ee) { } + catch (Exception) { } } } } @@ -2454,7 +2453,7 @@ namespace FineUIPro.Web.HJGL.RepairManage } } - catch (Exception ee) { } + catch (Exception) { } } } else @@ -2484,7 +2483,7 @@ namespace FineUIPro.Web.HJGL.RepairManage } } } - catch (Exception ee) { } + catch (Exception) { } } } } diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageImport.aspx.cs index edb517b..a406953 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageImport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageImport.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -1190,7 +1189,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", "")); } - catch (Exception ex) + catch (Exception) { row["index"] = 0; } @@ -1348,24 +1347,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1381,24 +1380,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1469,24 +1468,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1502,24 +1501,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1589,24 +1588,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1622,24 +1621,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1707,24 +1706,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1740,24 +1739,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1825,24 +1824,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1858,24 +1857,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs index f69ed35..071464c 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageAudit.aspx.cs @@ -753,24 +753,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -786,24 +786,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -874,24 +874,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -907,24 +907,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -994,24 +994,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1027,24 +1027,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1112,24 +1112,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1145,24 +1145,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1230,24 +1230,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1263,24 +1263,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1348,24 +1348,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot1 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic1 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot3 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic3 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } @@ -1381,24 +1381,24 @@ namespace FineUIPro.Web.HJGL.TestPackageManage { jot2 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic2 += int.Parse(row["PassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; case "不合格": try { jot4 += int.Parse(row["jotNum"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } try { pic4 += int.Parse(row["NoPassFilm"].ToString()); } - catch (Exception ee) { } + catch (Exception) { } break; } diff --git a/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs index 8f431b5..a7752cf 100644 --- a/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs @@ -221,7 +221,7 @@ namespace FineUIPro.Web.HJGL.TrustManage { row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", "")); } - catch (Exception e) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageAudit.aspx.cs index 5c6fe10..7d6f885 100644 --- a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageAudit.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; diff --git a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs index 8b687a9..4857980 100644 --- a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; diff --git a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageSet.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageSet.aspx.cs index 8c2087f..f7333f4 100644 --- a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageSet.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageSet.aspx.cs @@ -141,7 +141,7 @@ namespace FineUIPro.Web.HJGL.TrustManage this.txtCH_TrustCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.CH_Trust", "CH_TrustCode", this.CurrUser.LoginProjectId, code); } } - catch (Exception ee) { } + catch (Exception) { } } } else @@ -201,7 +201,7 @@ namespace FineUIPro.Web.HJGL.TrustManage this.txtCH_TrustCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.CH_Trust", "CH_TrustCode", this.CurrUser.LoginProjectId, code); } } - catch (Exception ee) { } + catch (Exception) { } } } @@ -257,7 +257,7 @@ namespace FineUIPro.Web.HJGL.TrustManage { trust.CH_TrustUnit = this.drpCH_TrustUnit.SelectedValue; } - if (this.drpCH_NDTMethod.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpCH_NDTMethod.SelectedValue)) ; + if (this.drpCH_NDTMethod.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpCH_NDTMethod.SelectedValue)) { trust.CH_NDTMethod = this.drpCH_NDTMethod.SelectedValue; } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs index 6ff1c95..7012073 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -376,7 +375,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", "")); } - catch (Exception e) + catch (Exception) { row["index"] = 0; } @@ -704,7 +703,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", "")); } - catch (Exception ex) + catch (Exception) { row["index"] = 0; } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfoOut.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfoOut.aspx.cs index f2c3647..f7d2bd2 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfoOut.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfoOut.aspx.cs @@ -110,7 +110,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", "")); } - catch (Exception e) + catch (Exception) { row["index"] = 0; } @@ -185,7 +185,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx.cs index 8ec7229..f79f15c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx.cs @@ -738,10 +738,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (isoId != null) { var jotCount = (from x in Funs.DB.PW_JointInfo where x.ISO_ID == isoId.ToString() select x).Count(); - if (jotCount != null) - { - return jotCount.ToString(); - } + return jotCount.ToString(); } return null; } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PmiMaterialTemplate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PmiMaterialTemplate.aspx.cs index 332ef72..5eb3ff8 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PmiMaterialTemplate.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PmiMaterialTemplate.aspx.cs @@ -409,11 +409,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage return; } - bool isShow = true; - if (Grid1.SelectedRowIndexArray.Length > 1) - { - isShow = false; - } foreach (int rowIndex in Grid1.SelectedRowIndexArray) { string rowID = Grid1.DataKeys[rowIndex][0].ToString(); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs index b5ce310..c41b238 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs @@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage this.txtPointID.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode3ByProjectPrefix", "dbo.BO_Point", "PW_PointNo", this.CurrUser.LoginProjectId, date + "-"); } - catch (Exception ee) { } + catch (Exception) { } } else { @@ -421,7 +421,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage this.txtPointID.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode3ByProjectPrefix", "dbo.BO_Point", "PW_PointNo", this.CurrUser.LoginProjectId, date + "-"); } - catch (Exception ee) { } + catch (Exception) { } } else { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointShowSearch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointShowSearch.aspx.cs index 9c3ee5a..4088324 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointShowSearch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointShowSearch.aspx.cs @@ -260,7 +260,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { cbJOTDia.Checked = false; } - } catch (Exception ex) { } + } catch (Exception) { } BindGrid(isoId); //未点口的焊工 @@ -325,7 +325,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", "")); } - catch (Exception e) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs index 3e2b6e9..9e3bc66 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs @@ -322,7 +322,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", "")); } - catch (Exception e) + catch (Exception) { row["index"] = 0; } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportItemEdit.aspx.cs index f055efb..f69fd95 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportItemEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportItemEdit.aspx.cs @@ -249,7 +249,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { row["index"] = int.Parse(System.Text.RegularExpressions.Regex.Replace(row["JOT_JointNo"].ToString(), @"[^0-9]+", "")); } - catch (Exception e) + catch (Exception) { row["index"] = 0; } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/ArriveDetail.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/ArriveDetail.aspx.cs index f62a570..2c07015 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/ArriveDetail.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/ArriveDetail.aspx.cs @@ -286,7 +286,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -330,7 +330,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/ArriveStatic.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/ArriveStatic.aspx.cs index 4fd780e..bb0070d 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/ArriveStatic.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/ArriveStatic.aspx.cs @@ -226,7 +226,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -270,7 +270,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/CheckStatistics.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/CheckStatistics.aspx.cs index 8b1f547..3f7e133 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/CheckStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/CheckStatistics.aspx.cs @@ -143,7 +143,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.cs index 1f4b671..72a3cc4 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.cs @@ -216,7 +216,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -260,7 +260,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FilmJointStatistics.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FilmJointStatistics.aspx.cs index 5402a21..5121758 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FilmJointStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FilmJointStatistics.aspx.cs @@ -74,22 +74,22 @@ namespace FineUIPro.Web.HJGL.WeldingReport { pt_jot += int.Parse(row["five_pt_jot"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { pt_jot += int.Parse(row["ten_pt_jot"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { pt_jot += int.Parse(row["twenty_pt_jot"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { pt_jot += int.Parse(row["onHundred_pt_jot"].ToString()); } - catch (Exception e) { } + catch (Exception) { } row["pt_jot"] = pt_jot; } Grid1.DataSource = table; @@ -241,7 +241,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -340,7 +340,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs index 49d9460..bc3e73c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs @@ -283,7 +283,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -327,7 +327,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs index 3a83302..a11642a 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs @@ -49,10 +49,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport #endregion #region 绑定BindGrid - /// - /// - /// - private DataTable tb = null; /// /// 绑定数据 @@ -158,7 +154,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -202,7 +198,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs index 7bc7d06..754d4b7 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs @@ -62,10 +62,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport #endregion #region 绑定BindGrid - /// - /// - /// - private DataTable tb = null; /// /// 绑定数据 @@ -275,7 +271,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { row.CreateCell(5).SetCellValue(tb.Rows[i]["JOT_Dia"] != DBNull.Value ? ((decimal)tb.Rows[i]["JOT_Dia"]).ToString("##.#") : ""); } - catch (Exception e) { } + catch (Exception) { } row.CreateCell(6).SetCellValue(tb.Rows[i]["JOT_Sch"] != DBNull.Value ? tb.Rows[i]["JOT_Sch"].ToString() : ""); row.CreateCell(7).SetCellValue(tb.Rows[i]["JOT_FactSch"] != DBNull.Value ? tb.Rows[i]["JOT_FactSch"].ToString() : ""); row.CreateCell(8).SetCellValue(tb.Rows[i]["STE_Name1"] != DBNull.Value ? tb.Rows[i]["STE_Name1"].ToString() : ""); @@ -288,7 +284,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { row.CreateCell(14).SetCellValue(tb.Rows[i]["JOT_WeldDate"] != DBNull.Value ? ((DateTime)tb.Rows[i]["JOT_WeldDate"]).ToString("yyyy-MM-dd") : ""); } - catch (Exception e) { } + catch (Exception) { } row.CreateCell(15).SetCellValue(tb.Rows[i]["JOT_DailyReportNo"] != DBNull.Value ? tb.Rows[i]["JOT_DailyReportNo"].ToString() : ""); row.CreateCell(16).SetCellValue(tb.Rows[i]["CH_TRUSTCODE1"] != DBNull.Value ? tb.Rows[i]["CH_TRUSTCODE1"].ToString() : ""); row.CreateCell(17).SetCellValue(tb.Rows[i]["ProessName"] != DBNull.Value ? tb.Rows[i]["ProessName"].ToString() : ""); @@ -297,7 +293,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { row.CreateCell(19).SetCellValue(tb.Rows[i]["ProessDate"] != DBNull.Value ? ((DateTime)tb.Rows[i]["ProessDate"]).ToString("yyyy-MM-dd") : ""); } - catch (Exception e) { } + catch (Exception) { } //try //{ // row.CreateCell(20).SetCellValue(tb.Rows[i]["CHT_CHECKDATE"] != DBNull.Value ? ((DateTime)tb.Rows[i]["CHT_FilmDate"]).ToString("yyyy-MM-dd") : ""); @@ -315,12 +311,12 @@ namespace FineUIPro.Web.HJGL.WeldingReport { row.CreateCell(29).SetCellValue(tb.Rows[i]["HotHardDate"] != DBNull.Value ? ((DateTime)tb.Rows[i]["HotHardDate"]).ToString("yyyy-MM-dd") : ""); } - catch (Exception e) { } + catch (Exception) { } try { row.CreateCell(30).SetCellValue(tb.Rows[i]["CH_TrustDate"] != DBNull.Value ? ((DateTime)tb.Rows[i]["CH_TrustDate"]).ToString("yyyy-MM-dd") : ""); } - catch (Exception e) { } + catch (Exception) { } row.CreateCell(31).SetCellValue(tb.Rows[i]["PTP_TestPackageNo"] != DBNull.Value ? tb.Rows[i]["PTP_TestPackageNo"].ToString() : ""); row.CreateCell(32).SetCellValue(tb.Rows[i]["WeldTypeCode"] != DBNull.Value ? tb.Rows[i]["WeldTypeCode"].ToString() : ""); @@ -384,7 +380,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -428,7 +424,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs index a7f6a36..a0835d9 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs @@ -274,7 +274,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -318,7 +318,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTMonthReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTMonthReport.aspx.cs index cdbcdfa..3184534 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTMonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTMonthReport.aspx.cs @@ -306,7 +306,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue1.CellStyle = styleCenter; celCellValue1.SetCellValue((100.0 * int.Parse(row["curr_pass_film"].ToString()) / int.Parse(row["curr_total_film"].ToString())).ToString("0.00")); } - catch (Exception e1) + catch (Exception) { } recordSheet.GetRow(5 + i).CreateCell(14).SetCellValue(row["pro_total_film"].ToString()); @@ -322,7 +322,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue2.CellStyle = styleCenter; celCellValue2.SetCellValue((100.0 * int.Parse(row["pro_pass_film"].ToString()) / int.Parse(row["pro_total_film"].ToString())).ToString("0.00")); } - catch (Exception e2) + catch (Exception) { } recordSheet.GetRow(5 + i).CreateCell(17).SetCellValue(row["total_film"].ToString()); recordSheet.GetRow(5 + i).GetCell(17).CellStyle = styleCenter; @@ -338,7 +338,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue3.SetCellValue((100.0 * int.Parse(row["pass_film"].ToString()) / int.Parse(row["total_film"].ToString())).ToString("0.00")); } - catch (Exception e3) + catch (Exception) { } recordSheet.GetRow(5 + i).CreateCell(20).SetCellValue(row["recurr_total_film"].ToString()); recordSheet.GetRow(5 + i).GetCell(20).CellStyle = styleCenter; @@ -353,7 +353,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue4.SetCellValue((100.0 * int.Parse(row["recurr_pass_film"].ToString()) / int.Parse(row["recurr_total_film"].ToString())).ToString("0.00")); } - catch (Exception e4) + catch (Exception) { } recordSheet.GetRow(5 + i).CreateCell(23).SetCellValue(row["retotal_total_film"].ToString()); recordSheet.GetRow(5 + i).GetCell(23).CellStyle = styleCenter; @@ -368,7 +368,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue5.SetCellValue((100.0 * int.Parse(row["retotal_pass_film"].ToString()) / int.Parse(row["retotal_total_film"].ToString())).ToString("0.00")); } - catch (Exception e5) + catch (Exception) { } recordSheet.GetRow(5 + i).CreateCell(26).SetCellValue(row["curr_trust_count_total"].ToString()); @@ -387,7 +387,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue5.SetCellValue((100.0 * int.Parse(row["curr_pass_point"].ToString()) / int.Parse(row["curr_check_count_point"].ToString())).ToString("0.00")); } - catch (Exception e6) + catch (Exception) { } recordSheet.GetRow(5 + i).CreateCell(30).SetCellValue(row["trust_count_total"].ToString()); recordSheet.GetRow(5 + i).GetCell(30).CellStyle = styleCenter; @@ -406,7 +406,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue5.SetCellValue((100.0 * int.Parse(row["total_pass_point"].ToString()) / int.Parse(row["total_check_count_point"].ToString())).ToString("0.00")); } - catch (Exception e7) + catch (Exception) { } @@ -428,7 +428,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue1.SetCellValue((100.0 * curr_pass_film / curr_total_film).ToString("0.00")); } } - catch (Exception e1) + catch (Exception) { } recordSheet.GetRow(dt.Rows.Count+6).CreateCell(15).SetCellValue(pro_pass_film + ""); @@ -444,7 +444,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue2.SetCellValue((100.0 * pro_pass_film / pro_total_film).ToString("0.00")); } } - catch (Exception e2) + catch (Exception) { } recordSheet.GetRow(dt.Rows.Count + 6).CreateCell(17).SetCellValue(total_film + ""); recordSheet.GetRow(dt.Rows.Count+6).GetCell(17).CellStyle = styleCenter; @@ -459,7 +459,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue3.SetCellValue((100.0 * pass_film / total_film).ToString("0.00")); } } - catch (Exception e3) + catch (Exception) { } recordSheet.GetRow(dt.Rows.Count+6).CreateCell(20).SetCellValue(recurr_pass_film + ""); recordSheet.GetRow(dt.Rows.Count+6).GetCell(20).CellStyle = styleCenter; @@ -475,7 +475,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue4.SetCellValue((100.0 * recurr_pass_film / recurr_total_film).ToString("0.00")); } } - catch (Exception e4) + catch (Exception) { } recordSheet.GetRow(dt.Rows.Count+6).CreateCell(23).SetCellValue(retotal_pass_film + ""); recordSheet.GetRow(dt.Rows.Count+6).GetCell(23).CellStyle = styleCenter; @@ -490,7 +490,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue5.SetCellValue((100.0 * retotal_pass_film / retotal_total_film).ToString("0.00")); } } - catch (Exception e5) + catch (Exception) { } recordSheet.GetRow(dt.Rows.Count + 6).CreateCell(26).SetCellValue(curr_trust_count_total + ""); recordSheet.GetRow(dt.Rows.Count + 6).GetCell(26).CellStyle = styleCenter; @@ -508,7 +508,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } - catch (Exception e6) + catch (Exception) { } recordSheet.GetRow(dt.Rows.Count + 6).CreateCell(30).SetCellValue(trust_count_total + ""); @@ -527,7 +527,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } - catch (Exception e7) + catch (Exception) { } } @@ -546,7 +546,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue1.SetCellValue((100.0 * curr_pass_film / curr_total_film).ToString("0.00")); } } - catch (Exception e1) + catch (Exception) { } recordSheet.GetRow(16).CreateCell(15).SetCellValue(pro_pass_film+""); @@ -562,7 +562,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue2.SetCellValue((100.0 * pro_pass_film / pro_total_film).ToString("0.00")); } } - catch (Exception e2) + catch (Exception) { } recordSheet.GetRow(16).CreateCell(17).SetCellValue(total_film + ""); recordSheet.GetRow(16).GetCell(17).CellStyle = styleCenter; @@ -577,7 +577,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue3.SetCellValue((100.0 * pass_film / total_film).ToString("0.00")); } } - catch (Exception e3) + catch (Exception) { } recordSheet.GetRow(16).CreateCell(20).SetCellValue(recurr_pass_film+""); recordSheet.GetRow(16).GetCell(20).CellStyle = styleCenter; @@ -592,7 +592,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport celCellValue4.SetCellValue((100.0 * recurr_pass_film / recurr_total_film).ToString("0.00")); } } - catch (Exception e4) + catch (Exception) { } recordSheet.GetRow(16).CreateCell(23).SetCellValue(retotal_pass_film+""); recordSheet.GetRow(16).GetCell(23).CellStyle = styleCenter; @@ -608,7 +608,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } - catch (Exception e5) + catch (Exception) { } recordSheet.GetRow(16).CreateCell(26).SetCellValue(curr_trust_count_total + ""); recordSheet.GetRow(16).GetCell(26).CellStyle = styleCenter; @@ -626,7 +626,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } - catch (Exception e6) + catch (Exception) { } recordSheet.GetRow(16).CreateCell(30).SetCellValue(trust_count_total + ""); @@ -645,7 +645,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } - catch (Exception e7) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTTotalReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTTotalReport.aspx.cs index 6b62945..a892121 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTTotalReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTTotalReport.aspx.cs @@ -365,13 +365,13 @@ namespace FineUIPro.Web.HJGL.WeldingReport row["curr_pass_rate"] =1.0 * int.Parse(row["curr_pass_film"].ToString()) / int.Parse(row["curr_total_film"].ToString()); } - catch (Exception e1) + catch (Exception) { } try { row["recurr_pass_rate"] = 1.0 * int.Parse(row["recurr_pass_film"].ToString()) / int.Parse(row["recurr_total_film"].ToString()); } - catch (Exception e2) + catch (Exception) { } } @@ -423,7 +423,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); @@ -535,7 +535,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTWeekReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTWeekReport.aspx.cs index cac876d..87fcd51 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTWeekReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/NDTWeekReport.aspx.cs @@ -289,19 +289,19 @@ from Base_Unit unit right join row["curr_pass_rate"] =1.0 * int.Parse(row["curr_pass_film"].ToString()) / int.Parse(row["curr_total_film"].ToString()); } - catch (Exception e1) + catch (Exception) { } try { row["recurr_pass_rate"] = 1.0 * int.Parse(row["recurr_pass_film"].ToString()) / int.Parse(row["recurr_total_film"].ToString()); } - catch (Exception e2) + catch (Exception) { } try { row["curr_pass_rate_point"] = 1.0 * int.Parse(row["curr_pass_point"].ToString()) / int.Parse(row["curr_point_count_total"].ToString()); } - catch (Exception e3) + catch (Exception) { } } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayReport.aspx.cs index 945f212..ac653bc 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayReport.aspx.cs @@ -61,10 +61,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport #endregion #region 绑定BindGrid - /// - /// - /// - private DataTable tb = null; /// /// 绑定数据 @@ -268,7 +264,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { row1["Day" + row3["day"]] = ((decimal)row3["finished_total_din_bq"]).ToString("#0.##"); } - catch (Exception e) { } + catch (Exception) { } } } } @@ -282,7 +278,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport has += double.Parse(row4["Day" + i].ToString()); } - catch (Exception e) { } + catch (Exception) { } } tb1.Rows[j * 2]["has_month_din"] = has; @@ -307,7 +303,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport tb1.Rows[j * 2]["finished_total_din"] = hasTotalfinsh; } } - catch (Exception e) { } + catch (Exception) { } } } var rowTotal1 = tb1.NewRow(); @@ -329,7 +325,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { total_din += double.Parse(tb1.Rows[j * 2 + 1]["total_din"].ToString()); } - catch (Exception e) + catch (Exception) { } for (int i = 1; i <= day; i++) @@ -365,7 +361,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport hasTotal += double.Parse(rowTotal2["Day" + i].ToString()); } - catch (Exception e) + catch (Exception) { } } @@ -392,7 +388,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } - catch (Exception e) + catch (Exception) { } Grid1.RecordCount = tb1.Rows.Count; @@ -540,7 +536,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayTrustReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayTrustReport.aspx.cs index 0580fe9..0d131d7 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayTrustReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayTrustReport.aspx.cs @@ -80,10 +80,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport #endregion #region 绑定BindGrid - /// - /// - /// - private DataTable tb = null; /// /// 绑定数据 @@ -343,7 +339,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport has += double.Parse(row4["Day" + i].ToString()); } - catch (Exception e) { } + catch (Exception) { } } tb1.Rows[j * 2]["has_month_din"] = has; @@ -373,7 +369,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport has += double.Parse(row4["Day" + i].ToString()); } - catch (Exception e) { } + catch (Exception) { } } tb1.Rows[j * 2+1]["has_month_din"] = has; @@ -587,7 +583,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneMonthReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneMonthReport.aspx.cs index 7a7a909..aeb9430 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneMonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneMonthReport.aspx.cs @@ -153,32 +153,32 @@ left join( { total_din += decimal.Parse(tb0.Rows[i]["total_din"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { finished_total_din_bq += decimal.Parse(tb0.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { week_total_din_bq += decimal.Parse(tb0.Rows[i]["week_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { WelderNum += int.Parse(tb0.Rows[i]["WelderNum"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { tb0.Rows[i]["res_din"] = decimal.Parse(tb0.Rows[i]["total_din"].ToString()) - decimal.Parse(tb0.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { tb0.Rows[i]["has_per"] = (100 * decimal.Parse(tb0.Rows[i]["finished_total_din_bq"].ToString()) / decimal.Parse(tb0.Rows[i]["total_din"].ToString())).ToString("##.##"); } - catch (Exception e) { } + catch (Exception) { } } newRow["total_din"] = total_din ; @@ -189,12 +189,12 @@ left join( { newRow["res_din"] = decimal.Parse(newRow["total_din"].ToString()) - decimal.Parse(newRow["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { newRow["has_per"] = (100 * decimal.Parse(newRow["finished_total_din_bq"].ToString()) / decimal.Parse(newRow["total_din"].ToString())).ToString("##.##"); } - catch (Exception e) { } + catch (Exception) { } tb0.Rows.Add(newRow); } this.Grid0.DataSource = tb0; @@ -278,32 +278,32 @@ left join( { total_din += decimal.Parse(tb1.Rows[i]["total_din"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { finished_total_din_bq += decimal.Parse(tb1.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { week_total_din_bq += decimal.Parse(tb1.Rows[i]["week_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { WelderNum += int.Parse(tb1.Rows[i]["WelderNum"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { tb1.Rows[i]["res_din"] = decimal.Parse(tb1.Rows[i]["total_din"].ToString()) - decimal.Parse(tb1.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { tb1.Rows[i]["has_per"] = (100 * decimal.Parse(tb1.Rows[i]["finished_total_din_bq"].ToString()) / decimal.Parse(tb1.Rows[i]["total_din"].ToString())).ToString("##.##"); } - catch (Exception e) { } + catch (Exception) { } } newRow["total_din"] = total_din; @@ -314,12 +314,12 @@ left join( { newRow["res_din"] = decimal.Parse(newRow["total_din"].ToString()) - decimal.Parse(newRow["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { newRow["has_per"] = (100 * decimal.Parse(newRow["finished_total_din_bq"].ToString()) / decimal.Parse(newRow["total_din"].ToString())).ToString("##.##"); } - catch (Exception e) { } + catch (Exception) { } tb1.Rows.Add(newRow); } this.Grid1.DataSource = tb1; @@ -640,7 +640,6 @@ left join( { int nowtotalfilm = 0;//本期拍片总数 int nowpassfilm = 0;//本期拍片合格数 - int nownotpassfilm = 0;//本期拍片不合格数 string nowpassrate = ""; int totalfilm = 0;//总片数 int passfilm = 0;//合格片数 @@ -959,22 +958,22 @@ left join( tb1.Rows[i]["finished_total_din_bq"] = 0; } } - catch (Exception e11) { } + catch (Exception) { } try { WelderNum += int.Parse(tb1.Rows[i]["WelderNum"].ToString()); } - catch (Exception e1) { } + catch (Exception) { } try { tb1.Rows[i]["res_din"] = decimal.Parse(tb1.Rows[i]["total_din"].ToString()) - decimal.Parse(tb1 .Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e2) { } + catch (Exception) { } try { tb1.Rows[i]["has_per"] = (100 * decimal.Parse(tb1.Rows[i]["finished_total_din_bq"].ToString()) / decimal.Parse(tb1.Rows[i]["total_din"].ToString())).ToString("##.##"); } - catch (Exception e3) { } + catch (Exception) { } } @@ -1062,22 +1061,22 @@ left join( tb2.Rows[i]["finished_total_din_bq"] = 0; } } - catch (Exception e11) { } + catch (Exception) { } try { WelderNum += int.Parse(tb2.Rows[i]["WelderNum"].ToString()); } - catch (Exception e1) { } + catch (Exception) { } try { tb2.Rows[i]["res_din"] = decimal.Parse(tb2.Rows[i]["total_din"].ToString()) - decimal.Parse(tb2.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e2) { } + catch (Exception) { } try { tb2.Rows[i]["has_per"] = (100 * decimal.Parse(tb2.Rows[i]["finished_total_din_bq"].ToString()) / decimal.Parse(tb2.Rows[i]["total_din"].ToString())).ToString("##.##"); } - catch (Exception e3) { } + catch (Exception) { } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneWeekDeviceReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneWeekDeviceReport.aspx.cs index 62fef73..100f7b5 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneWeekDeviceReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneWeekDeviceReport.aspx.cs @@ -503,7 +503,7 @@ where IsoInfo.ProjectId=@ProjectId and ( IsoInfo.Is_Standard=@IsStandard OR @ /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); @@ -615,7 +615,7 @@ where IsoInfo.ProjectId=@ProjectId and ( IsoInfo.Is_Standard=@IsStandard OR @ } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneWeekReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneWeekReport.aspx.cs index 4d74699..a48ac99 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneWeekReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/OneWeekReport.aspx.cs @@ -1,6 +1,5 @@ using BLL; using System; -using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -156,32 +155,32 @@ left join( { total_din += decimal.Parse(tb0.Rows[i]["total_din"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { finished_total_din_bq += decimal.Parse(tb0.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { week_total_din_bq += decimal.Parse(tb0.Rows[i]["week_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { WelderNum += int.Parse(tb0.Rows[i]["WelderNum"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { tb0.Rows[i]["res_din"] = decimal.Parse(tb0.Rows[i]["total_din"].ToString()) - decimal.Parse(tb0.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { tb0.Rows[i]["has_per"] = (100 * decimal.Parse(tb0.Rows[i]["finished_total_din_bq"].ToString()) / decimal.Parse(tb0.Rows[i]["total_din"].ToString())).ToString("##.##"); } - catch (Exception e) { } + catch (Exception) { } } newRow["total_din"] = total_din; @@ -192,12 +191,12 @@ left join( { newRow["res_din"] = decimal.Parse(newRow["total_din"].ToString()) - decimal.Parse(newRow["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { newRow["has_per"] = (100 * decimal.Parse(newRow["finished_total_din_bq"].ToString()) / decimal.Parse(newRow["total_din"].ToString())).ToString("##.##"); } - catch (Exception e) { } + catch (Exception) { } tb0.Rows.Add(newRow); } this.Grid0.DataSource = tb0; @@ -278,32 +277,32 @@ left join( { total_din += decimal.Parse(tb1.Rows[i]["total_din"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { finished_total_din_bq += decimal.Parse(tb1.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { week_total_din_bq += decimal.Parse(tb1.Rows[i]["week_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { WelderNum += int.Parse(tb1.Rows[i]["WelderNum"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { tb1.Rows[i]["res_din"] = decimal.Parse(tb1.Rows[i]["total_din"].ToString()) - decimal.Parse(tb1.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { tb1.Rows[i]["has_per"] = (100 * decimal.Parse(tb1.Rows[i]["finished_total_din_bq"].ToString()) / decimal.Parse(tb1.Rows[i]["total_din"].ToString())).ToString("##.##"); } - catch (Exception e) { } + catch (Exception) { } } newRow["total_din"] = total_din; @@ -314,12 +313,12 @@ left join( { newRow["res_din"] = decimal.Parse(newRow["total_din"].ToString()) - decimal.Parse(newRow["finished_total_din_bq"].ToString()); } - catch (Exception e) { } + catch (Exception) { } try { newRow["has_per"] = (100 * decimal.Parse(newRow["finished_total_din_bq"].ToString()) / decimal.Parse(newRow["total_din"].ToString())).ToString("##.##"); } - catch (Exception e) { } + catch (Exception) { } tb1.Rows.Add(newRow); } this.Grid1.DataSource = tb1; @@ -625,7 +624,6 @@ left join( { int nowtotalfilm = 0;//本期拍片总数 int nowpassfilm = 0;//本期拍片合格数 - int nownotpassfilm = 0;//本期拍片不合格数 string nowpassrate = ""; int totalfilm = 0;//总片数 int passfilm = 0;//合格片数 @@ -893,23 +891,23 @@ left join( tb1.Rows[i]["finished_total_din_bq"] = 0; } } - catch (Exception e11) { } + catch (Exception) { } try { WelderNum += int.Parse(tb1.Rows[i]["WelderNum"].ToString()); } - catch (Exception e1) { } + catch (Exception) { } try { tb1.Rows[i]["res_din"] = decimal.Parse(tb1.Rows[i]["total_din"].ToString()) - decimal.Parse(tb1.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e2) { } + catch (Exception) { } try { tb1.Rows[i]["has_per"] = (100 * decimal.Parse(tb1.Rows[i]["finished_total_din_bq"].ToString()) / decimal.Parse(tb1.Rows[i]["total_din"].ToString())).ToString("##.##"); } - catch (Exception e3) { } + catch (Exception) { } } @@ -997,23 +995,23 @@ left join( tb2.Rows[i]["finished_total_din_bq"] = 0; } } - catch (Exception e11) { } + catch (Exception) { } try { WelderNum += int.Parse(tb2.Rows[i]["WelderNum"].ToString()); } - catch (Exception e1) { } + catch (Exception) { } try { tb2.Rows[i]["res_din"] = decimal.Parse(tb2.Rows[i]["total_din"].ToString()) - decimal.Parse(tb2.Rows[i]["finished_total_din_bq"].ToString()); } - catch (Exception e2) { } + catch (Exception) { } try { tb2.Rows[i]["has_per"] = (100 * decimal.Parse(tb2.Rows[i]["finished_total_din_bq"].ToString()) / decimal.Parse(tb2.Rows[i]["total_din"].ToString())).ToString("##.##"); } - catch (Exception e3) { } + catch (Exception) { } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/PointTrustCheckTaskList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/PointTrustCheckTaskList.aspx.cs index e2aa795..94c20df 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/PointTrustCheckTaskList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/PointTrustCheckTaskList.aspx.cs @@ -159,7 +159,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs index 13e52be..a7ec327 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs @@ -229,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -273,7 +273,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/RepairStatistics.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/RepairStatistics.aspx.cs index f9d7a89..4725083 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/RepairStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/RepairStatistics.aspx.cs @@ -159,7 +159,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs index 43cdbc6..95b95ea 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs @@ -191,7 +191,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -235,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkAreaQuality.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkAreaQuality.aspx.cs index e55e735..cca8a37 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkAreaQuality.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkAreaQuality.aspx.cs @@ -448,7 +448,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); @@ -584,7 +584,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkareaAnalyze.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkareaAnalyze.aspx.cs index 64749eb..0e05c19 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkareaAnalyze.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkareaAnalyze.aspx.cs @@ -361,7 +361,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -405,7 +405,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderDynamicStatistics.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderDynamicStatistics.aspx.cs index 5244ef0..d8dcab4 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderDynamicStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderDynamicStatistics.aspx.cs @@ -191,7 +191,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -286,7 +286,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs index 2215b17..6ff1815 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs @@ -325,7 +325,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); @@ -468,7 +468,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WeldingStatistical.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WeldingStatistical.aspx.cs index df55e78..7896811 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WeldingStatistical.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WeldingStatistical.aspx.cs @@ -334,7 +334,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); grid.PageSize = this.Grid1.RecordCount; @@ -378,7 +378,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", ""); } } - catch (Exception e) + catch (Exception) { sb.AppendFormat("{0}", ""); diff --git a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.cs b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.cs index 07f59b3..0efc58c 100644 --- a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanSummary.aspx.cs @@ -324,7 +324,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx.cs index 22db085..6f945c9 100644 --- a/SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Administrative/CarManager.aspx.cs @@ -252,7 +252,7 @@ namespace FineUIPro.Web.HSSE.Administrative /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Administrative/DriverManager.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Administrative/DriverManager.aspx.cs index a82e37c..5311d7c 100644 --- a/SGGL/FineUIPro.Web/HSSE/Administrative/DriverManager.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Administrative/DriverManager.aspx.cs @@ -263,7 +263,7 @@ namespace FineUIPro.Web.HSSE.Administrative /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckDayWH.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckDayWH.aspx.cs index a02d7c8..bcc8d8d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckDayWH.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckDayWH.aspx.cs @@ -419,7 +419,7 @@ namespace FineUIPro.Web.HSSE.Check /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckHoliday.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckHoliday.aspx.cs index b3c28e3..04560b6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckHoliday.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckHoliday.aspx.cs @@ -338,7 +338,7 @@ namespace FineUIPro.Web.HSSE.Check /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs index b7839bd..edc8499 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs @@ -290,7 +290,7 @@ namespace FineUIPro.Web.HSSE.Check } } } - catch (Exception e) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckWork.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckWork.aspx.cs index d30ee07..4c78d24 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckWork.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckWork.aspx.cs @@ -340,7 +340,7 @@ namespace FineUIPro.Web.HSSE.Check /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Check/ContactList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/ContactList.aspx.cs index 9176219..3055127 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/ContactList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/ContactList.aspx.cs @@ -269,7 +269,7 @@ namespace FineUIPro.Web.HSSE.Check /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Check/HSECertificate.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/HSECertificate.aspx.cs index a130d1d..e8d111d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/HSECertificate.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/HSECertificate.aspx.cs @@ -260,7 +260,7 @@ namespace FineUIPro.Web.HSSE.Check /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesStatistics.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesStatistics.aspx.cs index db91272..4b95cd6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesStatistics.aspx.cs @@ -131,7 +131,7 @@ namespace FineUIPro.Web.HSSE.Check /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Check/SupervisionNotice.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/SupervisionNotice.aspx.cs index a010840..075b755 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/SupervisionNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/SupervisionNotice.aspx.cs @@ -360,7 +360,7 @@ namespace FineUIPro.Web.HSSE.Check /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Check/ViolationPerson.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/ViolationPerson.aspx.cs index 9dd4e1c..a4a308a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/ViolationPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/ViolationPerson.aspx.cs @@ -341,7 +341,7 @@ namespace FineUIPro.Web.Check /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/GoodsManage.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/GoodsManage.aspx.cs index ee47393..cc3dfba 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/GoodsManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/GoodsManage.aspx.cs @@ -249,7 +249,7 @@ namespace FineUIPro.Web.HSSE.CostGoods /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/MeasuresPlan.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/MeasuresPlan.aspx.cs index 1022920..6b1157f 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/MeasuresPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/MeasuresPlan.aspx.cs @@ -287,7 +287,7 @@ namespace FineUIPro.Web.HSSE.CostGoods /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.cs index 09e29ab..546c990 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistration.aspx.cs @@ -275,7 +275,7 @@ namespace FineUIPro.Web.HSSE.CostGoods /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/SubPayRegistration.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/SubPayRegistration.aspx.cs index 9cdbe19..f6ee598 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/SubPayRegistration.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/SubPayRegistration.aspx.cs @@ -262,7 +262,7 @@ namespace FineUIPro.Web.HSSE.CostGoods /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.cs index 14b3b7b..ab48763 100644 --- a/SGGL/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Emergency/DrillRecordList.aspx.cs @@ -256,7 +256,7 @@ namespace FineUIPro.Web.HSSE.Emergency /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx.cs index 50f2dc9..1709d9d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx.cs @@ -401,12 +401,12 @@ namespace FineUIPro.Web.HSSE.Hazard newConstructionRisk.DateWeek = newConstructionRisk.DateA.Value.ToString("yyyy年") + Funs.GetWeekOfYear(newConstructionRisk.DateA.Value)+"周"; } - catch (Exception e) { } + catch (Exception) { } try { newConstructionRisk.DateZ = Funs.GetNewDateTime(row1); } - catch (Exception e) { } + catch (Exception) { } newConstructionRisk.ConstructionContent = row4; newConstructionRisk.RefLicense = row5; newConstructionRisk.LicenseDes = row6; diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.cs index d17ea35..7c482b9 100644 --- a/SGGL/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.cs @@ -203,7 +203,7 @@ namespace FineUIPro.Web.HSSE.Hazard /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.cs index 819e62c..3b99b8f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.cs @@ -266,7 +266,7 @@ namespace FineUIPro.Web.HSSE.Hazard /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx new file mode 100644 index 0000000..98e0e0c --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx @@ -0,0 +1,157 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardProject.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.HazardProject" %> + + + + + + + 危大、超危清单 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx.cs new file mode 100644 index 0000000..83d0cac --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx.cs @@ -0,0 +1,341 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Web; +using NPOI.SS.UserModel; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 危大、超危工程清单页面 + /// + public partial class HazardProject : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + this.BindGrid(); + } + } + + /// + /// 新增按钮事件 + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference("HazardProjectEdit.aspx")); + } + #endregion + + #region 数据绑定 + /// + /// 绑定数据 + /// + private void BindGrid() + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先登录或选择项目！", MessageBoxIcon.Warning); + return; + } + List list = this.GetFilteredList(); + Grid1.RecordCount = list.Count; + var table = this.GetPagedDataTable(Grid1, list); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 获取按查询条件过滤后的清单列表 + /// + private List GetFilteredList() + { + List list = BLL.HazardProjectService.GetList(this.CurrUser.LoginProjectId); + ////查询条件过滤 + string name = this.txtProjectName.Text.Trim(); + if (!string.IsNullOrEmpty(name)) + { + list = list.Where(x => x.ProjectName.Contains(name)).ToList(); + } + if (!string.IsNullOrEmpty(this.ddlRiskLevel.SelectedValue)) + { + list = list.Where(x => x.RiskLevel == this.ddlRiskLevel.SelectedValue).ToList(); + } + ////开工时间范围过滤 + if (this.dpStartDateFrom.SelectedDate.HasValue) + { + DateTime startFrom = this.dpStartDateFrom.SelectedDate.Value; + list = list.Where(x => x.StartDate.HasValue && x.StartDate.Value >= startFrom).ToList(); + } + if (this.dpStartDateTo.SelectedDate.HasValue) + { + DateTime startTo = this.dpStartDateTo.SelectedDate.Value; + list = list.Where(x => x.StartDate.HasValue && x.StartDate.Value <= startTo).ToList(); + } + ////结束时间范围过滤 + if (this.dpEndDateFrom.SelectedDate.HasValue) + { + DateTime endFrom = this.dpEndDateFrom.SelectedDate.Value; + list = list.Where(x => x.EndDate.HasValue && x.EndDate.Value >= endFrom).ToList(); + } + if (this.dpEndDateTo.SelectedDate.HasValue) + { + DateTime endTo = this.dpEndDateTo.SelectedDate.Value; + list = list.Where(x => x.EndDate.HasValue && x.EndDate.Value <= endTo).ToList(); + } + return list; + } + + /// + /// 分页事件 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 每页记录数下拉事件 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序事件 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 导入导出 + /// + /// 导出 + /// + protected void btnOut_Click(object sender, EventArgs e) + { + List list = this.GetFilteredList(); + + string[] cols = { "序号", "分部分项工程", "施工内容", "风险等级", "开工时间", "结束时间", "现场负责人", "备注" }; + short[] widths = { 8, 30, 40, 16, 16, 16, 16, 30 }; + + string rootPath = Server.MapPath("~/"); + string fullPath = rootPath + BLL.Const.ExcelUrl; + if (!Directory.Exists(fullPath)) + { + Directory.CreateDirectory(fullPath); + } + string fileName = "危大超危工程清单" + BLL.Funs.GetNewFileName() + ".xls"; + string filePath = fullPath + fileName; + + BLL.Common.NPOIExcel excel = new BLL.Common.NPOIExcel(); + + ////表头样式：白字加粗、蓝底、带边框 + IFont headerFont = excel.CreateFont(); + headerFont.Boldweight = 700; + headerFont.Color = BLL.Common.NPOIColor.WHITE; + ICellStyle headerStyle = excel.CreateCellStyle(); + headerStyle.SetFont(headerFont); + headerStyle.FillForegroundColor = BLL.Common.NPOIColor.ROYAL_BLUE; + headerStyle.FillPattern = FillPattern.SolidForeground; + headerStyle.BorderTop = BorderStyle.Thin; + headerStyle.BorderBottom = BorderStyle.Thin; + headerStyle.BorderLeft = BorderStyle.Thin; + headerStyle.BorderRight = BorderStyle.Thin; + + ////数据样式：带边框 + ICellStyle dataStyle = excel.CreateCellStyle(); + dataStyle.BorderTop = BorderStyle.Thin; + dataStyle.BorderBottom = BorderStyle.Thin; + dataStyle.BorderLeft = BorderStyle.Thin; + dataStyle.BorderRight = BorderStyle.Thin; + + for (int i = 0; i < cols.Length; i++) + { + excel.SetValue(0, i, cols[i]); + excel.SetStyle(0, i, headerStyle); + excel.SetColumnWidth(i, widths[i]); + } + + int rowIndex = 1; + foreach (Model.HSSE_HazardProject item in list) + { + excel.SetValue(rowIndex, 0, rowIndex.ToString()); + excel.SetValue(rowIndex, 1, item.ProjectName ?? string.Empty); + excel.SetValue(rowIndex, 2, item.WorkContent ?? string.Empty); + excel.SetValue(rowIndex, 3, item.RiskLevel ?? string.Empty); + excel.SetValue(rowIndex, 4, item.StartDate.HasValue ? item.StartDate.Value.ToString("yyyy-MM-dd") : string.Empty); + excel.SetValue(rowIndex, 5, item.EndDate.HasValue ? item.EndDate.Value.ToString("yyyy-MM-dd") : string.Empty); + excel.SetValue(rowIndex, 6, item.ManagerMan ?? string.Empty); + excel.SetValue(rowIndex, 7, item.Remark ?? string.Empty); + for (int i = 0; i < cols.Length; i++) + { + excel.SetStyle(rowIndex, i, dataStyle); + } + rowIndex++; + } + + excel.Save(filePath); + + FileInfo info = new FileInfo(filePath); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/vnd.ms-excel"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(filePath, 0, fileSize); + Response.Flush(); + Response.End(); + } + + /// + /// 导入 + /// + protected void btnImport_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window2.GetShowReference("HazardProjectDataIn.aspx")); + } + + /// + /// 导入窗口关闭事件 + /// + protected void Window2_Close(object sender, WindowCloseEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 编辑 + /// + /// 双击行编辑事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键菜单编辑事件 + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HazardProjectEdit.aspx?HazardProjectId={0}", id))); + } + #endregion + + #region 删除 + /// + /// 右键菜单删除事件 + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.HazardProjectService.Delete(rowID); + } + this.BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + #endregion + + #region 关联数据查看 + /// + /// 右键菜单查看该危大、超危工程关联的安全巡检记录 + /// + protected void btnMenuSafetyPatrol_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(String.Format("window.open('SafetyPatrol.aspx?HazardProjectId={0}', '_blank');", id)); + } + + /// + /// 右键菜单查看该危大、超危工程关联的安全防护验收记录 + /// + protected void btnMenuSafetyAcceptance_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(String.Format("window.open('SafetyAcceptance.aspx?HazardProjectId={0}', '_blank');", id)); + } + #endregion + + #region 公示牌二维码 + /// + /// 生成现场公示牌二维码（安全员扫码后进入巡检） + /// + protected void btnQR_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + Model.HSSE_HazardProject info = BLL.HazardProjectService.GetById(id); + if (info != null) + { + ////二维码内容：危大工程标识（编号），接入数据库后替换为巡检页面URL + string strValue = "hazard$hid=" + info.HazardProjectId; + string urlName = "hazard$hid=" + info.HazardProjectId; + string title = "危大工程公示牌：" + info.ProjectName; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/ShowQRImage.aspx?strValue={0}&urlName={1}&title={2}", strValue, urlName, System.Web.HttpUtility.UrlEncode(title)), "公示牌二维码", 340, 400)); + } + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx.designer.cs new file mode 100644 index 0000000..5fec721 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProject.aspx.designer.cs @@ -0,0 +1,242 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class HazardProject + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// ddlRiskLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlRiskLevel; + + /// + /// dpStartDateFrom 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker dpStartDateFrom; + + /// + /// dpStartDateTo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker dpStartDateTo; + + /// + /// dpEndDateFrom 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker dpEndDateFrom; + + /// + /// dpEndDateTo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker dpEndDateTo; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnQR 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnQR; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx new file mode 100644 index 0000000..8472107 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx @@ -0,0 +1,34 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardProjectDataIn.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.HazardProjectDataIn" %> + + + + + + + 导入危大、超危工程 + + + +
+ + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx.cs new file mode 100644 index 0000000..b15c6ee --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx.cs @@ -0,0 +1,210 @@ +using System; +using System.Data; +using System.IO; +using NPOI.SS.UserModel; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 危大、超危工程导入页面 + /// + public partial class HazardProjectDataIn : PageBase + { + /// + /// 上传预设的虚拟路径 + /// + private string initPath = BLL.Const.ExcelUrl; + + /// + /// 加载页面 + /// + protected void Page_Load(object sender, EventArgs e) + { + } + + #region 模板下载 + /// + /// 下载导入模板 + /// + protected void btnTemplate_Click(object sender, EventArgs e) + { + string fileName = "危大超危工程导入模板.xls"; + string rootPath = Server.MapPath("~/"); + string fullPath = rootPath + initPath; + if (!Directory.Exists(fullPath)) + { + Directory.CreateDirectory(fullPath); + } + string filePath = fullPath + fileName; + + BLL.Common.NPOIExcel excel = new BLL.Common.NPOIExcel(); + string[] cols = { "分部分项工程", "施工内容", "风险等级", "开工时间", "结束时间", "现场负责人", "备注" }; + short[] widths = { 30, 40, 16, 16, 16, 16, 30 }; + + ////表头样式：白字加粗、蓝底、带边框 + IFont headerFont = excel.CreateFont(); + headerFont.Boldweight = 700; + headerFont.Color = BLL.Common.NPOIColor.WHITE; + ICellStyle headerStyle = excel.CreateCellStyle(); + headerStyle.SetFont(headerFont); + headerStyle.FillForegroundColor = BLL.Common.NPOIColor.ROYAL_BLUE; + headerStyle.FillPattern = FillPattern.SolidForeground; + headerStyle.BorderTop = BorderStyle.Thin; + headerStyle.BorderBottom = BorderStyle.Thin; + headerStyle.BorderLeft = BorderStyle.Thin; + headerStyle.BorderRight = BorderStyle.Thin; + + for (int i = 0; i < cols.Length; i++) + { + excel.SetValue(0, i, cols[i]); + excel.SetStyle(0, i, headerStyle); + excel.SetColumnWidth(i, widths[i]); + } + excel.SetRowHeight(0, 22); + + ////开工时间、结束时间列设为日期格式（Excel 中显示为日期） + short dateFormat = excel.ActiveSheet.Workbook.CreateDataFormat().GetFormat("yyyy-mm-dd"); + ICellStyle dateStyle = excel.CreateCellStyle(); + dateStyle.DataFormat = dateFormat; + excel.ActiveSheet.SetDefaultColumnStyle(3, dateStyle); + excel.ActiveSheet.SetDefaultColumnStyle(4, dateStyle); + + ////风险等级下拉（第3列，数据行 1-500） + excel.SetValueRange(1, 500, 2, 2, new string[] { "危大工程", "超危工程" }, "请选择：危大工程 或 超危工程"); + + excel.Save(filePath); + + FileInfo info = new FileInfo(filePath); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/vnd.ms-excel"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(filePath, 0, fileSize); + Response.Flush(); + Response.End(); + } + #endregion + + #region 导入 + /// + /// 导入 + /// + protected void btnImport_Click(object sender, EventArgs e) + { + try + { + this.txtError.Hidden = true; + this.txtError.Text = string.Empty; + if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + if (this.FileExcel.HasFile == false) + { + Alert.ShowInTop("请您选择Excel文件!", MessageBoxIcon.Warning); + return; + } + string ext = Path.GetExtension(FileExcel.FileName).ToLower(); + if (ext != ".xls") + { + Alert.ShowInTop("请选择.xls格式的Excel文件!", MessageBoxIcon.Warning); + return; + } + string rootPath = Server.MapPath("~/"); + string fullPath = rootPath + initPath; + if (!Directory.Exists(fullPath)) + { + Directory.CreateDirectory(fullPath); + } + string filePath = fullPath + BLL.Funs.GetNewFileName() + ext; + if (FileExcel.PostedFile == null || FileExcel.PostedFile.ContentLength == 0) + { + Alert.ShowInTop("文件上传失败，请重新选择文件！", MessageBoxIcon.Warning); + return; + } + FileExcel.PostedFile.SaveAs(filePath); + + DataTable dt = BLL.Common.NPOIHelper.ExcelToDataTable1(filePath); + if (dt == null || dt.Rows.Count == 0) + { + Alert.ShowInTop("导入数据为空！", MessageBoxIcon.Warning); + return; + } + int success = 0; + foreach (DataRow row in dt.Rows) + { + string projectName = GetCell(row, 0); + if (string.IsNullOrEmpty(projectName)) + { + continue; + } + Model.HSSE_HazardProject info = new Model.HSSE_HazardProject + { + HazardProjectId = Guid.NewGuid().ToString(), + ProjectId = this.CurrUser.LoginProjectId, + ProjectCode = BLL.HazardProjectService.GetNewCode(), + ProjectName = projectName, + WorkContent = GetCell(row, 1), + RiskLevel = GetCell(row, 2), + StartDate = ParseDate(GetCell(row, 3)), + EndDate = ParseDate(GetCell(row, 4)), + ManagerMan = GetCell(row, 5), + Remark = GetCell(row, 6) + }; + BLL.HazardProjectService.Add(info); + success++; + } + ShowNotify("导入成功，共导入 " + success + " 条数据！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + catch (Exception ex) + { + this.txtError.Hidden = false; + this.txtError.Text = ex.ToString(); + } + } + + /// + /// 安全获取单元格值 + /// + private string GetCell(DataRow row, int index) + { + if (row.Table.Columns.Count > index && row[index] != null && row[index] != DBNull.Value) + { + return row[index].ToString().Trim(); + } + return string.Empty; + } + + /// + /// 解析日期（兼容文本日期与Excel数值日期） + /// + private DateTime? ParseDate(string val) + { + if (string.IsNullOrEmpty(val)) + { + return null; + } + DateTime dt; + if (DateTime.TryParse(val, out dt)) + { + return dt; + } + double oa; + if (double.TryParse(val, out oa) && oa > 0) + { + try + { + return DateTime.FromOADate(oa); + } + catch (Exception) + { + } + } + return null; + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx.designer.cs new file mode 100644 index 0000000..1c28211 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectDataIn.aspx.designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class HazardProjectDataIn + { + + /// + /// form1 控件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Toolbar1 控件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// FileExcel 控件。 + /// + protected global::FineUIPro.FileUpload FileExcel; + + /// + /// ToolbarFill1 控件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnTemplate 控件。 + /// + protected global::FineUIPro.Button btnTemplate; + + /// + /// btnImport 控件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// txtError 控件。 + /// + protected global::FineUIPro.TextArea txtError; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx new file mode 100644 index 0000000..0f43561 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx @@ -0,0 +1,73 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardProjectEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.HazardProjectEdit" %> + + + + + + + 编辑危大、超危工程 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx.cs new file mode 100644 index 0000000..29dce5b --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx.cs @@ -0,0 +1,113 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 编辑危大、超危工程页面 + /// + public partial class HazardProjectEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string HazardProjectId + { + get + { + return (string)ViewState["HazardProjectId"]; + } + set + { + ViewState["HazardProjectId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.HazardProjectId = Request.Params["HazardProjectId"]; + if (!string.IsNullOrEmpty(this.HazardProjectId)) + { + ////编辑：回填数据 + Model.HSSE_HazardProject info = BLL.HazardProjectService.GetById(this.HazardProjectId); + if (info != null) + { + this.txtProjectName.Text = info.ProjectName; + this.txtWorkContent.Text = info.WorkContent; + this.ddlRiskLevel.SelectedValue = info.RiskLevel; + if (info.StartDate.HasValue) + { + this.dpStartDate.SelectedDate = info.StartDate.Value; + } + if (info.EndDate.HasValue) + { + this.dpEndDate.SelectedDate = info.EndDate.Value; + } + this.txtManagerMan.Text = info.ManagerMan; + this.txtRemark.Text = info.Remark; + } + } + } + } + #endregion + + #region 保存 + /// + /// 保存按钮事件 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + if (!string.IsNullOrEmpty(this.HazardProjectId)) + { + ////编辑：更新原记录（仅更新表单字段，保留编号等内部字段） + Model.HSSE_HazardProject info = BLL.HazardProjectService.GetById(this.HazardProjectId); + if (info != null) + { + info.ProjectName = this.txtProjectName.Text.Trim(); + info.WorkContent = this.txtWorkContent.Text.Trim(); + info.RiskLevel = this.ddlRiskLevel.SelectedValue; + info.StartDate = this.dpStartDate.SelectedDate; + info.EndDate = this.dpEndDate.SelectedDate; + info.ManagerMan = this.txtManagerMan.Text.Trim(); + info.Remark = this.txtRemark.Text.Trim(); + BLL.HazardProjectService.Update(info); + } + } + else + { + ////新增：插入记录，编号自动生成 + Model.HSSE_HazardProject info = new Model.HSSE_HazardProject + { + HazardProjectId = Guid.NewGuid().ToString(), + ProjectId = this.CurrUser.LoginProjectId, + ProjectCode = BLL.HazardProjectService.GetNewCode(), + ProjectName = this.txtProjectName.Text.Trim(), + WorkContent = this.txtWorkContent.Text.Trim(), + RiskLevel = this.ddlRiskLevel.SelectedValue, + StartDate = this.dpStartDate.SelectedDate, + EndDate = this.dpEndDate.SelectedDate, + ManagerMan = this.txtManagerMan.Text.Trim(), + Remark = this.txtRemark.Text.Trim() + }; + BLL.HazardProjectService.Add(info); + } + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx.designer.cs new file mode 100644 index 0000000..c61ca67 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/HazardProjectEdit.aspx.designer.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class HazardProjectEdit + { + + /// + /// form1 控件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtProjectName 控件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// txtWorkContent 控件。 + /// + protected global::FineUIPro.TextBox txtWorkContent; + + /// + /// ddlRiskLevel 控件。 + /// + protected global::FineUIPro.DropDownList ddlRiskLevel; + + /// + /// dpStartDate 控件。 + /// + protected global::FineUIPro.DatePicker dpStartDate; + + /// + /// dpEndDate 控件。 + /// + protected global::FineUIPro.DatePicker dpEndDate; + + /// + /// txtManagerMan 控件。 + /// + protected global::FineUIPro.TextBox txtManagerMan; + + /// + /// txtRemark 控件。 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// Toolbar1 控件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx new file mode 100644 index 0000000..a1e67d3 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx @@ -0,0 +1,132 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RiskControlList.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.RiskControlList" %> + + + + + + + 风险分级管控清单 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.cs new file mode 100644 index 0000000..dd3171d --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.cs @@ -0,0 +1,176 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 风险分级管控清单页面 + /// + public partial class RiskControlList : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + this.BindGrid(); + } + } + + /// + /// 新增按钮事件 + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference("RiskControlListEdit.aspx")); + } + #endregion + + #region 数据绑定 + /// + /// 绑定数据 + /// + private void BindGrid() + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先登录或选择项目！", MessageBoxIcon.Warning); + return; + } + List list = BLL.RiskControlListService.GetList(this.CurrUser.LoginProjectId); + ////查询条件过滤 + string name = this.txtRiskName.Text.Trim(); + if (!string.IsNullOrEmpty(name)) + { + list = list.Where(x => x.RiskName.Contains(name)).ToList(); + } + if (!string.IsNullOrEmpty(this.ddlRiskLevel.SelectedValue)) + { + list = list.Where(x => x.RiskLevel == this.ddlRiskLevel.SelectedValue).ToList(); + } + Grid1.RecordCount = list.Count; + var table = this.GetPagedDataTable(Grid1, list); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页事件 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 每页记录数下拉事件 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序事件 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 编辑 + /// + /// 双击行编辑事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键菜单编辑事件 + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RiskControlListEdit.aspx?RiskId={0}", id))); + } + #endregion + + #region 删除 + /// + /// 右键菜单删除事件 + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.RiskControlListService.Delete(rowID); + } + this.BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + /// + /// 编辑窗口关闭事件 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 附件查看 + /// + /// 附件查看（弹出附件列表窗口） + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "attchUrl") + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/RiskControl&menuId={2}", + -1, e.RowID, BLL.Const.ProjectRiskControlMenuId))); + } + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.designer.cs new file mode 100644 index 0000000..e1e6d7a --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlList.aspx.designer.cs @@ -0,0 +1,102 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class RiskControlList + { + + /// + /// form1 控件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtRiskName 控件。 + /// + protected global::FineUIPro.TextBox txtRiskName; + + /// + /// ddlRiskLevel 控件。 + /// + protected global::FineUIPro.DropDownList ddlRiskLevel; + + /// + /// ToolbarFill1 控件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// ToolbarSeparator1 控件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// WindowAtt 控件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx new file mode 100644 index 0000000..0e48a45 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx @@ -0,0 +1,96 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RiskControlListEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.RiskControlListEdit" %> + + + + + + + 编辑风险分级管控清单 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.cs new file mode 100644 index 0000000..262ac76 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.cs @@ -0,0 +1,111 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 编辑风险分级管控清单页面 + /// + public partial class RiskControlListEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string RiskId + { + get + { + return (string)ViewState["RiskId"]; + } + set + { + ViewState["RiskId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.RiskId = Request.Params["RiskId"]; + if (!string.IsNullOrEmpty(this.RiskId)) + { + ////编辑：回填数据 + Model.HSSE_RiskControlList info = BLL.RiskControlListService.GetById(this.RiskId); + if (info != null) + { + this.txtRiskName.Text = info.RiskName; + this.ddlRiskLevel.SelectedValue = info.RiskLevel; + this.txtRiskType.Text = info.RiskType; + this.txtControlMeasure.Text = info.ControlMeasure; + this.txtManagerUnit.Text = info.ManagerUnit; + this.txtManagerMan.Text = info.ManagerMan; + this.txtRemark.Text = info.Remark; + } + } + } + } + #endregion + + #region 保存 + /// + /// 保存按钮事件 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + ////新增时先生成主键，保证附件能挂到同一记录 + if (string.IsNullOrEmpty(this.RiskId)) + { + this.RiskId = Guid.NewGuid().ToString(); + } + ////校验附件是否已上传 + Model.AttachFile attach = BLL.Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.RiskId); + if (attach == null || string.IsNullOrEmpty(attach.AttachUrl)) + { + Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + return; + } + Model.HSSE_RiskControlList info = new Model.HSSE_RiskControlList + { + RiskId = this.RiskId, + ProjectId = this.CurrUser.LoginProjectId, + RiskName = this.txtRiskName.Text.Trim(), + RiskLevel = this.ddlRiskLevel.SelectedValue, + RiskType = this.txtRiskType.Text.Trim(), + ControlMeasure = this.txtControlMeasure.Text.Trim(), + ManagerUnit = this.txtManagerUnit.Text.Trim(), + ManagerMan = this.txtManagerMan.Text.Trim(), + Remark = this.txtRemark.Text.Trim() + }; + ////存在则更新，不存在则新增（服务层已处理） + BLL.RiskControlListService.Update(info); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 上传附件（弹出附件上传窗口） + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.RiskId)) + { + this.RiskId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/RiskControl&menuId={1}", this.RiskId, BLL.Const.ProjectRiskControlMenuId))); + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.designer.cs new file mode 100644 index 0000000..65a1636 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/RiskControlListEdit.aspx.designer.cs @@ -0,0 +1,107 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class RiskControlListEdit + { + + /// + /// form1 控件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Panel2 控件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Label1 控件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// btnAttach 控件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// txtRiskName 控件。 + /// + protected global::FineUIPro.TextBox txtRiskName; + + /// + /// ddlRiskLevel 控件。 + /// + protected global::FineUIPro.DropDownList ddlRiskLevel; + + /// + /// txtRiskType 控件。 + /// + protected global::FineUIPro.TextBox txtRiskType; + + /// + /// txtControlMeasure 控件。 + /// + protected global::FineUIPro.TextArea txtControlMeasure; + + /// + /// txtManagerUnit 控件。 + /// + protected global::FineUIPro.TextBox txtManagerUnit; + + /// + /// txtManagerMan 控件。 + /// + protected global::FineUIPro.TextBox txtManagerMan; + + /// + /// txtRemark 控件。 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// Toolbar1 控件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// WindowAtt 控件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx new file mode 100644 index 0000000..1ff60d5 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx @@ -0,0 +1,120 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyAcceptance.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.SafetyAcceptance" %> + + + + + + + 安全防护验收 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx.cs new file mode 100644 index 0000000..85bca84 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx.cs @@ -0,0 +1,189 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 安全防护验收页面 + /// + public partial class SafetyAcceptance : PageBase + { + #region 关联危大工程主键 + /// + /// 关联的危大、超危工程主键（从危大清单右键进入时按此过滤） + /// + private string HazardProjectId + { + get { return (string)ViewState["HazardProjectId"]; } + set { ViewState["HazardProjectId"] = value; } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.HazardProjectId = Request.Params["HazardProjectId"]; + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + this.BindGrid(); + } + } + + /// + /// 新增按钮事件 + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference("SafetyAcceptanceEdit.aspx")); + } + #endregion + + #region 数据绑定 + /// + /// 绑定数据 + /// + private void BindGrid() + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先登录或选择项目！", MessageBoxIcon.Warning); + return; + } + List list = BLL.SafetyAcceptanceService.GetList(this.CurrUser.LoginProjectId); + ////按关联危大工程过滤（从危大清单右键进入） + if (!string.IsNullOrEmpty(this.HazardProjectId)) + { + list = list.Where(x => x.HazardProjectId == this.HazardProjectId).ToList(); + } + ////查询条件过滤 + string projectName = this.txtProjectName.Text.Trim(); + if (!string.IsNullOrEmpty(projectName)) + { + list = list.Where(x => x.HazardProjectName.Contains(projectName)).ToList(); + } + Grid1.RecordCount = list.Count; + var table = this.GetPagedDataTable(Grid1, list); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页事件 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 每页记录数下拉事件 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序事件 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 编辑 + /// + /// 双击行编辑事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键菜单编辑事件 + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SafetyAcceptanceEdit.aspx?AcceptanceId={0}", id))); + } + #endregion + + #region 删除 + /// + /// 右键菜单删除事件 + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.SafetyAcceptanceService.Delete(rowID); + } + this.BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + /// + /// 编辑窗口关闭事件 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 附件查看 + /// + /// 附件查看（弹出附件列表窗口） + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "attchUrl") + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/SafetyAcceptance&menuId={2}", + -1, e.RowID, BLL.Const.SafetyAcceptanceMenuId))); + } + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx.designer.cs new file mode 100644 index 0000000..c945c84 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptance.aspx.designer.cs @@ -0,0 +1,170 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class SafetyAcceptance + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx new file mode 100644 index 0000000..f3a64ac --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx @@ -0,0 +1,75 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyAcceptanceEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.SafetyAcceptanceEdit" %> + + + + + + + 编辑安全防护验收 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.cs new file mode 100644 index 0000000..e4400a8 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.cs @@ -0,0 +1,130 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 编辑安全防护验收页面 + /// + public partial class SafetyAcceptanceEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string AcceptanceId + { + get + { + return (string)ViewState["AcceptanceId"]; + } + set + { + ViewState["AcceptanceId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.InitDropDownList(); + this.AcceptanceId = Request.Params["AcceptanceId"]; + if (!string.IsNullOrEmpty(this.AcceptanceId)) + { + ////编辑：回填数据 + Model.HSSE_SafetyAcceptance info = BLL.SafetyAcceptanceService.GetById(this.AcceptanceId); + if (info != null) + { + this.ddlHazardProject.SelectedValue = info.HazardProjectId; + this.ddlAcceptanceResult.SelectedValue = info.AcceptanceResult; + this.txtRemark.Text = info.Remark; + } + } + } + } + + /// + /// 初始化危大、超危清单下拉 + /// + private void InitDropDownList() + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + return; + } + List projects = BLL.HazardProjectService.GetList(this.CurrUser.LoginProjectId); + foreach (Model.HSSE_HazardProject p in projects) + { + this.ddlHazardProject.Items.Add(new FineUIPro.ListItem(p.ProjectName + "（" + p.ProjectCode + "）", p.HazardProjectId)); + } + } + #endregion + + #region 保存 + /// + /// 保存按钮事件 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + ////新增时先生成主键，保证附件能挂到同一记录 + if (string.IsNullOrEmpty(this.AcceptanceId)) + { + this.AcceptanceId = Guid.NewGuid().ToString(); + } + ////校验附件是否已上传 + Model.AttachFile attach = BLL.Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.AcceptanceId); + if (attach == null || string.IsNullOrEmpty(attach.AttachUrl)) + { + Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + return; + } + ////根据所选清单回填工程名称 + string hazardProjectName = string.Empty; + Model.HSSE_HazardProject project = BLL.HazardProjectService.GetById(this.ddlHazardProject.SelectedValue); + if (project != null) + { + hazardProjectName = project.ProjectName; + } + Model.HSSE_SafetyAcceptance info = new Model.HSSE_SafetyAcceptance + { + AcceptanceId = this.AcceptanceId, + ProjectId = this.CurrUser.LoginProjectId, + HazardProjectId = this.ddlHazardProject.SelectedValue, + HazardProjectName = hazardProjectName, + AcceptanceResult = this.ddlAcceptanceResult.SelectedValue, + AcceptanceMan = this.CurrUser.UserName, + AcceptanceDate = DateTime.Now, + Remark = this.txtRemark.Text.Trim() + }; + ////存在则更新，不存在则新增（服务层已处理） + BLL.SafetyAcceptanceService.Update(info); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 上传附件 + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.AcceptanceId)) + { + this.AcceptanceId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/SafetyAcceptance&menuId={1}", this.AcceptanceId, BLL.Const.SafetyAcceptanceMenuId))); + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.designer.cs new file mode 100644 index 0000000..8adec8a --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyAcceptanceEdit.aspx.designer.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class SafetyAcceptanceEdit + { + + /// + /// form1 控件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ddlHazardProject 控件。 + /// + protected global::FineUIPro.DropDownList ddlHazardProject; + + /// + /// ddlAcceptanceResult 控件。 + /// + protected global::FineUIPro.DropDownList ddlAcceptanceResult; + + /// + /// Panel2 控件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Label1 控件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// btnAttach 控件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// txtRemark 控件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Toolbar1 控件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// WindowAtt 控件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx new file mode 100644 index 0000000..f2731cd --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx @@ -0,0 +1,139 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyPatrol.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.SafetyPatrol" %> + + + + + + + 安全巡检 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx.cs new file mode 100644 index 0000000..dc31356 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx.cs @@ -0,0 +1,223 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 安全巡检页面 + /// + public partial class SafetyPatrol : PageBase + { + #region 关联危大工程主键 + /// + /// 关联的危大、超危工程主键（从危大清单右键进入时按此过滤） + /// + private string HazardProjectId + { + get { return (string)ViewState["HazardProjectId"]; } + set { ViewState["HazardProjectId"] = value; } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.HazardProjectId = Request.Params["HazardProjectId"]; + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + this.BindGrid(); + } + } + + /// + /// 扫码巡检按钮事件 + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference("SafetyPatrolEdit.aspx")); + } + #endregion + + #region 模板绑定辅助方法 + /// + /// 巡检状态颜色（待整改标红） + /// + public Color GetPatrolStatusColor(object value) + { + string state = value == null ? "" : value.ToString(); + return state == "待整改" ? Color.Red : Color.Green; + } + #endregion + + #region 数据绑定 + /// + /// 绑定数据 + /// + private void BindGrid() + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先登录或选择项目！", MessageBoxIcon.Warning); + return; + } + List list = BLL.SafetyPatrolService.GetList(this.CurrUser.LoginProjectId); + ////按关联危大工程过滤（从危大清单右键进入） + if (!string.IsNullOrEmpty(this.HazardProjectId)) + { + list = list.Where(x => x.HazardProjectId == this.HazardProjectId).ToList(); + } + ////查询条件过滤 + string projectName = this.txtProjectName.Text.Trim(); + if (!string.IsNullOrEmpty(projectName)) + { + list = list.Where(x => x.HazardProjectName != null && x.HazardProjectName.Contains(projectName)).ToList(); + } + ////巡检日期时间段过滤 + DateTime startDate; + if (DateTime.TryParse(this.txtStartTime.Text, out startDate)) + { + list = list.Where(x => x.PatrolDate.HasValue && x.PatrolDate.Value.Date >= startDate.Date).ToList(); + } + DateTime endDate; + if (DateTime.TryParse(this.txtEndTime.Text, out endDate)) + { + list = list.Where(x => x.PatrolDate.HasValue && x.PatrolDate.Value.Date <= endDate.Date).ToList(); + } + Grid1.RecordCount = list.Count; + var table = this.GetPagedDataTable(Grid1, list); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页事件 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 每页记录数下拉事件 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序事件 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + /// + /// 重置查询条件 + /// + protected void btnRset_Click(object sender, EventArgs e) + { + this.txtProjectName.Text = ""; + this.txtStartTime.Text = ""; + this.txtEndTime.Text = ""; + this.BindGrid(); + } + #endregion + + #region 编辑 + /// + /// 双击行编辑事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键菜单编辑事件 + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SafetyPatrolEdit.aspx?PatrolId={0}", id))); + } + #endregion + + #region 删除 + /// + /// 右键菜单删除事件 + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.SafetyPatrolService.Delete(rowID); + } + this.BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + /// + /// 编辑窗口关闭事件 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 附件查看 + /// + /// 附件查看（弹出附件列表窗口） + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + if (e.CommandName == "attchUrl") + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/SafetyPatrol&menuId={2}", + -1, e.RowID, BLL.Const.SafetyPatrolMenuId))); + } + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx.designer.cs new file mode 100644 index 0000000..c4ff4d9 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrol.aspx.designer.cs @@ -0,0 +1,206 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class SafetyPatrol + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnRset 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnRset; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// lblPatrolStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPatrolStatus; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx new file mode 100644 index 0000000..8ebd705 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx @@ -0,0 +1,80 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyPatrolEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.SafetyPatrolEdit" %> + + + + + + + 编辑安全巡检记录 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx.cs new file mode 100644 index 0000000..c489aa9 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx.cs @@ -0,0 +1,151 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 编辑安全巡检记录页面 + /// + public partial class SafetyPatrolEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string PatrolId + { + get + { + return (string)ViewState["PatrolId"]; + } + set + { + ViewState["PatrolId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.InitDropDownList(); + ////巡检人关联当前登录账号 + if (this.CurrUser != null) + { + this.lblPatrolMan.Text = this.CurrUser.UserName; + } + this.PatrolId = Request.Params["PatrolId"]; + if (!string.IsNullOrEmpty(this.PatrolId)) + { + ////编辑：回填数据 + Model.HSSE_SafetyPatrol info = BLL.SafetyPatrolService.GetById(this.PatrolId); + if (info != null) + { + if (!string.IsNullOrEmpty(info.HazardProjectId)) + { + this.ddlHazardProject.SelectedValue = info.HazardProjectId; + } + if (info.PatrolDate.HasValue) + { + this.dpPatrolDate.SelectedDate = info.PatrolDate.Value; + } + if (!string.IsNullOrEmpty(info.PatrolStatus)) + { + this.ddlPatrolStatus.SelectedValue = info.PatrolStatus; + } + this.txtContent.Text = info.Content; + } + } + else + { + ////新增（扫码巡检）：默认巡检日期为当天、巡检状态为正常 + this.dpPatrolDate.SelectedDate = DateTime.Now; + this.ddlPatrolStatus.SelectedValue = "正常"; + } + } + } + + /// + /// 初始化危大、超危清单下拉 + /// + private void InitDropDownList() + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + return; + } + List projects = BLL.HazardProjectService.GetList(this.CurrUser.LoginProjectId); + foreach (Model.HSSE_HazardProject p in projects) + { + this.ddlHazardProject.Items.Add(new FineUIPro.ListItem(p.ProjectName + "（" + p.ProjectCode + "）", p.HazardProjectId)); + } + } + #endregion + + #region 保存 + /// + /// 保存按钮事件 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + ////新增时先生成主键，保证附件能挂到同一记录 + if (string.IsNullOrEmpty(this.PatrolId)) + { + this.PatrolId = Guid.NewGuid().ToString(); + } + ////校验附件是否已上传 + Model.AttachFile attach = BLL.Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.PatrolId); + if (attach == null || string.IsNullOrEmpty(attach.AttachUrl)) + { + Alert.ShowInTop("请上传巡检图片！", MessageBoxIcon.Warning); + return; + } + ////根据所选清单回填工程名称 + string hazardProjectName = string.Empty; + Model.HSSE_HazardProject project = BLL.HazardProjectService.GetById(this.ddlHazardProject.SelectedValue); + if (project != null) + { + hazardProjectName = project.ProjectName; + } + Model.HSSE_SafetyPatrol info = new Model.HSSE_SafetyPatrol + { + PatrolId = this.PatrolId, + ProjectId = this.CurrUser.LoginProjectId, + HazardProjectId = this.ddlHazardProject.SelectedValue, + HazardProjectName = hazardProjectName, + PatrolDate = this.dpPatrolDate.SelectedDate, + PatrolMan = this.CurrUser.UserName, + PatrolStatus = this.ddlPatrolStatus.SelectedValue, + Content = this.txtContent.Text.Trim() + }; + ////存在则更新，不存在则新增（服务层已处理） + BLL.SafetyPatrolService.Update(info); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 上传巡检图片 + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.PatrolId)) + { + this.PatrolId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/SafetyPatrol&menuId={1}", this.PatrolId, BLL.Const.SafetyPatrolMenuId))); + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx.designer.cs new file mode 100644 index 0000000..c43744c --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SafetyPatrolEdit.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class SafetyPatrolEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ddlHazardProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlHazardProject; + + /// + /// dpPatrolDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker dpPatrolDate; + + /// + /// ddlPatrolStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPatrolStatus; + + /// + /// lblPatrolMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblPatrolMan; + + /// + /// txtContent 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtContent; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// btnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx new file mode 100644 index 0000000..1df4a53 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx @@ -0,0 +1,78 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SpecialPlanEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.HazardousMG.SpecialPlanEdit" %> + + + + + + + 编辑专项施工方案 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx.cs new file mode 100644 index 0000000..866edb9 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx.cs @@ -0,0 +1,111 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + /// + /// 编辑专项施工方案页面 + /// + public partial class SpecialPlanEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string PlanId + { + get + { + return (string)ViewState["PlanId"]; + } + set + { + ViewState["PlanId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.PlanId = Request.Params["PlanId"]; + if (!string.IsNullOrEmpty(this.PlanId)) + { + ////编辑：回填数据 + Model.HSSE_SpecialPlan info = BLL.SpecialPlanService.GetById(this.PlanId); + if (info != null) + { + this.txtHazardProjectName.Text = info.HazardProjectName; + this.txtPlanName.Text = info.PlanName; + this.txtCompileMan.Text = info.CompileMan; + if (info.CompileDate.HasValue) + { + this.dpCompileDate.SelectedDate = info.CompileDate.Value; + } + this.txtRemark.Text = info.Remark; + } + } + } + } + #endregion + + #region 保存 + /// + /// 保存按钮事件 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.CurrUser == null || string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + Alert.ShowInTop("请先选择项目！", MessageBoxIcon.Warning); + return; + } + ////新增时先生成主键，保证附件能挂到同一记录 + if (string.IsNullOrEmpty(this.PlanId)) + { + this.PlanId = Guid.NewGuid().ToString(); + } + ////校验附件是否已上传 + Model.AttachFile attach = BLL.Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.PlanId); + if (attach == null || string.IsNullOrEmpty(attach.AttachUrl)) + { + Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + return; + } + Model.HSSE_SpecialPlan info = new Model.HSSE_SpecialPlan + { + PlanId = this.PlanId, + ProjectId = this.CurrUser.LoginProjectId, + HazardProjectName = this.txtHazardProjectName.Text.Trim(), + PlanName = this.txtPlanName.Text.Trim(), + CompileMan = this.txtCompileMan.Text.Trim(), + CompileDate = this.dpCompileDate.SelectedDate, + Remark = this.txtRemark.Text.Trim() + }; + ////存在则更新，不存在则新增（服务层已处理） + BLL.SpecialPlanService.Update(info); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 上传附件 + /// + protected void btnAttach_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.PlanId)) + { + this.PlanId = Guid.NewGuid().ToString(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/SpecialPlan&menuId={1}", this.PlanId, BLL.Const.SpecialSchemeMenuId))); + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx.designer.cs new file mode 100644 index 0000000..6e97c54 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/HazardousMG/SpecialPlanEdit.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.HazardousMG +{ + + + public partial class SpecialPlanEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtHazardProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHazardProjectName; + + /// + /// txtPlanName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPlanName; + + /// + /// txtCompileMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCompileMan; + + /// + /// dpCompileDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker dpCompileDate; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// btnAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttach; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs index 1cf39d0..c0df6a1 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs @@ -822,7 +822,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection } } - catch(Exception ex) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RishAnalysis.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RishAnalysis.aspx.cs index 2f6ec5f..91eac37 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RishAnalysis.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RishAnalysis.aspx.cs @@ -136,7 +136,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.cs index 4778988..8b3ee2b 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/Notice.aspx.cs @@ -453,7 +453,7 @@ namespace FineUIPro.Web.HSSE.InformationProject /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs index 1a4f290..2fb30f9 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs @@ -253,7 +253,7 @@ namespace FineUIPro.Web.HSSE.InformationProject /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/KqShowScreen/JZYScreen.aspx.cs b/SGGL/FineUIPro.Web/HSSE/KqShowScreen/JZYScreen.aspx.cs index 2b66384..eb25979 100644 --- a/SGGL/FineUIPro.Web/HSSE/KqShowScreen/JZYScreen.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/KqShowScreen/JZYScreen.aspx.cs @@ -83,7 +83,6 @@ namespace FineUIPro.Web.HSSE.KqShowScreen //let leftLabel = ['施工人员', '十六化建管理人员', '天辰管理人员', '监理管理人员', '业主管理人员', '当前现场总人数', '当日最高人数'] int num1 = 0; - int num2 = 0; int num3 = 0; int num4 = 0; int num5 = 0; diff --git a/SGGL/FineUIPro.Web/HSSE/License/EquipmentSafetyList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/EquipmentSafetyList.aspx.cs index cfc1bdf..2922c2f 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/EquipmentSafetyList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/EquipmentSafetyList.aspx.cs @@ -305,7 +305,7 @@ namespace FineUIPro.Web.HSSE.License /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/License/SecurityLicense.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/SecurityLicense.aspx.cs index de60724..1736a19 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/SecurityLicense.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/SecurityLicense.aspx.cs @@ -297,7 +297,7 @@ namespace FineUIPro.Web.HSSE.License /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonth.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonth.aspx.cs index 07b7bef..4f13ee7 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonth.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonth.aspx.cs @@ -250,7 +250,7 @@ namespace FineUIPro.Web.HSSE.Manager /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthView.aspx.cs index a14a0ad..f899120 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthView.aspx.cs @@ -121,5 +121,34 @@ namespace FineUIPro.Web.HSSE.Manager this.txtNum15.Text = hsseLogMonth.Num15.ToString(); } #endregion + + #region 事件 + /// + /// 月份变更事件（重新加载当前记录数据） + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.HSSELogMonthId)) + { + Model.Manager_HSSELogMonth hsseLogMonth = BLL.HSSELogMonthService.GetHSSELogMonthByHSSELogMonthId(this.HSSELogMonthId); + if (hsseLogMonth != null) + { + this.InitText(hsseLogMonth); + } + } + } + + /// + /// 数值变更事件（查看页只读展示，无需处理） + /// + /// + /// + protected void Value_TextChanged(object sender, EventArgs e) + { + ////查看页面，数据只读展示，不做处理 + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthB.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthB.aspx.cs index 314e4bd..144060d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthB.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthB.aspx.cs @@ -348,7 +348,7 @@ namespace FineUIPro.Web.HSSE.Manager /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthC.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthC.aspx.cs index c8a0585..96958c5 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthC.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthC.aspx.cs @@ -374,7 +374,7 @@ namespace FineUIPro.Web.HSSE.Manager /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerWeek.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerWeek.aspx.cs index 02e3cb5..6a903ac 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerWeek.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerWeek.aspx.cs @@ -315,7 +315,7 @@ namespace FineUIPro.Web.HSSE.Manager /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportBEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportBEdit.aspx.cs index bc1b717..e3a3200 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportBEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportBEdit.aspx.cs @@ -912,7 +912,7 @@ namespace FineUIPro.Web.HSSE.Manager { bPeopleNum += int.Parse(b.PeopleNum); } - catch (Exception e) { } + catch (Exception) { } } Model.Manager_TrainSortB lastTrainSort = BLL.TrainSortBService.GetTrainSortByMonthReportIdAndTrainType(LastMonthReportId, item.TrainTypeName); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs index 0de99f4..2a274a6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/MonthReportCEdit6.aspx.cs @@ -142,7 +142,7 @@ namespace FineUIPro.Web.HSSE.Manager { Model.Manager_MonthReportC mr = BLL.MonthReportCService.GetLastMonthReportByDate(endTime, this.ProjectId); decimal? sMonthType1 = 0, sMonthType2 = 0, sMonthType3 = 0, sMonthType4 = 0, sMonthType5 = 0, sMonthType6 = 0; - decimal? tMonthType1 = 0, tMonthType2 = 0; + decimal? tMonthType1 = 0; List payRegistrations = BLL.PayRegistrationService.GetPayRegistrationByPayDate(startTime, endTime, this.ProjectId); if (payRegistrations != null) { diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/SubManagerMonth.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/SubManagerMonth.aspx.cs index e6f0b97..0b9642b 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/SubManagerMonth.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/SubManagerMonth.aspx.cs @@ -335,7 +335,7 @@ namespace FineUIPro.Web.HSSE.Manager /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/SubManagerWeek.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/SubManagerWeek.aspx.cs index 3c177ca..a8ff83b 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/SubManagerWeek.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/SubManagerWeek.aspx.cs @@ -314,7 +314,7 @@ namespace FineUIPro.Web.HSSE.Manager /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Material/MaterPhyQuantityList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Material/MaterPhyQuantityList.aspx.cs index 32a7849..6f6f9f7 100644 --- a/SGGL/FineUIPro.Web/HSSE/Material/MaterPhyQuantityList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Material/MaterPhyQuantityList.aspx.cs @@ -212,7 +212,7 @@ namespace FineUIPro.Web.HSSE.Material /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs index 8a56c4a..59e2bd0 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs @@ -216,9 +216,9 @@ namespace FineUIPro.Web.HSSE.Meeting DateTime end = DateTime.Parse(string.Format("{0} 23:59:59", this.txtEndTime.Text.Trim())); try { - str = Funs.DB.Meeting_ClassMeeting.Where(x => x.TeamGroupId == groupId && x.ClassMeetingDate >= start && x.ClassMeetingDate <= end && x.ProjectId == this.CurrUser.LoginProjectId).Sum(p => p.AttentPersonNum).ToString(); + str = Funs.DB.Meeting_ClassMeeting.Where(x => x.TeamGroupId == (string)groupId && x.ClassMeetingDate >= start && x.ClassMeetingDate <= end && x.ProjectId == this.CurrUser.LoginProjectId).Sum(p => p.AttentPersonNum).ToString(); } - catch (Exception ex) + catch (Exception) { str = ""; } diff --git a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs index 9ec8e99..dfecd45 100644 --- a/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeetingView.aspx.cs @@ -59,7 +59,10 @@ namespace FineUIPro.Web.HSSE.Meeting this.drpUnit.Text = UnitService.GetUnitNameByUnitId(classMeeting.UnitId); this.drpTeamGroup.Text = TeamGroupService.GetTeamGroupNameByTeamGroupId(classMeeting.TeamGroupId); this.txtAttentPersonNum.Text = classMeeting.AttentPersonNum.ToString(); - this.textInstallationName.Text = classMeeting.InstallationName.ToString(); + if (!string.IsNullOrEmpty(classMeeting.InstallationName)) + { + this.textInstallationName.Text = classMeeting.InstallationName; + } } } diff --git a/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx new file mode 100644 index 0000000..8859e4b --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx @@ -0,0 +1,150 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PowerBox.aspx.cs" Inherits="FineUIPro.Web.HSSE.PowerMG.PowerBox" %> + + + + + + + 配电箱管理 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx.cs new file mode 100644 index 0000000..e2c1608 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx.cs @@ -0,0 +1,315 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Web; + +namespace FineUIPro.Web.HSSE.PowerMG +{ + /// + /// 配电箱信息实体（模拟数据阶段使用，接入数据库后可删除） + /// + public class PowerBoxInfo + { + /// + /// 主键 + /// + public string PowerBoxId { get; set; } + + /// + /// 配电箱编号 + /// + public string PowerBoxCode { get; set; } + + /// + /// 配电箱名称/型号 + /// + public string PowerBoxName { get; set; } + + /// + /// 类型（总配电箱/分配电箱/开关箱） + /// + public string BoxType { get; set; } + + /// + /// 安装位置 + /// + public string InstallPlace { get; set; } + + /// + /// 额定容量(A) + /// + public string RatedCapacity { get; set; } + + /// + /// 电压等级 + /// + public string VoltageLevel { get; set; } + + /// + /// 责任单位 + /// + public string ManagerUnit { get; set; } + + /// + /// 责任人 + /// + public string ManagerMan { get; set; } + + /// + /// 联系电话 + /// + public string ManagerTel { get; set; } + + /// + /// 状态（正常/停用/维修中） + /// + public string States { get; set; } + + /// + /// 最近巡检日期 + /// + public DateTime? LastCheckDate { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + } + + /// + /// 配电箱管理页面（当前为模拟数据演示，数据存于 Session，后续接入数据库） + /// + public partial class PowerBox : PageBase + { + /// + /// 模拟数据Session键 + /// + public const string MockSessionKey = "PowerBoxMockData"; + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.InitMockData(); + this.btnNew.OnClientClick = Window1.GetShowReference("PowerBoxEdit.aspx") + "return false;"; + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + this.BindGrid(); + } + } + #endregion + + #region 模拟数据（先以模拟数据演示，接入数据库后删除本区域代码） + /// + /// 初始化模拟数据（Session为空时生成） + /// + private void InitMockData() + { + if (Session[MockSessionKey] == null) + { + Session[MockSessionKey] = CreateMockData(); + } + } + + /// + /// 获取模拟数据列表（来自Session） + /// + private List GetMockList() + { + return Session[MockSessionKey] as List; + } + + /// + /// 生成初始模拟数据 + /// + private List CreateMockData() + { + List list = new List(); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-001", PowerBoxName = "总配电箱1#（XL-21型）", BoxType = "总配电箱", InstallPlace = "项目部西侧配电房", RatedCapacity = "630", VoltageLevel = "380V", ManagerUnit = "河北安装一分公司", ManagerMan = "张建国", ManagerTel = "13800001201", States = "正常", LastCheckDate = new DateTime(2026, 1, 10), Remark = "" }); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-002", PowerBoxName = "分配电箱1#楼", BoxType = "分配电箱", InstallPlace = "1#楼一层东侧", RatedCapacity = "250", VoltageLevel = "380V", ManagerUnit = "河北安装一分公司", ManagerMan = "李卫东", ManagerTel = "13800001202", States = "正常", LastCheckDate = new DateTime(2026, 1, 8), Remark = "" }); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-003", PowerBoxName = "分配电箱2#楼", BoxType = "分配电箱", InstallPlace = "2#楼一层西侧", RatedCapacity = "250", VoltageLevel = "380V", ManagerUnit = "河北安装一分公司", ManagerMan = "李卫东", ManagerTel = "13800001203", States = "正常", LastCheckDate = new DateTime(2026, 1, 5), Remark = "" }); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-004", PowerBoxName = "开关箱1-1", BoxType = "开关箱", InstallPlace = "1#楼三层南侧", RatedCapacity = "63", VoltageLevel = "380V", ManagerUnit = "河北安装一分公司", ManagerMan = "王强", ManagerTel = "13800001204", States = "正常", LastCheckDate = new DateTime(2026, 1, 12), Remark = "" }); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-005", PowerBoxName = "开关箱1-2", BoxType = "开关箱", InstallPlace = "1#楼五层北侧", RatedCapacity = "63", VoltageLevel = "380V", ManagerUnit = "河北安装一分公司", ManagerMan = "王强", ManagerTel = "13800001205", States = "维修中", LastCheckDate = new DateTime(2025, 12, 28), Remark = "漏电保护器故障，待更换" }); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-006", PowerBoxName = "总配电箱2#", BoxType = "总配电箱", InstallPlace = "生活区东侧", RatedCapacity = "400", VoltageLevel = "380V", ManagerUnit = "河北安装二分公司", ManagerMan = "刘志刚", ManagerTel = "13800001206", States = "正常", LastCheckDate = new DateTime(2026, 1, 11), Remark = "" }); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-007", PowerBoxName = "分配电箱生活区", BoxType = "分配电箱", InstallPlace = "生活区食堂旁", RatedCapacity = "160", VoltageLevel = "380V", ManagerUnit = "河北安装二分公司", ManagerMan = "刘志刚", ManagerTel = "13800001207", States = "正常", LastCheckDate = new DateTime(2026, 1, 6), Remark = "" }); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-008", PowerBoxName = "开关箱钢筋棚", BoxType = "开关箱", InstallPlace = "钢筋加工棚北侧", RatedCapacity = "63", VoltageLevel = "380V", ManagerUnit = "河北安装二分公司", ManagerMan = "赵磊", ManagerTel = "13800001208", States = "停用", LastCheckDate = new DateTime(2025, 12, 20), Remark = "钢筋棚搬迁后停用" }); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-009", PowerBoxName = "分配电箱塔吊1#", BoxType = "分配电箱", InstallPlace = "1#塔吊基础旁", RatedCapacity = "250", VoltageLevel = "380V", ManagerUnit = "河北安装三分公司", ManagerMan = "孙立新", ManagerTel = "13800001209", States = "正常", LastCheckDate = new DateTime(2026, 1, 9), Remark = "" }); + list.Add(new PowerBoxInfo { PowerBoxId = Guid.NewGuid().ToString(), PowerBoxCode = "PDX-010", PowerBoxName = "开关箱塔吊1#", BoxType = "开关箱", InstallPlace = "1#塔吊操作室", RatedCapacity = "40", VoltageLevel = "380V", ManagerUnit = "河北安装三分公司", ManagerMan = "孙立新", ManagerTel = "13800001210", States = "正常", LastCheckDate = new DateTime(2026, 1, 9), Remark = "" }); + return list; + } + #endregion + + #region 数据绑定 + /// + /// 绑定数据 + /// + private void BindGrid() + { + List list = GetMockList(); + if (list == null) + { + this.InitMockData(); + list = GetMockList(); + } + ////查询条件过滤 + string code = this.txtPowerBoxCode.Text.Trim(); + if (!string.IsNullOrEmpty(code)) + { + list = list.Where(x => x.PowerBoxCode.Contains(code)).ToList(); + } + string name = this.txtPowerBoxName.Text.Trim(); + if (!string.IsNullOrEmpty(name)) + { + list = list.Where(x => x.PowerBoxName.Contains(name)).ToList(); + } + if (!string.IsNullOrEmpty(this.ddlBoxType.SelectedValue)) + { + list = list.Where(x => x.BoxType == this.ddlBoxType.SelectedValue).ToList(); + } + if (!string.IsNullOrEmpty(this.ddlStates.SelectedValue)) + { + list = list.Where(x => x.States == this.ddlStates.SelectedValue).ToList(); + } + Grid1.RecordCount = list.Count; + var table = this.GetPagedDataTable(Grid1, list); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 每页记录数下拉事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序事件 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 编辑 + /// + /// 双击行编辑事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键菜单编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PowerBoxEdit.aspx?PowerBoxId={0}", id))); + } + #endregion + + #region 删除 + /// + /// 右键菜单删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + List list = GetMockList(); + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + list.RemoveAll(x => x.PowerBoxId == rowID); + } + Session[MockSessionKey] = list; + this.BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + #endregion + + #region 二维码 + /// + /// 生成巡检二维码（模拟阶段：二维码内容为配电箱标识，接入数据库后可改为巡检URL） + /// + /// + /// + protected void btnQR_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + string id = Grid1.SelectedRowID; + List list = GetMockList(); + PowerBoxInfo info = list.FirstOrDefault(x => x.PowerBoxId == id); + if (info != null) + { + ////二维码内容：配电箱标识（编号），后续可替换为巡检页面URL + string strValue = "powerbox$" + info.PowerBoxCode; + string urlName = info.PowerBoxCode; + string title = "配电箱：" + info.PowerBoxCode + " " + info.PowerBoxName; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/ShowQRImage.aspx?strValue={0}&urlName={1}&title={2}", strValue, urlName, System.Web.HttpUtility.UrlEncode(title)), "巡检二维码", 340, 400)); + } + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx.designer.cs new file mode 100644 index 0000000..f0edc0b --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBox.aspx.designer.cs @@ -0,0 +1,188 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.PowerMG +{ + + + public partial class PowerBox + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtPowerBoxCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPowerBoxCode; + + /// + /// txtPowerBoxName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPowerBoxName; + + /// + /// ddlBoxType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlBoxType; + + /// + /// ddlStates 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlStates; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnQR 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnQR; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx new file mode 100644 index 0000000..cb0019a --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx @@ -0,0 +1,106 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PowerBoxEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.PowerMG.PowerBoxEdit" %> + + + + + + + 编辑配电箱 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx.cs new file mode 100644 index 0000000..7f54bd1 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx.cs @@ -0,0 +1,162 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace FineUIPro.Web.HSSE.PowerMG +{ + /// + /// 编辑配电箱页面（模拟数据阶段，数据存于 Session，接入数据库后替换为数据库操作） + /// + public partial class PowerBoxEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string PowerBoxId + { + get + { + return (string)ViewState["PowerBoxId"]; + } + set + { + ViewState["PowerBoxId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.PowerBoxId = Request.Params["PowerBoxId"]; + if (!string.IsNullOrEmpty(this.PowerBoxId)) + { + ////编辑：回填数据 + List list = this.GetMockList(); + PowerBoxInfo info = list.FirstOrDefault(x => x.PowerBoxId == this.PowerBoxId); + if (info != null) + { + this.txtPowerBoxCode.Text = info.PowerBoxCode; + this.txtPowerBoxName.Text = info.PowerBoxName; + this.ddlBoxType.SelectedValue = info.BoxType; + this.txtInstallPlace.Text = info.InstallPlace; + this.txtRatedCapacity.Text = info.RatedCapacity; + this.ddlVoltageLevel.SelectedValue = info.VoltageLevel; + this.txtManagerUnit.Text = info.ManagerUnit; + this.txtManagerMan.Text = info.ManagerMan; + this.txtManagerTel.Text = info.ManagerTel; + this.ddlStates.SelectedValue = info.States; + if (info.LastCheckDate.HasValue) + { + this.dpLastCheckDate.SelectedDate = info.LastCheckDate.Value; + } + this.txtRemark.Text = info.Remark; + } + } + else + { + ////新增：自动生成编号 + this.txtPowerBoxCode.Text = this.GetNewCode(); + } + } + } + #endregion + + #region 模拟数据操作（接入数据库后删除本区域代码） + /// + /// 获取模拟数据列表（来自Session） + /// + private List GetMockList() + { + return Session[PowerBox.MockSessionKey] as List; + } + + /// + /// 自动生成配电箱编号（PDX-XXX，取现有最大序号加1） + /// + private string GetNewCode() + { + List list = GetMockList(); + int max = 0; + if (list != null) + { + foreach (PowerBoxInfo item in list) + { + string code = item.PowerBoxCode; + if (!string.IsNullOrEmpty(code) && code.StartsWith("PDX-")) + { + int num = 0; + if (int.TryParse(code.Substring(4), out num) && num > max) + { + max = num; + } + } + } + } + return string.Format("PDX-{0:D3}", max + 1); + } + #endregion + + #region 保存 + /// + /// 保存按钮事件 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + List list = GetMockList(); + if (list == null) + { + list = new List(); + } + PowerBoxInfo info = new PowerBoxInfo + { + PowerBoxCode = this.txtPowerBoxCode.Text.Trim(), + PowerBoxName = this.txtPowerBoxName.Text.Trim(), + BoxType = this.ddlBoxType.SelectedValue, + InstallPlace = this.txtInstallPlace.Text.Trim(), + RatedCapacity = this.txtRatedCapacity.Text.Trim(), + VoltageLevel = this.ddlVoltageLevel.SelectedValue, + ManagerUnit = this.txtManagerUnit.Text.Trim(), + ManagerMan = this.txtManagerMan.Text.Trim(), + ManagerTel = this.txtManagerTel.Text.Trim(), + States = this.ddlStates.SelectedValue, + LastCheckDate = this.dpLastCheckDate.SelectedDate, + Remark = this.txtRemark.Text.Trim() + }; + if (!string.IsNullOrEmpty(this.PowerBoxId)) + { + ////编辑：更新原记录 + info.PowerBoxId = this.PowerBoxId; + int index = list.FindIndex(x => x.PowerBoxId == this.PowerBoxId); + if (index >= 0) + { + list[index] = info; + } + else + { + list.Insert(0, info); + } + } + else + { + ////新增：插入记录 + info.PowerBoxId = Guid.NewGuid().ToString(); + list.Insert(0, info); + } + Session[PowerBox.MockSessionKey] = list; + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx.designer.cs new file mode 100644 index 0000000..6a84cdb --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/PowerMG/PowerBoxEdit.aspx.designer.cs @@ -0,0 +1,188 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.PowerMG +{ + + + public partial class PowerBoxEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtPowerBoxCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPowerBoxCode; + + /// + /// txtPowerBoxName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPowerBoxName; + + /// + /// ddlBoxType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlBoxType; + + /// + /// txtInstallPlace 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtInstallPlace; + + /// + /// txtRatedCapacity 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRatedCapacity; + + /// + /// ddlVoltageLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlVoltageLevel; + + /// + /// txtManagerUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtManagerUnit; + + /// + /// txtManagerMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtManagerMan; + + /// + /// txtManagerTel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtManagerTel; + + /// + /// ddlStates 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlStates; + + /// + /// dpLastCheckDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker dpLastCheckDate; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx.cs index 44daf8a..08e07f2 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx.cs @@ -369,7 +369,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit QRCodeAttachUrl = equipmentQuality.QRCodeAttachUrl; Funs.DB.SubmitChanges(); } - catch (Exception e1) { } + catch (Exception) { } } //add picture data to this workbook. @@ -423,7 +423,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit return UploadFileService.QRCodeImageFilePath + filename; } - catch (Exception ex) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityDataIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityDataIn.aspx.cs index 87a45f2..d4ad2cf 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityDataIn.aspx.cs @@ -467,7 +467,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { equipmentQuality.CheckDate = DateTime.Parse(row[7].ToString()); } - catch (Exception e) + catch (Exception) { } @@ -475,7 +475,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { equipmentQuality.LimitDate = DateTime.Parse(row[8].ToString()); } - catch (Exception e) + catch (Exception) { } @@ -483,7 +483,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { equipmentQuality.InDate = DateTime.Parse(row[9].ToString()); } - catch (Exception e) + catch (Exception) { } @@ -491,7 +491,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { equipmentQuality.OutDate = DateTime.Parse(row[10].ToString()); } - catch (Exception e) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQuality.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQuality.aspx.cs index 3fad7ee..50b000a 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQuality.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQuality.aspx.cs @@ -9,8 +9,6 @@ using AspNet = System.Web.UI.WebControls; using BLL.Common; using System.IO; -using System.Linq; -using System.Text; using ThoughtWorks.QRCode.Codec; namespace FineUIPro.Web.HSSE.QualityAudit { @@ -356,7 +354,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit QRCodeAttachUrl = equipmentQuality.QRCodeAttachUrl; Funs.DB.SubmitChanges(); } - catch (Exception e1) { } + catch (Exception) { } } //add picture data to this workbook. excel.SetPicValue(2 * (int)(i / 3), i % 3, Server.MapPath("~/") + QRCodeAttachUrl); @@ -408,7 +406,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit return UploadFileService.QRCodeImageFilePath + filename; } - catch (Exception ex) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQualityDataIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQualityDataIn.aspx.cs index 5045fd8..1bdf4d6 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQualityDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/GeneralEquipmentQualityDataIn.aspx.cs @@ -202,7 +202,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { DateTime.Parse(pds.Rows[i][1].ToString()); } - catch (Exception e) { + catch (Exception) { result += (i + 2).ToString() + "," + "入场时间" + "," + "格式不对！" + "|"; } } @@ -396,7 +396,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { equipmentQuality.InDate = DateTime.Parse(row[1].ToString()); } - catch (Exception e) + catch (Exception) { } diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.cs index 78e5615..b94535e 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.cs @@ -276,7 +276,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.cs index b3fbff7..65b7816 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.cs @@ -280,7 +280,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs index c99d7e6..3c5f95b 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs @@ -244,7 +244,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/VehicleInOut.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/VehicleInOut.aspx.cs index 3f4f18f..1ddae23 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/VehicleInOut.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/VehicleInOut.aspx.cs @@ -9,8 +9,6 @@ using AspNet = System.Web.UI.WebControls; using BLL.Common; using System.IO; -using System.Linq; -using System.Text; using ThoughtWorks.QRCode.Codec; namespace FineUIPro.Web.HSSE.QualityAudit { diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/VehicleList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/VehicleList.aspx.cs index 3d4b694..6e58d76 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/VehicleList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/VehicleList.aspx.cs @@ -9,8 +9,6 @@ using AspNet = System.Web.UI.WebControls; using BLL.Common; using System.IO; -using System.Linq; -using System.Text; using ThoughtWorks.QRCode.Codec; namespace FineUIPro.Web.HSSE.QualityAudit { diff --git a/SGGL/FineUIPro.Web/HSSE/SecuritySystem/SafetyOrganizationPic.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SecuritySystem/SafetyOrganizationPic.aspx.cs index 086f52d..7d1320e 100644 --- a/SGGL/FineUIPro.Web/HSSE/SecuritySystem/SafetyOrganizationPic.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SecuritySystem/SafetyOrganizationPic.aspx.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Web.UI.WebControls; using System.Web; using System.Web.UI; -using System.Web.UI.WebControls; using System.IO; using Newtonsoft.Json.Linq; using System.Configuration; diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonAskForLeaveList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonAskForLeaveList.aspx.cs index d515661..97e467c 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonAskForLeaveList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonAskForLeaveList.aspx.cs @@ -273,7 +273,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs index da6f88c..e943f0e 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs @@ -651,7 +651,7 @@ namespace FineUIPro.Web.HSSE.SitePerson /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs index 815f595..6c39d08 100644 --- a/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs @@ -784,7 +784,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew /// /// /// - public static string GetGridTableHtml(Grid grid) + public new static string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs index 263af71..48c1155 100644 --- a/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs @@ -1596,7 +1596,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew var ID = gvApprove.DataKeys[rowIndex][0]; - var approve = Funs.DB.Solution_HSSEConstructSolutionApprove.Where(x => x.ConstructSolutionApproveId == ID).FirstOrDefault(); + var approve = Funs.DB.Solution_HSSEConstructSolutionApprove.Where(x => x.ConstructSolutionApproveId == (string)ID).FirstOrDefault(); if (approve != null) { approve.ApproveDate = null; diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WBSOut.aspx.cs b/SGGL/FineUIPro.Web/JDGL/WBS/WBSOut.aspx.cs index 870360f..8cbca99 100644 --- a/SGGL/FineUIPro.Web/JDGL/WBS/WBSOut.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/WBS/WBSOut.aspx.cs @@ -335,7 +335,7 @@ namespace FineUIPro.Web.JDGL.WBS /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WBSSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/WBS/WBSSet.aspx.cs index 232981b..da3dfee 100644 --- a/SGGL/FineUIPro.Web/JDGL/WBS/WBSSet.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/WBS/WBSSet.aspx.cs @@ -12,7 +12,6 @@ namespace FineUIPro.Web.JDGL.WBS private static TreeNode node; private static string type; private static TreeNode delNode; - private static string operating = null; #endregion #region 页面加载 @@ -347,7 +346,6 @@ namespace FineUIPro.Web.JDGL.WBS { this.hdSelectId.Text = this.trWBS.SelectedNodeID; node = trWBS.SelectedNode; - operating = "modify"; PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WBSSetEdit.aspx?operating=modify&Id={0}&Type={1}", this.trWBS.SelectedNodeID, this.trWBS.SelectedNode.CommandName, "编辑 - "))); } @@ -381,7 +379,6 @@ namespace FineUIPro.Web.JDGL.WBS type = this.trWBS.SelectedNode.CommandName; this.hdSelectId.Text = this.trWBS.SelectedNodeID; node = trWBS.SelectedNode; - operating = "add"; string openUrl = String.Format("WBSSetEdit.aspx?operating=add&Id={0}&Type={1}", trWBS.SelectedNodeID, trWBS.SelectedNode.CommandName, "拷贝 - "); PageContext.RegisterStartupScript(Window2.GetSaveStateReference(hdSelectId.ClientID) + Window2.GetShowReference(openUrl)); diff --git a/SGGL/FineUIPro.Web/ProjectData/MainDataProjectList.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/MainDataProjectList.aspx.cs index aa9ff20..52489fb 100644 --- a/SGGL/FineUIPro.Web/ProjectData/MainDataProjectList.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/MainDataProjectList.aspx.cs @@ -138,11 +138,6 @@ namespace FineUIPro.Web.ProjectData if (Grid1.SelectedRowIndexArray.Length > 0) { - bool isShow = false; - if (Grid1.SelectedRowIndexArray.Length == 1) - { - isShow = true; - } foreach (int rowIndex in Grid1.SelectedRowIndexArray) { string rowID = Grid1.DataKeys[rowIndex][0].ToString(); diff --git a/SGGL/FineUIPro.Web/ProjectData/WorkArea.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/WorkArea.aspx.cs index 81f556e..a30e9fb 100644 --- a/SGGL/FineUIPro.Web/ProjectData/WorkArea.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/WorkArea.aspx.cs @@ -285,7 +285,7 @@ namespace FineUIPro.Web.ProjectData /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/SYHSE/Data_EnvironmentProtectionDataIn.aspx.cs b/SGGL/FineUIPro.Web/SYHSE/Data_EnvironmentProtectionDataIn.aspx.cs index 37ecf5c..dbce24e 100644 --- a/SGGL/FineUIPro.Web/SYHSE/Data_EnvironmentProtectionDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/SYHSE/Data_EnvironmentProtectionDataIn.aspx.cs @@ -211,7 +211,7 @@ namespace FineUIPro.Web.SYHSE try { DateTime.Parse(pds.Rows[i][1].ToString()); - }catch(Exception ex) + }catch(Exception) { result += (i + 2).ToString() + "," + "监测时间（开始）" + "," + "格式不对！" + "|"; @@ -225,7 +225,7 @@ namespace FineUIPro.Web.SYHSE { DateTime.Parse(pds.Rows[i][1].ToString()); } - catch (Exception ex) + catch (Exception) { result += (i + 2).ToString() + "," + "监测时间（结束）" + "," + "格式不对！" + "|"; diff --git a/SGGL/FineUIPro.Web/SysManage/HttpLog.aspx.cs b/SGGL/FineUIPro.Web/SysManage/HttpLog.aspx.cs index 0000509..ef4fe3e 100644 --- a/SGGL/FineUIPro.Web/SysManage/HttpLog.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/HttpLog.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.SysManage /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataStatistics/CheckStatistics.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataStatistics/CheckStatistics.aspx.cs index b6158f7..f3d66e8 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataStatistics/CheckStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataStatistics/CheckStatistics.aspx.cs @@ -129,7 +129,7 @@ namespace FineUIPro.Web.ZHGL.DataStatistics /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataStatistics/MeetStatistics.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataStatistics/MeetStatistics.aspx.cs index 1cc936b..2a8864f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataStatistics/MeetStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataStatistics/MeetStatistics.aspx.cs @@ -129,7 +129,7 @@ namespace FineUIPro.Web.ZHGL.DataStatistics /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataStatistics/ProjectPersonStatics.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataStatistics/ProjectPersonStatics.aspx.cs index d0d69ef..71e268c 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataStatistics/ProjectPersonStatics.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataStatistics/ProjectPersonStatics.aspx.cs @@ -85,7 +85,7 @@ namespace FineUIPro.Web.ZHGL.DataStatistics /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataStatistics/RectifyNoticesStatistics.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataStatistics/RectifyNoticesStatistics.aspx.cs index aed1730..a03fe94 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataStatistics/RectifyNoticesStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataStatistics/RectifyNoticesStatistics.aspx.cs @@ -129,7 +129,7 @@ namespace FineUIPro.Web.ZHGL.DataStatistics /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/CQMSData_CQMS.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/CQMSData_CQMS.aspx.cs index d3cced8..39e5d22 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/CQMSData_CQMS.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/CQMSData_CQMS.aspx.cs @@ -215,7 +215,7 @@ namespace FineUIPro.Web.ZHGL.DataSync /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/HJGLData_HJGL.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/HJGLData_HJGL.aspx.cs index f384374..950ebd0 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/HJGLData_HJGL.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/HJGLData_HJGL.aspx.cs @@ -217,7 +217,7 @@ namespace FineUIPro.Web.ZHGL.DataSync /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSE.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSE.aspx.cs index af38c23..75beab7 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSE.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSE.aspx.cs @@ -215,7 +215,7 @@ namespace FineUIPro.Web.ZHGL.DataSync /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs index 396851f..b6aa70d 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs @@ -216,7 +216,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs index 1ee319b..5609929 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs @@ -218,7 +218,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs index a2fdade..6fa6289 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs @@ -216,7 +216,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSE.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSE.aspx.cs index 5b8b855..4d04707 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSE.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSE.aspx.cs @@ -216,7 +216,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_Data.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_Data.aspx.cs index 2b90eef..765fc1c 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_Data.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_Data.aspx.cs @@ -213,7 +213,7 @@ namespace FineUIPro.Web.ZHGL.DataSync /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_SYHSE.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_SYHSE.aspx.cs index fececbd..c498f65 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_SYHSE.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_SYHSE.aspx.cs @@ -214,7 +214,7 @@ namespace FineUIPro.Web.ZHGL.DataSync /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs index 5b69e17..7a34124 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs @@ -243,7 +243,7 @@ namespace FineUIPro.Web.ZHGL.Emergency /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs index 24e0433..0ac0834 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs @@ -496,7 +496,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReport.aspx.cs index 4c589cf..63756c3 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReport.aspx.cs @@ -496,7 +496,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs index 7c69d47..15628aa 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs @@ -1907,7 +1907,6 @@ namespace FineUIPro.Web.ZHGL.Environmental protected void btnSave_Click(object sender, EventArgs e) { - bool isEmpty = false; //foreach (JObject mergedRow in Grid1.GetMergedData()) //{ // JObject values = mergedRow.Value("values"); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/EIAReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/EIAReport.aspx.cs index 6e60e97..e051efc 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/EIAReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/EIAReport.aspx.cs @@ -270,7 +270,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx.cs index a71cd23..bbd591f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx.cs @@ -477,7 +477,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnvironmentalEmergencyPlan.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnvironmentalEmergencyPlan.aspx.cs index a88d73a..8b5bc83 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnvironmentalEmergencyPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnvironmentalEmergencyPlan.aspx.cs @@ -270,7 +270,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnvironmentalMonitoring.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnvironmentalMonitoring.aspx.cs index b568c7b..0ecf925 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnvironmentalMonitoring.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnvironmentalMonitoring.aspx.cs @@ -270,7 +270,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx.cs index 005bad9..46e8922 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx.cs @@ -461,7 +461,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectChemicalReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectChemicalReport.aspx.cs index d695d0a..52f4152 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectChemicalReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectChemicalReport.aspx.cs @@ -461,7 +461,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectEnergyReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectEnergyReport.aspx.cs index f875e54..3b63401 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectEnergyReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectEnergyReport.aspx.cs @@ -476,7 +476,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/UnexpectedEnvironmental.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/UnexpectedEnvironmental.aspx.cs index 08bc295..70d2b0e 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/UnexpectedEnvironmental.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/UnexpectedEnvironmental.aspx.cs @@ -270,7 +270,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/HSSEManage.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/HSSEManage.aspx.cs index 665e195..101c563 100644 --- a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/HSSEManage.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/HSSEManage.aspx.cs @@ -387,7 +387,7 @@ namespace FineUIPro.Web.ZHGL.HSSESystem /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.cs index a60192c..c44c172 100644 --- a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.cs @@ -258,7 +258,7 @@ namespace FineUIPro.Web.ZHGL.HSSESystem /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/AccidentCauseReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/AccidentCauseReport.aspx.cs index f47d2d6..cee5964 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/AccidentCauseReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/AccidentCauseReport.aspx.cs @@ -569,7 +569,7 @@ namespace FineUIPro.Web.ZHGL.Information /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/DrillConductedQuarterlyReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/DrillConductedQuarterlyReport.aspx.cs index ce89535..167e49f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/DrillConductedQuarterlyReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/DrillConductedQuarterlyReport.aspx.cs @@ -573,7 +573,7 @@ namespace FineUIPro.Web.ZHGL.Information /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/DrillPlanHalfYearReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/DrillPlanHalfYearReport.aspx.cs index 8daacee..5acc593 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/DrillPlanHalfYearReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/DrillPlanHalfYearReport.aspx.cs @@ -554,7 +554,7 @@ namespace FineUIPro.Web.ZHGL.Information /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs index 736871b..2120c75 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs @@ -542,7 +542,7 @@ namespace FineUIPro.Web.ZHGL.Information /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/InformationProject/Picture.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/InformationProject/Picture.aspx.cs index e4607c5..ade3243 100644 --- a/SGGL/FineUIPro.Web/ZHGL/InformationProject/Picture.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/InformationProject/Picture.aspx.cs @@ -363,7 +363,7 @@ namespace FineUIPro.Web.ZHGL.InformationProject /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/MonthReportB.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/MonthReportB.aspx.cs index 36d2553..95f38f4 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/MonthReportB.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/MonthReportB.aspx.cs @@ -297,7 +297,7 @@ namespace FineUIPro.Web.ZHGL.ManagementReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/ReportCheck.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/ReportCheck.aspx.cs index 4b70470..2c7ac06 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/ReportCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/ReportCheck.aspx.cs @@ -333,7 +333,7 @@ namespace FineUIPro.Web.ZHGL.ManagementReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/ReportRemind.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/ReportRemind.aspx.cs index 1a13b60..a3a95d9 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/ReportRemind.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/ReportRemind.aspx.cs @@ -533,7 +533,7 @@ namespace FineUIPro.Web.ZHGL.ManagementReport /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/HazardDetection.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/HazardDetection.aspx.cs index 12b454d..f7d15f6 100644 --- a/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/HazardDetection.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/HazardDetection.aspx.cs @@ -270,7 +270,7 @@ namespace FineUIPro.Web.ZHGL.OccupationHealth /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/OccupationalDiseaseAccident.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/OccupationalDiseaseAccident.aspx.cs index e907a9d..375f2ab 100644 --- a/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/OccupationalDiseaseAccident.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/OccupationalDiseaseAccident.aspx.cs @@ -270,7 +270,7 @@ namespace FineUIPro.Web.ZHGL.OccupationHealth /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/PhysicalExamination.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/PhysicalExamination.aspx.cs index 685c4d5..0ae3155 100644 --- a/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/PhysicalExamination.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/OccupationHealth/PhysicalExamination.aspx.cs @@ -270,7 +270,7 @@ namespace FineUIPro.Web.ZHGL.OccupationHealth /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentAnalysis.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentAnalysis.aspx.cs index c765776..56b689b 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentAnalysis.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentAnalysis.aspx.cs @@ -204,7 +204,7 @@ namespace FineUIPro.Web.ZHGL.ProjectAccident /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentData.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentData.aspx.cs index 5a6f094..ad2d117 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentData.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentData.aspx.cs @@ -293,7 +293,7 @@ namespace FineUIPro.Web.ZHGL.ProjectAccident /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentReport.aspx.cs index 9997843..e23f15b 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentReport.aspx.cs @@ -241,7 +241,7 @@ namespace FineUIPro.Web.ZHGL.ProjectAccident /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentStatistics.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentStatistics.aspx.cs index 8007d05..56cdba4 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ProjectAccident/AccidentStatistics.aspx.cs @@ -246,7 +246,7 @@ namespace FineUIPro.Web.ZHGL.ProjectAccident /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.cs index 5e74792..b172d72 100644 --- a/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/OnPost.aspx.cs @@ -69,7 +69,7 @@ namespace FineUIPro.Web.ZHGL.RealName /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroRecord.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroRecord.aspx.cs index d832b2d..d61095f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroRecord.aspx.cs @@ -88,7 +88,7 @@ namespace FineUIPro.Web.ZHGL.RealName /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs index 05e8915..6ee0bc5 100644 --- a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs @@ -402,7 +402,7 @@ namespace FineUIPro.Web.ZHGL.RealName } Alert.ShowInTop("已清理" + delCount.ToString(), MessageBoxIcon.Success); } - catch (Exception ex) + catch (Exception) { Alert.ShowInTop("已清理" + delCount.ToString(), MessageBoxIcon.Success); return; diff --git a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckInfoReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckInfoReport.aspx.cs index ec21a35..af1e33f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckInfoReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckInfoReport.aspx.cs @@ -127,7 +127,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs index a8703e2..70346e9 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/CheckRectify.aspx.cs @@ -184,7 +184,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); MultiHeaderTable mht = new MultiHeaderTable(); diff --git a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReport.aspx.cs index b7c9623..b21e786 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReport.aspx.cs @@ -217,7 +217,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck /// /// /// - private string GetGridTableHtml(Grid grid) + private new string GetGridTableHtml(Grid grid) { StringBuilder sb = new StringBuilder(); sb.Append(""); diff --git a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseBranchTeamList.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseBranchTeamList.aspx.cs index a8bce30..64a090c 100644 --- a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseBranchTeamList.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseBranchTeamList.aspx.cs @@ -68,7 +68,6 @@ namespace FineUIPro.Web.ZHGL.SubPackManage // 防止浏览器端多次快速点击 parentNode.Nodes.Clear(); - TreeNode node = null; switch (parentNode.CommandName) { case "unit": diff --git a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseBranchTeamListTeam.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseBranchTeamListTeam.aspx.cs index f4d419e..010e5c8 100644 --- a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseBranchTeamListTeam.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseBranchTeamListTeam.aspx.cs @@ -65,7 +65,6 @@ namespace FineUIPro.Web.ZHGL.SubPackManage // 防止浏览器端多次快速点击 parentNode.Nodes.Clear(); - TreeNode node = null; switch (parentNode.CommandName) { case "unit": diff --git a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseLaborTeamList.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseLaborTeamList.aspx.cs index fac9802..2fcd29d 100644 --- a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseLaborTeamList.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseLaborTeamList.aspx.cs @@ -66,7 +66,6 @@ namespace FineUIPro.Web.ZHGL.SubPackManage // 防止浏览器端多次快速点击 parentNode.Nodes.Clear(); - TreeNode node = null; switch (parentNode.CommandName) { case "unit": diff --git a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackLaborTeam.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackLaborTeam.aspx.cs index 8ee848a..94b6730 100644 --- a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackLaborTeam.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackLaborTeam.aspx.cs @@ -65,7 +65,6 @@ namespace FineUIPro.Web.ZHGL.SubPackManage // 防止浏览器端多次快速点击 parentNode.Nodes.Clear(); - TreeNode node = null; switch (parentNode.CommandName) { case "unit": diff --git a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackPersonnel.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackPersonnel.aspx.cs index dba6575..8aacd11 100644 --- a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackPersonnel.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackPersonnel.aspx.cs @@ -255,7 +255,6 @@ namespace FineUIPro.Web.ZHGL.SubPackManage // 防止浏览器端多次快速点击 parentNode.Nodes.Clear(); - TreeNode node = null; switch (parentNode.CommandName) { case "unit": diff --git a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackTeam.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackTeam.aspx.cs index ef20eb8..ff68f35 100644 --- a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackTeam.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackTeam.aspx.cs @@ -65,7 +65,6 @@ namespace FineUIPro.Web.ZHGL.SubPackManage // 防止浏览器端多次快速点击 parentNode.Nodes.Clear(); - TreeNode node = null; switch (parentNode.CommandName) { case "unit": diff --git a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackTeamlist.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackTeamlist.aspx.cs index 611df81..47f136e 100644 --- a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackTeamlist.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackBlackTeamlist.aspx.cs @@ -69,7 +69,6 @@ namespace FineUIPro.Web.ZHGL.SubPackManage // 防止浏览器端多次快速点击 parentNode.Nodes.Clear(); - TreeNode node = null; switch (parentNode.CommandName) { case "unit": diff --git a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackPersonnel.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackPersonnel.aspx.cs index a394c21..680a6a2 100644 --- a/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackPersonnel.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/SubPackManage/BaseSubPackPersonnel.aspx.cs @@ -253,7 +253,6 @@ namespace FineUIPro.Web.ZHGL.SubPackManage // 防止浏览器端多次快速点击 parentNode.Nodes.Clear(); - TreeNode node = null; switch (parentNode.CommandName) { case "unit": diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml index d52113c..157a908 100644 --- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml +++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml @@ -10,6 +10,11 @@ + + + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml index f8ef4d9..bb83163 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml @@ -1,10 +1,19 @@  - - + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/common/main0.aspx.cs b/SGGL/FineUIPro.Web/common/main0.aspx.cs index 3cb90a8..c12e1ec 100644 --- a/SGGL/FineUIPro.Web/common/main0.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main0.aspx.cs @@ -262,7 +262,7 @@ namespace FineUIPro.Web.common //Model.SingleSerie s2 = new Model.SingleSerie(); List listdata = new List(); //List listdata2 = new List(); - double result = 0, result2 = 0; + double result = 0; foreach (var project in projects) { listCategories.Add(project.ShortName); @@ -284,7 +284,6 @@ namespace FineUIPro.Web.common listdata.Add(result); //listdata2.Add(result2); result = 0; - result2 = 0; } s.data = listdata; //s2.data = listdata2; diff --git a/SGGL/FineUIPro.Web/common/main3.aspx.cs b/SGGL/FineUIPro.Web/common/main3.aspx.cs index 5e9aa91..dc6a6fd 100644 --- a/SGGL/FineUIPro.Web/common/main3.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main3.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.common var rate = 100 * double.Parse(tb.Rows[0]["current_pass_film"].ToString()) / double.Parse(tb.Rows[0]["current_total_film"].ToString()); PassRate = "" + ((int)rate); } - catch (Exception ex) + catch (Exception) { PassRate = "0"; } @@ -222,7 +222,7 @@ namespace FineUIPro.Web.common } } } - catch (Exception ex) { } + catch (Exception) { } } divProjectPic.InnerHtml = picHtml; diff --git a/SGGL/FineUIPro.Web/common/mainI.aspx.cs b/SGGL/FineUIPro.Web/common/mainI.aspx.cs index 39c56ed..8309fa8 100644 --- a/SGGL/FineUIPro.Web/common/mainI.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainI.aspx.cs @@ -266,7 +266,7 @@ namespace FineUIPro.Web.common //Model.SingleSerie s2 = new Model.SingleSerie(); List listdata = new List(); //List listdata2 = new List(); - double result = 0, result2 = 0; + double result = 0; foreach (var project in projects) { listCategories.Add(project.ProjectCode); @@ -288,7 +288,6 @@ namespace FineUIPro.Web.common listdata.Add(result); //listdata2.Add(result2); result = 0; - result2 = 0; } s.data = listdata; //s2.data = listdata2; diff --git a/SGGL/FineUIPro.Web/common/mainIII.aspx.cs b/SGGL/FineUIPro.Web/common/mainIII.aspx.cs index 8512350..6be6566 100644 --- a/SGGL/FineUIPro.Web/common/mainIII.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainIII.aspx.cs @@ -247,18 +247,10 @@ namespace FineUIPro.Web.common List controlItemAndCycles = new List(); List soptCheckDetails = new List(); unitWorks = BLL.UnitWorkService.GetUnitWorkLists(this.CurrUser.LoginProjectId); - decimal totalUnitWorkWeights = 0; - bool noWeights = false; - bool noProjectWeights = false; workPackages = BLL.WorkPackageService.GetAllWorkPackagesByProjectId(this.CurrUser.LoginProjectId); controlItemAndCycles = BLL.ControlItemAndCycleService.GetControlItemAndCyclesByProjectIdAndDate(this.CurrUser.LoginProjectId, endDate); soptCheckDetails = BLL.SpotCheckDetailService.GetViewSpotCheckDetailsByProjectIdAndDate(this.CurrUser.LoginProjectId, endDate, isDataOK); - var unitWork1 = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.Weights == null); - if (unitWork1 != null) //存在没有权重值的单位工程 - { - noProjectWeights = true; - } //if (noWeights && unitWorkIds.Length > 1) //{ @@ -502,7 +494,7 @@ namespace FineUIPro.Web.common //Model.SingleSerie s2 = new Model.SingleSerie(); List listdata = new List(); //List listdata2 = new List(); - double result = 0, result2 = 0; + double result = 0; foreach (var unitWork in unitWorks) { listCategories.Add(unitWork.UnitWorkName); diff --git a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs index 12d1834..740fefd 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs @@ -197,7 +197,6 @@ namespace FineUIPro.Web set.Add(id); } var toKeys = Funs.DB.AttachFile.Select(x => x.ToKeyId).ToList(); - int a = 0; foreach (var tokey in toKeys) { if (tokey != null) diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs index c1cce67..c47cbd7 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs @@ -251,7 +251,7 @@ namespace FineUIPro.Web var rate = 100 * double.Parse(tb.Rows[0]["current_pass_film"].ToString()) / double.Parse(tb.Rows[0]["current_total_film"].ToString()); PassRate = "" + ((int)rate); } - catch (Exception ex) + catch (Exception) { PassRate = "0"; } diff --git a/SGGL/FineUIPro.Web/common/mainMenu_JDGL.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_JDGL.aspx.cs index d5109c8..16cc1ce 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_JDGL.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_JDGL.aspx.cs @@ -43,18 +43,10 @@ namespace FineUIPro.Web List controlItemAndCycles = new List(); List soptCheckDetails = new List(); unitWorks = BLL.UnitWorkService.GetUnitWorkLists(this.CurrUser.LoginProjectId); - decimal totalUnitWorkWeights = 0; - bool noWeights = false; - bool noProjectWeights = false; workPackages = BLL.WorkPackageService.GetAllWorkPackagesByProjectId(this.CurrUser.LoginProjectId); controlItemAndCycles = BLL.ControlItemAndCycleService.GetControlItemAndCyclesByProjectIdAndDate(this.CurrUser.LoginProjectId, endDate); soptCheckDetails = BLL.SpotCheckDetailService.GetViewSpotCheckDetailsByProjectIdAndDate(this.CurrUser.LoginProjectId, endDate, isDataOK); - var unitWork1 = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.Weights == null); - if (unitWork1 != null) //存在没有权重值的单位工程 - { - noProjectWeights = true; - } //if (noWeights && unitWorkIds.Length > 1) //{ diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs index 3d1dd67..9c4a6ed 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs @@ -219,7 +219,7 @@ namespace FineUIPro.Web.common //divHJ5.InnerHtml = environment.Ws.Value.ToString("#.##"); //divHJ6.InnerHtml = environment.Pm10.Value.ToString("#.##"); } - catch (Exception ex) { } + catch (Exception) { } } else { @@ -328,7 +328,7 @@ namespace FineUIPro.Web.common WorkPostS = JsonConvert.SerializeObject(worksList); InPostCounts = JsonConvert.SerializeObject(InPostCountList); InDutyCounts = JsonConvert.SerializeObject(InDutyCountList); - } catch (Exception ex) + } catch (Exception) { } @@ -553,7 +553,7 @@ namespace FineUIPro.Web.common var rate = 100 * double.Parse(tb.Rows[0]["current_pass_film"].ToString()) / double.Parse(tb.Rows[0]["current_total_film"].ToString()); FirstPassRate = Math.Round(rate, 1); } - catch (Exception ex) + catch (Exception) { FirstPassRate = 0; } diff --git a/SGGL/FineUIPro.Web/common/mainProject0.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject0.aspx.cs index 30633d1..fe9a884 100644 --- a/SGGL/FineUIPro.Web/common/mainProject0.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject0.aspx.cs @@ -151,7 +151,7 @@ namespace FineUIPro.Web.common //Model.SingleSerie s2 = new Model.SingleSerie(); List listdata = new List(); //List listdata2 = new List(); - double result = 0, result2 = 0; + double result = 0; foreach (var unitWork in unitWorks) { listCategories.Add(unitWork.UnitWorkName); @@ -201,7 +201,7 @@ namespace FineUIPro.Web.common //Model.SingleSerie s2 = new Model.SingleSerie(); List listdata = new List(); //List listdata2 = new List(); - double result = 0, result2 = 0; + double result = 0; foreach (var unitWork in unitWorks) { listCategories.Add(unitWork.UnitWorkName); diff --git a/SGGL/FineUIPro.Web/common/main_copy_index.aspx.cs b/SGGL/FineUIPro.Web/common/main_copy_index.aspx.cs index 9e89989..78fddcb 100644 --- a/SGGL/FineUIPro.Web/common/main_copy_index.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_copy_index.aspx.cs @@ -500,7 +500,7 @@ namespace FineUIPro.Web.common var rate = 100 * double.Parse(tb.Rows[0]["current_pass_film"].ToString()) / double.Parse(tb.Rows[0]["current_total_film"].ToString()); return "" + ((int)rate); } - catch (Exception ex) + catch (Exception) { return "0"; } diff --git a/SGGL/FineUIPro.Web/index.aspx.cs b/SGGL/FineUIPro.Web/index.aspx.cs index b15c3e8..74a5e0e 100644 --- a/SGGL/FineUIPro.Web/index.aspx.cs +++ b/SGGL/FineUIPro.Web/index.aspx.cs @@ -54,6 +54,11 @@ namespace FineUIPro.Web if (!IsPostBack) { + if (this.CurrUser == null) + { + PageBase.PageRefresh(Request.ApplicationPath + "/Login.aspx"); + return; + } this.CurrUser.LoginProjectId = null; } } diff --git a/SGGL/FineUIPro.Web/index4.aspx.cs b/SGGL/FineUIPro.Web/index4.aspx.cs index e644b1f..621a999 100644 --- a/SGGL/FineUIPro.Web/index4.aspx.cs +++ b/SGGL/FineUIPro.Web/index4.aspx.cs @@ -54,6 +54,11 @@ namespace FineUIPro.Web if (!IsPostBack) { + if (this.CurrUser == null) + { + PageBase.PageRefresh(Request.ApplicationPath + "/Login.aspx"); + return; + } this.CurrUser.LoginProjectId = null; } } diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index 4438a80..16e794b 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -24,9 +24,12 @@ namespace FineUIPro.Web #region Page_Init private string _menuType = "menu"; - public string cssMessage = ""; private int _examplesCount = 0; private string _searchText = ""; + private HashSet _userPowerMenuIds; // 当前用户有权限的菜单ID集合 + private Dictionary _menuTypeMap; // 菜单ID -> 菜单类型 缓存 + private bool _menuPowerLoaded = false; // 菜单权限是否已加载 + private bool _isAdminUser = false; // 是否系统管理员 public string User_Id { get @@ -82,7 +85,11 @@ namespace FineUIPro.Web //////////////////////////////////////////////////////////////// if (!IsPostBack) { - + if (this.CurrUser == null) + { + PageBase.PageRefresh(Request.ApplicationPath + "/Login.aspx"); + return; + } } } @@ -326,11 +333,81 @@ namespace FineUIPro.Web XmlAttribute isNewAttr = node.Attributes["id"]; if (isNewAttr != null) { - result = BLL.CommonService.ReturnMenuByUserIdMenuId(this.CurrUser.UserId, isNewAttr.Value.ToString(), this.CurrUser.LoginProjectId); + EnsureMenuPowerLoaded(); + string menuId = isNewAttr.Value.ToString(); + if (_isAdminUser || _userPowerMenuIds.Contains(menuId)) + { + result = true; + } + else + { + // 个人设置类菜单始终显示（与原 ReturnMenuByUserIdMenuId 逻辑一致） + string menuType; + result = _menuTypeMap.TryGetValue(menuId, out menuType) && menuType == Const.Menu_Personal; + } } return result; } + + /// + /// 一次性加载当前用户在当前项目下的菜单权限，避免每个菜单节点重复查询数据库（N+1）。 + /// 判定逻辑与逐节点调用 BLL.CommonService.ReturnMenuByUserIdMenuId 保持一致。 + /// + private void EnsureMenuPowerLoaded() + { + if (_menuPowerLoaded) + { + return; + } + _menuPowerLoaded = true; + + _isAdminUser = this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sedinId; + _userPowerMenuIds = new HashSet(); + if (_isAdminUser) + { + return; + } + + // 缓存菜单ID -> 菜单类型（个人设置菜单特判用） + try + { + _menuTypeMap = Funs.DB.Sys_Menu.GroupBy(m => m.MenuId).ToDictionary(g => g.Key, g => g.First().MenuType); + } + catch + { + _menuTypeMap = new Dictionary(); + } + + var getUser = Funs.DB.Sys_User.FirstOrDefault(x => x.UserId == this.CurrUser.UserId); + if (getUser == null) + { + return; + } + + List powerMenuIds; + if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + if (string.IsNullOrEmpty(getUser.RoleId)) + { + return; + } + powerMenuIds = Funs.DB.Sys_RolePower.Where(x => x.RoleId == getUser.RoleId).Select(x => x.MenuId).ToList(); + } + else + { + List roleIdList = UserService.GetRoleListByProjectIdUserId(this.CurrUser.LoginProjectId, this.CurrUser.UserId); + powerMenuIds = Funs.DB.Sys_RolePower.Where(x => roleIdList.Contains(x.RoleId)).Select(x => x.MenuId).ToList(); + } + + foreach (string menuId in powerMenuIds) + { + if (!string.IsNullOrEmpty(menuId)) + { + _userPowerMenuIds.Add(menuId); + } + } + } #endregion #region GetIsNewHtml 是否必填项 @@ -365,12 +442,6 @@ namespace FineUIPro.Web /// protected void Page_Load(object sender, EventArgs e) { - - var getDataList = Funs.DB.Sp_Main_GetToDoItems(this.CurrUser.UserId, CurrUser.LoginProjectId).ToList(); - if (getDataList.Count == 0) - { - cssMessage = "style='display: none'"; - } if (!IsPostBack) { string needProjectId = ""; diff --git a/SGGL/FineUIPro.Web/indexShiYe.aspx.cs b/SGGL/FineUIPro.Web/indexShiYe.aspx.cs index cecde3a..a4e5e70 100644 --- a/SGGL/FineUIPro.Web/indexShiYe.aspx.cs +++ b/SGGL/FineUIPro.Web/indexShiYe.aspx.cs @@ -11,9 +11,6 @@ namespace FineUIPro.Web public partial class indexShiYe : PageBase { - private string _menuType = "menu"; - private int _examplesCount = 0; - private string _searchText = ""; #region Page_Init /// diff --git a/SGGL/FineUIPro.Web/indexs.aspx.cs b/SGGL/FineUIPro.Web/indexs.aspx.cs index e48e386..aac6729 100644 --- a/SGGL/FineUIPro.Web/indexs.aspx.cs +++ b/SGGL/FineUIPro.Web/indexs.aspx.cs @@ -54,6 +54,11 @@ namespace FineUIPro.Web if (!IsPostBack) { + if (this.CurrUser == null) + { + PageBase.PageRefresh(Request.ApplicationPath + "/Login.aspx"); + return; + } this.CurrUser.LoginProjectId = null; } } diff --git a/SGGL/FineUIPro.Web/res/css/common.css b/SGGL/FineUIPro.Web/res/css/common.css index 83ef5cd..7269266 100644 --- a/SGGL/FineUIPro.Web/res/css/common.css +++ b/SGGL/FineUIPro.Web/res/css/common.css @@ -64,4 +64,9 @@ table.result { .f-grid-row .f-grid-cell-inner { white-space: normal; word-break: break-all; +} + +/* 表单字段标签不换行 */ +.f-field-label { + white-space: nowrap !important; } \ No newline at end of file diff --git a/SGGL/Model/APIItem/CQMS/BeanUtil.cs b/SGGL/Model/APIItem/CQMS/BeanUtil.cs index ba3faeb..ed205b3 100644 --- a/SGGL/Model/APIItem/CQMS/BeanUtil.cs +++ b/SGGL/Model/APIItem/CQMS/BeanUtil.cs @@ -67,7 +67,7 @@ namespace Model // myProperty.SetValue(targetDeepCopyObj, CopyOjbect(propertyValue,hasProperty), null); } } - catch (System.Exception ex) + catch (System.Exception) { return obj; } diff --git a/SGGL/Model/APIItem/HSSE/HazardProjectItem.cs b/SGGL/Model/APIItem/HSSE/HazardProjectItem.cs new file mode 100644 index 0000000..4fdc839 --- /dev/null +++ b/SGGL/Model/APIItem/HSSE/HazardProjectItem.cs @@ -0,0 +1,100 @@ +using System; + +namespace Model +{ + /// + /// 危大、超危工程清单项 + /// + public class HazardProjectItem + { + /// + /// 主键 + /// + public string HazardProjectId + { + get; + set; + } + + /// + /// 项目ID + /// + public string ProjectId + { + get; + set; + } + + /// + /// 编号 + /// + public string ProjectCode + { + get; + set; + } + + /// + /// 分部分项工程 + /// + public string ProjectName + { + get; + set; + } + + /// + /// 施工内容 + /// + public string WorkContent + { + get; + set; + } + + /// + /// 风险等级（危大工程/超危工程） + /// + public string RiskLevel + { + get; + set; + } + + /// + /// 开工时间 + /// + public System.Nullable StartDate + { + get; + set; + } + + /// + /// 结束时间 + /// + public System.Nullable EndDate + { + get; + set; + } + + /// + /// 现场负责人 + /// + public string ManagerMan + { + get; + set; + } + + /// + /// 备注 + /// + public string Remark + { + get; + set; + } + } +} diff --git a/SGGL/Model/APIItem/HSSE/SafetyAcceptanceItem.cs b/SGGL/Model/APIItem/HSSE/SafetyAcceptanceItem.cs new file mode 100644 index 0000000..b736a96 --- /dev/null +++ b/SGGL/Model/APIItem/HSSE/SafetyAcceptanceItem.cs @@ -0,0 +1,91 @@ +using System; + +namespace Model +{ + /// + /// 安全防护验收项 + /// + public class SafetyAcceptanceItem + { + /// + /// 主键 + /// + public string AcceptanceId + { + get; + set; + } + + /// + /// 项目ID + /// + public string ProjectId + { + get; + set; + } + + /// + /// 危大、超危工程主键 + /// + public string HazardProjectId + { + get; + set; + } + + /// + /// 工程名称 + /// + public string HazardProjectName + { + get; + set; + } + + /// + /// 验收结果 + /// + public string AcceptanceResult + { + get; + set; + } + + /// + /// 验收人 + /// + public string AcceptanceMan + { + get; + set; + } + + /// + /// 验收时间 + /// + public System.Nullable AcceptanceDate + { + get; + set; + } + + /// + /// 情况说明 + /// + public string Remark + { + get; + set; + } + + /// + /// 附件URL（逗号分隔） + /// + public string AttachUrl + { + get; + set; + } + } +} diff --git a/SGGL/Model/APIItem/HSSE/SafetyPatrolItem.cs b/SGGL/Model/APIItem/HSSE/SafetyPatrolItem.cs new file mode 100644 index 0000000..dd6404a --- /dev/null +++ b/SGGL/Model/APIItem/HSSE/SafetyPatrolItem.cs @@ -0,0 +1,91 @@ +using System; + +namespace Model +{ + /// + /// 安全巡检项 + /// + public class SafetyPatrolItem + { + /// + /// 主键 + /// + public string PatrolId + { + get; + set; + } + + /// + /// 项目ID + /// + public string ProjectId + { + get; + set; + } + + /// + /// 危大、超危工程主键 + /// + public string HazardProjectId + { + get; + set; + } + + /// + /// 工程名称 + /// + public string HazardProjectName + { + get; + set; + } + + /// + /// 巡检日期 + /// + public System.Nullable PatrolDate + { + get; + set; + } + + /// + /// 巡检人 + /// + public string PatrolMan + { + get; + set; + } + + /// + /// 巡检状态（正常/待整改） + /// + public string PatrolStatus + { + get; + set; + } + + /// + /// 巡检内容 + /// + public string Content + { + get; + set; + } + + /// + /// 附件URL（逗号分隔） + /// + public string AttachUrl + { + get; + set; + } + } +} diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 5869ab7..b5ee732 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1364,12 +1364,30 @@ namespace Model partial void InsertHSSE_Hazard_HazardRegisterTypes(HSSE_Hazard_HazardRegisterTypes instance); partial void UpdateHSSE_Hazard_HazardRegisterTypes(HSSE_Hazard_HazardRegisterTypes instance); partial void DeleteHSSE_Hazard_HazardRegisterTypes(HSSE_Hazard_HazardRegisterTypes instance); + partial void InsertHSSE_HazardProject(HSSE_HazardProject instance); + partial void UpdateHSSE_HazardProject(HSSE_HazardProject instance); + partial void DeleteHSSE_HazardProject(HSSE_HazardProject instance); partial void InsertHSSE_Material(HSSE_Material instance); partial void UpdateHSSE_Material(HSSE_Material instance); partial void DeleteHSSE_Material(HSSE_Material instance); partial void InsertHSSE_MaterPhyQuantity(HSSE_MaterPhyQuantity instance); partial void UpdateHSSE_MaterPhyQuantity(HSSE_MaterPhyQuantity instance); partial void DeleteHSSE_MaterPhyQuantity(HSSE_MaterPhyQuantity instance); + partial void InsertHSSE_RiskControlList(HSSE_RiskControlList instance); + partial void UpdateHSSE_RiskControlList(HSSE_RiskControlList instance); + partial void DeleteHSSE_RiskControlList(HSSE_RiskControlList instance); + partial void InsertHSSE_SafetyAcceptance(HSSE_SafetyAcceptance instance); + partial void UpdateHSSE_SafetyAcceptance(HSSE_SafetyAcceptance instance); + partial void DeleteHSSE_SafetyAcceptance(HSSE_SafetyAcceptance instance); + partial void InsertHSSE_SafetyDisclosure(HSSE_SafetyDisclosure instance); + partial void UpdateHSSE_SafetyDisclosure(HSSE_SafetyDisclosure instance); + partial void DeleteHSSE_SafetyDisclosure(HSSE_SafetyDisclosure instance); + partial void InsertHSSE_SafetyPatrol(HSSE_SafetyPatrol instance); + partial void UpdateHSSE_SafetyPatrol(HSSE_SafetyPatrol instance); + partial void DeleteHSSE_SafetyPatrol(HSSE_SafetyPatrol instance); + partial void InsertHSSE_SpecialPlan(HSSE_SpecialPlan instance); + partial void UpdateHSSE_SpecialPlan(HSSE_SpecialPlan instance); + partial void DeleteHSSE_SpecialPlan(HSSE_SpecialPlan instance); partial void InsertHSSE_Vehicle(HSSE_Vehicle instance); partial void UpdateHSSE_Vehicle(HSSE_Vehicle instance); partial void DeleteHSSE_Vehicle(HSSE_Vehicle instance); @@ -6475,6 +6493,14 @@ namespace Model } } + public System.Data.Linq.Table HSSE_HazardProject + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table HSSE_Material { get @@ -6491,6 +6517,46 @@ namespace Model } } + public System.Data.Linq.Table HSSE_RiskControlList + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table HSSE_SafetyAcceptance + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table HSSE_SafetyDisclosure + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table HSSE_SafetyPatrol + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table HSSE_SpecialPlan + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table HSSE_Vehicle { get @@ -218874,6 +218940,284 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HSSE_HazardProject")] + public partial class HSSE_HazardProject : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _HazardProjectId; + + private string _ProjectId; + + private string _ProjectCode; + + private string _ProjectName; + + private string _WorkContent; + + private string _RiskLevel; + + private System.Nullable _StartDate; + + private System.Nullable _EndDate; + + private string _ManagerMan; + + private string _Remark; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnHazardProjectIdChanging(string value); + partial void OnHazardProjectIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnProjectCodeChanging(string value); + partial void OnProjectCodeChanged(); + partial void OnProjectNameChanging(string value); + partial void OnProjectNameChanged(); + partial void OnWorkContentChanging(string value); + partial void OnWorkContentChanged(); + partial void OnRiskLevelChanging(string value); + partial void OnRiskLevelChanged(); + partial void OnStartDateChanging(System.Nullable value); + partial void OnStartDateChanged(); + partial void OnEndDateChanging(System.Nullable value); + partial void OnEndDateChanged(); + partial void OnManagerManChanging(string value); + partial void OnManagerManChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + #endregion + + public HSSE_HazardProject() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string HazardProjectId + { + get + { + return this._HazardProjectId; + } + set + { + if ((this._HazardProjectId != value)) + { + this.OnHazardProjectIdChanging(value); + this.SendPropertyChanging(); + this._HazardProjectId = value; + this.SendPropertyChanged("HazardProjectId"); + this.OnHazardProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectCode", DbType="NVarChar(50)")] + public string ProjectCode + { + get + { + return this._ProjectCode; + } + set + { + if ((this._ProjectCode != value)) + { + this.OnProjectCodeChanging(value); + this.SendPropertyChanging(); + this._ProjectCode = value; + this.SendPropertyChanged("ProjectCode"); + this.OnProjectCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(500)")] + public string ProjectName + { + get + { + return this._ProjectName; + } + set + { + if ((this._ProjectName != value)) + { + this.OnProjectNameChanging(value); + this.SendPropertyChanging(); + this._ProjectName = value; + this.SendPropertyChanged("ProjectName"); + this.OnProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkContent", DbType="NVarChar(1000)")] + public string WorkContent + { + get + { + return this._WorkContent; + } + set + { + if ((this._WorkContent != value)) + { + this.OnWorkContentChanging(value); + this.SendPropertyChanging(); + this._WorkContent = value; + this.SendPropertyChanged("WorkContent"); + this.OnWorkContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskLevel", DbType="NVarChar(50)")] + public string RiskLevel + { + get + { + return this._RiskLevel; + } + set + { + if ((this._RiskLevel != value)) + { + this.OnRiskLevelChanging(value); + this.SendPropertyChanging(); + this._RiskLevel = value; + this.SendPropertyChanged("RiskLevel"); + this.OnRiskLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StartDate", DbType="DateTime")] + public System.Nullable StartDate + { + get + { + return this._StartDate; + } + set + { + if ((this._StartDate != value)) + { + this.OnStartDateChanging(value); + this.SendPropertyChanging(); + this._StartDate = value; + this.SendPropertyChanged("StartDate"); + this.OnStartDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EndDate", DbType="DateTime")] + public System.Nullable EndDate + { + get + { + return this._EndDate; + } + set + { + if ((this._EndDate != value)) + { + this.OnEndDateChanging(value); + this.SendPropertyChanging(); + this._EndDate = value; + this.SendPropertyChanged("EndDate"); + this.OnEndDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ManagerMan", DbType="NVarChar(50)")] + public string ManagerMan + { + get + { + return this._ManagerMan; + } + set + { + if ((this._ManagerMan != value)) + { + this.OnManagerManChanging(value); + this.SendPropertyChanging(); + this._ManagerMan = value; + this.SendPropertyChanged("ManagerMan"); + this.OnManagerManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HSSE_Material")] public partial class HSSE_Material : INotifyPropertyChanging, INotifyPropertyChanged { @@ -219406,6 +219750,1204 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HSSE_RiskControlList")] + public partial class HSSE_RiskControlList : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _RiskId; + + private string _ProjectId; + + private string _RiskName; + + private string _RiskLevel; + + private string _RiskType; + + private string _ControlMeasure; + + private string _ManagerUnit; + + private string _ManagerMan; + + private string _Remark; + + private string _UploadFile; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnRiskIdChanging(string value); + partial void OnRiskIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnRiskNameChanging(string value); + partial void OnRiskNameChanged(); + partial void OnRiskLevelChanging(string value); + partial void OnRiskLevelChanged(); + partial void OnRiskTypeChanging(string value); + partial void OnRiskTypeChanged(); + partial void OnControlMeasureChanging(string value); + partial void OnControlMeasureChanged(); + partial void OnManagerUnitChanging(string value); + partial void OnManagerUnitChanged(); + partial void OnManagerManChanging(string value); + partial void OnManagerManChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnUploadFileChanging(string value); + partial void OnUploadFileChanged(); + #endregion + + public HSSE_RiskControlList() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string RiskId + { + get + { + return this._RiskId; + } + set + { + if ((this._RiskId != value)) + { + this.OnRiskIdChanging(value); + this.SendPropertyChanging(); + this._RiskId = value; + this.SendPropertyChanged("RiskId"); + this.OnRiskIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskName", DbType="NVarChar(200)")] + public string RiskName + { + get + { + return this._RiskName; + } + set + { + if ((this._RiskName != value)) + { + this.OnRiskNameChanging(value); + this.SendPropertyChanging(); + this._RiskName = value; + this.SendPropertyChanged("RiskName"); + this.OnRiskNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskLevel", DbType="NVarChar(50)")] + public string RiskLevel + { + get + { + return this._RiskLevel; + } + set + { + if ((this._RiskLevel != value)) + { + this.OnRiskLevelChanging(value); + this.SendPropertyChanging(); + this._RiskLevel = value; + this.SendPropertyChanged("RiskLevel"); + this.OnRiskLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskType", DbType="NVarChar(50)")] + public string RiskType + { + get + { + return this._RiskType; + } + set + { + if ((this._RiskType != value)) + { + this.OnRiskTypeChanging(value); + this.SendPropertyChanging(); + this._RiskType = value; + this.SendPropertyChanged("RiskType"); + this.OnRiskTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ControlMeasure", DbType="NVarChar(1000)")] + public string ControlMeasure + { + get + { + return this._ControlMeasure; + } + set + { + if ((this._ControlMeasure != value)) + { + this.OnControlMeasureChanging(value); + this.SendPropertyChanging(); + this._ControlMeasure = value; + this.SendPropertyChanged("ControlMeasure"); + this.OnControlMeasureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ManagerUnit", DbType="NVarChar(200)")] + public string ManagerUnit + { + get + { + return this._ManagerUnit; + } + set + { + if ((this._ManagerUnit != value)) + { + this.OnManagerUnitChanging(value); + this.SendPropertyChanging(); + this._ManagerUnit = value; + this.SendPropertyChanged("ManagerUnit"); + this.OnManagerUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ManagerMan", DbType="NVarChar(50)")] + public string ManagerMan + { + get + { + return this._ManagerMan; + } + set + { + if ((this._ManagerMan != value)) + { + this.OnManagerManChanging(value); + this.SendPropertyChanging(); + this._ManagerMan = value; + this.SendPropertyChanged("ManagerMan"); + this.OnManagerManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UploadFile", DbType="NVarChar(500)")] + public string UploadFile + { + get + { + return this._UploadFile; + } + set + { + if ((this._UploadFile != value)) + { + this.OnUploadFileChanging(value); + this.SendPropertyChanging(); + this._UploadFile = value; + this.SendPropertyChanged("UploadFile"); + this.OnUploadFileChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HSSE_SafetyAcceptance")] + public partial class HSSE_SafetyAcceptance : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _AcceptanceId; + + private string _ProjectId; + + private string _HazardProjectId; + + private string _HazardProjectName; + + private string _AcceptanceResult; + + private string _AcceptanceMan; + + private System.Nullable _AcceptanceDate; + + private string _Remark; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnAcceptanceIdChanging(string value); + partial void OnAcceptanceIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnHazardProjectIdChanging(string value); + partial void OnHazardProjectIdChanged(); + partial void OnHazardProjectNameChanging(string value); + partial void OnHazardProjectNameChanged(); + partial void OnAcceptanceResultChanging(string value); + partial void OnAcceptanceResultChanged(); + partial void OnAcceptanceManChanging(string value); + partial void OnAcceptanceManChanged(); + partial void OnAcceptanceDateChanging(System.Nullable value); + partial void OnAcceptanceDateChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + #endregion + + public HSSE_SafetyAcceptance() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string AcceptanceId + { + get + { + return this._AcceptanceId; + } + set + { + if ((this._AcceptanceId != value)) + { + this.OnAcceptanceIdChanging(value); + this.SendPropertyChanging(); + this._AcceptanceId = value; + this.SendPropertyChanged("AcceptanceId"); + this.OnAcceptanceIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardProjectId", DbType="NVarChar(50)")] + public string HazardProjectId + { + get + { + return this._HazardProjectId; + } + set + { + if ((this._HazardProjectId != value)) + { + this.OnHazardProjectIdChanging(value); + this.SendPropertyChanging(); + this._HazardProjectId = value; + this.SendPropertyChanged("HazardProjectId"); + this.OnHazardProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardProjectName", DbType="NVarChar(500)")] + public string HazardProjectName + { + get + { + return this._HazardProjectName; + } + set + { + if ((this._HazardProjectName != value)) + { + this.OnHazardProjectNameChanging(value); + this.SendPropertyChanging(); + this._HazardProjectName = value; + this.SendPropertyChanged("HazardProjectName"); + this.OnHazardProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceResult", DbType="NVarChar(50)")] + public string AcceptanceResult + { + get + { + return this._AcceptanceResult; + } + set + { + if ((this._AcceptanceResult != value)) + { + this.OnAcceptanceResultChanging(value); + this.SendPropertyChanging(); + this._AcceptanceResult = value; + this.SendPropertyChanged("AcceptanceResult"); + this.OnAcceptanceResultChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceMan", DbType="NVarChar(50)")] + public string AcceptanceMan + { + get + { + return this._AcceptanceMan; + } + set + { + if ((this._AcceptanceMan != value)) + { + this.OnAcceptanceManChanging(value); + this.SendPropertyChanging(); + this._AcceptanceMan = value; + this.SendPropertyChanged("AcceptanceMan"); + this.OnAcceptanceManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AcceptanceDate", DbType="DateTime")] + public System.Nullable AcceptanceDate + { + get + { + return this._AcceptanceDate; + } + set + { + if ((this._AcceptanceDate != value)) + { + this.OnAcceptanceDateChanging(value); + this.SendPropertyChanging(); + this._AcceptanceDate = value; + this.SendPropertyChanged("AcceptanceDate"); + this.OnAcceptanceDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HSSE_SafetyDisclosure")] + public partial class HSSE_SafetyDisclosure : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _DisclosureId; + + private string _ProjectId; + + private string _HazardProjectName; + + private string _DisclosureName; + + private string _DisclosureMan; + + private System.Nullable _DisclosureDate; + + private string _UploadFile; + + private string _Remark; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnDisclosureIdChanging(string value); + partial void OnDisclosureIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnHazardProjectNameChanging(string value); + partial void OnHazardProjectNameChanged(); + partial void OnDisclosureNameChanging(string value); + partial void OnDisclosureNameChanged(); + partial void OnDisclosureManChanging(string value); + partial void OnDisclosureManChanged(); + partial void OnDisclosureDateChanging(System.Nullable value); + partial void OnDisclosureDateChanged(); + partial void OnUploadFileChanging(string value); + partial void OnUploadFileChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + #endregion + + public HSSE_SafetyDisclosure() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DisclosureId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string DisclosureId + { + get + { + return this._DisclosureId; + } + set + { + if ((this._DisclosureId != value)) + { + this.OnDisclosureIdChanging(value); + this.SendPropertyChanging(); + this._DisclosureId = value; + this.SendPropertyChanged("DisclosureId"); + this.OnDisclosureIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardProjectName", DbType="NVarChar(500)")] + public string HazardProjectName + { + get + { + return this._HazardProjectName; + } + set + { + if ((this._HazardProjectName != value)) + { + this.OnHazardProjectNameChanging(value); + this.SendPropertyChanging(); + this._HazardProjectName = value; + this.SendPropertyChanged("HazardProjectName"); + this.OnHazardProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DisclosureName", DbType="NVarChar(200)")] + public string DisclosureName + { + get + { + return this._DisclosureName; + } + set + { + if ((this._DisclosureName != value)) + { + this.OnDisclosureNameChanging(value); + this.SendPropertyChanging(); + this._DisclosureName = value; + this.SendPropertyChanged("DisclosureName"); + this.OnDisclosureNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DisclosureMan", DbType="NVarChar(50)")] + public string DisclosureMan + { + get + { + return this._DisclosureMan; + } + set + { + if ((this._DisclosureMan != value)) + { + this.OnDisclosureManChanging(value); + this.SendPropertyChanging(); + this._DisclosureMan = value; + this.SendPropertyChanged("DisclosureMan"); + this.OnDisclosureManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DisclosureDate", DbType="DateTime")] + public System.Nullable DisclosureDate + { + get + { + return this._DisclosureDate; + } + set + { + if ((this._DisclosureDate != value)) + { + this.OnDisclosureDateChanging(value); + this.SendPropertyChanging(); + this._DisclosureDate = value; + this.SendPropertyChanged("DisclosureDate"); + this.OnDisclosureDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UploadFile", DbType="NVarChar(500)")] + public string UploadFile + { + get + { + return this._UploadFile; + } + set + { + if ((this._UploadFile != value)) + { + this.OnUploadFileChanging(value); + this.SendPropertyChanging(); + this._UploadFile = value; + this.SendPropertyChanged("UploadFile"); + this.OnUploadFileChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HSSE_SafetyPatrol")] + public partial class HSSE_SafetyPatrol : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _PatrolId; + + private string _ProjectId; + + private string _HazardProjectId; + + private string _HazardProjectName; + + private System.Nullable _PatrolDate; + + private string _PatrolMan; + + private string _PatrolStatus; + + private string _Content; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnPatrolIdChanging(string value); + partial void OnPatrolIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnHazardProjectIdChanging(string value); + partial void OnHazardProjectIdChanged(); + partial void OnHazardProjectNameChanging(string value); + partial void OnHazardProjectNameChanged(); + partial void OnPatrolDateChanging(System.Nullable value); + partial void OnPatrolDateChanged(); + partial void OnPatrolManChanging(string value); + partial void OnPatrolManChanged(); + partial void OnPatrolStatusChanging(string value); + partial void OnPatrolStatusChanged(); + partial void OnContentChanging(string value); + partial void OnContentChanged(); + #endregion + + public HSSE_SafetyPatrol() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PatrolId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string PatrolId + { + get + { + return this._PatrolId; + } + set + { + if ((this._PatrolId != value)) + { + this.OnPatrolIdChanging(value); + this.SendPropertyChanging(); + this._PatrolId = value; + this.SendPropertyChanged("PatrolId"); + this.OnPatrolIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardProjectId", DbType="NVarChar(50)")] + public string HazardProjectId + { + get + { + return this._HazardProjectId; + } + set + { + if ((this._HazardProjectId != value)) + { + this.OnHazardProjectIdChanging(value); + this.SendPropertyChanging(); + this._HazardProjectId = value; + this.SendPropertyChanged("HazardProjectId"); + this.OnHazardProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardProjectName", DbType="NVarChar(500)")] + public string HazardProjectName + { + get + { + return this._HazardProjectName; + } + set + { + if ((this._HazardProjectName != value)) + { + this.OnHazardProjectNameChanging(value); + this.SendPropertyChanging(); + this._HazardProjectName = value; + this.SendPropertyChanged("HazardProjectName"); + this.OnHazardProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PatrolDate", DbType="DateTime")] + public System.Nullable PatrolDate + { + get + { + return this._PatrolDate; + } + set + { + if ((this._PatrolDate != value)) + { + this.OnPatrolDateChanging(value); + this.SendPropertyChanging(); + this._PatrolDate = value; + this.SendPropertyChanged("PatrolDate"); + this.OnPatrolDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PatrolMan", DbType="NVarChar(50)")] + public string PatrolMan + { + get + { + return this._PatrolMan; + } + set + { + if ((this._PatrolMan != value)) + { + this.OnPatrolManChanging(value); + this.SendPropertyChanging(); + this._PatrolMan = value; + this.SendPropertyChanged("PatrolMan"); + this.OnPatrolManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PatrolStatus", DbType="NVarChar(50)")] + public string PatrolStatus + { + get + { + return this._PatrolStatus; + } + set + { + if ((this._PatrolStatus != value)) + { + this.OnPatrolStatusChanging(value); + this.SendPropertyChanging(); + this._PatrolStatus = value; + this.SendPropertyChanged("PatrolStatus"); + this.OnPatrolStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Content", DbType="NVarChar(1000)")] + public string Content + { + get + { + return this._Content; + } + set + { + if ((this._Content != value)) + { + this.OnContentChanging(value); + this.SendPropertyChanging(); + this._Content = value; + this.SendPropertyChanged("Content"); + this.OnContentChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HSSE_SpecialPlan")] + public partial class HSSE_SpecialPlan : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _PlanId; + + private string _ProjectId; + + private string _HazardProjectName; + + private string _PlanName; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + private string _UploadFile; + + private string _Remark; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnPlanIdChanging(string value); + partial void OnPlanIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnHazardProjectNameChanging(string value); + partial void OnHazardProjectNameChanged(); + partial void OnPlanNameChanging(string value); + partial void OnPlanNameChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + partial void OnUploadFileChanging(string value); + partial void OnUploadFileChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + #endregion + + public HSSE_SpecialPlan() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string PlanId + { + get + { + return this._PlanId; + } + set + { + if ((this._PlanId != value)) + { + this.OnPlanIdChanging(value); + this.SendPropertyChanging(); + this._PlanId = value; + this.SendPropertyChanged("PlanId"); + this.OnPlanIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardProjectName", DbType="NVarChar(500)")] + public string HazardProjectName + { + get + { + return this._HazardProjectName; + } + set + { + if ((this._HazardProjectName != value)) + { + this.OnHazardProjectNameChanging(value); + this.SendPropertyChanging(); + this._HazardProjectName = value; + this.SendPropertyChanged("HazardProjectName"); + this.OnHazardProjectNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanName", DbType="NVarChar(200)")] + public string PlanName + { + get + { + return this._PlanName; + } + set + { + if ((this._PlanName != value)) + { + this.OnPlanNameChanging(value); + this.SendPropertyChanging(); + this._PlanName = value; + this.SendPropertyChanged("PlanName"); + this.OnPlanNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UploadFile", DbType="NVarChar(500)")] + public string UploadFile + { + get + { + return this._UploadFile; + } + set + { + if ((this._UploadFile != value)) + { + this.OnUploadFileChanging(value); + this.SendPropertyChanging(); + this._UploadFile = value; + this.SendPropertyChanged("UploadFile"); + this.OnUploadFileChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HSSE_Vehicle")] public partial class HSSE_Vehicle : INotifyPropertyChanging, INotifyPropertyChanged { diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 7d359c2..249cd9f 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -45,13 +45,7 @@ ..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll - @@ -116,6 +110,7 @@ + @@ -138,6 +133,8 @@ + + diff --git a/SGGL/Model/ZHGL/DataSync/AccidentOutput.cs b/SGGL/Model/ZHGL/DataSync/AccidentOutput.cs index 4d25fb7..20ede57 100644 --- a/SGGL/Model/ZHGL/DataSync/AccidentOutput.cs +++ b/SGGL/Model/ZHGL/DataSync/AccidentOutput.cs @@ -7,7 +7,7 @@ namespace Model /// public class AccidentOutput:BaseEntities { - public string Id { get; set; } + public new string Id { get; set; } /// /// 事故类型 /// diff --git a/SGGL/SgManager.AI/ConfigAppSetting.cs b/SGGL/SgManager.AI/ConfigAppSetting.cs index 2753f4f..846c45f 100644 --- a/SGGL/SgManager.AI/ConfigAppSetting.cs +++ b/SGGL/SgManager.AI/ConfigAppSetting.cs @@ -14,7 +14,7 @@ namespace SgManager.AI { return Convert.ToDouble(System.Configuration.ConfigurationManager.AppSettings[name]); } - catch (Exception ex) + catch (Exception) { return 0; } diff --git a/SGGL/SgManager.AI/FaceClass.cs b/SGGL/SgManager.AI/FaceClass.cs index a84318e..b743fe2 100644 --- a/SGGL/SgManager.AI/FaceClass.cs +++ b/SGGL/SgManager.AI/FaceClass.cs @@ -111,7 +111,7 @@ namespace SgManager.AI { result = getFaceClant().Search(image, imageType, groupIdList, options); } - catch (Exception ex) + catch (Exception) { return null; } @@ -289,9 +289,7 @@ namespace SgManager.AI public static String TOKEN = "24.adda70c11b9786206253ddb70affdc46.2592000.1493524354.282335-1234567"; // 百度云中开通对应服务应用的 API Key 建议开通应用的时候多选服务 - private static String clientId = "百度云应用的AK"; // 百度云中开通对应服务应用的 Secret Key - private static String clientSecret = "百度云应用的SK"; public static String getAccessToken() { diff --git a/SGGL/SgManager.AI/IDCardRecognition.cs b/SGGL/SgManager.AI/IDCardRecognition.cs index 3d974dc..771e5ce 100644 --- a/SGGL/SgManager.AI/IDCardRecognition.cs +++ b/SGGL/SgManager.AI/IDCardRecognition.cs @@ -28,8 +28,6 @@ namespace SgManager.AI /// 结果状态 public static APIBaseModel GetIdcardRecognitionString(string token, string imagePath, ref string recognitionString, out string errorMsg, string id_card_side = "front", bool detect_direction = false, string detect_risk = "false") { - bool resultState = true; - APIBaseModel tempModel = new APIBaseModel(); tempModel.contextModel = new IDCardRecognitionModel(); @@ -53,7 +51,6 @@ namespace SgManager.AI recognitionString = tempResult; if (recognitionString.Contains("\"error_code\""))//说明异常 { - resultState = false; tempModel.state = false; tempModel.contextModel.errorTypeModel = Json.ToObject(tempResult); tempModel.contextModel.errorTypeModel.error_discription = OCR_CharacterRecognitionErrorType.GetErrorCodeToDescription(tempModel.contextModel.errorTypeModel.error_code); @@ -70,7 +67,6 @@ namespace SgManager.AI } catch (Exception ex)//接口外部异常，如网络异常 { - resultState = false; errorMsg = ex.ToString(); tempModel.state = false; tempModel.errorMsg = ex.ToString(); diff --git a/SGGL/WebAPI/Controllers/CQMS/ContactController.cs b/SGGL/WebAPI/Controllers/CQMS/ContactController.cs index 4a32836..0a8d679 100644 --- a/SGGL/WebAPI/Controllers/CQMS/ContactController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/ContactController.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Web; using System.Web.Http; using BLL; -using Model; using System.Collections; namespace Web.obj diff --git a/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs b/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs index 318703b..449502b 100644 --- a/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs @@ -28,7 +28,7 @@ namespace WebAPI.Controllers.CQMS res.successful = BLL.API.CQMS.ApiInspectionManagementService.AddInspectionManagement(inspectionManagement); res.successful = true; } - catch (Exception e) + catch (Exception) { } @@ -50,7 +50,7 @@ namespace WebAPI.Controllers.CQMS res.resultValue = BLL.API.CQMS.BreakdownProjectService.getBreakdowns(projectId, keyWord); res.successful = true; } - catch (Exception e) + catch (Exception) { } @@ -77,7 +77,7 @@ namespace WebAPI.Controllers.CQMS res.resultValue = BLL.API.CQMS.ApiInspectionManagementService.getInspectionManagement(projectId, index, page, state, name); } - catch (Exception e) + catch (Exception) { res.successful = false; @@ -105,7 +105,7 @@ namespace WebAPI.Controllers.CQMS res.resultValue = BLL.API.CQMS.ApiInspectionManagementService.getInspectionManagementDetail(projectId, index, page, state, name); } - catch (Exception e) + catch (Exception) { res.successful = false; @@ -128,7 +128,7 @@ namespace WebAPI.Controllers.CQMS res.resultValue = BLL.API.CQMS.ApiInspectionManagementService.getInspectionManagementDetailByinspectionId(InspectionId); } - catch (Exception e) + catch (Exception) { res.successful = false; diff --git a/SGGL/WebAPI/Controllers/CQMS/JointCheckController.cs b/SGGL/WebAPI/Controllers/CQMS/JointCheckController.cs index da3f36e..3bed14e 100644 --- a/SGGL/WebAPI/Controllers/CQMS/JointCheckController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/JointCheckController.cs @@ -188,7 +188,7 @@ namespace Mvc.Controllers res.resultValue = CheckControl.JointCheckId; } } - catch (Exception e) + catch (Exception) { res.successful = false; } @@ -295,7 +295,7 @@ namespace Mvc.Controllers } } } - catch (Exception e) + catch (Exception) { res.successful = false; } diff --git a/SGGL/WebAPI/Controllers/CQMS/SpotCheckController.cs b/SGGL/WebAPI/Controllers/CQMS/SpotCheckController.cs index dbdfb64..97d9655 100644 --- a/SGGL/WebAPI/Controllers/CQMS/SpotCheckController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/SpotCheckController.cs @@ -184,7 +184,7 @@ namespace Mvc.Controllers res.resultValue = SpotCheckDetail.SpotCheckDetailId; } } - catch (Exception e) + catch (Exception) { res.successful = false; } @@ -205,7 +205,7 @@ namespace Mvc.Controllers } } - catch (Exception e) + catch (Exception) { res.successful = false; } @@ -358,7 +358,7 @@ namespace Mvc.Controllers res.resultValue = BLL.SpotCheckApproveService.AddSpotCheckApproveForApi(approve); } - catch (Exception e) + catch (Exception) { res.successful = false; } @@ -380,7 +380,7 @@ namespace Mvc.Controllers BLL.SpotCheckApproveService.UpdateSpotCheckApproveForApi(approve); } - catch (Exception e) + catch (Exception) { res.successful = false; } diff --git a/SGGL/WebAPI/Controllers/CQMS/TechnicalContactController.cs b/SGGL/WebAPI/Controllers/CQMS/TechnicalContactController.cs index e925fac..c0e226c 100644 --- a/SGGL/WebAPI/Controllers/CQMS/TechnicalContactController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/TechnicalContactController.cs @@ -285,7 +285,7 @@ namespace Mvc.Controllers string path = "FileUpload\\TechnicalContactList\\" + DateTime.Now.ToString("yyyy-MM") + "\\工程联络单.doc"; string newuploadfilepath = rootPath + path; string newUrl = newuploadfilepath.Replace(".doc", technicalContactList.Code + ".doc"); - string AttachPath = rootPath + "FileUpload\\TechnicalContactList\\" + DateTime.Now.ToString("yyyy-MM"); ///文件夹 + string AttachPath = rootPath + "FileUpload\\TechnicalContactList\\" + DateTime.Now.ToString("yyyy-MM"); //文件夹 if (!Directory.Exists(AttachPath)) { Directory.CreateDirectory(AttachPath); diff --git a/SGGL/WebAPI/Controllers/FaceController.cs b/SGGL/WebAPI/Controllers/FaceController.cs index dc2a524..1804c9c 100644 --- a/SGGL/WebAPI/Controllers/FaceController.cs +++ b/SGGL/WebAPI/Controllers/FaceController.cs @@ -42,7 +42,7 @@ namespace WebAPI.Controllers kqFace = (List)SgManager.AI.FaceClass.SearchFileFace(localRoot); } - catch (Exception e) + catch (Exception) { responeData.message = "识别失败,人脸库信息为空" + localRoot; responeData.data = localRoot; @@ -120,7 +120,7 @@ namespace WebAPI.Controllers kqFace = (List)SgManager.AI.FaceClass.SearchFileFace(localRoot); } - catch (Exception e) + catch (Exception) { responeData.message = "识别失败,人脸库信息为空"+ localRoot; responeData.data = localRoot; diff --git a/SGGL/WebAPI/Controllers/HJGL/ElectrodeRecoveryController.cs b/SGGL/WebAPI/Controllers/HJGL/ElectrodeRecoveryController.cs index 6e2182a..5decd04 100644 --- a/SGGL/WebAPI/Controllers/HJGL/ElectrodeRecoveryController.cs +++ b/SGGL/WebAPI/Controllers/HJGL/ElectrodeRecoveryController.cs @@ -24,7 +24,7 @@ namespace WebAPI.Controllers.HJGL res.resultValue = APIElectrodeRecoveryService.GetListData(projectId, index, page, name); } - catch (Exception e) + catch (Exception) { res.successful = false; diff --git a/SGGL/WebAPI/Controllers/HJGL/PersonEntranceController.cs b/SGGL/WebAPI/Controllers/HJGL/PersonEntranceController.cs index a5e8c81..93aebf1 100644 --- a/SGGL/WebAPI/Controllers/HJGL/PersonEntranceController.cs +++ b/SGGL/WebAPI/Controllers/HJGL/PersonEntranceController.cs @@ -23,7 +23,7 @@ namespace WebAPI.Controllers.HJGL res.resultValue = BLL.APIWelderEntranceService.GetWelderList(projectId, index, page, name); } - catch (Exception e) + catch (Exception) { res.successful = false; @@ -41,7 +41,7 @@ namespace WebAPI.Controllers.HJGL res.resultValue = BLL.APIWelderEntranceService.GetWelderById(welderId); } - catch (Exception e) + catch (Exception) { res.successful = false; @@ -59,7 +59,7 @@ namespace WebAPI.Controllers.HJGL res.resultValue = BLL.APIWelderEntranceService.IsExistWEDName( WED_Name, projectId); } - catch (Exception e) + catch (Exception) { res.successful = false; @@ -77,7 +77,7 @@ namespace WebAPI.Controllers.HJGL res.resultValue = BLL.APIWelderEntranceService.IsExistWEDCode(WED_Code, projectId); } - catch (Exception e) + catch (Exception) { res.successful = false; @@ -95,7 +95,7 @@ namespace WebAPI.Controllers.HJGL BLL.APIWelderEntranceService.DeleteBSWelder(WED_ID); } - catch (Exception e) + catch (Exception) { res.successful = false; @@ -115,7 +115,7 @@ namespace WebAPI.Controllers.HJGL BLL.APIWelderEntranceService.AddBSWelder(welder); } - catch (Exception e) + catch (Exception) { res.successful = false; @@ -133,7 +133,7 @@ namespace WebAPI.Controllers.HJGL BLL.APIWelderEntranceService.UpdateBSWelder(welder); } - catch (Exception e) + catch (Exception) { res.successful = false; diff --git a/SGGL/WebAPI/Controllers/HSSE/HazardousMG/HazardProjectController.cs b/SGGL/WebAPI/Controllers/HSSE/HazardousMG/HazardProjectController.cs new file mode 100644 index 0000000..115e568 --- /dev/null +++ b/SGGL/WebAPI/Controllers/HSSE/HazardousMG/HazardProjectController.cs @@ -0,0 +1,66 @@ +using BLL; +using System; +using System.Linq; +using System.Web.Http; + +namespace WebAPI.Controllers.HSSE.HazardousMG +{ + /// + /// 危大、超危工程清单 + /// + public class HazardProjectController : ApiController + { + #region 获取危大、超危工程清单分页列表 + /// + /// 获取危大、超危工程清单分页列表（按分部分项工程搜索） + /// + /// 项目主键 + /// 页码 + /// 每页条数 + /// 分部分项工程关键字 + /// + public Model.ResponeData getHazardProjectList(string projectId, int pageNumber, int pageSize, string keyword) + { + var responeData = new Model.ResponeData(); + try + { + var dataList = APIHazardProjectService.getHazardProjectList(projectId, keyword); + int totalCount = dataList.Count; + if (pageNumber > 0 && pageSize > 0) + { + dataList = dataList.Skip((pageNumber - 1) * pageSize).Take(pageSize).ToList(); + } + responeData.data = new { totalCount, dataList }; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + + #region 根据主键获取危大、超危工程详情 + /// + /// 根据主键获取危大、超危工程详情 + /// + /// 主键 + /// + public Model.ResponeData getHazardProjectById(string hazardProjectId) + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = APIHazardProjectService.getHazardProjectById(hazardProjectId); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + } +} diff --git a/SGGL/WebAPI/Controllers/HSSE/HazardousMG/SafetyAcceptanceController.cs b/SGGL/WebAPI/Controllers/HSSE/HazardousMG/SafetyAcceptanceController.cs new file mode 100644 index 0000000..d51f0e5 --- /dev/null +++ b/SGGL/WebAPI/Controllers/HSSE/HazardousMG/SafetyAcceptanceController.cs @@ -0,0 +1,141 @@ +using BLL; +using System; +using System.Linq; +using System.Web.Http; + +namespace WebAPI.Controllers.HSSE.HazardousMG +{ + /// + /// 安全防护验收 + /// + public class SafetyAcceptanceController : ApiController + { + #region 获取安全防护验收分页列表 + /// + /// 获取安全防护验收分页列表（按工程名称搜索，含附件） + /// + /// 项目主键 + /// 页码 + /// 每页条数 + /// 工程名称关键字 + /// + public Model.ResponeData getSafetyAcceptanceList(string projectId, int pageNumber, int pageSize, string keyword) + { + var responeData = new Model.ResponeData(); + try + { + var dataList = APISafetyAcceptanceService.getSafetyAcceptanceList(projectId, keyword); + int totalCount = dataList.Count; + if (pageNumber > 0 && pageSize > 0) + { + dataList = dataList.Skip((pageNumber - 1) * pageSize).Take(pageSize).ToList(); + } + ////附件关联 + foreach (var item in dataList) + { + item.AttachUrl = AttachFileService.getFileUrl(item.AcceptanceId, Const.SafetyAcceptanceMenuId); + } + responeData.data = new { totalCount, dataList }; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + + #region 根据主键获取安全防护验收详情 + /// + /// 根据主键获取安全防护验收详情 + /// + /// 主键 + /// + public Model.ResponeData getSafetyAcceptanceById(string acceptanceId) + { + var responeData = new Model.ResponeData(); + try + { + var item = APISafetyAcceptanceService.getSafetyAcceptanceById(acceptanceId); + if (item != null) + { + ////附件关联 + item.AttachUrl = AttachFileService.getFileUrl(item.AcceptanceId, Const.SafetyAcceptanceMenuId); + } + responeData.data = item; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + + #region 新增安全防护验收 + /// + /// 新增安全防护验收 + /// + /// 验收项 + /// + [HttpPost] + public Model.ResponeData addSafetyAcceptance([FromBody] Model.SafetyAcceptanceItem item) + { + var responeData = new Model.ResponeData(); + try + { + if (item == null || string.IsNullOrEmpty(item.ProjectId)) + { + responeData.code = 0; + responeData.message = "项目主键不能为空！"; + } + else + { + string acceptanceId = APISafetyAcceptanceService.addSafetyAcceptance(item); + responeData.data = new { acceptanceId }; + } + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + + #region 编辑安全防护验收 + /// + /// 编辑安全防护验收 + /// + /// 验收项 + /// + [HttpPost] + public Model.ResponeData updateSafetyAcceptance([FromBody] Model.SafetyAcceptanceItem item) + { + var responeData = new Model.ResponeData(); + try + { + if (item == null || string.IsNullOrEmpty(item.AcceptanceId)) + { + responeData.code = 0; + responeData.message = "验收主键不能为空！"; + } + else if (!APISafetyAcceptanceService.updateSafetyAcceptance(item)) + { + responeData.code = 0; + responeData.message = "未找到对应记录！"; + } + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + } +} diff --git a/SGGL/WebAPI/Controllers/HSSE/HazardousMG/SafetyPatrolController.cs b/SGGL/WebAPI/Controllers/HSSE/HazardousMG/SafetyPatrolController.cs new file mode 100644 index 0000000..1f9b41b --- /dev/null +++ b/SGGL/WebAPI/Controllers/HSSE/HazardousMG/SafetyPatrolController.cs @@ -0,0 +1,141 @@ +using BLL; +using System; +using System.Linq; +using System.Web.Http; + +namespace WebAPI.Controllers.HSSE.HazardousMG +{ + /// + /// 安全巡检 + /// + public class SafetyPatrolController : ApiController + { + #region 获取安全巡检分页列表 + /// + /// 获取安全巡检分页列表（按工程名称搜索，含附件） + /// + /// 项目主键 + /// 页码 + /// 每页条数 + /// 工程名称关键字 + /// + public Model.ResponeData getSafetyPatrolList(string projectId, int pageNumber, int pageSize, string keyword) + { + var responeData = new Model.ResponeData(); + try + { + var dataList = APISafetyPatrolService.getSafetyPatrolList(projectId, keyword); + int totalCount = dataList.Count; + if (pageNumber > 0 && pageSize > 0) + { + dataList = dataList.Skip((pageNumber - 1) * pageSize).Take(pageSize).ToList(); + } + ////附件关联 + foreach (var item in dataList) + { + item.AttachUrl = AttachFileService.getFileUrl(item.PatrolId, Const.SafetyPatrolMenuId); + } + responeData.data = new { totalCount, dataList }; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + + #region 根据主键获取安全巡检详情 + /// + /// 根据主键获取安全巡检详情 + /// + /// 主键 + /// + public Model.ResponeData getSafetyPatrolById(string patrolId) + { + var responeData = new Model.ResponeData(); + try + { + var item = APISafetyPatrolService.getSafetyPatrolById(patrolId); + if (item != null) + { + ////附件关联 + item.AttachUrl = AttachFileService.getFileUrl(item.PatrolId, Const.SafetyPatrolMenuId); + } + responeData.data = item; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + + #region 新增安全巡检 + /// + /// 新增安全巡检 + /// + /// 巡检项 + /// + [HttpPost] + public Model.ResponeData addSafetyPatrol([FromBody] Model.SafetyPatrolItem item) + { + var responeData = new Model.ResponeData(); + try + { + if (item == null || string.IsNullOrEmpty(item.ProjectId)) + { + responeData.code = 0; + responeData.message = "项目主键不能为空！"; + } + else + { + string patrolId = APISafetyPatrolService.addSafetyPatrol(item); + responeData.data = new { patrolId }; + } + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + + #region 编辑安全巡检 + /// + /// 编辑安全巡检 + /// + /// 巡检项 + /// + [HttpPost] + public Model.ResponeData updateSafetyPatrol([FromBody] Model.SafetyPatrolItem item) + { + var responeData = new Model.ResponeData(); + try + { + if (item == null || string.IsNullOrEmpty(item.PatrolId)) + { + responeData.code = 0; + responeData.message = "巡检主键不能为空！"; + } + else if (!APISafetyPatrolService.updateSafetyPatrol(item)) + { + responeData.code = 0; + responeData.message = "未找到对应记录！"; + } + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion + } +} diff --git a/SGGL/WebAPI/Controllers/HSSE/ImageRecognitionController.cs b/SGGL/WebAPI/Controllers/HSSE/ImageRecognitionController.cs index ea36e6d..3ffe456 100644 --- a/SGGL/WebAPI/Controllers/HSSE/ImageRecognitionController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/ImageRecognitionController.cs @@ -42,7 +42,7 @@ namespace WebAPI.Controllers.HSSE responeData.data = faceNum; } } - catch (Exception ex) + catch (Exception) { responeData.code = 0; } diff --git a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs b/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs index f717563..de0e871 100644 --- a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs @@ -47,42 +47,61 @@ namespace WebAPI.Controllers /// 会议类型(C-班前会；W-周例会；M-例会；S-专题例会；A-其他会议) /// 状态（0-待提交；1-已提交） /// 页码 + /// 编制日期开始日期（yyyy-MM-dd，为空不限制） + /// 编制日期结束日期（yyyy-MM-dd，包含当天，为空不限制） /// - public Model.ResponeData getMeetingByProjectIdStates(string projectId, string meetingType, string states, int pageIndex) + public Model.ResponeData getMeetingByProjectIdStates(string projectId, string meetingType, string states, int pageIndex, string startDate, string endDate) { var responeData = new Model.ResponeData(); try { List getDataList = new List(); int pageCount = 0; + // 编制日期(CompileDate)范围过滤：startDate/endDate为空时不限制；endDate取整天（包含endDate当天） + DateTime? dStart = Funs.GetNewDateTime(startDate); + DateTime? dEnd = Funs.GetNewDateTime(endDate); + if (dEnd.HasValue) + { + dEnd = dEnd.Value.Date.AddDays(1); + } if (meetingType == "C") { pageCount = Funs.DB.Meeting_ClassMeeting.Count(x => x.ProjectId == projectId - && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))); + && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))); } else if (meetingType == "W") { pageCount = Funs.DB.Meeting_WeekMeeting.Count(x => x.ProjectId == projectId - && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))); + && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))); } else if (meetingType == "M") { pageCount = Funs.DB.Meeting_MonthMeeting.Count(x => x.ProjectId == projectId - && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))); + && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))); } else if (meetingType == "S") { pageCount = Funs.DB.Meeting_SpecialMeeting.Count(x => x.ProjectId == projectId - && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))); + && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))); } else { pageCount = Funs.DB.Meeting_AttendMeeting.Count(x => x.ProjectId == projectId - && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2")))); + && (states == null || (states == "0" && (x.States == "0" || x.States == null)) || (states == "1" && (x.States == "1" || x.States == "2"))) + && (!dStart.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value >= dStart)) + && (!dEnd.HasValue || (x.CompileDate.HasValue && x.CompileDate.Value < dEnd))); } if (pageCount > 0 && pageIndex > 0) { - getDataList = APIMeetingService.getMeetingByProjectIdStates(projectId, meetingType, states, pageIndex); + getDataList = APIMeetingService.getMeetingByProjectIdStates(projectId, meetingType, states, pageIndex, startDate, endDate); } responeData.data = new { pageCount, getDataList }; } diff --git a/SGGL/WebAPI/Controllers/UserController.cs b/SGGL/WebAPI/Controllers/UserController.cs index cffa3c8..eca2110 100644 --- a/SGGL/WebAPI/Controllers/UserController.cs +++ b/SGGL/WebAPI/Controllers/UserController.cs @@ -31,7 +31,9 @@ namespace WebAPI.Controllers { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - var sysUser = db.Sys_User.FirstOrDefault(x => (x.Account == userInfo.Account || x.Telephone == userInfo.Telephone) && x.IsPost == true); + string account = userInfo.Account; + string telephone = userInfo.Telephone; + var sysUser = db.Sys_User.FirstOrDefault(x => (x.Account == account || x.Telephone == telephone) && x.IsPost == true); if (sysUser != null) { if (sysUser.LockTime.HasValue && sysUser.LockTime.Value > DateTime.Now) diff --git a/SGGL/WebAPI/SafetyPatrol_API.md b/SGGL/WebAPI/SafetyPatrol_API.md new file mode 100644 index 0000000..364265f --- /dev/null +++ b/SGGL/WebAPI/SafetyPatrol_API.md @@ -0,0 +1,168 @@ +# 安全巡检接口文档 + +## 1. 概述 + +- **基础地址**：`http://{host}:{port}`（WebAPI 独立站点，本地调试默认 `http://localhost:7143`） +- **路由规则**：`api/{controller}/{action}/{id}` +- **Controller**：`SafetyPatrol` +- **数据格式**：JSON（请求体、响应体均为 JSON） + +## 2. 通用返回结构 `ResponeData` + +所有接口统一返回以下结构： + +| 字段 | 类型 | 说明 | +|------|------|------| +| `code` | int | `1` 成功，`0` 失败 | +| `message` | string | 提示消息（成功时为空，失败时为异常信息） | +| `data` | object | 业务数据（各接口不同，见下文） | + +```json +{ + "code": 1, + "message": null, + "data": { } +} +``` + +## 3. 数据对象 `SafetyPatrolItem` + +| 字段 | 类型 | 必填 | 说明 | +|------|------|------|------| +| `PatrolId` | string | 编辑时必填 | 主键（新增时可不传，服务端自动生成 GUID） | +| `ProjectId` | string | 新增时必填 | 项目主键 | +| `HazardProjectId` | string | 否 | 危大、超危工程主键 | +| `HazardProjectName` | string | 否 | 工程名称 | +| `PatrolDate` | datetime | 否 | 巡检日期（ISO 格式，如 `2026-08-19T10:00:00`） | +| `PatrolMan` | string | 否 | 巡检人 | +| `PatrolStatus` | string | 否 | 巡检状态：`正常` / `待整改` | +| `Content` | string | 否 | 巡检内容（语音转文字） | +| `AttachUrl` | string | 否 | 巡检图片附件 URL（逗号分隔）；查询接口自动回填，新增/编辑时传入则自动写入附件表关联 | + +## 4. 接口列表 + +### 4.1 获取安全巡检分页列表 + +- **请求方式**：`GET` +- **URL**：`/api/SafetyPatrol/getSafetyPatrolList` + +**请求参数（Query）** + +| 参数 | 类型 | 必填 | 说明 | +|------|------|------|------| +| `projectId` | string | 是 | 项目主键 | +| `pageNumber` | int | 否 | 页码，从 1 开始；为 0 时不限制 | +| `pageSize` | int | 否 | 每页条数；为 0 时不限制 | +| `keyword` | string | 否 | 工程名称关键字（模糊匹配） | + +**示例** + +``` +GET /api/SafetyPatrol/getSafetyPatrolList?projectId=xxx&pageNumber=1&pageSize=10&keyword=基坑 +``` + +**返回 `data`** + +```json +{ + "totalCount": 12, + "dataList": [ + { + "PatrolId": "9f1a...", + "ProjectId": "xxx", + "HazardProjectId": "hd-001", + "HazardProjectName": "深基坑土方开挖工程", + "PatrolDate": "2026-08-19T10:00:00", + "PatrolMan": "张建国", + "PatrolStatus": "正常", + "Content": "现场深基坑边坡稳定，无裂缝。", + "AttachUrl": "fileupload/safetypatrol/patrol_001.jpg,fileupload/safetypatrol/patrol_002.jpg" + } + ] +} +``` + +### 4.2 获取安全巡检详情 + +- **请求方式**：`GET` +- **URL**：`/api/SafetyPatrol/getSafetyPatrolById` + +**请求参数（Query）** + +| 参数 | 类型 | 必填 | 说明 | +|------|------|------|------| +| `patrolId` | string | 是 | 巡检记录主键 | + +**示例** + +``` +GET /api/SafetyPatrol/getSafetyPatrolById?patrolId=9f1a... +``` + +**返回 `data`**：单个 `SafetyPatrolItem` 对象（含 `AttachUrl`），不存在时为 `null`。 + +### 4.3 新增安全巡检 + +- **请求方式**：`POST` +- **URL**：`/api/SafetyPatrol/addSafetyPatrol` +- **Content-Type**：`application/json` + +**请求体（JSON）** + +```json +{ + "ProjectId": "xxx", + "HazardProjectId": "hd-001", + "HazardProjectName": "深基坑土方开挖工程", + "PatrolDate": "2026-08-19T10:00:00", + "PatrolMan": "张建国", + "PatrolStatus": "正常", + "Content": "现场深基坑边坡稳定，无裂缝。", + "AttachUrl": "fileupload/safetypatrol/patrol_001.jpg" +} +``` + +> 说明：`AttachUrl` 非必填；传入图片 URL（多个用英文逗号分隔）时，服务端会自动写入附件表（`ToKeyId`=PatrolId、`MenuId`=SafetyPatrolMenuId），之后查询接口即可回读。 + +**返回 `data`** + +```json +{ "patrolId": "9f1a..." } +``` + +> 校验：`ProjectId` 为空时返回 `code=0`，`message="项目主键不能为空！"`。 + +### 4.4 编辑安全巡检 + +- **请求方式**：`POST` +- **URL**：`/api/SafetyPatrol/updateSafetyPatrol` +- **Content-Type**：`application/json` + +**请求体（JSON）**（需携带 `PatrolId`） + +```json +{ + "PatrolId": "9f1a...", + "ProjectId": "xxx", + "HazardProjectId": "hd-001", + "HazardProjectName": "深基坑土方开挖工程", + "PatrolDate": "2026-08-19T10:00:00", + "PatrolMan": "张建国", + "PatrolStatus": "待整改", + "Content": "边坡局部有积水，需整改。", + "AttachUrl": "fileupload/safetypatrol/patrol_003.jpg" +} +``` + +> 说明：传入 `AttachUrl` 时会覆盖该记录的原有附件；不传则保留原附件不变。 + +**返回 `data`**：成功时无数据（`data` 为空）。 + +> 校验：`PatrolId` 为空返回 `"巡检主键不能为空！"`；记录不存在返回 `"未找到对应记录！"`。 + +## 5. 错误码 + +| `code` | 含义 | +|--------|------| +| `1` | 成功 | +| `0` | 失败（`message` 为具体原因，如参数校验失败、数据库异常） | diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index 6ede5a9..97078ba 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -173,6 +173,9 @@ + + + diff --git a/reasonix.toml b/reasonix.toml new file mode 100644 index 0000000..896a300 --- /dev/null +++ b/reasonix.toml @@ -0,0 +1,2 @@ +[permissions] +allow = ["Bash=cd 'E:\\COMPANYPROJECT\\河北安装\\SGGL_HBAZ\\SGGL'; Select-String -Path 'WebAPI\\WebAPI.csproj','SgManager.AI\\SgManager.AI.csproj','BLL\\BLL.csproj','Model\\Model.csproj' -Pattern 'TargetFrameworkVersion|OutputType' | ForEach-Object { \"$($_.Filename): $($_.Line.Trim())\" }", "Bash=cd 'E:\\COMPANYPROJECT\\河北安装\\SGGL_HBAZ'; git log --oneline -5; git branch --show-current"]