gaofei
/
SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-07-10 17:09:23 +08:00
parent 8eb81d2d63 41c9569eea
commit ac37e4b7fa
25 changed files with 1309 additions and 1871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CreateModel2017local.bat
View File

@ -25,9 +25,9 @@ REM --------------
@echo 设置.net控制台环境 @echo 设置.net控制台环境
@echo. @echo.
@call "%VS150%" @call "%VS2022%"
SqlMetal /views /server:. /user:sa /password:1111 /database:SGGLDB_TCC /code:%Model_ROOT%\Model.cs /namespace:Model SqlMetal /views /server:DESKTOP-B3C9LJ1 /user:sa /password:303303 /database:SGGLDB_HBAZ /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成 @ECHO 完成
pause pause

2
SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
View File

@ -159,7 +159,7 @@ namespace BLL
var hazardRegisters = (from x in db.HSSE_Hazard_HazardRegister var hazardRegisters = (from x in db.HSSE_Hazard_HazardRegister
where x.CheckTime.Value.Year == mdate.Year where x.CheckTime.Value.Year == mdate.Year
&& x.CheckTime.Value.Month == mdate.Month && x.CheckTime.Value.Month == mdate.Month
&& x.CheckTime.Value.Day == mdate.Day && x.CheckTime.Value.Day == mdate.Day
select new Model.HazardRegisterItem select new Model.HazardRegisterItem
{ {
HazardRegisterId = x.HazardRegisterId, HazardRegisterId = x.HazardRegisterId,

194
SGGL/FineUIPro.Web/App_GlobalResources/Lan.designer.cs generated
View File

@ -13,13 +13,13 @@ namespace Resources {
/// <summary> /// <summary>
/// 强类型资源类，用于查找本地化字符串等。 /// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary> /// </summary>
// 此类是由 StronglyTypedResourceBuilder // 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 Visual Studio 项目。 // (以 /str 作为命令选项)，或重新生成 Visual Studio 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Web.Application.StronglyTypedResourceProxyBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Lan { internal class Lan {
@ -33,7 +33,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。 /// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
@ -47,8 +47,8 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 覆盖当前线程的 CurrentUICulture 属性 /// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型的资源类的资源查找。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
@ -61,7 +61,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 大数据中心 的本地化字符串。 /// 查找类似 大数据中心 的本地化字符串。
/// </summary> /// </summary>
internal static string BigDataCenter { internal static string BigDataCenter {
get { get {
@ -70,7 +70,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 证书预警 的本地化字符串。 /// 查找类似 证书预警 的本地化字符串。
/// </summary> /// </summary>
internal static string CertificateWarning { internal static string CertificateWarning {
get { get {
@ -79,7 +79,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 中国 的本地化字符串。 /// 查找类似 中国 的本地化字符串。
/// </summary> /// </summary>
internal static string China { internal static string China {
get { get {
@ -88,7 +88,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 中文 的本地化字符串。 /// 查找类似 中文 的本地化字符串。
/// </summary> /// </summary>
internal static string Chinese { internal static string Chinese {
get { get {
@ -97,7 +97,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 土建基础交安 的本地化字符串。 /// 查找类似 土建基础交安 的本地化字符串。
/// </summary> /// </summary>
internal static string CivilInfrastructure { internal static string CivilInfrastructure {
get { get {
@ -106,7 +106,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 已完成 的本地化字符串。 /// 查找类似 已完成 的本地化字符串。
/// </summary> /// </summary>
internal static string completed { internal static string completed {
get { get {
@ -115,7 +115,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 参建人数 的本地化字符串。 /// 查找类似 参建人数 的本地化字符串。
/// </summary> /// </summary>
internal static string ConPersonCount { internal static string ConPersonCount {
get { get {
@ -124,7 +124,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 施工单位 的本地化字符串。 /// 查找类似 施工单位 的本地化字符串。
/// </summary> /// </summary>
internal static string ConstructionUnit { internal static string ConstructionUnit {
get { get {
@ -133,7 +133,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 合同到期时间 的本地化字符串。 /// 查找类似 合同到期时间 的本地化字符串。
/// </summary> /// </summary>
internal static string ContractExpirationTime { internal static string ContractExpirationTime {
get { get {
@ -142,7 +142,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 当前现场人数 的本地化字符串。 /// 查找类似 当前现场人数 的本地化字符串。
/// </summary> /// </summary>
internal static string CurrentPersonnel { internal static string CurrentPersonnel {
get { get {
@ -151,7 +151,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 隐患总数 的本地化字符串。 /// 查找类似 隐患总数 的本地化字符串。
/// </summary> /// </summary>
internal static string DangersCount { internal static string DangersCount {
get { get {
@ -160,7 +160,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 员工管理 的本地化字符串。 /// 查找类似 员工管理 的本地化字符串。
/// </summary> /// </summary>
internal static string EmployeeManage { internal static string EmployeeManage {
get { get {
@ -169,7 +169,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 英文 的本地化字符串。 /// 查找类似 英文 的本地化字符串。
/// </summary> /// </summary>
internal static string English { internal static string English {
get { get {
@ -178,7 +178,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 现场动态 的本地化字符串。 /// 查找类似 现场动态 的本地化字符串。
/// </summary> /// </summary>
internal static string FieldDynamics { internal static string FieldDynamics {
get { get {
@ -187,7 +187,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 首台设备到货 的本地化字符串。 /// 查找类似 首台设备到货 的本地化字符串。
/// </summary> /// </summary>
internal static string FirstEquipmentArrived { internal static string FirstEquipmentArrived {
get { get {
@ -196,7 +196,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 焊接一次合格率 的本地化字符串。 /// 查找类似 焊接一次合格率 的本地化字符串。
/// </summary> /// </summary>
internal static string FistPassRateWelding { internal static string FistPassRateWelding {
get { get {
@ -205,7 +205,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 全屏 的本地化字符串。 /// 查找类似 全屏 的本地化字符串。
/// </summary> /// </summary>
internal static string FullScreen { internal static string FullScreen {
get { get {
@ -214,7 +214,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 总承包商施工计划 的本地化字符串。 /// 查找类似 总承包商施工计划 的本地化字符串。
/// </summary> /// </summary>
internal static string GeneralConPlan { internal static string GeneralConPlan {
get { get {
@ -223,7 +223,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 一般风险 的本地化字符串。 /// 查找类似 一般风险 的本地化字符串。
/// </summary> /// </summary>
internal static string GeneralRisk { internal static string GeneralRisk {
get { get {
@ -232,7 +232,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 较大风险 的本地化字符串。 /// 查找类似 较大风险 的本地化字符串。
/// </summary> /// </summary>
internal static string GreaterRisk { internal static string GreaterRisk {
get { get {
@ -241,7 +241,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 总部检查 的本地化字符串。 /// 查找类似 总部检查 的本地化字符串。
/// </summary> /// </summary>
internal static string HeadquartersInspection { internal static string HeadquartersInspection {
get { get {
@ -250,7 +250,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 首页 的本地化字符串。 /// 查找类似 首页 的本地化字符串。
/// </summary> /// </summary>
internal static string HomePage { internal static string HomePage {
get { get {
@ -259,7 +259,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 安全管理 的本地化字符串。 /// 查找类似 安全管理 的本地化字符串。
/// </summary> /// </summary>
internal static string HSEManage { internal static string HSEManage {
get { get {
@ -268,7 +268,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 湿度 的本地化字符串。 /// 查找类似 湿度 的本地化字符串。
/// </summary> /// </summary>
internal static string humidness { internal static string humidness {
get { get {
@ -277,7 +277,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 综合管理 的本地化字符串。 /// 查找类似 综合管理 的本地化字符串。
/// </summary> /// </summary>
internal static string IntegratedManage { internal static string IntegratedManage {
get { get {
@ -286,7 +286,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 在施危大工程数 的本地化字符串。 /// 查找类似 在施危大工程数 的本地化字符串。
/// </summary> /// </summary>
internal static string LargeRisk { internal static string LargeRisk {
get { get {
@ -295,7 +295,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 级 的本地化字符串。 /// 查找类似 级 的本地化字符串。
/// </summary> /// </summary>
internal static string Level { internal static string Level {
get { get {
@ -304,7 +304,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 现场视频 的本地化字符串。 /// 查找类似 现场视频 的本地化字符串。
/// </summary> /// </summary>
internal static string LiveVideo { internal static string LiveVideo {
get { get {
@ -313,7 +313,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 现场相册 的本地化字符串。 /// 查找类似 现场相册 的本地化字符串。
/// </summary> /// </summary>
internal static string Live_photo_album { internal static string Live_photo_album {
get { get {
@ -322,7 +322,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 低风险 的本地化字符串。 /// 查找类似 低风险 的本地化字符串。
/// </summary> /// </summary>
internal static string LowRisk { internal static string LowRisk {
get { get {
@ -331,7 +331,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 重大风险 的本地化字符串。 /// 查找类似 重大风险 的本地化字符串。
/// </summary> /// </summary>
internal static string MajorRisk { internal static string MajorRisk {
get { get {
@ -340,7 +340,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 管理人员总数 的本地化字符串。 /// 查找类似 管理人员总数 的本地化字符串。
/// </summary> /// </summary>
internal static string managersCount { internal static string managersCount {
get { get {
@ -349,7 +349,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 最大化 的本地化字符串。 /// 查找类似 最大化 的本地化字符串。
/// </summary> /// </summary>
internal static string maximize { internal static string maximize {
get { get {
@ -358,7 +358,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 机械竣工 的本地化字符串。 /// 查找类似 机械竣工 的本地化字符串。
/// </summary> /// </summary>
internal static string MechanicalCompletion { internal static string MechanicalCompletion {
get { get {
@ -367,7 +367,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 机械预警 的本地化字符串。 /// 查找类似 机械预警 的本地化字符串。
/// </summary> /// </summary>
internal static string MechanicalWarning { internal static string MechanicalWarning {
get { get {
@ -376,7 +376,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 消息 的本地化字符串。 /// 查找类似 消息 的本地化字符串。
/// </summary> /// </summary>
internal static string message { internal static string message {
get { get {
@ -385,7 +385,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 更多 的本地化字符串。 /// 查找类似 更多 的本地化字符串。
/// </summary> /// </summary>
internal static string more { internal static string more {
get { get {
@ -394,7 +394,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 您没有此模块操作权限，请联系管理员授权！ 的本地化字符串。 /// 查找类似 您没有此模块操作权限，请联系管理员授权！ 的本地化字符串。
/// </summary> /// </summary>
internal static string NoAuthorize { internal static string NoAuthorize {
get { get {
@ -403,7 +403,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 噪音 的本地化字符串。 /// 查找类似 噪音 的本地化字符串。
/// </summary> /// </summary>
internal static string noise { internal static string noise {
get { get {
@ -412,7 +412,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 您没有权限进入项目管理模块！ 的本地化字符串。 /// 查找类似 您没有权限进入项目管理模块！ 的本地化字符串。
/// </summary> /// </summary>
internal static string NoPermission { internal static string NoPermission {
get { get {
@ -421,7 +421,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 通知管理 的本地化字符串。 /// 查找类似 通知管理 的本地化字符串。
/// </summary> /// </summary>
internal static string NoticeManage { internal static string NoticeManage {
get { get {
@ -430,7 +430,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 现场考勤 的本地化字符串。 /// 查找类似 现场考勤 的本地化字符串。
/// </summary> /// </summary>
internal static string OnSiteAttendance { internal static string OnSiteAttendance {
get { get {
@ -439,7 +439,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 在新标签页中打开 的本地化字符串。 /// 查找类似 在新标签页中打开 的本地化字符串。
/// </summary> /// </summary>
internal static string OpensNewTab { internal static string OpensNewTab {
get { get {
@ -448,7 +448,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 合格率 的本地化字符串。 /// 查找类似 合格率 的本地化字符串。
/// </summary> /// </summary>
internal static string PassRate { internal static string PassRate {
get { get {
@ -457,7 +457,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 桩基施工 的本地化字符串。 /// 查找类似 桩基施工 的本地化字符串。
/// </summary> /// </summary>
internal static string Pilefoundationconstruction { internal static string Pilefoundationconstruction {
get { get {
@ -466,7 +466,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 管道安装开始 的本地化字符串。 /// 查找类似 管道安装开始 的本地化字符串。
/// </summary> /// </summary>
internal static string PipeInstallationStarts { internal static string PipeInstallationStarts {
get { get {
@ -475,7 +475,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 变电所受电 的本地化字符串。 /// 查找类似 变电所受电 的本地化字符串。
/// </summary> /// </summary>
internal static string PowerReceived { internal static string PowerReceived {
get { get {
@ -484,7 +484,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 问题总数 的本地化字符串。 /// 查找类似 问题总数 的本地化字符串。
/// </summary> /// </summary>
internal static string ProblemTotal { internal static string ProblemTotal {
get { get {
@ -493,7 +493,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 项目地址 的本地化字符串。 /// 查找类似 项目地址 的本地化字符串。
/// </summary> /// </summary>
internal static string ProjectAddress { internal static string ProjectAddress {
get { get {
@ -502,7 +502,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 项目清单 的本地化字符串。 /// 查找类似 项目清单 的本地化字符串。
/// </summary> /// </summary>
internal static string ProjectList { internal static string ProjectList {
get { get {
@ -511,7 +511,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 项目名称 的本地化字符串。 /// 查找类似 项目名称 的本地化字符串。
/// </summary> /// </summary>
internal static string ProjectName { internal static string ProjectName {
get { get {
@ -520,7 +520,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 项目进度计划 的本地化字符串。 /// 查找类似 项目进度计划 的本地化字符串。
/// </summary> /// </summary>
internal static string ProjectSchedule { internal static string ProjectSchedule {
get { get {
@ -529,7 +529,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 项目统计 的本地化字符串。 /// 查找类似 项目统计 的本地化字符串。
/// </summary> /// </summary>
internal static string ProjectStatistics { internal static string ProjectStatistics {
get { get {
@ -538,7 +538,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 在建项目 的本地化字符串。 /// 查找类似 在建项目 的本地化字符串。
/// </summary> /// </summary>
internal static string ProjectUnderConstruction { internal static string ProjectUnderConstruction {
get { get {
@ -547,7 +547,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 质量管理 的本地化字符串。 /// 查找类似 质量管理 的本地化字符串。
/// </summary> /// </summary>
internal static string QualityManage { internal static string QualityManage {
get { get {
@ -556,7 +556,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 质量统计 的本地化字符串。 /// 查找类似 质量统计 的本地化字符串。
/// </summary> /// </summary>
internal static string QualityStatistics { internal static string QualityStatistics {
get { get {
@ -565,7 +565,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 质量预警 的本地化字符串。 /// 查找类似 质量预警 的本地化字符串。
/// </summary> /// </summary>
internal static string QualityWarning { internal static string QualityWarning {
get { get {
@ -574,7 +574,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 质量问题统计 的本地化字符串。 /// 查找类似 质量问题统计 的本地化字符串。
/// </summary> /// </summary>
internal static string Quality_problem_statistics { internal static string Quality_problem_statistics {
get { get {
@ -583,7 +583,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 资质预警 的本地化字符串。 /// 查找类似 资质预警 的本地化字符串。
/// </summary> /// </summary>
internal static string Quawarning { internal static string Quawarning {
get { get {
@ -592,7 +592,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 退出 的本地化字符串。 /// 查找类似 退出 的本地化字符串。
/// </summary> /// </summary>
internal static string quit { internal static string quit {
get { get {
@ -601,7 +601,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 实时视频 的本地化字符串。 /// 查找类似 实时视频 的本地化字符串。
/// </summary> /// </summary>
internal static string RealTimeVideo { internal static string RealTimeVideo {
get { get {
@ -610,7 +610,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 整改率 的本地化字符串。 /// 查找类似 整改率 的本地化字符串。
/// </summary> /// </summary>
internal static string RectificationRate { internal static string RectificationRate {
get { get {
@ -619,7 +619,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 刷新 的本地化字符串。 /// 查找类似 刷新 的本地化字符串。
/// </summary> /// </summary>
internal static string Refresh { internal static string Refresh {
get { get {
@ -628,7 +628,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 刷新本页 的本地化字符串。 /// 查找类似 刷新本页 的本地化字符串。
/// </summary> /// </summary>
internal static string RefreshPage { internal static string RefreshPage {
get { get {
@ -637,7 +637,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 距竣工剩余 的本地化字符串。 /// 查找类似 距竣工剩余 的本地化字符串。
/// </summary> /// </summary>
internal static string RemainingTimeCompletion { internal static string RemainingTimeCompletion {
get { get {
@ -646,7 +646,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 风险管控 的本地化字符串。 /// 查找类似 风险管控 的本地化字符串。
/// </summary> /// </summary>
internal static string RiskControl { internal static string RiskControl {
get { get {
@ -655,7 +655,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 安全人工时 的本地化字符串。 /// 查找类似 安全人工时 的本地化字符串。
/// </summary> /// </summary>
internal static string SafeLaborHours { internal static string SafeLaborHours {
get { get {
@ -664,7 +664,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 安全问题统计 的本地化字符串。 /// 查找类似 安全问题统计 的本地化字符串。
/// </summary> /// </summary>
internal static string SafeProStat { internal static string SafeProStat {
get { get {
@ -673,7 +673,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 累计安全人工时 的本地化字符串。 /// 查找类似 累计安全人工时 的本地化字符串。
/// </summary> /// </summary>
internal static string SafetyLaborHours { internal static string SafetyLaborHours {
get { get {
@ -682,7 +682,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 安全统计 的本地化字符串。 /// 查找类似 安全统计 的本地化字符串。
/// </summary> /// </summary>
internal static string SafetyStatistics { internal static string SafetyStatistics {
get { get {
@ -691,7 +691,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 工程管理 的本地化字符串。 /// 查找类似 工程管理 的本地化字符串。
/// </summary> /// </summary>
internal static string ScheduleManage { internal static string ScheduleManage {
get { get {
@ -700,7 +700,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 选择语言 的本地化字符串。 /// 查找类似 选择语言 的本地化字符串。
/// </summary> /// </summary>
internal static string SelectLanguage { internal static string SelectLanguage {
get { get {
@ -709,7 +709,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 劳务数据 的本地化字符串。 /// 查找类似 劳务数据 的本地化字符串。
/// </summary> /// </summary>
internal static string ServiceData { internal static string ServiceData {
get { get {
@ -718,7 +718,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 设置 的本地化字符串。 /// 查找类似 设置 的本地化字符串。
/// </summary> /// </summary>
internal static string Settings { internal static string Settings {
get { get {
@ -727,7 +727,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 注销 的本地化字符串。 /// 查找类似 注销 的本地化字符串。
/// </summary> /// </summary>
internal static string SignOUT { internal static string SignOUT {
get { get {
@ -736,7 +736,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 开工时间 的本地化字符串。 /// 查找类似 开工时间 的本地化字符串。
/// </summary> /// </summary>
internal static string Start_time { internal static string Start_time {
get { get {
@ -745,7 +745,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 分包管理 的本地化字符串。 /// 查找类似 分包管理 的本地化字符串。
/// </summary> /// </summary>
internal static string SubManagement { internal static string SubManagement {
get { get {
@ -754,7 +754,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 监理单位 的本地化字符串。 /// 查找类似 监理单位 的本地化字符串。
/// </summary> /// </summary>
internal static string SupervisionUnit { internal static string SupervisionUnit {
get { get {
@ -763,7 +763,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 切换首页 的本地化字符串。 /// 查找类似 切换首页 的本地化字符串。
/// </summary> /// </summary>
internal static string SwitchHomePage { internal static string SwitchHomePage {
get { get {
@ -772,7 +772,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 系统菜单 的本地化字符串。 /// 查找类似 系统菜单 的本地化字符串。
/// </summary> /// </summary>
internal static string SystemMenu { internal static string SystemMenu {
get { get {
@ -781,7 +781,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 智慧施工管理信息系统 的本地化字符串。 /// 查找类似 智慧施工管理信息系统 的本地化字符串。
/// </summary> /// </summary>
internal static string SystemName { internal static string SystemName {
get { get {
@ -790,7 +790,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 温度 的本地化字符串。 /// 查找类似 温度 的本地化字符串。
/// </summary> /// </summary>
internal static string temperature { internal static string temperature {
get { get {
@ -799,7 +799,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 竣工时间 的本地化字符串。 /// 查找类似 竣工时间 的本地化字符串。
/// </summary> /// </summary>
internal static string TimeCompletion { internal static string TimeCompletion {
get { get {
@ -808,7 +808,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 待办事项 的本地化字符串。 /// 查找类似 待办事项 的本地化字符串。
/// </summary> /// </summary>
internal static string TodoList { internal static string TodoList {
get { get {
@ -817,7 +817,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 合同总工期 的本地化字符串。 /// 查找类似 合同总工期 的本地化字符串。
/// </summary> /// </summary>
internal static string TotalContractDuration { internal static string TotalContractDuration {
get { get {
@ -826,7 +826,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 未完成 的本地化字符串。 /// 查找类似 未完成 的本地化字符串。
/// </summary> /// </summary>
internal static string uncompleted { internal static string uncompleted {
get { get {
@ -835,7 +835,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 用户 的本地化字符串。 /// 查找类似 用户 的本地化字符串。
/// </summary> /// </summary>
internal static string user { internal static string user {
get { get {
@ -844,7 +844,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 视频监控 的本地化字符串。 /// 查找类似 视频监控 的本地化字符串。
/// </summary> /// </summary>
internal static string VideoSurveillance { internal static string VideoSurveillance {
get { get {
@ -853,7 +853,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 焊接管理 的本地化字符串。 /// 查找类似 焊接管理 的本地化字符串。
/// </summary> /// </summary>
internal static string WeldingManage { internal static string WeldingManage {
get { get {
@ -862,7 +862,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 风速 的本地化字符串。 /// 查找类似 风速 的本地化字符串。
/// </summary> /// </summary>
internal static string WindSpeed { internal static string WindSpeed {
get { get {
@ -871,7 +871,7 @@ namespace Resources {
} }
/// <summary> /// <summary>
/// 查找类似 作业人员总数 的本地化字符串。 /// 查找类似 作业人员总数 的本地化字符串。
/// </summary> /// </summary>
internal static string WorkPersonnel { internal static string WorkPersonnel {
get { get {

4
SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx.cs
View File

@ -1,10 +1,10 @@
using System; using BLL;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Web; using System.Web;
using System.Web.UI; using System.Web.UI;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.AttachFile namespace FineUIPro.Web.AttachFile
{ {

77
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -7346,3 +7346,80 @@ IP地址:::1
出错时间:05/09/2025 15:05:47 出错时间:05/09/2025 15:05:47
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 ASP.attachfile_onlineediting_aspx.__Render__control3(HtmlTextWriter __w, Control parameterContainer) 位置 e:\公司项目\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\AttachFile\OnlineEditing.aspx:行号 105
在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
在 System.Web.UI.HtmlControls.HtmlHead.RenderChildren(HtmlTextWriter writer)
在 System.Web.UI.HtmlControls.HtmlContainerControl.Render(HtmlTextWriter writer)
在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
在 System.Web.UI.Page.Render(HtmlTextWriter writer)
在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:05/14/2025 17:37:21
出错文件:http://localhost:4528/AttachFile/OnlineEditing.aspx
IP地址:::1
出错时间:05/14/2025 17:37:21
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HSSE.Meeting.ClassMeeting.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\HSSE\Meeting\ClassMeeting.aspx.cs:行号 40
在 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)
出错时间:06/04/2025 09:55:34
出错文件:http://localhost:4528/HSSE/Meeting/ClassMeeting.aspx
IP地址:::1
出错时间:06/04/2025 09:55:34
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HSSE.Meeting.ClassMeeting.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\HSSE\Meeting\ClassMeeting.aspx.cs:行号 40
在 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)
出错时间:06/04/2025 10:21:52
出错文件:http://localhost:4528/HSSE/Meeting/ClassMeeting.aspx
IP地址:::1
出错时间:06/04/2025 10:21:52
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.HSSE.Meeting.ClassMeeting.Page_Load(Object sender, EventArgs e) 位置 E:\COMPANYPROJECT\河北安装\SGGL_HBAZ\SGGL\FineUIPro.Web\HSSE\Meeting\ClassMeeting.aspx.cs:行号 40
在 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)
出错时间:06/05/2025 14:16:02
出错文件:http://localhost:4528/HSSE/Meeting/ClassMeeting.aspx
IP地址:::1
出错时间:06/05/2025 14:16:02

4
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FineUIPro.Web</RootNamespace> <RootNamespace>FineUIPro.Web</RootNamespace>
<AssemblyName>FineUIPro.Web</AssemblyName> <AssemblyName>FineUIPro.Web</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<SccProjectName> <SccProjectName>
</SccProjectName> </SccProjectName>
@ -19738,7 +19738,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

6
SGGL/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs
View File

@ -89,12 +89,12 @@ namespace FineUIPro.Web.HSSE.Meeting
} }
if (!string.IsNullOrEmpty(txtStartTime.Text.Trim())) if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
{ {
strSql += " AND ClassMeeting.CompileDate >= @StartTime"; strSql += " AND ClassMeeting.ClassMeetingDate >= @StartTime";
listStr.Add(new SqlParameter("@StartTime", string.Format("{0} {1}", this.txtStartTime.Text.Trim(), "00:00:00"))); listStr.Add(new SqlParameter("@StartTime", string.Format("{0} {1}", this.txtStartTime.Text.Trim(), "00:00:00")));
} }
if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim())) if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
{ {
strSql += " AND ClassMeeting.CompileDate <= @EndTime ORDER BY TeamGroupId ASC"; strSql += " AND ClassMeeting.ClassMeetingDate <= @EndTime ORDER BY TeamGroupId ASC";
listStr.Add(new SqlParameter("@EndTime", string.Format("{0} {1}", this.txtEndTime.Text.Trim(), "23:59:59"))); listStr.Add(new SqlParameter("@EndTime", string.Format("{0} {1}", this.txtEndTime.Text.Trim(), "23:59:59")));
} }
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
@ -216,7 +216,7 @@ namespace FineUIPro.Web.HSSE.Meeting
DateTime end = DateTime.Parse(string.Format("{0} 23:59:59", this.txtEndTime.Text.Trim())); DateTime end = DateTime.Parse(string.Format("{0} 23:59:59", this.txtEndTime.Text.Trim()));
try try
{ {
str = Funs.DB.Meeting_ClassMeeting.Where(x => x.TeamGroupId == groupId && x.CompileDate >= start && x.CompileDate <= end && x.ProjectId == this.CurrUser.LoginProjectId).Sum(p => p.AttentPersonNum).ToString(); 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();
} }
catch (Exception ex) catch (Exception ex)
{ {

12
SGGL/FineUIPro.Web/common/main3.aspx
View File

@ -17,7 +17,8 @@
input[type="date"] { input[type="date"] {
background-color: rgba(0,0,0,0); background-color: rgba(0,0,0,0);
color: #ffffff; color: #ffffff;
font-size: .175rem; font-size: 0.2rem;
font-weight: 700;
} }
img { img {
@ -179,7 +180,7 @@
<div class="t-aqtj"> <div class="t-aqtj">
<div id="aqtj" style="height: 100%; width: 100%;"></div> <div id="aqtj" style="height: 100%; width: 100%;"></div>
</div> </div>
<div class="t-side-tit"> <%-- <div class="t-side-tit">
<asp:Literal runat="server" Text="<%$ Resources:Lan,LiveVideo%>" /> <asp:Literal runat="server" Text="<%$ Resources:Lan,LiveVideo%>" />
</div> </div>
<div class="t-xcsp video_content" style="position: relative;"> <div class="t-xcsp video_content" style="position: relative;">
@ -197,7 +198,7 @@
</div> </div>
</div> </div>
</div> </div>--%>
</div> </div>
<div class="t-center"> <div class="t-center">
<%-- <div class="t-xm flex-row flex-center"> <%-- <div class="t-xm flex-row flex-center">
@ -483,6 +484,11 @@
grid: { grid: {
top: 30, top: 30,
}, },
tooltip: {
textStyle: {
fontSize: 20
}
},
xAxis: { xAxis: {
type: 'category', type: 'category',
data: tit, data: tit,

8
SGGL/FineUIPro.Web/common/main3.aspx.cs
View File

@ -86,12 +86,14 @@ namespace FineUIPro.Web.common
{ {
DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00")); DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00"));
DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59")); DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59"));
int m_count = Funs.DB.Project_ProjectUser.Count();
int job_count = (from x in Funs.DB.Meeting_ClassMeeting var m_count = Funs.DB.Project_ProjectUser.Count();
var job_count = (from x in Funs.DB.Meeting_ClassMeeting
where x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd where x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd
select new Model.MeetingItem select new Model.MeetingItem
{ {
AttentPersonNum = x.AttentPersonNum ?? 0, ProjectId = x.ProjectId,
AttentPersonNum = x.AttentPersonNum ?? 0
}).ToList().Sum(s => s.AttentPersonNum); }).ToList().Sum(s => s.AttentPersonNum);

18
SGGL/FineUIPro.Web/common/mainProject.aspx
View File

@ -12,7 +12,7 @@
<link href="../res/indexv2/assets/css/swiper.min.css" rel="stylesheet" /> <link href="../res/indexv2/assets/css/swiper.min.css" rel="stylesheet" />
<link rel="stylesheet" href="../res/css/base.css"> <link rel="stylesheet" href="../res/css/base.css">
<link rel="stylesheet" href="../res/css/projectIndex.css?v3"> <link rel="stylesheet" href="../res/css/projectIndex.css?v5">
<script src="../res/lib/flex.js"></script> <script src="../res/lib/flex.js"></script>
<style type="text/css"> <style type="text/css">
.sd-body2 .sd-section .sd-section7-inner .sd-labor-echart .sd-labor-echart-box { .sd-body2 .sd-section .sd-section7-inner .sd-labor-echart .sd-labor-echart-box {
@ -22,7 +22,8 @@
input[type="date"] { input[type="date"] {
background-color: rgba(0,0,0,0); background-color: rgba(0,0,0,0);
color: #ffffff; color: #ffffff;
font-size: .175rem; font-size: 0.2rem;
font-weight: 700;
} }
input[type="date"]::-webkit-calendar-picker-indicator { input[type="date"]::-webkit-calendar-picker-indicator {
@ -257,7 +258,7 @@
<video src="#"></video> <video src="#"></video>
</div> </div>
</div>--%> </div>--%>
<div class="side-tit image-full tit1"> <%-- <div class="side-tit image-full tit1">
<asp:Literal runat="server" Text="<%$ Resources:Lan,VideoSurveillance%>" /> <asp:Literal runat="server" Text="<%$ Resources:Lan,VideoSurveillance%>" />
</div> </div>
<div class="vid-box sd-section-content video_content" style="height: 3.75rem;"> <div class="vid-box sd-section-content video_content" style="height: 3.75rem;">
@ -275,7 +276,7 @@
</div> </div>
</div> </div>
</div> </div>--%>
</div> </div>
<div class="center"> <div class="center">
<div class="pro-d"> <div class="pro-d">
@ -305,7 +306,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ht-box flex-row flex-between"> <%-- <div class="ht-box flex-row flex-between">
<div class="ht-item flex-column flex-center flex-item-start"> <div class="ht-item flex-column flex-center flex-item-start">
<div class="ht-item-lab"> <div class="ht-item-lab">
<asp:Literal runat="server" Text="<%$ Resources:Lan,TotalContractDuration%>" /> <asp:Literal runat="server" Text="<%$ Resources:Lan,TotalContractDuration%>" />
@ -428,7 +429,7 @@
<div class="cs-item-lab">PM10</div> <div class="cs-item-lab">PM10</div>
<div class="cs-item-val"><span runat="server" id="divHJ6">0</span></div> <div class="cs-item-val"><span runat="server" id="divHJ6">0</span></div>
</div> </div>
</div> </div>--%>
</div> </div>
<div class="side side-right"> <div class="side side-right">
<div class="side-tit image-full"> <div class="side-tit image-full">
@ -715,6 +716,11 @@
grid: { grid: {
top: 30, top: 30,
}, },
tooltip: {
textStyle: {
fontSize: 20
}
},
xAxis: { xAxis: {
type: 'category', type: 'category',
data: tit, data: tit,

269
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
View File

@ -86,20 +86,15 @@ namespace FineUIPro.Web.common
{ {
DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00")); DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00"));
DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59")); DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59"));
var meet = (from x in Funs.DB.Meeting_ClassMeeting
where x.ProjectId == ProjectId && x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd var m_count = Funs.DB.Project_ProjectUser.Where(x => x.ProjectId == ProjectId).Count();
select new Model.MeetingItem var job_count = (from x in Funs.DB.Meeting_ClassMeeting
{ where x.ProjectId == ProjectId && x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd
AttentPersonNum = x.AttentPersonNum ?? 0, select new Model.MeetingItem
ManagePersonNum = x.ManagePersonNum ?? 0, {
}).ToList(); AttentPersonNum = x.AttentPersonNum ?? 0,
var m_count = 0; ManagePersonNum = x.ManagePersonNum ?? 0,
var job_count = 0; }).ToList().Sum(s => s.AttentPersonNum);
if (meet.Count() > 0)
{
m_count = meet.Where(m => m.ManagePersonNum != null).Max(m => m.ManagePersonNum);
job_count = meet.Sum(s => s.AttentPersonNum);
}
return new { return new {
@ -217,23 +212,23 @@ namespace FineUIPro.Web.common
{ {
try try
{ {
divHJ1.InnerHtml = environment.Tem.Value.ToString("#.##"); //divHJ1.InnerHtml = environment.Tem.Value.ToString("#.##");
divHJ2.InnerHtml = environment.Noise.Value.ToString("#.##"); //divHJ2.InnerHtml = environment.Noise.Value.ToString("#.##");
divHJ3.InnerHtml = environment.Hum.Value.ToString("#.##"); //divHJ3.InnerHtml = environment.Hum.Value.ToString("#.##");
divHJ4.InnerHtml = environment.Pm25.Value.ToString("#.##"); //divHJ4.InnerHtml = environment.Pm25.Value.ToString("#.##");
divHJ5.InnerHtml = environment.Ws.Value.ToString("#.##"); //divHJ5.InnerHtml = environment.Ws.Value.ToString("#.##");
divHJ6.InnerHtml = environment.Pm10.Value.ToString("#.##"); //divHJ6.InnerHtml = environment.Pm10.Value.ToString("#.##");
} }
catch (Exception ex) { } catch (Exception ex) { }
} }
else else
{ {
divHJ1.InnerHtml = "0"; //divHJ1.InnerHtml = "0";
divHJ2.InnerHtml = "0"; //divHJ2.InnerHtml = "0";
divHJ3.InnerHtml = "0"; //divHJ3.InnerHtml = "0";
divHJ4.InnerHtml = "0"; //divHJ4.InnerHtml = "0";
divHJ5.InnerHtml = "0"; //divHJ5.InnerHtml = "0";
divHJ6.InnerHtml = "0"; //divHJ6.InnerHtml = "0";
} }
} }
#endregion #endregion
@ -413,18 +408,18 @@ namespace FineUIPro.Web.common
//this.divProjectMoney.InnerHtml = divProjectMoneyTitle = project.ProjectMoney.ToString(); //this.divProjectMoney.InnerHtml = divProjectMoneyTitle = project.ProjectMoney.ToString();
if (project.EndDate.HasValue) if (project.EndDate.HasValue)
{ {
this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate); //this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate);
int endDays = (project.EndDate.Value - DateTime.Now).Days; int endDays = (project.EndDate.Value - DateTime.Now).Days;
if (endDays >= 0) if (endDays >= 0)
{ {
this.divRemainingDays.InnerHtml = endDays.ToString(); //this.divRemainingDays.InnerHtml = endDays.ToString();
} }
if (project.StartDate.HasValue) if (project.StartDate.HasValue)
{ {
int pdays = (project.EndDate.Value - project.StartDate.Value).Days; int pdays = (project.EndDate.Value - project.StartDate.Value).Days;
if (pdays >= 0) if (pdays >= 0)
{ {
this.divProjectDays.InnerHtml = pdays.ToString(); //this.divProjectDays.InnerHtml = pdays.ToString();
} }
} }
} }
@ -656,119 +651,119 @@ namespace FineUIPro.Web.common
{ {
var Pmodel = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == ProjectId); var Pmodel = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == ProjectId);
//开工日期 //开工日期
if (Pmodel.StartDate != null) //if (Pmodel.StartDate != null)
{ //{
scheDate0.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.StartDate); // scheDate0.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.StartDate);
if (!isBoolDates(Pmodel.StartDate)) // if (!isBoolDates(Pmodel.StartDate))
{ // {
scheline0.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; // scheline0.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
scheDate0.Style.Add("color", "#FF7474"); // scheDate0.Style.Add("color", "#FF7474");
scheName0.Style.Add("color", "#FF7474"); // scheName0.Style.Add("color", "#FF7474");
} // }
} //}
else //else
{ //{
scheDate0.InnerText = ""; // scheDate0.InnerText = "";
} //}
//竣工日期 //竣工日期
if (Pmodel.EndDate != null) //if (Pmodel.EndDate != null)
{ //{
scheDate7.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.EndDate); // scheDate7.InnerText = string.Format("{0:yyyy-MM-dd}", Pmodel.EndDate);
if (!isBoolDates(Pmodel.EndDate)) // if (!isBoolDates(Pmodel.EndDate))
{ // {
scheline7.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; // scheline7.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
scheDate7.Style.Add("color", "#FF7474"); // scheDate7.Style.Add("color", "#FF7474");
scheName7.Style.Add("color", "#FF7474"); // scheName7.Style.Add("color", "#FF7474");
} // }
} //}
else //else
{ //{
scheDate7.InnerText = ""; // scheDate7.InnerText = "";
} //}
if (scheduleList.Count > 0) //if (scheduleList.Count > 0)
{ //{
//节点1 // //节点1
if (scheduleList.FirstOrDefault(x => x.SortId == 1) != null) // //if (scheduleList.FirstOrDefault(x => x.SortId == 1) != null)
{ // //{
scheName1.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleName; // // scheName1.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleName;
var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleDate; // // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 1).ScheduleDate;
scheDate1.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); // // scheDate1.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
if (!isBoolDates(NowDate)) // // if (!isBoolDates(NowDate))
{ // // {
scheline1.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; // // scheline1.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
scheDate1.Style.Add("color", "#FF7474"); // // scheDate1.Style.Add("color", "#FF7474");
scheName1.Style.Add("color", "#FF7474"); // // scheName1.Style.Add("color", "#FF7474");
} // // }
} // //}
//节点2 // //节点2
if (scheduleList.FirstOrDefault(x => x.SortId == 2) != null) // //if (scheduleList.FirstOrDefault(x => x.SortId == 2) != null)
{ // //{
scheName2.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleName; // // scheName2.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleName;
var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleDate; // // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 2).ScheduleDate;
scheDate2.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); // // scheDate2.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
if (!isBoolDates(NowDate)) // // if (!isBoolDates(NowDate))
{ // // {
scheline2.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; // // scheline2.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
scheDate2.Style.Add("color", "#FF7474"); // // scheDate2.Style.Add("color", "#FF7474");
scheName2.Style.Add("color", "#FF7474"); // // scheName2.Style.Add("color", "#FF7474");
} // // }
} // //}
//节点3 // //节点3
if (scheduleList.FirstOrDefault(x => x.SortId == 3) != null) // if (scheduleList.FirstOrDefault(x => x.SortId == 3) != null)
{ // {
scheName3.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleName; // scheName3.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleName;
var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleDate; // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 3).ScheduleDate;
scheDate3.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); // scheDate3.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
if (!isBoolDates(NowDate)) // if (!isBoolDates(NowDate))
{ // {
scheline3.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; // scheline3.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
scheDate3.Style.Add("color", "#FF7474"); // scheDate3.Style.Add("color", "#FF7474");
scheName3.Style.Add("color", "#FF7474"); // scheName3.Style.Add("color", "#FF7474");
} // }
} // }
//节点4 // //节点4
if (scheduleList.FirstOrDefault(x => x.SortId == 4) != null) // if (scheduleList.FirstOrDefault(x => x.SortId == 4) != null)
{ // {
scheName4.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleName; // scheName4.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleName;
var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleDate; // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 4).ScheduleDate;
scheDate4.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); // scheDate4.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
if (!isBoolDates(NowDate)) // if (!isBoolDates(NowDate))
{ // {
scheline4.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; // scheline4.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
scheDate4.Style.Add("color", "#FF7474"); // scheDate4.Style.Add("color", "#FF7474");
scheName4.Style.Add("color", "#FF7474"); // scheName4.Style.Add("color", "#FF7474");
} // }
} // }
//节点5 // //节点5
if (scheduleList.FirstOrDefault(x => x.SortId == 5) != null) // if (scheduleList.FirstOrDefault(x => x.SortId == 5) != null)
{ // {
scheName5.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleName; // scheName5.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleName;
var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleDate; // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 5).ScheduleDate;
scheDate5.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); // scheDate5.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
if (!isBoolDates(NowDate)) // if (!isBoolDates(NowDate))
{ // {
scheline5.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; // scheline5.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
scheDate5.Style.Add("color", "#FF7474"); // scheDate5.Style.Add("color", "#FF7474");
scheName5.Style.Add("color", "#FF7474"); // scheName5.Style.Add("color", "#FF7474");
} // }
}//节点6 // }//节点6
if (scheduleList.FirstOrDefault(x => x.SortId == 6) != null) // if (scheduleList.FirstOrDefault(x => x.SortId == 6) != null)
{ // {
scheName6.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleName; // scheName6.InnerText = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleName;
var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleDate; // var NowDate = scheduleList.FirstOrDefault(x => x.SortId == 6).ScheduleDate;
scheDate6.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate); // scheDate6.InnerText = string.Format("{0:yyyy-MM-dd}", NowDate);
if (!isBoolDates(NowDate)) // if (!isBoolDates(NowDate))
{ // {
scheline6.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red"; // scheline6.Attributes["class"] = "jd-line-dot flex-column flex-center jd-line-dot-red";
scheDate6.Style.Add("color", "#FF7474"); // scheDate6.Style.Add("color", "#FF7474");
scheName6.Style.Add("color", "#FF7474"); // scheName6.Style.Add("color", "#FF7474");
} // }
} // }
} //}
} }
} }

297
SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs generated
View File

@ -59,303 +59,6 @@ namespace FineUIPro.Web.common
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label lbRemark; protected global::System.Web.UI.WebControls.Label lbRemark;
/// <summary>
/// divProjectDays 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divProjectDays;
/// <summary>
/// divEndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEndDate;
/// <summary>
/// divRemainingDays 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRemainingDays;
/// <summary>
/// scheline0 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline0;
/// <summary>
/// scheName0 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName0;
/// <summary>
/// scheDate0 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate0;
/// <summary>
/// scheline1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline1;
/// <summary>
/// scheName1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName1;
/// <summary>
/// scheDate1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate1;
/// <summary>
/// scheline2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline2;
/// <summary>
/// scheName2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName2;
/// <summary>
/// scheDate2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate2;
/// <summary>
/// scheline3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline3;
/// <summary>
/// scheName3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName3;
/// <summary>
/// scheDate3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate3;
/// <summary>
/// scheline4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline4;
/// <summary>
/// scheName4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName4;
/// <summary>
/// scheDate4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate4;
/// <summary>
/// scheline5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline5;
/// <summary>
/// scheName5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName5;
/// <summary>
/// scheDate5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate5;
/// <summary>
/// scheline6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline6;
/// <summary>
/// scheName6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName6;
/// <summary>
/// scheDate6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate6;
/// <summary>
/// scheline7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheline7;
/// <summary>
/// scheName7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheName7;
/// <summary>
/// scheDate7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl scheDate7;
/// <summary>
/// divHJ1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ1;
/// <summary>
/// divHJ2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ2;
/// <summary>
/// divHJ3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ3;
/// <summary>
/// divHJ4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ4;
/// <summary>
/// divHJ5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ5;
/// <summary>
/// divHJ6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHJ6;
/// <summary> /// <summary>
/// divCQMSAllNum 控件。 /// divCQMSAllNum 控件。
/// </summary> /// </summary>

13
SGGL/FineUIPro.Web/index.aspx
View File

@ -19,7 +19,6 @@
<link href="~/res/indexv2/assets/css/video-7.15.0.min.css" rel="stylesheet" /> <link href="~/res/indexv2/assets/css/video-7.15.0.min.css" rel="stylesheet" />
<link href="~/res/indexv2/assets/css/index8.css" rel="stylesheet" /> <link href="~/res/indexv2/assets/css/index8.css" rel="stylesheet" />
<link href="~/res/css/mainindex.css?v2" rel="stylesheet" /> <link href="~/res/css/mainindex.css?v2" rel="stylesheet" />
>
<style type="text/css"> <style type="text/css">
html { html {
min-height: auto; min-height: auto;
@ -185,7 +184,7 @@
</div> </div>
</div> </div>
<div class="t-head-log flex-row flex-center" onclick="onHomeClick()" style="cursor: pointer;"> <div class="t-head-log flex-row flex-center" onclick="onHomeClick()" style="cursor: pointer;font-size: .5rem;">
<asp:Literal runat="server" Text="<%$ Resources:Lan,SystemName%>" /></div> <asp:Literal runat="server" Text="<%$ Resources:Lan,SystemName%>" /></div>
<div class="t-head-navs flex-row flex-item-end flex-end"> <div class="t-head-navs flex-row flex-item-end flex-end">
<div class="t-head-nav"> <div class="t-head-nav">
@ -219,23 +218,23 @@
</div> </div>
<div class="t-head-sets flex-row flex-center"> <div class="t-head-sets flex-row flex-center">
<div class="t-head-set news" hidden="hidden"> <div class="t-head-set news" hidden="hidden">
<f:Button runat="server" Text="<%$ Resources:Lan,SwitchHomePage %>" Hidden="true" CssStyle="color: #ffffff;" OnClick="btnChangeHomePage_Click" OnClientClick="parent.removeActiveTab();" <f:Button runat="server" Text="<%$ Resources:Lan,SwitchHomePage %>" Hidden="true" CssStyle="color: #ffffff;font-size:.25rem;" OnClick="btnChangeHomePage_Click" OnClientClick="parent.removeActiveTab();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnToDoItem"> EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnToDoItem">
</f:Button> </f:Button>
</div> </div>
<div class="t-head-set user"> <div class="t-head-set user">
<f:Button runat="server" Text="<%$ Resources:Lan,user %>" CssStyle="color: #ffffff;" OnClick="btnPersonal_Click" OnClientClick="parent.removeActiveTab();" <f:Button runat="server" Text="<%$ Resources:Lan,user %>" CssStyle="color: #ffffff;font-size:.25rem;" OnClick="btnPersonal_Click" OnClientClick="parent.removeActiveTab();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal"> EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal">
</f:Button> </f:Button>
</div> </div>
<div class="t-head-set set"> <div class="t-head-set set">
<f:Button runat="server" Text="<%$ Resources:Lan,Settings %>" CssStyle="color: #ffffff;" OnClientClick="parent.removeActiveTab();" OnClick="btnSysSet_Click" <f:Button runat="server" Text="<%$ Resources:Lan,Settings %>" CssStyle="color: #ffffff;font-size:.25rem;" OnClientClick="parent.removeActiveTab();" OnClick="btnSysSet_Click"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button7"> EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button7">
</f:Button> </f:Button>
</div> </div>
<div class="t-head-set exit"><a href="javascript:void(0);" onclick="onToolSignOutClick()" style="color: #ffffff;"> <div class="t-head-set exit"><a href="javascript:void(0);" onclick="onToolSignOutClick()" style="color: #ffffff;font-size:.25rem;">
<asp:Literal runat="server" Text="<%$ Resources:Lan,quit%>" /></a></div> <asp:Literal runat="server" Text="<%$ Resources:Lan,quit%>" /></a></div>
<div class="t-head-set full"> <div class="t-head-set full" style="font-size:.25rem;">
<asp:Literal runat="server" Text="<%$ Resources:Lan,FullScreen%>" /></div> <asp:Literal runat="server" Text="<%$ Resources:Lan,FullScreen%>" /></div>
<div class="top-li-item"> <div class="top-li-item">
<f:Button runat="server" CssClass="bgbtntop" Text="刷新" ToolTip="刷新菜单" IconFont="Retweet" OnClick="btnRetweet_Click" <f:Button runat="server" CssClass="bgbtntop" Text="刷新" ToolTip="刷新菜单" IconFont="Retweet" OnClick="btnRetweet_Click"

13
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -69,6 +69,7 @@
background-color: transparent !important; background-color: transparent !important;
padding: 0 !important; padding: 0 !important;
line-height: 1; line-height: 1;
font-size: .3rem;
} }
.activeClick { .activeClick {
@ -132,7 +133,9 @@
left: 0; left: 0;
top: 0; top: 0;
}*/ }*/
#index-project .bgbtn2{
font-size: .25rem;
}
.f-tabstrip-align-left .f-tab-header.f-first { .f-tabstrip-align-left .f-tab-header.f-first {
background-color: #dfe4f1; background-color: #dfe4f1;
/* color: #fff;*/ /* color: #fff;*/
@ -305,7 +308,7 @@
</div> </div>
<div class="logo flex-row flex-center"> <div class="logo flex-row flex-center">
<h1> <h1>
<f:Button runat="server" CssClass="bgbtn2" EnablePostBack="true" CssStyle="color: #ffffff;" Text="<%$ Resources:Lan,SystemName %>" OnClick="btnHome_Click" <f:Button runat="server" EnablePostBack="true" CssStyle="color: #ffffff;font-size: .5rem;" Text="<%$ Resources:Lan,SystemName %>" OnClick="btnHome_Click"
EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome"> EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome">
</f:Button> </f:Button>
</h1> </h1>
@ -348,7 +351,7 @@
</div> </div>
<div class="nav-bars flex-row flex-center"> <div class="nav-bars flex-row flex-center">
<div class="project-select flex-row flex-start"> <div class="project-select flex-row flex-start">
<f:DropDownList runat="server" MarginBottom="0" ID="drpProject" OnSelectedIndexChanged="drpProject_SelectedIndexChanged" <f:DropDownList runat="server" MarginBottom="0" CssClass="bgbtn2" ID="drpProject" OnSelectedIndexChanged="drpProject_SelectedIndexChanged"
AutoPostBack="true" EnableEdit="true"> AutoPostBack="true" EnableEdit="true">
</f:DropDownList> </f:DropDownList>
</div> </div>
@ -372,10 +375,10 @@
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();"> EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
</f:Button> </f:Button>
</div> </div>
<div class="nav-bar exit"><a href="javascript:void(0);" style="color: #ffffff;" onclick="onToolSignOutClick()"> <div class="nav-bar exit"><a href="javascript:void(0);" style="color: #ffffff;font-size:.25rem;" onclick="onToolSignOutClick()">
<asp:Literal runat="server" Text="<%$ Resources:Lan,quit%>" /></a></div> <asp:Literal runat="server" Text="<%$ Resources:Lan,quit%>" /></a></div>
<div class="nav-bar full"> <div class="nav-bar full">
<div class="t-btn1 icon-quanping_o ab" style="cursor: pointer"><span style="color: #fff"> <div class="t-btn1 icon-quanping_o ab" style="cursor: pointer"><span style="color: #fff; font-size:.25rem;">
<asp:Literal runat="server" Text="<%$ Resources:Lan,FullScreen%>" /></span></div> <asp:Literal runat="server" Text="<%$ Resources:Lan,FullScreen%>" /></span></div>
</div> </div>
</div> </div>

2
SGGL/FineUIPro.Web/res/css/base.css
View File

@ -169,7 +169,7 @@ body, .wrap, .main {
.image-full{ .image-full{
background-size: 100%; background-size: 100% 100%;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }

12
SGGL/FineUIPro.Web/res/css/mainindex.css
View File

@ -122,14 +122,14 @@ body::-webkit-scrollbar{
} }
.lw-tit>.lw-item{ .lw-tit>.lw-item{
width: 1.475rem; width: 1.475rem;
height: .825rem; height: 1rem;
background-color: #254056; background-color: #254056;
color: #ffffff; color: #ffffff;
padding: .05rem; padding: .05rem;
} }
.lw-tit > .lw-item > .lw-item-lab { .lw-tit > .lw-item > .lw-item-lab {
font-size: .175rem; font-size: .25rem;
height: .25rem; height: .5rem;
color: #A9DDEE; color: #A9DDEE;
border-bottom: 1px solid #00BEFF; border-bottom: 1px solid #00BEFF;
width: 100%; width: 100%;
@ -143,11 +143,11 @@ body::-webkit-scrollbar{
.lw-tit > .lw-item > .lw-item-val { .lw-tit > .lw-item > .lw-item-val {
height: calc(100% - .25rem); height: calc(100% - .5rem);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: .3rem; font-size: .35rem;
} }
.t-side>.t-side-tit{ .t-side>.t-side-tit{
height: .45rem; height: .45rem;
@ -159,7 +159,7 @@ body::-webkit-scrollbar{
background-repeat: no-repeat; background-repeat: no-repeat;
font-family: Alibaba PuHuiTi 2.0, Alibaba PuHuiTi 20; font-family: Alibaba PuHuiTi 2.0, Alibaba PuHuiTi 20;
color: #FFFFFF; color: #FFFFFF;
font-size: .2rem; font-size: .25rem;
position: relative; position: relative;
} }

31
SGGL/FineUIPro.Web/res/css/projectIndex.css
View File

@ -3,13 +3,13 @@
padding: .25rem; padding: .25rem;
} }
.side{ .side {
width: calc((100% - 11.25rem) / 2); width: calc((100% - 10rem) / 2);
height: 100% height: 100%
} }
.center{ .center{
width: 11.25rem; width: 10rem;
height: 100%; height: 100%;
} }
.c_lang { .c_lang {
@ -19,11 +19,11 @@
} }
.side-tit { .side-tit {
width: 100%; width: 100%;
height: .375rem; height: .5rem;
font-size: .175rem; font-size: .25rem;
color: #ffffff; color: #ffffff;
padding-left: .375rem; padding-left: .5rem;
line-height: .375rem; line-height: .5rem;
background-image: url(../images/z01.png); background-image: url(../images/z01.png);
position: relative; position: relative;
} }
@ -66,9 +66,12 @@
.anq-inner>.anq-inner-b>.anq-inner-b-val{ .anq-inner>.anq-inner-b>.anq-inner-b-val{
margin-top: .125rem; margin-top: .125rem;
font-size: .25rem; font-size: .4rem;
} }
.anq-inner>.anq-inner-b>.anq-inner-b-val>span:nth-child(2){ .anq-inner > .anq-inner-b > .anq-inner-b-text {
font-size: .3rem;
}
.anq-inner>.anq-inner-b>.anq-inner-b-val>span:nth-child(2){
margin-left: .05rem; margin-left: .05rem;
font-size: .175rem; font-size: .175rem;
} }
@ -91,8 +94,8 @@
padding: .05rem; padding: .05rem;
} }
.lw-tit > .lw-item > .lw-item-lab { .lw-tit > .lw-item > .lw-item-lab {
font-size: .175rem; font-size: .3rem;
height: .25rem; height: .4rem;
color: #A9DDEE; color: #A9DDEE;
border-bottom: 1px solid #00BEFF; border-bottom: 1px solid #00BEFF;
width: 100%; width: 100%;
@ -106,7 +109,7 @@
.lw-tit > .lw-item > .lw-item-val { .lw-tit > .lw-item > .lw-item-val {
height: calc(100% - .25rem); height: calc(100% - .4rem);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -290,13 +293,13 @@
} }
.pro-d{ .pro-d{
width: 11.25rem; width: 10rem;
height: 5.75rem; height: 5.75rem;
padding: .125rem; padding: .125rem;
position: relative; position: relative;
background-image: url(../images/m02.png); background-image: url(../images/m02.png);
background-position: center; background-position: center;
background-size: 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }

5
SGGL/Model/APIItem/HSSE/MeetingItem.cs
View File

@ -236,5 +236,10 @@ namespace Model
get; get;
set; set;
} }
public string ClassMeetingDate
{
get;
set;
}
} }
} }

443
SGGL/Model/Model.cs
View File

@ -10155,6 +10155,14 @@ namespace Model
} }
} }
public System.Data.Linq.Table<V_Cl_W_MaterialOutS> V_Cl_W_MaterialOutS
{
get
{
return this.GetTable<V_Cl_W_MaterialOutS>();
}
}
public System.Data.Linq.Table<V_JOINTVIEW> V_JOINTVIEW public System.Data.Linq.Table<V_JOINTVIEW> V_JOINTVIEW
{ {
get get
@ -101203,6 +101211,8 @@ namespace Model
private System.Nullable<decimal> _RQuantity; private System.Nullable<decimal> _RQuantity;
private string _Ghfs;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -101251,6 +101261,8 @@ namespace Model
partial void OnReturnSheetSIDChanged(); partial void OnReturnSheetSIDChanged();
partial void OnRQuantityChanging(System.Nullable<decimal> value); partial void OnRQuantityChanging(System.Nullable<decimal> value);
partial void OnRQuantityChanged(); partial void OnRQuantityChanged();
partial void OnGhfsChanging(string value);
partial void OnGhfsChanged();
#endregion #endregion
public Cl_w_comp() public Cl_w_comp()
@ -101698,6 +101710,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="ghfs", Storage="_Ghfs", DbType="NVarChar(10)")]
public string Ghfs
{
get
{
return this._Ghfs;
}
set
{
if ((this._Ghfs != value))
{
this.OnGhfsChanging(value);
this.SendPropertyChanging();
this._Ghfs = value;
this.SendPropertyChanged("Ghfs");
this.OnGhfsChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@ -104864,6 +104896,8 @@ namespace Model
private string _InstallationId; private string _InstallationId;
private string _Ghfs;
private EntitySet<Cl_W_MaterialReturnS> _Cl_W_MaterialReturnS; private EntitySet<Cl_W_MaterialReturnS> _Cl_W_MaterialReturnS;
#region 可扩展性方法定义 #region 可扩展性方法定义
@ -104908,6 +104942,8 @@ namespace Model
partial void OnUAidChanged(); partial void OnUAidChanged();
partial void OnInstallationIdChanging(string value); partial void OnInstallationIdChanging(string value);
partial void OnInstallationIdChanged(); partial void OnInstallationIdChanged();
partial void OnGhfsChanging(string value);
partial void OnGhfsChanged();
#endregion #endregion
public Cl_W_MaterialReturnM() public Cl_W_MaterialReturnM()
@ -105296,6 +105332,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="ghfs", Storage="_Ghfs", DbType="NVarChar(10)", UpdateCheck=UpdateCheck.Never)]
public string Ghfs
{
get
{
return this._Ghfs;
}
set
{
if ((this._Ghfs != value))
{
this.OnGhfsChanging(value);
this.SendPropertyChanging();
this._Ghfs = value;
this.SendPropertyChanged("Ghfs");
this.OnGhfsChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_W_MAT_REFERENCE_CL_W_MAT", Storage="_Cl_W_MaterialReturnS", ThisKey="ReturnSheetMid", OtherKey="ReturnSheetMid", DeleteRule="NO ACTION")] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CL_W_MAT_REFERENCE_CL_W_MAT", Storage="_Cl_W_MaterialReturnS", ThisKey="ReturnSheetMid", OtherKey="ReturnSheetMid", DeleteRule="NO ACTION")]
public EntitySet<Cl_W_MaterialReturnS> Cl_W_MaterialReturnS public EntitySet<Cl_W_MaterialReturnS> Cl_W_MaterialReturnS
{ {
@ -437663,6 +437719,393 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.V_Cl_W_MaterialOutS")]
public partial class V_Cl_W_MaterialOutS
{
private string _UAName;
private string _Installationname;
private string _OutSheetCode;
private string _OutSheetSID;
private string _StorageSheetSID;
private string _MaterialID;
private string _SystemCode;
private string _Materialname;
private string _Specificationtype;
private string _Unit;
private System.Nullable<decimal> _OutQuantity;
private decimal _ReturnQuantity;
private System.Nullable<decimal> _Sjcksl;
private System.Nullable<decimal> _Weight;
private System.Nullable<decimal> _Price;
private string _FirstpartyCode;
private string _ProjectId;
private string _InstallationId;
private string _YYPID;
private string _UAid;
private System.Nullable<System.DateTime> _UserTime;
public V_Cl_W_MaterialOutS()
{
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UAName", DbType="NVarChar(100)")]
public string UAName
{
get
{
return this._UAName;
}
set
{
if ((this._UAName != value))
{
this._UAName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Installationname", DbType="NVarChar(50)")]
public string Installationname
{
get
{
return this._Installationname;
}
set
{
if ((this._Installationname != value))
{
this._Installationname = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSheetCode", DbType="NVarChar(50)")]
public string OutSheetCode
{
get
{
return this._OutSheetCode;
}
set
{
if ((this._OutSheetCode != value))
{
this._OutSheetCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSheetSID", DbType="Char(36) NOT NULL", CanBeNull=false)]
public string OutSheetSID
{
get
{
return this._OutSheetSID;
}
set
{
if ((this._OutSheetSID != value))
{
this._OutSheetSID = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StorageSheetSID", DbType="Char(36)")]
public string StorageSheetSID
{
get
{
return this._StorageSheetSID;
}
set
{
if ((this._StorageSheetSID != value))
{
this._StorageSheetSID = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialID", DbType="Char(36)")]
public string MaterialID
{
get
{
return this._MaterialID;
}
set
{
if ((this._MaterialID != value))
{
this._MaterialID = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemCode", DbType="NVarChar(50)")]
public string SystemCode
{
get
{
return this._SystemCode;
}
set
{
if ((this._SystemCode != value))
{
this._SystemCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="materialname", Storage="_Materialname", DbType="NVarChar(500)")]
public string Materialname
{
get
{
return this._Materialname;
}
set
{
if ((this._Materialname != value))
{
this._Materialname = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="specificationtype", Storage="_Specificationtype", DbType="NVarChar(500)")]
public string Specificationtype
{
get
{
return this._Specificationtype;
}
set
{
if ((this._Specificationtype != value))
{
this._Specificationtype = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="unit", Storage="_Unit", DbType="NVarChar(50)")]
public string Unit
{
get
{
return this._Unit;
}
set
{
if ((this._Unit != value))
{
this._Unit = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutQuantity", DbType="Decimal(15,4)")]
public System.Nullable<decimal> OutQuantity
{
get
{
return this._OutQuantity;
}
set
{
if ((this._OutQuantity != value))
{
this._OutQuantity = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReturnQuantity", DbType="Decimal(38,4) NOT NULL")]
public decimal ReturnQuantity
{
get
{
return this._ReturnQuantity;
}
set
{
if ((this._ReturnQuantity != value))
{
this._ReturnQuantity = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="sjcksl", Storage="_Sjcksl", DbType="Decimal(38,4)")]
public System.Nullable<decimal> Sjcksl
{
get
{
return this._Sjcksl;
}
set
{
if ((this._Sjcksl != value))
{
this._Sjcksl = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Weight", DbType="Decimal(10,4)")]
public System.Nullable<decimal> Weight
{
get
{
return this._Weight;
}
set
{
if ((this._Weight != value))
{
this._Weight = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Price", DbType="Decimal(10,4)")]
public System.Nullable<decimal> Price
{
get
{
return this._Price;
}
set
{
if ((this._Price != value))
{
this._Price = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FirstpartyCode", DbType="NVarChar(20)")]
public string FirstpartyCode
{
get
{
return this._FirstpartyCode;
}
set
{
if ((this._FirstpartyCode != value))
{
this._FirstpartyCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this._ProjectId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(50)")]
public string InstallationId
{
get
{
return this._InstallationId;
}
set
{
if ((this._InstallationId != value))
{
this._InstallationId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YYPID", DbType="NVarChar(150)")]
public string YYPID
{
get
{
return this._YYPID;
}
set
{
if ((this._YYPID != value))
{
this._YYPID = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UAid", DbType="Char(36)")]
public string UAid
{
get
{
return this._UAid;
}
set
{
if ((this._UAid != value))
{
this._UAid = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserTime", DbType="DateTime")]
public System.Nullable<System.DateTime> UserTime
{
get
{
return this._UserTime;
}
set
{
if ((this._UserTime != value))
{
this._UserTime = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.V_JOINTVIEW")] [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.V_JOINTVIEW")]
public partial class V_JOINTVIEW public partial class V_JOINTVIEW
{ {

12
SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs
View File

@ -176,7 +176,17 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData(); var responeData = new Model.ResponeData();
try try
{ {
responeData.data = APIHazardRegisterService.getHazardRegisterByProjectIdStates(projectId, checkDate);
if(string.IsNullOrEmpty(projectId))
{
projectId = ""; // 明确使用默认值
responeData.data = APIHazardRegisterService.getHazardRegisterByProjectIdStates(projectId,checkDate);
}
else
{
responeData.data = APIHazardRegisterService.getHazardRegisterByProjectIdStates(projectId, checkDate);
}
} }
catch (Exception ex) catch (Exception ex)
{ {

1283
SGGL/WebAPI/Controllers/MaterialEntranceAndExitController.cs
View File

File diff suppressed because it is too large Load Diff

230
SGGL/WebAPI/Controllers/MaterialsBasicsController.cs Normal file
View File

@ -0,0 +1,230 @@
using Aspose.Words;
using BLL;
using Microsoft.Office.Interop.Excel;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Net.NetworkInformation;
using System.Web.Http;
using static WebAPI.Controllers.HSSE.ImageRecognitionController;
namespace WebAPI.Controllers
{
/*
* 物资管理的一些基础信息
* **/
public class MaterialsBasicsController : ApiController
{
#region 获取单位列表
public Model.ResponeData GetUnitList(string projectId, string keyWord = "" )
{
Model.ResponeData responeData = new Model.ResponeData();
try
{
if (string.IsNullOrEmpty(keyWord))
{
keyWord = ""; // 明确使用默认值
}
var list = Funs.DB.Cl_b_unitapp.Where(x => x.ProjectId == projectId && x.UAName.Contains(keyWord)).ToList();
responeData.data = list;
}
catch (System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 获取专业
public Model.ResponeData getInstallationList(string projectId, string keyWord = "")
{
Model.ResponeData responeData = new Model.ResponeData();
try
{
if (string.IsNullOrEmpty(keyWord))
{
keyWord = ""; // 明确使用默认值
}
responeData.data = Funs.DB.Cl_b_Installation.Where(x => x.ProjectId == projectId&&x.InstallationName.Contains(keyWord))
.Select(x => new {
x.InstallationId,
x.InstallationCode,
x.InstallationName,
}).ToList();
}
catch (System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 物资工区
public Model.ResponeData getSpecialityList(string projectId, string keyWord = "")
{
Model.ResponeData responeData = new Model.ResponeData();
try
{
if (string.IsNullOrEmpty(keyWord))
{
keyWord = ""; // 明确使用默认值
}
responeData.data = Funs.DB.CL_B_Speciality.Where(x => x.ProjectId == projectId && x.SpecialityName.Contains(keyWord))
.Select(x => new {
x.Specialityid,
x.SpecialityCode,
x.SpecialityName
}).ToList();
}
catch (System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 获取材料明细
public Model.ResponeData GetMaterialsBySystemCode(string ProjectId, string InstallationId, string ghfs, string area, string code)
{
Model.ResponeData responeData = new Model.ResponeData();
try
{
string strSql = "SELECT cp.ProjectId,cp.InstallationId,zz.Installationname AS InstallationName,ghfs AS Ghfs,cp.MaterialID,MaterialName,specificationtype AS Specificationtype,MaterialQuality,standardspecification ,unit AS Unit," +
"technicalconditions AS TechnicalConditions,SystemCode,rtrim( ltrim( TAreaMaterialMID ) ) AS AreaCode,0.000 AS bcckl,SUM ( Aquantity ) AS Aquantity,SUM ( Pquantity ) AS jh_quantity,SUM ( SQuantity ) AS dj_quantity,SUM ( HQuantity ) AS hj_quantity,SUM ( Pquantity ) - SUM ( OQuantity ) AS ck_quantity,SUM ( RQuantity ) AS tk_quantity,(SELECT SUM( SQuantity ) - SUM ( OQuantity ) + SUM ( RQuantity ) - SUM ( HQuantity ) FROM cl_w_comp WHERE cl_w_comp.MaterialID= cp.MaterialID AND cl_w_comp.InstallationId= cp.InstallationId AND cl_w_comp.ghfs= cp.ghfs ) AS kc_quantity,ROW_NUMBER ( ) OVER ( ORDER BY zz.InstallationCode,SystemCode ASC ) AS RowNum,0 AS xz,0 AS xh FROM cl_w_comp cp LEFT JOIN CL_B_Material mt ON mt.MaterialID= cp.MaterialID LEFT JOIN cl_b_Installation zz ON zz.InstallationId= cp.InstallationId GROUP BY cp.ProjectId,cp.InstallationId,zz.InstallationCode,zz.Installationname,ghfs,cp.MaterialID,MaterialName,specificationtype,MaterialQuality,standardspecification,unit,technicalconditions,SystemCode,TAreaMaterialMID HAVING ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += "cp.ProjectId= @ProjectId AND cp.installationid= @InstallationId AND TAreaMaterialMID = @area AND ghfs = @ghfs AND SystemCode = @code";
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
listStr.Add(new SqlParameter("@InstallationId", InstallationId));
listStr.Add(new SqlParameter("@ghfs", ghfs));
listStr.Add(new SqlParameter("@area", area));
listStr.Add(new SqlParameter("@code", code));
SqlParameter[] parameter = listStr.ToArray();
System.Data.DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
responeData.data = tb;
//responeData.data = (
//from bm in Funs.DB.CL_B_Material
//where bm.SystemCode == code && bm.ProjectId == ProjectId
//select new
//{
// ProjectId = bm.ProjectId, // 项目ID
// InstallationId = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).InstallationId, // 专业ID
// Installationname = Funs.DB.Cl_b_Installation.FirstOrDefault(x => x.InstallationId == Funs.DB.Cl_w_comp.FirstOrDefault(y => y.MaterialID == bm.MaterialID).InstallationId).InstallationName, // 专业名称
// ghfs = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).Ghfs, // 采购方类别
// MaterialID = bm.MaterialID, // 物资ID
// MaterialName = bm.MaterialName, // 物资名称
// Specificationtype = bm.Specificationtype, // 规格
// TechnicalConditions = bm.TechnicalConditions,
// StandardSpecification = bm.StandardSpecification,
// MaterialQuality = bm.MaterialQuality,
// Unit = bm.Unit, // 单位
// SystemCode = bm.SystemCode, // 编号
// AreaCode = Funs.DB.Cl_w_comp.FirstOrDefault(x => x.MaterialID == bm.MaterialID).TAreaMaterialMID, // 工区
// jh_quantity = Funs.DB.Cl_w_comp.Where(c => c.MaterialID == bm.MaterialID).Sum(c => c.Pquantity), // 计划量
// ck_quantity = Funs.DB.Cl_w_comp.Where(c => c.MaterialID == bm.MaterialID).Sum(c => c.Pquantity) - Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.OQuantity), // 最大允许出库量
// kc_quantity = Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.SQuantity) - Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.OQuantity) + Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.RQuantity) - Funs.DB.Cl_w_comp.Where(x => x.MaterialID == bm.MaterialID).Sum(c => c.HQuantity) // 库存量
//}
//).FirstOrDefault(x => x.SystemCode == code);
}
catch ( System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 获取材料列表
public Model.ResponeData GetMaterialsList(string ProjectId, string InstallationId, string ghfs, string area)
{
Model.ResponeData responeData = new Model.ResponeData();
try
{
string strSql = "SELECT cp.ProjectId,cp.InstallationId,zz.Installationname AS InstallationName,ghfs AS Ghfs,cp.MaterialID,MaterialName,specificationtype AS Specificationtype,MaterialQuality,standardspecification ,unit AS Unit," +
"technicalconditions AS TechnicalConditions,SystemCode,";
if (!string.IsNullOrWhiteSpace(area))
{
strSql += "rtrim( ltrim( TAreaMaterialMID ) ) AS AreaCode,";
}
strSql += "0.000 AS bcckl,SUM ( Aquantity ) AS Aquantity,SUM ( Pquantity ) AS jh_quantity,SUM ( SQuantity ) AS dj_quantity,SUM ( HQuantity ) AS hj_quantity,SUM ( Pquantity ) - SUM ( OQuantity ) AS ck_quantity,SUM ( RQuantity ) AS tk_quantity,(SELECT SUM( SQuantity ) - SUM ( OQuantity ) + SUM ( RQuantity ) - SUM ( HQuantity ) FROM cl_w_comp WHERE cl_w_comp.MaterialID= cp.MaterialID AND cl_w_comp.InstallationId= cp.InstallationId AND cl_w_comp.ghfs= cp.ghfs ) AS kc_quantity,ROW_NUMBER ( ) OVER ( ORDER BY zz.InstallationCode,SystemCode ASC ) AS RowNum,0 AS xz,0 AS xh FROM cl_w_comp cp LEFT JOIN CL_B_Material mt ON mt.MaterialID= cp.MaterialID LEFT JOIN cl_b_Installation zz ON zz.InstallationId= cp.InstallationId GROUP BY cp.ProjectId,cp.InstallationId,zz.InstallationCode,zz.Installationname,ghfs,cp.MaterialID,MaterialName,specificationtype,MaterialQuality,standardspecification,unit,technicalconditions,SystemCode";
if (!string.IsNullOrWhiteSpace(area))
{
strSql += ", TAreaMaterialMID";
}
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " HAVING cp.ProjectId= @ProjectId AND cp.installationid= @InstallationId AND ghfs = @ghfs";
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
listStr.Add(new SqlParameter("@InstallationId", InstallationId));
listStr.Add(new SqlParameter("@ghfs", ghfs));
if (!string.IsNullOrWhiteSpace(area))
{
strSql += " AND TAreaMaterialMID = @area ";
listStr.Add(new SqlParameter("@area", area));
}
SqlParameter[] parameter = listStr.ToArray();
System.Data.DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
responeData.data = tb;
}
catch (System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 保存物资文件
[HttpPost]
public Model.ResponeData UploadMaterialsFile(Model.Cl_file file)
{
Model.ResponeData responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
int count = db.Cl_file.Count();
Model.Cl_file new_file = new Model.Cl_file();
new_file.FID = Guid.NewGuid().ToString();
new_file.Ffl = file.Ffl;
new_file.Fname = file.Fname;
new_file.Fshm = file.Fshm;
new_file.UserTime = DateTime.Now;
new_file.UserID = file.UserID;
new_file.Flj = file.Flj;
new_file.Flx = file.Flx;
new_file.Bz = file.Bz;
new_file.InstallationId = file.InstallationId;
new_file.Unid = file.Unid;
new_file.ProjectId = file.ProjectId;
db.Cl_file.InsertOnSubmit(new_file);
db.SubmitChanges();
responeData.message = new_file.FID;
}
}
catch(System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
}
}

92
SGGL/WebAPI/Controllers/MaterialsExitController.cs Normal file
View File

@ -0,0 +1,92 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Diagnostics;
using System.Linq;
using System.Runtime.Remoting.Messaging;
using System.Web.Http;
using WebAPI.Helpers;
namespace WebAPI.Controllers
{
public class MaterialsExitController : ApiController
{
#region 添加物资入库主表
[HttpPost]
public Model.ResponeData AddMaterialExitM(Model.Cl_W_MaterialStorageM exit)
{
var responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var userTime = DateTime.Now;
int count = db.Cl_W_MaterialStorageM.Where(x => x.UserTime.Value.Year == userTime.Year && x.UserTime.Value.Month == userTime.Month && x.UserTime.Value.Day == userTime.Day).ToList().Count();
Model.Cl_W_MaterialStorageM exitM = new Model.Cl_W_MaterialStorageM
{
StorageSheetMID = exit.StorageSheetMID,
StorageSheetCode = string.Format("RKD--{0}{1}", DateTime.Now.ToString("yyyyMMdd"), count.ToString("000")),
UserId = exit.UserId,
UserTime = DateTime.Now,
IsOk = "0", // 0-未审核，1-已审核
APid = exit.APid, // 采购方类别（甲乙供）
Specialityid = exit.Specialityid, // 专业ID
InstallationId = exit.InstallationId
};
exit.UserTime = DateTime.Now;
exit.StorageSheetCode = string.Format("CKD--{0}{1}", DateTime.Now.ToString("yyyyMMdd"), count.ToString("000"));
db.Cl_W_MaterialStorageM.InsertOnSubmit(exitM);
db.SubmitChanges();
responeData.data = exit;
}
}
catch (System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 添加物资入库 子
[HttpPost]
public Model.ResponeData AddMaterialExitS(Model.Cl_W_MaterialStorageS s)
{
var responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Cl_W_MaterialStorageS cws = new Model.Cl_W_MaterialStorageS();
cws.SystemCode = s.SystemCode;
cws.StorageQuantity = s.StorageQuantity; // 到货数量
cws.TheoryWeight = s.TheoryWeight; // 单价
cws.ActualWeight = s.ActualWeight; // 金额
cws.RecordTableOptions = s.RecordTableOptions; // 备注说明
cws.Manufacturer = s.Manufacturer; // 制造厂家
cws.ProjectId = s.ProjectId;
cws.StorageSheetMID = s.StorageSheetMID;
cws.StorageSheetSID = Guid.NewGuid().ToString();
cws.MaterialID = s.MaterialID;
db.Cl_W_MaterialStorageS.InsertOnSubmit(cws);
db.SubmitChanges();
responeData.data = "添加成功";
}
}
catch (System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
}
}

142
SGGL/WebAPI/Controllers/MaterialsOutController.cs Normal file
View File

@ -0,0 +1,142 @@
using BLL;
using Model;
using System;
using System.Linq;
using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.Web.Http;
namespace WebAPI.Controllers
{
/**
* 物资出库
*/
public class MaterialsOutController : ApiController
{
#region 添加物资出库主表
[HttpPost]
public Model.ResponeData AddMaterialOutM(Model.Cl_W_MaterialOutM MaterialOutM)
{
var responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var userTime = DateTime.Now;
int count = db.Cl_W_MaterialOutM.Where(x => x.UserTime.Value.Year == userTime.Year&&x.UserTime.Value.Month==userTime.Month&&x.UserTime.Value.Day==userTime.Day).ToList().Count();
Model.Cl_W_MaterialOutM outm = new Model.Cl_W_MaterialOutM();
outm.OutSheetMID = MaterialOutM.OutSheetMID;
outm.ProjectId = MaterialOutM.ProjectId;
outm.OutSheetCode = string.Format("CKD--{0}{1}", DateTime.Now.ToString("yyyyMMdd"),count.ToString("000"));
outm.UserTime = DateTime.Now;
outm.UnitId = MaterialOutM.UnitId;
outm.UAid = MaterialOutM.UAid;
outm.InstallationId = MaterialOutM.InstallationId;
outm.PlanSheetMID = MaterialOutM.PlanSheetMID; // 工区ID
outm.YYPID = MaterialOutM.YYPID;
outm.RecordMan = MaterialOutM.RecordMan;
MaterialOutM.OutSheetCode = string.Format("CKD--{0}{1}", DateTime.Now.ToString("yyyyMMdd"), count.ToString("000"));
db.Cl_W_MaterialOutM.InsertOnSubmit(outm);
db.SubmitChanges();
responeData.data = MaterialOutM;
}
}
catch (System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 添加物资子表
[HttpPost]
public Model.ResponeData AddMaterialOutS(Model.Cl_W_MaterialOutS MaterialOutS)
{
var responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
int count = db.Cl_W_MaterialOutM.Where(x => x.UserTime == DateTime.Now).ToList().Count();
Model.Cl_W_MaterialOutS outs = new Model.Cl_W_MaterialOutS();
outs.ProjectId = MaterialOutS.ProjectId;
outs.OutSheetMID = MaterialOutS.OutSheetMID;
outs.OutSheetSID = Guid.NewGuid().ToString();
outs.MaterialID = MaterialOutS.MaterialID;
//outs.Soft = MaterialOutS.Soft ?? DBNull.Value;
outs.PlannedQuantity = MaterialOutS.PlannedQuantity;
outs.StoreQuantity = MaterialOutS.StoreQuantity;
outs.OutQuantity = MaterialOutS.OutQuantity;
outs.OutQuantityY = MaterialOutS.OutQuantityY;
outs.StorePQuantity = MaterialOutS.StorePQuantity;
outs.CertificatesFactoryNo = MaterialOutS.CertificatesFactoryNo;
outs.FurnaceBatchNo = MaterialOutS.FurnaceBatchNo;
outs.CertificateSelfNo = MaterialOutS.CertificateSelfNo;
outs.Weight = MaterialOutS.Weight;
outs.Price = MaterialOutS.Price;
outs.OutQuantityP = MaterialOutS.OutQuantityP;
outs.OutQuantityO = MaterialOutS.OutQuantityO;
outs.StorehouseName = MaterialOutS.StorehouseName;
outs.StorageSheetSID = MaterialOutS.StorageSheetSID;
outs.FirstpartyCode = MaterialOutS.FirstpartyCode;
outs.ISupload = MaterialOutS.ISupload;
outs.InstallationId = MaterialOutS.InstallationId;
outs.Shue = MaterialOutS.Shue;
outs.Bhsje = MaterialOutS.Bhsje;
db.Cl_W_MaterialOutS.InsertOnSubmit(outs);
Model.Cl_W_MaterialOutM clw = db.Cl_W_MaterialOutM.FirstOrDefault(x => x.OutSheetMID == MaterialOutS.OutSheetMID);
if(clw.IsOk != "1")
{
clw.IsOk = "1";
}
db.SubmitChanges();
Model.Cl_w_comp cl = new Model.Cl_w_comp();
cl.CompID = Guid.NewGuid().ToString();
cl.ProjectId = MaterialOutS.ProjectId;
cl.InstallationId = clw.InstallationId;
cl.Ghfs = clw.YYPID;
cl.TAreaMaterialMID = MaterialOutS.FirstpartyCode;
cl.TAreaMaterialSID = "";
cl.MaterialID = MaterialOutS.MaterialID;
cl.Aquantity = 0;
cl.PlanSheetMID = "";
cl.PlanSheetSID = "";
cl.Pquantity = 0;
cl.StorageSheetMID = "";
cl.StorageSheetSID = "";
cl.SQuantity = 0;
cl.StorageHJSID = "";
cl.StorageHJMID = "";
cl.HQuantity = 0;
cl.OutSheetMID = MaterialOutS.OutSheetMID;
cl.OutSheetSID = outs.OutSheetSID;
cl.OQuantity = MaterialOutS.OutQuantity;
cl.ReturnSheetMid = "";
cl.ReturnSheetSID = "";
cl.RQuantity = 0;
db.Cl_w_comp.InsertOnSubmit(cl);
db.SubmitChanges();
responeData.data = MaterialOutS.OutSheetSID;
}
}
catch (System.Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
}
}

7
SGGL/WebAPI/WebAPI.csproj
View File

@ -86,6 +86,7 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Data.Linq" /> <Reference Include="System.Data.Linq" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@ -175,7 +176,9 @@
<Compile Include="Controllers\HSSE\SafetyInspectionController.cs" /> <Compile Include="Controllers\HSSE\SafetyInspectionController.cs" />
<Compile Include="Controllers\HSSE\SafetyResponsibilitiesController.cs" /> <Compile Include="Controllers\HSSE\SafetyResponsibilitiesController.cs" />
<Compile Include="Controllers\HSSE\TrainTestRecordController.cs" /> <Compile Include="Controllers\HSSE\TrainTestRecordController.cs" />
<Compile Include="Controllers\MaterialEntranceAndExitController.cs" /> <Compile Include="Controllers\MaterialsExitController.cs" />
<Compile Include="Controllers\MaterialsBasicsController.cs" />
<Compile Include="Controllers\MaterialsOutController.cs" />
<Compile Include="Controllers\Person\PersonCheckController.cs" /> <Compile Include="Controllers\Person\PersonCheckController.cs" />
<Compile Include="Controllers\CQMS\CheckEquipmentController.cs" /> <Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />
<Compile Include="Controllers\CQMS\CheckListController.cs" /> <Compile Include="Controllers\CQMS\CheckListController.cs" />
@ -283,6 +286,8 @@
<Folder Include="Models\" /> <Folder Include="Models\" />
<Folder Include="Properties\PublishProfiles\" /> <Folder Include="Properties\PublishProfiles\" />
<Folder Include="Views\Login\" /> <Folder Include="Views\Login\" />
<Folder Include="Views\MaterialsBasics\" />
<Folder Include="Views\MaterialsOut\" />
<Folder Include="Views\Vehicle\" /> <Folder Include="Views\Vehicle\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>