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

2026.04.10

This commit is contained in:
夏菊 2026-04-10 14:35:57 +08:00
parent 8a61b56389
commit 1b324edf2a
39 changed files with 1787 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
DataBase/版本日志/SUBQHSE_V2026-04-10.sql Normal file
View File

@ -0,0 +1,58 @@
-- 自动获取总包检查数据
alter table Base_Project add IsAutoFetch bit NULL;
GO
-- 岗位：质量报验
alter table Base_WorkPost add IsCQMSCheck bit NULL;
GO
alter table SitePerson_Person add IsTrain bit NULL;
GO
--select * from [Sys_Menu]
--where MenuName='数据库'
--定制版放到公司级的【报表管理/数据管理】下的【项目数据分析】,父级菜单id和菜单类型根据实际情况进行替换
INSERT INTO [dbo].[Sys_Menu] ( [MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed] )
VALUES
( N'A9E94BE9-6F53-4A41-9A65-250F09D9E449', N'安全巡检统计分析', NULL, N'HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx?Types=1', 1, N'FF0D9166-4509-4411-8039-F035BC251114', N'Menu_DigData', '0', '1', '1' );
GO
INSERT INTO [dbo].[Sys_Menu] ( [MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed] )
VALUES
( N'28848506-234F-4D21-8E79-A0F24F2B2DDA', N'质量巡检统计分析', NULL, N'HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx?Types=2', 1, N'FF0D9166-4509-4411-8039-F035BC251114', N'Menu_DigData', '0', '1', '1' );
GO
--加颁奖年份字段
alter table QCManage_QCGroupRegistration add AwardYear datetime
go
--【注意】
-----根据实际情况吧原本填写在过程字段(Process)上的年份数据移到新的新的字段(AwardYear)上
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'颁奖年份' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'QCManage_QCGroupRegistration', @level2type=N'COLUMN',@level2name=N'AwardYear'
GO
--把原来的数据替换到新的字段上
update QCManage_QCGroupRegistration set AwardYear = Process where AwardYear is null and LEN(Process) = 4
GO

2
SGGL/BLL/API/APIUserService.cs
View File

@ -71,7 +71,7 @@ namespace BLL
{
getDataList = (from x in db.Sys_User
join y in db.Project_ProjectUser on x.UserId equals y.UserId
where y.ProjectId == projectId && (x.UnitId == unitId || unitId == null)
where y.ProjectId == projectId && (y.UnitId == unitId || unitId == null)
&& (roleIds == null || roleList.Contains(y.RoleId)) && (strParam == null || x.UserName.Contains(strParam))
&& y.IsPost == true
select new Model.UserItem

3
SGGL/BLL/BaseInfo/WorkPostService.cs
View File

@ -8,7 +8,6 @@ namespace BLL
{
public static class WorkPostService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取信息
@ -38,6 +37,7 @@ namespace BLL
PostType = workPost.PostType,
IsHsse = workPost.IsHsse,
IsCQMS = workPost.IsCQMS,
IsCQMSCheck = workPost.IsCQMSCheck,
CNCodes = workPost.CNCodes,
Remark = workPost.Remark
};
@ -90,6 +90,7 @@ namespace BLL
newWorkPost.PostType = workPost.PostType;
newWorkPost.IsHsse = workPost.IsHsse;
newWorkPost.IsCQMS = workPost.IsCQMS;
newWorkPost.IsCQMSCheck = workPost.IsCQMSCheck;
newWorkPost.CNCodes = workPost.CNCodes;
newWorkPost.Remark = workPost.Remark;
db.SubmitChanges();

2
SGGL/BLL/CQMS/QualityActivity/QCManage/QCManage_QCGroupRegistrationService.cs
View File

@ -37,6 +37,7 @@ namespace BLL
newQCGroupRegistration.AwardLevel = QCGroupRegistration.AwardLevel;
newQCGroupRegistration.AwardType = QCGroupRegistration.AwardType;
newQCGroupRegistration.AwardingUnit = QCGroupRegistration.AwardingUnit;
newQCGroupRegistration.AwardYear = QCGroupRegistration.AwardYear;
db.QCManage_QCGroupRegistration.InsertOnSubmit(newQCGroupRegistration);
db.SubmitChanges();
}
@ -63,6 +64,7 @@ namespace BLL
newQCGroupRegistration.AwardLevel = QCGroupRegistration.AwardLevel;
newQCGroupRegistration.AwardType = QCGroupRegistration.AwardType;
newQCGroupRegistration.AwardingUnit = QCGroupRegistration.AwardingUnit;
newQCGroupRegistration.AwardYear = QCGroupRegistration.AwardYear;
newQCGroupRegistration.IsUpdate = null;
db.SubmitChanges();
}

3
SGGL/BLL/DataShare/APIDataShareSyncService.cs
View File

@ -348,7 +348,7 @@ namespace BLL
/// </summary>
/// <param name="WorkPostName"></param>
/// <returns></returns>
public static string getWorkPostId(string WorkPostName, string PostType, string IsHsse, string IsCQMS)
public static string getWorkPostId(string WorkPostName, string PostType, string IsHsse, string IsCQMS, string IsCQMSCheck)
{
string WorkPostId = null;
if (!string.IsNullOrEmpty(WorkPostName))
@ -363,6 +363,7 @@ namespace BLL
PostType = PostType,
IsHsse = Convert.ToBoolean(IsHsse),
IsCQMS = Convert.ToBoolean(IsCQMS),
IsCQMSCheck = Convert.ToBoolean(IsCQMSCheck),
Remark = "导入"
};
WorkPostService.AddWorkPost(newWorkPost);

9
SGGL/BLL/DataShare/HSSE/APIPersonSyncService.cs
View File

@ -109,6 +109,7 @@ namespace BLL
IsSafetyMonitoring = x.IsSafetyMonitoring,
ProvinceCode = x.ProvinceCode,
IsCardNoOK = x.IsCardNoOK,
IsTrain = x.IsTrain,
AttachFileId1 = att1.AttachFileId,
ToKeyId1 = att1.ToKeyId,
AttachSource1 = att1.AttachSource,
@ -133,6 +134,7 @@ namespace BLL
PostType = wp.PostType, //岗位诶类型
IsHsse = wp.IsHsse, //岗位是否是安管人员
IsCQMS = wp.IsCQMS, //岗位是否是质量管理
IsCQMSCheck = wp.IsCQMSCheck,
TeamGroupName = tg.TeamGroupName,
WorkAreaName = APIDataShareSyncService.GetWorkAreaNames(x.WorkAreaId, projectId)
}).ToList();
@ -372,7 +374,7 @@ namespace BLL
TeamGroupId = APIDataShareSyncService.GetTeamGroupId(item.TeamGroupName, projectId, unitId),
WorkAreaId = APIDataShareSyncService.getWorkAreaId(item.WorkAreaName, projectId),
WorkPostId = APIDataShareSyncService.getWorkPostId(item.WorkPostName, item.PostType,
item.IsHsse.ToString(), item.IsCQMS.ToString()),
item.IsHsse.ToString(), item.IsCQMS.ToString(),item.IsCQMSCheck.ToString()),
InTime = item.InTime,
OutTime = item.OutTime,
OutResult = item.OutResult,
@ -412,7 +414,8 @@ namespace BLL
CountryCode = item.CountryCode,
IsSafetyMonitoring = item.IsSafetyMonitoring,
ProvinceCode = item.ProvinceCode,
IsCardNoOK = item.IsCardNoOK
IsCardNoOK = item.IsCardNoOK,
IsTrain = item.IsTrain,
};
db.SitePerson_Person.InsertOnSubmit(newModel);
@ -430,7 +433,7 @@ namespace BLL
model.UnitId = unitId;
model.TeamGroupId = APIDataShareSyncService.GetTeamGroupId(item.TeamGroupName, projectId, unitId);
model.WorkAreaId = APIDataShareSyncService.getWorkAreaId(item.WorkAreaName, projectId);
model.WorkPostId = APIDataShareSyncService.getWorkPostId(item.WorkPostName, item.PostType, item.IsHsse.ToString(), item.IsCQMS.ToString());
model.WorkPostId = APIDataShareSyncService.getWorkPostId(item.WorkPostName, item.PostType, item.IsHsse.ToString(), item.IsCQMS.ToString(),item.IsCQMSCheck.ToString());
model.InTime = item.InTime;
model.OutTime = item.OutTime;
model.OutResult = item.OutResult;

12
SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
View File

@ -696,8 +696,10 @@ namespace BLL
MaterialInspectionNum = inspectionEquipmentList.Count(),
MaterialInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
UseNum = useNum.Count(),
OKNum = okNum.Count(),
//UseNum = useNum.Count(),
//OKNum = okNum.Count(),
UseNum = useNum.Sum(x => x.UnitsCount ?? 1),
OKNum = okNum.Sum(x => x.UnitsCount ?? 1),
SingleProjectNum = singleProjectNum.Count(),
UnitProjectNum = unitProjectNum.Count(),
SubProjectNum = subProjectNum.Count(),
@ -766,8 +768,10 @@ namespace BLL
MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true && x.ProjectId == projectid).Count(),
MaterialInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
MaterialInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1" && x.ProjectId == projectid).Count(),
UseNum = useNum.Count(x => x.ProjectId == projectid),
OKNum = okNum.Count(x => x.ProjectId == projectid),
//UseNum = useNum.Count(x => x.ProjectId == projectid),
//OKNum = okNum.Count(x => x.ProjectId == projectid),
UseNum = useNum.Where(x => x.ProjectId == projectid).Sum(x => x.UnitsCount ?? 1),
OKNum = okNum.Where(x => x.ProjectId == projectid).Sum(x => x.UnitsCount ?? 1),
SingleProjectNum = singleProjectNum.Count(x => x.ProjectId == projectid),
UnitProjectNum = unitProjectNum.Count(x => x.ProjectId == projectid),
SubProjectNum = subProjectNum.Count(x => x.ProjectId == projectid),

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
View File

@ -1393,6 +1393,7 @@ namespace BLL
AwardType = x.AwardType,
AwardLevel = x.AwardLevel,
AwardingUnit = x.AwardingUnit,
AwardYear = x.AwardYear,
}).Take(pushNum).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0)
@ -1462,6 +1463,7 @@ namespace BLL
AwardName = x.AwardName,
AwardLevel = x.AwardLevel,
AwardingUnit = x.AwardingUnit,
AwardYear = x.AwardYear,
}).ToList();
if (items.Count() > 0)

6
SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx
View File

@ -102,6 +102,8 @@
</f:CheckBox>
<f:CheckBox ID="ckbIsCQMS" runat="server" Label="质量管理" LabelAlign="Right" LabelWidth="80px">
</f:CheckBox>
<f:CheckBox ID="ckbIsCQMSCheck" runat="server" Label="质量报验" LabelAlign="Right" LabelWidth="80px">
</f:CheckBox>
<f:DropDownBox runat="server" Label="对口专业" ID="txtCNCodes" EmptyText="--请选择--" EnableMultiSelect="true" MatchFieldWidth="true" LabelWidth="80px">
<PopPanel>
<f:Grid ID="gvCNCodes" DataIDField="CNProfessionalId" ForceFit="true"
@ -123,7 +125,9 @@
</f:Label>
<f:Label ID="Label2" runat="server" Text="1、若选中安管人员即为安全专职人员；">
</f:Label>
<f:Label ID="Label3" runat="server" Text="2、特种作业人员和一般作业岗位为单位作业人员。">
<f:Label ID="Label5" runat="server" Text="2、若选中质量管理即为质量管理人员；">
</f:Label>
<f:Label ID="Label3" runat="server" Text="3、特种作业人员和一般作业岗位为单位作业人员。">
</f:Label>
</Items>
<Toolbars>

20
SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.cs
View File

@ -38,7 +38,7 @@ namespace FineUIPro.Web.BaseInfo
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.IsCQMS,wp.CNCodes,
string strSql = @"SELECT wp.WorkPostId,wp.WorkPostName, wp.WorkPostCode, wp.Remark,wp.PostType,wp.IsHsse,wp.IsCQMS,,wp.IsCQMSCheck,wp.CNCodes,
case wp.IsHsse when 1 then '是' else '否' end as IsHsseStr,const.ConstText as PostTypeName
FROM dbo.Base_WorkPost AS wp
LEFT JOIN Sys_Const AS const ON const.ConstValue = wp.PostType and const.GroupId = '" + ConstValue.Group_PostType + "' ";
@ -83,11 +83,24 @@ namespace FineUIPro.Web.BaseInfo
return paged;
}
protected void btnQuery_Click(object sender, EventArgs e)
{
BindGrid();
}
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
Grid1.PageIndex = e.NewPageIndex;
BindGrid();
}
/// <summary>
/// 关闭弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页下拉选择
@ -170,6 +183,10 @@ namespace FineUIPro.Web.BaseInfo
{
this.ckbIsCQMS.Checked = true;
}
if (workPost.IsCQMSCheck == true)
{
this.ckbIsCQMSCheck.Checked = true;
}
if (!string.IsNullOrEmpty(workPost.CNCodes))
{
txtCNCodes.Values = workPost.CNCodes.Split(',');
@ -210,6 +227,7 @@ namespace FineUIPro.Web.BaseInfo
PostType = this.drpPostType.SelectedValue,
IsHsse = Convert.ToBoolean(this.ckbIsHsse.Checked),
IsCQMS = Convert.ToBoolean(this.ckbIsCQMS.Checked),
IsCQMSCheck = Convert.ToBoolean(this.ckbIsCQMSCheck.Checked),
CNCodes = string.Join(",", txtCNCodes.Values),
Remark = txtRemark.Text.Trim()
};

18
SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.designer.cs generated
View File

@ -194,6 +194,15 @@ namespace FineUIPro.Web.BaseInfo
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsCQMS;
/// <summary>
/// ckbIsCQMSCheck 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsCQMSCheck;
/// <summary>
/// txtCNCodes 控件。
/// </summary>
@ -239,6 +248,15 @@ namespace FineUIPro.Web.BaseInfo
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// Label5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label5;
/// <summary>
/// Label3 控件。
/// </summary>

8
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
View File

@ -72,7 +72,13 @@ namespace FineUIPro.Web.CQMS.Check
btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;";
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
GetList();
APICheckControlSyncService.getCheckControlLists(this.ProjectId);
var getProject = ProjectService.GetProjectByProjectId(ProjectId);
if (getProject != null && getProject.IsAutoFetch == true)
{
APICheckControlSyncService.getCheckControlLists(this.ProjectId);
}
// 绑定表格
BindGrid();

11
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistration.aspx
View File

@ -73,9 +73,12 @@
FieldType="String" HeaderText="课题" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="Process" DataField="Process"
<%--<f:RenderField Width="180px" ColumnID="Process" DataField="Process"
FieldType="String" HeaderText="过程" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>--%>
<f:RenderField Width="120px" ColumnID="AwardYear" DataField="AwardYear" SortField="AwardYear"
FieldType="Date" Renderer="Date" RendererArgument="yyyy" HeaderText="颁奖年份" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Achievement" DataField="Achievement"
FieldType="String" HeaderText="成果" TextAlign="Center"
@ -86,8 +89,8 @@
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="AwardTypeName" DataField="AwardTypeName"
FieldType="String" HeaderText="获奖类型" TextAlign="Center"
HeaderTextAlign="Center">
FieldType="String" HeaderText="获奖类型" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="AwardLevelName" DataField="AwardLevelName"
FieldType="String" HeaderText="获奖等级" TextAlign="Center"
@ -102,7 +105,7 @@
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="获奖日期" TextAlign="Center" HeaderTextAlign="Center" >
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="获奖日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" TextAlign="Center" HeaderTextAlign="Center" />
</Columns>

19
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx
View File

@ -49,8 +49,11 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProcess" runat="server" LabelWidth="100px" Label="过程" LabelAlign="Right">
</f:TextBox>
<%--<f:TextBox ID="txtProcess" runat="server" LabelWidth="100px" Label="过程" LabelAlign="Right">
</f:TextBox>--%>
<f:DatePicker runat="server" Required="true" DateFormatString="yyyy" Label="颁奖年份" EmptyText="请选择颁奖年份"
ID="txtAwardYear" ShowRedStar="true" DisplayType="Year" ShowTodayButton="false">
</f:DatePicker>
<f:TextBox ID="txtAchievement" runat="server" LabelWidth="120px" Label="成果" LabelAlign="Right">
</f:TextBox>
</Items>
@ -61,19 +64,19 @@
</f:TextBox>
<f:TextBox ID="txtAwardingUnit" runat="server" LabelWidth="120px" Label="颁奖单位" LabelAlign="Right">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpAwardType" runat="server" LabelWidth="100px" Label="获奖类型" LabelAlign="Right" AutoPostBack="true"
OnSelectedIndexChanged="Change_AwardType">
<f:ListItem Value="" Text="-请选择-" Selected="true"/>
<f:ListItem Value="1" Text="创优"/>
<f:ListItem Value="2" Text="QC"/>
OnSelectedIndexChanged="Change_AwardType">
<f:ListItem Value="" Text="-请选择-" Selected="true" />
<f:ListItem Value="1" Text="创优" />
<f:ListItem Value="2" Text="QC" />
</f:DropDownList>
<f:DropDownList ID="drpAwardLevel" runat="server" Label="获奖等级" EnableEdit="true" ForceSelection="false"
LabelWidth="120px" >
LabelWidth="120px">
</f:DropDownList>
</Items>
</f:FormRow>

36
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx.cs
View File

@ -52,20 +52,27 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
{
this.drpUnitId.SelectedValue = QCGroupRegistration.UnitId;
}
if (QCGroupRegistration.AwardYear != null)
{
this.txtAwardYear.Text = string.Format("{0:yyyy}", QCGroupRegistration.AwardYear);
}
txtSubjects.Text = QCGroupRegistration.Subjects;
txtProcess.Text = QCGroupRegistration.Process;
//txtProcess.Text = QCGroupRegistration.Process;
txtAchievement.Text = QCGroupRegistration.Achievement;
txtAwardName.Text = QCGroupRegistration.AwardName;
if (!string.IsNullOrEmpty(QCGroupRegistration.AwardType))
{
drpAwardType.SelectedValue = QCGroupRegistration.AwardType;
if (QCGroupRegistration.AwardType == "1") {
if (QCGroupRegistration.AwardType == "1")
{
drpAwardLevel.Items.Add(new ListItem("鲁班奖", "1"));
drpAwardLevel.Items.Add(new ListItem("国优奖", "2"));
drpAwardLevel.Items.Add(new ListItem("省部级", "3"));
drpAwardLevel.Items.Add(new ListItem("市级", "4"));
}
else if (QCGroupRegistration.AwardType == "2") {
else if (QCGroupRegistration.AwardType == "2")
{
drpAwardLevel.Items.Add(new ListItem("省部级", "5"));
drpAwardLevel.Items.Add(new ListItem("集团级", "6"));
drpAwardLevel.Items.Add(new ListItem("企业级", "7"));
@ -125,9 +132,14 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
QCGroupRegistration.UnitId = this.drpUnitId.SelectedValue;
}
QCGroupRegistration.Subjects = txtSubjects.Text.Trim();
QCGroupRegistration.Process = txtProcess.Text.Trim();
//QCGroupRegistration.Process = txtProcess.Text.Trim();
QCGroupRegistration.Achievement = txtAchievement.Text.Trim();
QCGroupRegistration.AwardName = txtAwardName.Text.Trim();
var awardYearText = this.txtAwardYear.Text.Trim();
if (!string.IsNullOrEmpty(awardYearText))
{
QCGroupRegistration.AwardYear = DateTime.ParseExact(awardYearText, "yyyy", null);
}
if (!string.IsNullOrEmpty(this.drpAwardType.SelectedValue))
{
QCGroupRegistration.AwardType = this.drpAwardType.SelectedValue;
@ -159,20 +171,22 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
}
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
protected void Change_AwardType(object sender, EventArgs eventArgs)
{
drpAwardLevel.Items.Clear();
drpAwardLevel.Items.Add(new ListItem("-请选择-", ""));
if (drpAwardType.SelectedValue == "1") {
if (drpAwardType.SelectedValue == "1")
{
drpAwardLevel.Items.Add(new ListItem("鲁班奖", "1"));
drpAwardLevel.Items.Add(new ListItem("国优奖", "2"));
drpAwardLevel.Items.Add(new ListItem("省部级", "3"));
drpAwardLevel.Items.Add(new ListItem("市级", "4"));
}
else if (drpAwardType.SelectedValue == "2") {
else if (drpAwardType.SelectedValue == "2")
{
drpAwardLevel.Items.Add(new ListItem("省部级", "5"));
drpAwardLevel.Items.Add(new ListItem("集团级", "6"));
drpAwardLevel.Items.Add(new ListItem("企业级", "7"));
@ -182,8 +196,8 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
{
drpAwardLevel.SelectedIndex = 0;
}
}
}
}

4
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx.designer.cs generated
View File

@ -96,13 +96,13 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
protected global::FineUIPro.TextBox txtSubjects;
/// <summary>
/// txtProcess 控件。
/// txtAwardYear 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProcess;
protected global::FineUIPro.DatePicker txtAwardYear;
/// <summary>
/// txtAchievement 控件。

17
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationView.aspx
View File

@ -49,8 +49,11 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProcess" runat="server" LabelWidth="100px" Label="过程" LabelAlign="Right" Readonly="true">
</f:TextBox>
<%--<f:TextBox ID="txtProcess" runat="server" LabelWidth="100px" Label="过程" LabelAlign="Right" Readonly="true">
</f:TextBox>--%>
<f:DatePicker runat="server" Required="true" DateFormatString="yyyy" Label="颁奖年份" EmptyText="请选择颁奖年份"
ID="txtAwardYear" ShowRedStar="true" DisplayType="Year" ShowTodayButton="false" Readonly="true">
</f:DatePicker>
<f:TextBox ID="txtAchievement" runat="server" LabelWidth="120px" Label="成果" LabelAlign="Right" Readonly="true">
</f:TextBox>
</Items>
@ -67,13 +70,13 @@
<f:FormRow>
<Items>
<f:DropDownList ID="drpAwardType" runat="server" LabelWidth="100px" Label="获奖类型" LabelAlign="Right" AutoPostBack="true"
OnSelectedIndexChanged="Change_AwardType">
<f:ListItem Value="" Text="-请选择-" Selected="true"/>
<f:ListItem Value="1" Text="创优"/>
<f:ListItem Value="2" Text="QC"/>
OnSelectedIndexChanged="Change_AwardType">
<f:ListItem Value="" Text="-请选择-" Selected="true" />
<f:ListItem Value="1" Text="创优" />
<f:ListItem Value="2" Text="QC" />
</f:DropDownList>
<f:DropDownList ID="drpAwardLevel" runat="server" Label="获奖等级" EnableEdit="true" ForceSelection="false"
LabelWidth="120px">
LabelWidth="120px">
</f:DropDownList>
</Items>
</f:FormRow>

26
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationView.aspx.cs
View File

@ -51,20 +51,26 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
{
this.drpUnitId.SelectedValue = QCGroupRegistration.UnitId;
}
if (QCGroupRegistration.AwardYear != null)
{
this.txtAwardYear.Text = string.Format("{0:yyyy}", QCGroupRegistration.AwardYear);
}
txtSubjects.Text = QCGroupRegistration.Subjects;
txtProcess.Text = QCGroupRegistration.Process;
//txtProcess.Text = QCGroupRegistration.Process;
txtAchievement.Text = QCGroupRegistration.Achievement;
txtAwardName.Text = QCGroupRegistration.AwardName;
if (!string.IsNullOrEmpty(QCGroupRegistration.AwardType))
{
drpAwardType.SelectedValue = QCGroupRegistration.AwardType;
if (QCGroupRegistration.AwardType == "1") {
if (QCGroupRegistration.AwardType == "1")
{
drpAwardLevel.Items.Add(new ListItem("鲁班奖", "1"));
drpAwardLevel.Items.Add(new ListItem("国优奖", "2"));
drpAwardLevel.Items.Add(new ListItem("省部级", "3"));
drpAwardLevel.Items.Add(new ListItem("市级", "4"));
}
else if (QCGroupRegistration.AwardType == "2") {
else if (QCGroupRegistration.AwardType == "2")
{
drpAwardLevel.Items.Add(new ListItem("省部级", "5"));
drpAwardLevel.Items.Add(new ListItem("集团级", "6"));
drpAwardLevel.Items.Add(new ListItem("企业级", "7"));
@ -102,19 +108,21 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/QCGroupRegistration&menuId={1}", hdId.Text, BLL.Const.ProjectQCGroupRegistrationListMenuId)));
}
protected void Change_AwardType(object sender, EventArgs eventArgs)
{
drpAwardLevel.Items.Clear();
drpAwardLevel.Items.Add(new ListItem("-请选择-", ""));
if (drpAwardType.SelectedValue == "1") {
if (drpAwardType.SelectedValue == "1")
{
drpAwardLevel.Items.Add(new ListItem("国家级", "1"));
drpAwardLevel.Items.Add(new ListItem("省部级", "2"));
drpAwardLevel.Items.Add(new ListItem("市级", "3"));
}
else if (drpAwardType.SelectedValue == "2") {
else if (drpAwardType.SelectedValue == "2")
{
drpAwardLevel.Items.Add(new ListItem("省部级", "4"));
drpAwardLevel.Items.Add(new ListItem("集团级", "5"));
drpAwardLevel.Items.Add(new ListItem("企业级", "6"));
@ -124,7 +132,7 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
{
drpAwardLevel.SelectedIndex = 0;
}
}
}
}

4
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationView.aspx.designer.cs generated
View File

@ -96,13 +96,13 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
protected global::FineUIPro.TextBox txtSubjects;
/// <summary>
/// txtProcess 控件。
/// txtAwardYear 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProcess;
protected global::FineUIPro.DatePicker txtAwardYear;
/// <summary>
/// txtAchievement 控件。

167
SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
View File

@ -19,6 +19,168 @@ namespace Web.Controls
}
}
public void CreateChart1(Model.DataSourceChart dataSourceChart)
{
int totalDataCount = 0;
if (dataSourceChart.DataSourceTeams != null && dataSourceChart.DataSourceTeams.Count > 0)
{
var firstTeam = dataSourceChart.DataSourceTeams.FirstOrDefault(t => t.DataPointName != "累计");
if (firstTeam != null)
totalDataCount = firstTeam.DataSourcePoints.Count;
}
// 每个标签分配 70px 宽度（可微调：60-80 之间）
int autoChartWidth = totalDataCount * 45;
Chart chart1 = new Chart
{
ID = "chart1",
BackColor = Color.WhiteSmoke,
ImageLocation = "~/Images/ChartPic_#SEQ(300,3)",
BorderlineDashStyle = ChartDashStyle.Solid,
Palette = ChartColorPalette.BrightPastel,
BackSecondaryColor = Color.White,
BackGradientStyle = GradientStyle.TopBottom,
BorderWidth = 2,
BorderColor = Color.FromArgb(26, 59, 105),
ImageType = ChartImageType.Png,
Width = dataSourceChart.Width > autoChartWidth ? dataSourceChart.Width : autoChartWidth,
Height = dataSourceChart.Height
};
Title title = new Title
{
Text = dataSourceChart.Title,
ShadowColor = Color.FromArgb(32, 0, 0, 0),
Font = new Font("Trebuchet MS", 10F, FontStyle.Bold),
ShadowOffset = 3,
ForeColor = Color.FromArgb(26, 59, 105)
};
chart1.Titles.Add(title);
Legend legend = new Legend
{
Name = dataSourceChart.Title,
TextWrapThreshold = 1,
Docking = Docking.Top,
Alignment = StringAlignment.Center,
BackColor = Color.Transparent,
Font = new Font(new FontFamily("Trebuchet MS"), 8),
LegendStyle = LegendStyle.Row,
IsEquallySpacedItems = true,
IsTextAutoFit = false
};
chart1.Legends.Add(legend);
ChartArea chartArea = new ChartArea
{
Name = dataSourceChart.Title,
BackColor = Color.Transparent
};
chartArea.AxisX.IsLabelAutoFit = false;
chartArea.AxisY.IsLabelAutoFit = false;
chartArea.AxisX.Interval = 1; // 每个点都显示标签
chartArea.AxisX.LabelStyle.Angle = 45; // 倾斜45°
chartArea.AxisX.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F);
chartArea.AxisY.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F);
// 线条样式
chartArea.AxisY.LineColor = Color.FromArgb(64, 64, 64, 64);
chartArea.AxisX.LineColor = Color.FromArgb(64, 64, 64, 64);
chartArea.AxisY.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64);
chartArea.AxisX.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64);
chart1.ChartAreas.Add(chartArea);
Panel scrollPanel = new Panel();
scrollPanel.Style.Add("width", "100%"); // 父容器自适应
scrollPanel.Style.Add("overflow-x", "auto"); // 横向滚动条
scrollPanel.Style.Add("overflow-y", "hidden");
scrollPanel.Style.Add("margin-bottom", "10px");
scrollPanel.Controls.Add(chart1);
if (dataSourceChart.ChartType == SeriesChartType.Pie)
{
foreach (Model.DataSourceTeam dataSourceTeam in dataSourceChart.DataSourceTeams)
{
this.lblTotal.Text = "累计值为：";
if (dataSourceTeam.DataPointName == "累计")
{
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
{
this.lblTotal.Text += (dataSourcePoint.PointText + "：" + dataSourcePoint.PointValue + ",");
}
if (this.lblTotal.Text != "累计值为：")
{
this.lblTotal.Text = this.lblTotal.Text.Substring(0, this.lblTotal.Text.LastIndexOf(","));
}
}
else
{
this.lblTotal.Visible = false;
chart1.Series.Add(dataSourceTeam.DataPointName);
chart1.Series[dataSourceTeam.DataPointName].ChartType = dataSourceChart.ChartType;
chart1.Series[dataSourceTeam.DataPointName].Name = dataSourceTeam.DataPointName;
chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;
chart1.Series[dataSourceTeam.DataPointName].BorderWidth = 2;
chart1.Series[dataSourceTeam.DataPointName].Label = "#PERCENT{P1}";
chart1.Series[dataSourceTeam.DataPointName]["DrawingStyle"] = "Cylinder";
int m = 0;
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
{
chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText,
dataSourcePoint.PointValue);
chart1.Series[dataSourceTeam.DataPointName].Points[m].LegendText =
dataSourcePoint.PointText + "#PERCENT{P1}";
m++;
}
}
}
}
else
{
foreach (Model.DataSourceTeam dataSourceTeam in dataSourceChart.DataSourceTeams)
{
this.lblTotal.Text = "累计值为：";
if (dataSourceTeam.DataPointName == "累计")
{
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
{
this.lblTotal.Text += (dataSourcePoint.PointText + "：" + dataSourcePoint.PointValue + ",");
}
if (this.lblTotal.Text != "累计值为：")
{
this.lblTotal.Text = this.lblTotal.Text.Substring(0, this.lblTotal.Text.LastIndexOf(","));
}
}
else
{
this.lblTotal.Visible = false;
chart1.Series.Add(dataSourceTeam.DataPointName);
chart1.Series[dataSourceTeam.DataPointName].ChartType = dataSourceChart.ChartType;
chart1.Series[dataSourceTeam.DataPointName].Name = dataSourceTeam.DataPointName;
chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;
chart1.Series[dataSourceTeam.DataPointName].BorderWidth = 2;
chart1.Series[dataSourceTeam.DataPointName]["DrawingStyle"] = "Cylinder";
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
{
chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText,
dataSourcePoint.PointValue);
}
}
}
}
Controls.Add(scrollPanel);
}
/// <summary>
/// 创建Chart图形
/// </summary>
@ -357,7 +519,7 @@ namespace Web.Controls
chartArea.Area3DStyle.Enable3D = dataSourceChart.IsNotEnable3D;
chartArea.AxisY.LabelStyle.Format = " 0% "; // 格式化，为了显示百分号
chart1.ChartAreas.Add(chartArea);
@ -429,7 +591,8 @@ namespace Web.Controls
{
chart1.Series[dataSourceTeam.DataPointName].Color = Color.Red;
}
else {
else
{
chart1.Series[dataSourceTeam.DataPointName].Color = Color.Blue;
}
foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)

18
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx
View File

@ -19,7 +19,8 @@
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"
EnableSummary="true" SummaryPosition="Bottom">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
@ -34,8 +35,11 @@
<f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="130px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
</f:Toolbar>
@ -52,13 +56,13 @@
</f:RenderField>
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="在用计量器具数" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="在用计量器具数" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count2" Width="120px" HeaderText="校验合格数" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="Count2" Width="120px" HeaderText="校验合格数" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
@ -81,7 +85,7 @@
</f:Panel>
<f:Window ID="Window1" Title="详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1200px" Height="620px" Maximized="true">
Width="1200px" Height="620px" Maximized="true">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>

124
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
View File

@ -1,9 +1,12 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.DataShow
{
@ -168,10 +171,11 @@ namespace FineUIPro.Web.DataShow
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getD1 = from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectId.ToString() && x.IsOnSite == true && x.InspectionType.Contains("计量")
select x;
where x.ProjectId == projectId.ToString() && x.IsOnSite == true && x.InspectionType.Contains("计量")
//&& x.CompileDate == Funs.minSysDate
select x;
if (datetime1.HasValue)
{
getD1 = getD1.Where(x => x.CompileDate >= datetime1);
@ -181,11 +185,14 @@ namespace FineUIPro.Web.DataShow
getD1 = getD1.Where(x => x.CompileDate <= datetime2);
}
cout1 = getD1.Count();
// cout1 = getD1.Count();
cout1 = getD1.ToList().Sum(x => x.UnitsCount ?? 1);
}
return cout1;
}
/// <summary>
/// 校验合格数
/// </summary>
@ -197,10 +204,11 @@ namespace FineUIPro.Web.DataShow
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getD1 = from x in Funs.DB.Comprehensive_InspectionMachine
where x.ProjectId == projectId.ToString() && x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true
select x;
// && x.CompileDate == Funs.minSysDate
select x;
if (datetime1.HasValue)
{
getD1 = getD1.Where(x => x.CompileDate >= datetime1);
@ -209,10 +217,110 @@ namespace FineUIPro.Web.DataShow
{
getD1 = getD1.Where(x => x.CompileDate <= datetime2);
}
cout1 = getD1.Count();
// cout1 = getD1.Count();
cout1 = getD1.ToList().Sum(x => x.UnitsCount ?? 1);
}
return cout1;
}
#region 合计
private void OutputSummaryData()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName ,
isnull((select sum(isnull(a.UnitsCount,1)) from Comprehensive_InspectionMachine as a where a.ProjectId=P.ProjectId and a.IsOnSite=1 and a.InspectionType like '%计量%' ),0) as Count1,
isnull((select sum(isnull(a.UnitsCount,1)) from Comprehensive_InspectionMachine as a where a.ProjectId=P.ProjectId and a.IsOnSite=1 and a.InspectionType like '%计量%' and a.IsCheckOK=1 ),0) as Count2
from Base_Project as P where ProjectState =1 and (isDelete IS NULL OR isDelete =0) and (ProjectAttribute == 'GONGCHENG' OR ProjectAttribute IS NULL) ";
List<SqlParameter> listStr = new List<SqlParameter>();
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
int Count1 = 0, Count2 = 0;
foreach (DataRow row in tb.Rows)
{
Count1 += Convert.ToInt32(row["Count1"]);
Count2 += Convert.ToInt32(row["Count2"]);
}
JObject summary = new JObject();
summary.Add("ProjectName", "合计：");
summary.Add("Count1", Count1.ToString());
summary.Add("Count2", Count2.ToString());
Grid1.SummaryData = summary;
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition",
"attachment; filename=" +
System.Web.HttpUtility.UrlEncode("计量器具" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = this.Grid1.RecordCount;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
/// <summary>
/// 导出方法
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
sb.AppendFormat("<td>{0}</td>", column.HeaderText);
}
sb.Append("</tr>");
foreach (GridRow row in grid.Rows)
{
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber")
{
html = (row.FindControl("lblNumber") as AspNet.Label).Text;
}
if (column.ColumnID == "Count1")
{
html = (row.FindControl("Label2") as AspNet.Label).Text;
}
if (column.ColumnID == "Count2")
{
html = (row.FindControl("Label1") as AspNet.Label).Text;
}
sb.AppendFormat("<td>{0}</td>", html);
}
sb.Append("</tr>");
}
sb.Append("</table>");
return sb.ToString();
}
#endregion
}
}

9
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.designer.cs generated
View File

@ -95,6 +95,15 @@ namespace FineUIPro.Web.DataShow
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnClose 控件。
/// </summary>

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

@ -1181,6 +1181,8 @@
<Content Include="HSSE\Hazard\SetToolTipTime.aspx" />
<Content Include="HSSE\Hazard\ShowEnvironmentalItem.aspx" />
<Content Include="HSSE\Hazard\ShowHazardList.aspx" />
<Content Include="HSSE\HiddenInspection\CheckStatisticsAnalysis.aspx" />
<Content Include="HSSE\HiddenInspection\CheckStatisticsAnalysisProject.aspx" />
<Content Include="HSSE\HiddenInspection\HiddenRectificationAdd.aspx" />
<Content Include="HSSE\HiddenInspection\HiddenRectificationConfirm.aspx" />
<Content Include="HSSE\HiddenInspection\HiddenRectificationList.aspx" />
@ -12766,6 +12768,20 @@
<Compile Include="HSSE\Hazard\ShowHazardList.aspx.designer.cs">
<DependentUpon>ShowHazardList.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\HiddenInspection\CheckStatisticsAnalysis.aspx.cs">
<DependentUpon>CheckStatisticsAnalysis.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\HiddenInspection\CheckStatisticsAnalysis.aspx.designer.cs">
<DependentUpon>CheckStatisticsAnalysis.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\HiddenInspection\CheckStatisticsAnalysisProject.aspx.cs">
<DependentUpon>CheckStatisticsAnalysisProject.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HSSE\HiddenInspection\CheckStatisticsAnalysisProject.aspx.designer.cs">
<DependentUpon>CheckStatisticsAnalysisProject.aspx</DependentUpon>
</Compile>
<Compile Include="HSSE\HiddenInspection\HiddenRectificationAdd.aspx.cs">
<DependentUpon>HiddenRectificationAdd.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

66
SGGL/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx Normal file
View File

@ -0,0 +1,66 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckStatisticsAnalysis.aspx.cs" Inherits="FineUIPro.Web.HSSE.HiddenInspection.HSSECheckStatisticsAnalysis" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>隐患分析</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-row.yellow {
background-color: YellowGreen;
background-image: none;
}
.f-grid-row.red {
background-color: Yellow;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel3" runat="server" />
<f:Panel ID="Panel3" Margin="24px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit" IFrameUrl="" EnableIFrame="True"
Title="中间面板" ShowBorder="False" ShowHeader="false" BodyPadding="10px" IconFont="_RoundPlus">
</f:Panel>
</Items>
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker runat="server" Required="true" DateFormatString="yyyy-MM-dd" Label="开始日期" EmptyText="请选择日期"
ID="DatePicker1" ShowRedStar="true" DisplayType="Day" ShowTodayButton="false" Width="250px" LabelWidth="90px">
</f:DatePicker>
<f:DatePicker ID="DatePicker2" Required="true" Readonly="false" CompareControl="DatePicker1" DateFormatString="yyyy-MM-dd"
CompareOperator="GreaterThanEqual" CompareMessage="结束日期应该大于开始日期" Label="结束日期"
runat="server" ShowRedStar="true" DisplayType="Day" ShowTodayButton="false" Width="250px" LabelWidth="90px">
</f:DatePicker>
<f:DropDownList ID="drpProject" runat="server" Label="项目" EmptyText="-请选择-" Width="400px"
EnableEdit="true" LabelWidth="70px" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" EnableSimulateTree="True">
</f:DropDownList>
<f:ToolbarFill runat="server" />
<f:Button ID="BtnAnalyse" Text="统计" ToolTip="统计" Icon="ChartPie" runat="server" ValidateForms="Panel3" OnClick="BtnAnalyse_Click"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Panel>
</form>
<script>
function onRefIframe() {
panelCenterRegion.refreshIFrame();
}
</script>
</body>
</html>

56
SGGL/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx.cs Normal file
View File

@ -0,0 +1,56 @@
using System;
using BLL;
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HSSECheckStatisticsAnalysis : PageBase
{
public string Types
{
get => (string)ViewState["Types"];
set => ViewState["Types"] = value;
}
public string UnitId
{
get => (string)ViewState["UnitId"];
set => ViewState["UnitId"] = value;
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.DatePicker1.Text = new DateTime(DateTime.Now.Year, 1, 1).ToString("yyyy-MM-dd");
this.DatePicker2.Text = DateTime.Now.ToString("yyyy-MM-dd");
UnitId = this.CurrUser.UnitId;
if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sedinId)
{
UnitId = CommonService.GetThisUnitId();
}
BLL.ProjectService.InitProjectDropDownList(this.drpProject,UnitId, false);//项目
Types = Request.Params["Types"] ?? "1";
}
}
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
string ProjectStr = string.Empty;
foreach (ListItem item in this.drpProject.SelectedItemArray)
{
ProjectStr += item.Value + ",";
}
string queryStr = string.Empty;
if (!string.IsNullOrWhiteSpace(queryStr))
{
ShowNotify(queryStr, MessageBoxIcon.Warning);
return;
}
panelCenterRegion.IFrameUrl = $"./CheckStatisticsAnalysisProject.aspx?StartDate={DatePicker1.Text}&EndDate={DatePicker2.Text}&ProjectStr={ProjectStr}&Types={Types}&UnitId={UnitId}";
}
}
}

98
SGGL/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysis.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,98 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HSSECheckStatisticsAnalysis
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel3;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// DatePicker1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker DatePicker1;
/// <summary>
/// DatePicker2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker DatePicker2;
/// <summary>
/// drpProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
}
}

139
SGGL/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysisProject.aspx Normal file
View File

@ -0,0 +1,139 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckStatisticsAnalysisProject.aspx.cs" Inherits="FineUIPro.Web.HSSE.HiddenInspection.HSSECheckStatisticsAnalysisProject" %>
<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css"/>
<style type="text/css">
.f-grid-row-summary .f-grid-cell-text {
font-weight: bold;
color: red;
}
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-row.yellow {
background-color: YellowGreen;
background-image: none;
}
.f-grid-row.red {
background-color: Yellow;
}
.f-grid-cell[data-color=color1] {
background-color: Yellow;
color: #000000;
}
.f-grid-row-summary .f-grid-cell-text {
font-weight: bold;
color: red;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="TabStrip1" AjaxAspnetControls="divHiddenDangerProject"/>
<f:TabStrip ID="TabStrip1" IsFluid="true" Height="350px" ShowBorder="true" TabPosition="Top"
EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server">
<Tabs>
<f:Tab Title="数据分析" BodyPadding="10px" Layout="Fit" runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="问题分析表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" AllowCellEditing="true"
ClicksToEdit="1" DataIDField="ProjectId" AllowSorting="true" SortField="ProjectId"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowColumnLocking="true"
AllowPaging="false" IsDatabasePaging="false" PageSize="50" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableRowClickEvent="True" EnableSummary="true" SummaryPosition="Bottom">
<Toolbars>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill runat="server"/>
<f:Button ID="btnQuery" ToolTip="查询" Text="查询" Icon="SystemSearch" runat="server" EnablePostBack="true" Hidden="True"
OnClick="btnQuery_OnClick">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center" EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="500px" ColumnID="ProjectName" DataField="ProjectName"
SortField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:GroupField HeaderText="巡检数量" TextAlign="Center" HeaderTextAlign="Center">
<Columns>
<f:RenderField HeaderText="待整改" ColumnID="UNCloseNum" DataField="UNCloseNum" ExpandUnusedSpace="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField HeaderText="已关闭" ColumnID="CloseNum" DataField="CloseNum" ExpandUnusedSpace="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField HeaderText="合计" ColumnID="HJNum" DataField="HJNum" ExpandUnusedSpace="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField Width="150px" ColumnID="ProjectRate" DataField="ProjectRate" SortField="ProjectRate"
FieldType="String" HeaderText="关闭总占比" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Tab>
<f:Tab Title="图表分析" BodyPadding="10px"
runat="server">
<Items>
<f:DropDownList ID="drpChartType" runat="server" LabelWidth="100px" Label="图形类别" AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" LabelAlign="Right">
</f:DropDownList>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpHiddenDangerUnit" Margin="0 0 0 0">
<div id="divHiddenDangerProject">
<uc1:ChartControl ID="ChartHiddenDangerProject" runat="server"/>
</div>
</f:ContentPanel>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
<f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true"
Title="编辑PHTGL_ContractTrack" EnableIFrame="true" Height="650px"
Width="1200px">
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="650px">
</f:Window>
</form>
<script type="text/javascript">
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</body>
</html>

582
SGGL/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysisProject.aspx.cs Normal file
View File

@ -0,0 +1,582 @@
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HSSECheckStatisticsAnalysisProject : PageBase
{
public DataTable ChartTable
{
get { return (DataTable)ViewState["ChartTable"]; }
set { ViewState["ChartTable"] = value; }
}
/// <summary>
/// 开始年月
/// </summary>
public string StartDate
{
get => (string)ViewState["StartDate"];
set => ViewState["StartDate"] = value;
}
/// <summary>
/// 结束年月
/// </summary>
public string EndDate
{
get => (string)ViewState["EndDate"];
set => ViewState["EndDate"] = value;
}
public string UnitId
{
get => (string)ViewState["UnitId"];
set => ViewState["UnitId"] = value;
}
public bool ShowHsse
{
get => (bool)ViewState["ShowHsse"];
set => ViewState["ShowHsse"] = value;
}
public bool ShowEnvironment
{
get => (bool)ViewState["ShowEnvironment"];
set => ViewState["ShowEnvironment"] = value;
}
public bool ShowCqms
{
get => (bool)ViewState["ShowCqms"];
set => ViewState["ShowCqms"] = value;
}
public List<string> projects = new List<string>();
#region Page_Init
// 注意：动态创建的代码需要放置于Page_Init（不是Page_Load），这样每次构造页面时都会执行
protected void Page_Init(object sender, EventArgs e)
{
string ProblemTypes = Request.Params["Types"];
ShowHsse = ProblemTypes.Contains("1");
ShowCqms = ProblemTypes.Contains("2");
ShowEnvironment = ProblemTypes.Contains("3");
InitGrid();
}
private void InitGrid()
{
StartDate = Request.Params["StartDate"];
EndDate = Request.Params["EndDate"];
UnitId = Request.Params["UnitId"];
string ProjectStr = Request.Params["ProjectStr"];
if (!string.IsNullOrWhiteSpace(ProjectStr))
{
var projectlst = ProjectStr.Split(',');
foreach (var un in projectlst)
{
if (!string.IsNullOrWhiteSpace(un))
{
projects.Add(un);
}
}
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.drpChartType.DataTextField = "ConstText";
this.drpChartType.DataValueField = "ConstValue";
this.drpChartType.DataSource = BLL.ConstValue.drpConstItemList(ConstValue.Group_ChartType);
this.drpChartType.DataBind();
// 绑定表格
this.BindGrid();
AnalyseData();
}
}
#region 绑定数据
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
ChartTable = new DataTable();
ChartTable.Columns.Add("项目");
ChartTable.Columns.Add("待整改数");
ChartTable.Columns.Add("已关闭数");
DateTime start = DateTime.Parse(StartDate);
DateTime end = DateTime.Parse(EndDate);
var sublist = new List<Model.Base_Project>();
var IsThisUnit = CommonService.GetThisUnitId() == UnitId ? true : false;
if (IsThisUnit)
{
sublist = BLL.ProjectService.GetProjectWorkList();
}
else
{
sublist = BLL.ProjectService.GetProjectWorkList(UnitId);
}
var allHazardList = new List<TempHazardModel>();
if (ShowHsse)
{
allHazardList = (from x in Funs.DB.View_Hazard_HazardRegister
where x.CheckTime.HasValue && x.CheckTime.Value >= start && x.CheckTime.Value <= end
select new TempHazardModel
{
ProjectId = x.ProjectId,
ProjectName = x.ProjectName,
States = x.States,
CheckTime = x.CheckTime
}).ToList();
}
if (ShowCqms)
{
allHazardList = (from x in Funs.DB.Check_CheckControl
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pt
from p in pt
join y in Funs.DB.Check_CheckControl on x.CheckControlCode equals y.CheckControlCode into yt
from y in yt
where x.CheckDate.HasValue && x.CheckDate.Value >= start && x.CheckDate.Value <= end
select new TempHazardModel
{
ProjectId = x.ProjectId,
ProjectName = p.ProjectName,
States = y.State,
CheckTime = x.CheckDate
}).ToList();
}
if (projects.Count > 0)
{
allHazardList = allHazardList.Where(x => projects.Contains(x.ProjectId)).ToList();
}
List<AnalysisData> dataList = new List<AnalysisData>();
foreach (var item in sublist) //项目分组
{
if (projects.Count > 0 && !(projects.Where(x => x == item.ProjectId).Any()))
{
continue;
}
AnalysisData analysisData = new AnalysisData();
var projectHazardList = from x in allHazardList
where x.ProjectId == item.ProjectId
select x; //当前项目所有隐患
int closeList = 0;
if (ShowHsse)
{
closeList = projectHazardList.Where(x => x.States == "3").Count(); //已闭环
}
if (ShowCqms)
{
closeList = projectHazardList.Where(x => x.States == "7").Count(); //已闭环
}
analysisData.ProjectId = item.ProjectId;
analysisData.ProjectName = !string.IsNullOrEmpty(item.ShortName) ? item.ShortName : item.ProjectName;
analysisData.HJNum = projectHazardList.Count();
analysisData.CloseNum = closeList;
analysisData.UNCloseNum = projectHazardList.Count() - closeList;
if (projectHazardList.Count() > 0)
{
double rate = closeList / (double)projectHazardList.Count() * 100;
analysisData.ProjectRate = rate.ToString("F2") + "%"; // 保留两位小数
}
else
{
// 处理分母为零的情况，例如设置一个默认值或抛出异常
analysisData.ProjectRate = "0.00%"; // 或者其他适当的默认值
}
dataList.Add(analysisData);
//chart图表
DataRow chartTableRow = ChartTable.NewRow();
chartTableRow["项目"] = !string.IsNullOrEmpty(item.ShortName) ? item.ShortName : item.ProjectName;
chartTableRow["待整改数"] = projectHazardList.Count() - closeList;
chartTableRow["已关闭数"] = closeList;
ChartTable.Rows.Add(chartTableRow);
}
Grid1.RecordCount = dataList.Count;
Grid1.DataSource = dataList;
Grid1.DataBind();
// 数据合计
OutputSummaryData(dataList);
}
/// <summary>
/// 数据合计
/// </summary>
/// <param name="source"></param>
private void OutputSummaryData(List<AnalysisData> source)
{
JObject summary = new JObject();
summary.Add("ProjectName", "合计");
int UNCloseNumAll = 0;
int CloseNumAll = 0;
int HJNumAll = 0;
foreach (var analysisData in source)
{
UNCloseNumAll += Convert.ToInt32(analysisData.UNCloseNum);
CloseNumAll += Convert.ToInt32(analysisData.CloseNum);
HJNumAll += Convert.ToInt32(analysisData.HJNum);
}
summary.Add("UNCloseNum", UNCloseNumAll);
summary.Add("CloseNum", CloseNumAll);
summary.Add("HJNum", HJNumAll);
Grid1.SummaryData = summary;
}
#endregion
#region GV 数据操作
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
this.Grid1.PageIndex = e.NewPageIndex;
this.BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
this.Grid1.SortDirection = e.SortDirection;
this.Grid1.SortField = e.SortField;
this.BindGrid();
}
#endregion
#region 数据编辑事件
protected void btnQuery_OnClick(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 关闭弹出窗
/// <summary>
/// 关闭弹出窗
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition",
"attachment; filename=" +
System.Web.HttpUtility.UrlEncode("安全巡检统计分析表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = 500;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
private string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
MultiHeaderTable mht = new MultiHeaderTable();
mht.ResolveMultiHeaderTable(Grid1.Columns);
sb.Append("<meta http-equiv=\"Content-Type\" content=\"application/vnd.ms-excel;charset=utf-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
foreach (List<object[]> rows in mht.MultiTable)
{
sb.Append("<tr>");
foreach (object[] cell in rows)
{
int rowspan = Convert.ToInt32(cell[0]);
int colspan = Convert.ToInt32(cell[1]);
GridColumn column = cell[2] as GridColumn;
sb.AppendFormat("<th{0}{1}{2}>{3}</th>",
rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "",
colspan != 1 ? " colspan=\"" + colspan + "\"" : "",
colspan != 1 ? " style=\"text-align:center;\"" : "",
column.HeaderText);
}
sb.Append("</tr>");
}
foreach (GridRow row in grid.Rows)
{
sb.Append("<tr>");
foreach (GridColumn column in mht.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber")
{
html = (row.FindControl("lblNumber") as System.Web.UI.WebControls.Label).Text;
}
else if (column.ColumnID == "tfGender")
{
html = (row.FindControl("labGender") as System.Web.UI.WebControls.Label).Text;
}
sb.AppendFormat("<td>{0}</td>", html);
}
sb.Append("</tr>");
}
sb.Append("</table>");
return sb.ToString();
}
#region 多表头处理
/// <summary>
/// 多表头处理
/// </summary>
public class MultiHeaderTable
{
// 包含 rowspan，colspan 的多表头，方便生成 HTML 的 table 标签
public List<List<object[]>> MultiTable = new List<List<object[]>>();
// 最终渲染的列数组
public List<GridColumn> Columns = new List<GridColumn>();
public void ResolveMultiHeaderTable(GridColumnCollection columns)
{
List<object[]> row = new List<object[]>();
foreach (GridColumn column in columns)
{
object[] cell = new object[4];
cell[0] = 1; // rowspan
cell[1] = 1; // colspan
cell[2] = column;
cell[3] = null;
row.Add(cell);
}
ResolveMultiTable(row, 0);
ResolveColumns(row);
}
private void ResolveColumns(List<object[]> row)
{
foreach (object[] cell in row)
{
GroupField groupField = cell[2] as GroupField;
if (groupField != null && groupField.Columns.Count > 0)
{
List<object[]> subrow = new List<object[]>();
foreach (GridColumn column in groupField.Columns)
{
subrow.Add(new object[]
{
1,
1,
column,
groupField
});
}
ResolveColumns(subrow);
}
else
{
Columns.Add(cell[2] as GridColumn);
}
}
}
private void ResolveMultiTable(List<object[]> row, int level)
{
List<object[]> nextrow = new List<object[]>();
foreach (object[] cell in row)
{
GroupField groupField = cell[2] as GroupField;
if (groupField != null && groupField.Columns.Count > 0)
{
// 如果当前列包含子列，则更改当前列的 colspan，以及增加父列（向上递归）的colspan
cell[1] = Convert.ToInt32(groupField.Columns.Count);
PlusColspan(level - 1, cell[3] as GridColumn, groupField.Columns.Count - 1);
foreach (GridColumn column in groupField.Columns)
{
nextrow.Add(new object[]
{
1,
1,
column,
groupField
});
}
}
}
MultiTable.Add(row);
// 如果当前下一行，则增加上一行（向上递归）中没有子列的列的 rowspan
if (nextrow.Count > 0)
{
PlusRowspan(level);
ResolveMultiTable(nextrow, level + 1);
}
}
private void PlusRowspan(int level)
{
if (level < 0)
{
return;
}
foreach (object[] cells in MultiTable[level])
{
GroupField groupField = cells[2] as GroupField;
if (groupField != null && groupField.Columns.Count > 0)
{
}
else
{
cells[0] = Convert.ToInt32(cells[0]) + 1;
}
}
PlusRowspan(level - 1);
}
private void PlusColspan(int level, GridColumn parent, int plusCount)
{
if (level < 0)
{
return;
}
foreach (object[] cells in MultiTable[level])
{
GridColumn column = cells[2] as GridColumn;
if (column == parent)
{
cells[1] = Convert.ToInt32(cells[1]) + plusCount;
PlusColspan(level - 1, cells[3] as GridColumn, plusCount);
}
}
}
}
#endregion
#endregion
protected void drpChartType_SelectedIndexChanged(object sender, EventArgs e)
{
AnalyseData();
}
private void AnalyseData()
{
DataView dv = new DataView(ChartTable);
var tb = dv.ToTable();
DataTable newTable = new DataTable();
foreach (DataColumn column in tb.Columns)
{
newTable.Columns.Add(column.ColumnName, column.DataType);
}
// 将数据从原始表复制到新的DataTable中
foreach (DataRow row in tb.Rows)
{
DataRow newRow = newTable.NewRow();
foreach (DataColumn column in newTable.Columns)
{
newRow[column.ColumnName] = row[column.ColumnName];
}
newTable.Rows.Add(newRow);
}
this.ChartHiddenDangerProject.CreateChart1(BLL.ChartControlService.GetDataSourceChart(newTable, "安全巡检统计分析",
this.drpChartType.SelectedValue, 1150, 450, false));
}
public class AnalysisData
{
public string ProjectId { get; set; }
public string ProjectName { get; set; }
public int UNCloseNum { get; set; }
public int CloseNum { get; set; }
public int HJNum { get; set; }
public string ProjectRate { get; set; }
}
public class TempHazardModel
{
public string ProjectId { get; set; }
public string ProjectName { get; set; }
public string States { get; set; }
public DateTime? CheckTime { get; set; }
}
}
}

134
SGGL/FineUIPro.Web/HSSE/HiddenInspection/CheckStatisticsAnalysisProject.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,134 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HSSECheckStatisticsAnalysisProject
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// TabStrip1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// drpChartType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpChartType;
/// <summary>
/// cpHiddenDangerUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel cpHiddenDangerUnit;
/// <summary>
/// ChartHiddenDangerProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::Web.Controls.ChartControl ChartHiddenDangerProject;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
}
}

39
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.DataShow;
using System;
using System.Collections.Generic;
using System.Data;
@ -11,6 +12,34 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HiddenRectificationList : PageBase
{
#region 项目主键
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
public string UnintId
{
get
{
return (string)ViewState["UnintId"];
}
set
{
ViewState["UnintId"] = value;
}
}
#endregion
#region 定义项
/// <summary>
/// GV被选择项列表
@ -53,6 +82,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
Type = Request.Params["Type"];
Funs.DropDownPageSize(this.ddlPageSize);
ListItem[] ProblemTypes = new ListItem[2];
@ -72,6 +106,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
this.drpStates.DataSource = BLL.HSSE_Hazard_HazardRegisterService.GetStatesList();
this.drpStates.DataBind();
Funs.FineUIPleaseSelect(this.drpStates);
var getProject = ProjectService.GetProjectByProjectId(ProjectId);
if (getProject != null && getProject.IsAutoFetch == true)
{
APIHazardRegisterSyncService.getHazardRegisterLists(this.ProjectId);
}
// 绑定表格
BindGrid();
}

4
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
View File

@ -24,7 +24,9 @@
<Items>
<f:CheckBox ID="ckbIsFace" runat="server" Label="移动端人脸识别" Text="是否启用" LabelWidth="200">
</f:CheckBox>
<f:Label runat="server"></f:Label>
<f:CheckBox ID="ckbIsAutoFetch" runat="server" Label="自动拉取检查数据" Text="是否启用" LabelWidth="200">
</f:CheckBox>
<%--<f:Label runat="server"></f:Label>--%>
<f:Button runat="server" Text="坐标范围" OnClick="btnSetMap_Click" ID="btnSetMap"></f:Button>
</Items>
</f:FormRow>

7
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs
View File

@ -53,7 +53,8 @@ namespace FineUIPro.Web.common.ProjectSet
var getProject = ProjectService.GetProjectByProjectId(projectId);
if (getProject != null )
{
getProject.IsFace = this.ckbIsFace.Checked;
getProject.IsFace = this.ckbIsFace.Checked;
getProject.IsAutoFetch = this.ckbIsAutoFetch.Checked;
getProject.AQMAccount = this.txtAQMAccount.Text;
getProject.AQMPwd = this.txtAQMPwd.Text;
Funs.DB.SubmitChanges();
@ -302,6 +303,10 @@ namespace FineUIPro.Web.common.ProjectSet
{
this.ckbIsFace.Checked = true;
}
if (getProject != null && getProject.IsAutoFetch == true)
{
this.ckbIsAutoFetch.Checked = true;
}
if (!string.IsNullOrEmpty(getProject.AQMPwd))
{
this.txtAQMPwd.Text = getProject.AQMPwd;

9
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs generated
View File

@ -77,6 +77,15 @@ namespace FineUIPro.Web.common.ProjectSet
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsFace;
/// <summary>
/// ckbIsAutoFetch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsAutoFetch;
/// <summary>
/// btnSetMap 控件。
/// </summary>

9
SGGL/Model/APIItem/HSSE/QCRegistrationItem.cs
View File

@ -159,6 +159,13 @@ namespace Model
get;
set;
}
/// <summary>
/// 颁奖年份
/// </summary>
public DateTime? AwardYear
{
get;
set;
}
}
}

30
SGGL/Model/DataShare/PersonSyncData.cs
View File

@ -8,18 +8,18 @@ namespace Model
/// 公司社会统一信用代码
/// </summary>
public string CollCropCode { get; set; }
/// <summary>
/// 项目id
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 分包单位程序访问地址
/// </summary>
public string UnitDomain { get; set; }
/// <summary>
/// 项目安全隐患数据
/// </summary>
@ -29,9 +29,9 @@ namespace Model
set;
}
}
public class PersonSyncItem
{
public string PersonId { get; set; }
@ -60,7 +60,7 @@ namespace Model
public string CertificateCode { get; set; }
public string CertificateName { get; set; }
public DateTime? CertificateLimitTime { get; set; }
public CertificateItem CertificateItem { get; set; }
public string QualificationCertificateUrl { get; set; }
public string TrainingCertificateUrl { get; set; }
@ -91,6 +91,7 @@ namespace Model
public bool? IsSafetyMonitoring { get; set; }
public string ProvinceCode { get; set; }
public bool? IsCardNoOK { get; set; }
public bool? IsTrain { get; set; }
/// <summary>
/// 内容附件
/// </summary>
@ -118,19 +119,20 @@ namespace Model
public string PostType { get; set; }
public bool? IsHsse { get; set; }
public bool? IsCQMS { get; set; }
public bool? IsCQMSCheck { get; set; }
public string TeamGroupName { get; set; }
public string WorkAreaName { get; set; }
}
public class CertificateItem
{
public class CertificateItem
{
public string PersonQualityId { get; set; }
public string CertificateId { get; set; }
public string CertificateNo { get; set; }
public string CertificateName { get; set; }
public DateTime? CertificateLimitDate { get; set; }
}
}

96
SGGL/Model/Model.cs
View File

@ -27413,6 +27413,8 @@ namespace Model
private string _SubjectUnitWebUrl;
private System.Nullable<bool> _IsAutoFetch;
private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@ -28149,6 +28151,8 @@ namespace Model
partial void OnSubjectUnitApiUrlChanged();
partial void OnSubjectUnitWebUrlChanging(string value);
partial void OnSubjectUnitWebUrlChanged();
partial void OnIsAutoFetchChanging(System.Nullable<bool> value);
partial void OnIsAutoFetchChanged();
#endregion
public Base_Project()
@ -29556,6 +29560,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAutoFetch", DbType="Bit")]
public System.Nullable<bool> IsAutoFetch
{
get
{
return this._IsAutoFetch;
}
set
{
if ((this._IsAutoFetch != value))
{
this.OnIsAutoFetchChanging(value);
this.SendPropertyChanging();
this._IsAutoFetch = value;
this.SendPropertyChanged("IsAutoFetch");
this.OnIsAutoFetchChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
{
@ -48571,6 +48595,8 @@ namespace Model
private System.Nullable<bool> _IsCQMS;
private System.Nullable<bool> _IsCQMSCheck;
private EntitySet<Check_ViolationPerson> _Check_ViolationPerson;
private EntitySet<HSSESystem_HSSEMainDuty> _HSSESystem_HSSEMainDuty;
@ -48613,6 +48639,8 @@ namespace Model
partial void OnTemplateChanged();
partial void OnIsCQMSChanging(System.Nullable<bool> value);
partial void OnIsCQMSChanged();
partial void OnIsCQMSCheckChanging(System.Nullable<bool> value);
partial void OnIsCQMSCheckChanged();
#endregion
public Base_WorkPost()
@ -48810,6 +48838,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCQMSCheck", DbType="Bit")]
public System.Nullable<bool> IsCQMSCheck
{
get
{
return this._IsCQMSCheck;
}
set
{
if ((this._IsCQMSCheck != value))
{
this.OnIsCQMSCheckChanging(value);
this.SendPropertyChanging();
this._IsCQMSCheck = value;
this.SendPropertyChanged("IsCQMSCheck");
this.OnIsCQMSCheckChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ViolationPerson_Base_WorkPost", Storage="_Check_ViolationPerson", ThisKey="WorkPostId", OtherKey="WorkPostId", DeleteRule="NO ACTION")]
public EntitySet<Check_ViolationPerson> Check_ViolationPerson
{
@ -333179,6 +333227,8 @@ namespace Model
private string _AwardType;
private System.Nullable<System.DateTime> _AwardYear;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -333213,6 +333263,8 @@ namespace Model
partial void OnIsUpdateChanged();
partial void OnAwardTypeChanging(string value);
partial void OnAwardTypeChanged();
partial void OnAwardYearChanging(System.Nullable<System.DateTime> value);
partial void OnAwardYearChanged();
#endregion
public QCManage_QCGroupRegistration()
@ -333520,6 +333572,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AwardYear", DbType="DateTime")]
public System.Nullable<System.DateTime> AwardYear
{
get
{
return this._AwardYear;
}
set
{
if ((this._AwardYear != value))
{
this.OnAwardYearChanging(value);
this.SendPropertyChanging();
this._AwardYear = value;
this.SendPropertyChanged("AwardYear");
this.OnAwardYearChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -360113,6 +360185,8 @@ namespace Model
private System.Nullable<bool> _IsSyncWelder;
private System.Nullable<bool> _IsTrain;
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
private EntitySet<Accident_AccidentReportOtherItem> _Accident_AccidentReportOtherItem;
@ -360299,6 +360373,8 @@ namespace Model
partial void OnEmailChanged();
partial void OnIsSyncWelderChanging(System.Nullable<bool> value);
partial void OnIsSyncWelderChanged();
partial void OnIsTrainChanging(System.Nullable<bool> value);
partial void OnIsTrainChanged();
#endregion
public SitePerson_Person()
@ -361645,6 +361721,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsTrain", DbType="Bit")]
public System.Nullable<bool> IsTrain
{
get
{
return this._IsTrain;
}
set
{
if ((this._IsTrain != value))
{
this.OnIsTrainChanging(value);
this.SendPropertyChanging();
this._IsTrain = value;
this.SendPropertyChanged("IsTrain");
this.OnIsTrainChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")]
public EntitySet<Accident_AccidentPersonRecord> Accident_AccidentPersonRecord
{

24
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -5,8 +5,8 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
<History>True|2026-03-26T02:50:47.1719169Z||;True|2026-03-23T17:12:03.2477043+08:00||;True|2026-03-23T17:11:46.0120853+08:00||;True|2026-03-20T19:19:26.8552857+08:00||;True|2026-03-20T16:59:16.0930705+08:00||;True|2026-03-11T19:40:09.7470523+08:00||;True|2026-03-11T17:57:46.6298303+08:00||;True|2026-03-06T12:42:13.4499176+08:00||;True|2026-03-05T15:19:57.4320764+08:00||;True|2026-03-04T19:14:37.2772043+08:00||;True|2026-03-01T17:32:51.9305697+08:00||;True|2026-03-01T16:45:09.4172340+08:00||;True|2026-03-01T14:50:18.5222913+08:00||;True|2026-02-28T17:34:46.4778856+08:00||;True|2026-02-28T15:29:45.4981175+08:00||;True|2026-02-28T15:22:44.8350431+08:00||;True|2026-02-28T15:16:49.0265188+08:00||;True|2026-02-28T15:01:52.0489798+08:00||;True|2026-02-28T14:40:09.1723344+08:00||;True|2026-02-28T09:47:26.7601751+08:00||;True|2026-01-24T15:12:59.9025754+08:00||;True|2026-01-19T14:30:45.4370000+08:00||;True|2025-12-24T19:02:35.3684081+08:00||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;</History>
<_PublishTargetUrl>D:\发布\五环WebApi</_PublishTargetUrl>
<History>True|2026-04-10T06:20:29.9950690Z||;True|2026-04-10T10:33:19.2138091+08:00||;True|2026-03-30T09:20:37.7216012+08:00||;True|2026-03-26T10:50:47.1719169+08:00||;True|2026-03-23T17:12:03.2477043+08:00||;True|2026-03-23T17:11:46.0120853+08:00||;True|2026-03-20T19:19:26.8552857+08:00||;True|2026-03-20T16:59:16.0930705+08:00||;True|2026-03-11T19:40:09.7470523+08:00||;True|2026-03-11T17:57:46.6298303+08:00||;True|2026-03-06T12:42:13.4499176+08:00||;True|2026-03-05T15:19:57.4320764+08:00||;True|2026-03-04T19:14:37.2772043+08:00||;True|2026-03-01T17:32:51.9305697+08:00||;True|2026-03-01T16:45:09.4172340+08:00||;True|2026-03-01T14:50:18.5222913+08:00||;True|2026-02-28T17:34:46.4778856+08:00||;True|2026-02-28T15:29:45.4981175+08:00||;True|2026-02-28T15:22:44.8350431+08:00||;True|2026-02-28T15:16:49.0265188+08:00||;True|2026-02-28T15:01:52.0489798+08:00||;True|2026-02-28T14:40:09.1723344+08:00||;True|2026-02-28T09:47:26.7601751+08:00||;True|2026-01-24T15:12:59.9025754+08:00||;True|2026-01-19T14:30:45.4370000+08:00||;True|2025-12-24T19:02:35.3684081+08:00||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>03/26/2026 10:50:46</publishTime>
<publishTime>04/10/2026 14:20:27</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>03/26/2026 10:50:46</publishTime>
<publishTime>04/10/2026 14:20:27</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>03/26/2026 10:50:24</publishTime>
<publishTime>04/10/2026 14:20:16</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>03/26/2026 10:50:24</publishTime>
<publishTime>04/10/2026 14:20:16</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@ -128,10 +128,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>03/26/2026 10:50:18</publishTime>
<publishTime>04/10/2026 14:20:11</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>03/26/2026 10:50:18</publishTime>
<publishTime>04/10/2026 14:20:11</publishTime>
</File>
<File Include="bin/netstandard.dll">
<publishTime>03/16/2026 20:22:47</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>03/26/2026 10:50:25</publishTime>
<publishTime>04/10/2026 14:20:17</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>03/26/2026 10:50:25</publishTime>
<publishTime>04/10/2026 14:20:17</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>03/26/2026 10:50:25</publishTime>
<publishTime>04/10/2026 14:20:17</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>03/26/2026 10:50:26</publishTime>
<publishTime>04/10/2026 14:20:18</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime>

4
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@ -9,7 +9,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>D:\project\vs\47\CNCEC_SUBQHSE_WUHUAN\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>G:\公司项目\五环\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>1440</WebStackScaffolding_ControllerDialogWidth>