lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2安全生产看板补充在岗人数

This commit is contained in:
夏菊 2025-04-23 11:05:07 +08:00
parent 9047627ae1
commit e84ccc038a
6 changed files with 401 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
View File

@ -1356,4 +1356,8 @@
<value>Completion status of engineering quantity</value>
<comment>工程量完成情况</comment>
</data>
<data name="main_new0_ProjectNum_OnDuty" xml:space="preserve">
<value>OnDuty</value>
<comment>在岗人数</comment>
</data>
</root>

3
SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
View File

@ -1200,4 +1200,7 @@
<data name="mainProject2_QuantityDone" xml:space="preserve">
<value>工程量完成情况</value>
</data>
<data name="main_new0_ProjectNum_OnDuty" xml:space="preserve">
<value>在岗人数</value>
</data>
</root>

3
SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
View File

@ -1197,4 +1197,7 @@
<data name="mainProject2_QuantityDone" xml:space="preserve">
<value>工程量完成情况</value>
</data>
<data name="main_new0_ProjectNum_OnDuty" xml:space="preserve">
<value>在岗人数</value>
</data>
</root>

21
SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs generated
View File

@ -13,13 +13,13 @@ namespace Resources {
/// <summary>
/// 强类型资源类，用于查找本地化字符串等。
/// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /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.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Lan {
@ -33,7 +33,7 @@ namespace Resources {
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@ -47,8 +47,8 @@ namespace Resources {
}
/// <summary>
/// 覆盖当前线程的 CurrentUICulture 属性
/// 使用此强类型的资源类的资源查找。
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@ -1689,6 +1689,15 @@ namespace Resources {
}
}
/// <summary>
/// 查找类似 在岗人数 的本地化字符串。
/// </summary>
internal static string main_new0_ProjectNum_OnDuty {
get {
return ResourceManager.GetString("main_new0_ProjectNum_OnDuty", resourceCulture);
}
}
/// <summary>
/// 查找类似 参建人数 的本地化字符串。
/// </summary>

2
SGGL/FineUIPro.Web/common/main_new0.aspx
View File

@ -90,7 +90,7 @@
</div>
<div class="y_rs_box y_column">
<div class="y_rs_number" id="div_xmcjrs" runat="server">0</div>
<div class="y_rs_text"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_ProjectNum_Participants%>"/></div>
<div class="y_rs_text"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_ProjectNum_OnDuty%>"/></div>
</div>
</div>
</div>

20
SGGL/FineUIPro.Web/common/main_new0.aspx.cs
View File

@ -78,13 +78,15 @@ namespace FineUIPro.Web.common
where y.IsHsse == true && x.IsUsed == true
select x).Count().ToString();
div_qyzbzzrs1.InnerHtml = div_xmzzrs.InnerHtml;
//项目参建
div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
//企业总部参建人数
div_qyzbcjrs.InnerHtml = (from x in db.SitePerson_Person
where x.IsUsed == true
select x).Count().ToString();
//项目在岗人数
div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
where x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value > DateTime.Now)
select x).Count().ToString();
//企业总部参建人数
div_qyzbcjrs.InnerHtml = div_xmcjrs.InnerHtml;
//注安师
var ZasSql = @"SELECT Person.ProjectId,Project.ProjectCode,Project.ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName,
Person.PersonName,Person.PersonId,Person.IdentityCard,Person.Sex,Person.WorkPostId,WorkPost.WorkPostName,Person.Telephone
@ -115,12 +117,17 @@ namespace FineUIPro.Web.common
where y.IsHsse == true && x.IsUsed == true
&& pids.Contains(x.ProjectId)
select x).Count().ToString();
//项目参建
div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
//项目参建人数
div_qyzbcjrs.InnerHtml = (from x in db.SitePerson_Person
where x.IsUsed == true
&& pids.Contains(x.ProjectId)
select x).Count().ToString();
//项目在岗人数
div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
where x.IsUsed == true && pids.Contains(x.ProjectId) && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value > DateTime.Now)
select x).Count().ToString();
string s1 = string.Format("'{0}'", String.Join(",", pids).Replace(",", "','"));
//注安师
@ -142,7 +149,6 @@ namespace FineUIPro.Web.common
div_qyzbrs1.InnerHtml = div_xmrs.InnerHtml;
div_qyzbzzrs1.InnerHtml = div_xmzzrs.InnerHtml;
div_qyzbcjrs.InnerHtml = div_xmcjrs.InnerHtml;
}