zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230229

This commit is contained in:
李超 2023-08-29 18:56:49 +08:00
parent 6b420b5bd8
commit 6c19bf6a3e
56 changed files with 2342 additions and 2166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DataBase/版本日志/SGGLDB_CD_V2023-07-27-001.sql Normal file
View File

@ -0,0 +1,5 @@
Alter TABLE [dbo].[Training_TaskItem]add
[StartTime] [datetime] NULL,
[EndTime] [datetime] NULL,
[LearnTime] [int] NULL

38
SGGL/BLL/API/APIPersonService.cs
View File

@ -589,7 +589,7 @@ namespace BLL
}
List<string> unitIdList = Funs.GetStrListByStr(unitIds, ',');
var getPersons = from x in db.View_SitePerson_Person
var getPersons = (from x in db.View_SitePerson_Person
where x.ProjectId == projectId && unitIdList.Contains(x.UnitId) && x.IsUsed == 1 &&(string.IsNullOrEmpty(strParam)||x.PersonName.Contains(strParam)) && (string.IsNullOrEmpty(InTime) || x.InTime < inDateTime)
&& x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime >= DateTime.Now)
select new Model.PersonItem
@ -616,16 +616,20 @@ namespace BLL
Telephone = x.Telephone,
PhotoUrl = x.PhotoUrl,
DepartName = x.DepartName,
};
}).ToList();
if (!string.IsNullOrEmpty(workPostIds))
{
List<string> workPostIdList = Funs.GetStrListByStr(workPostIds, ',');
getPersons = getPersons.Where(x => workPostIdList.Contains(x.WorkPostId));
getPersons = getPersons.Where(x => workPostIdList.Contains(x.WorkPostId)).ToList();
}
if (!string.IsNullOrEmpty(trainTypeId) &&trainTypeId == Const.SpecialSafeTrainId)//专项安全培训
{
var ids = db.Base_WorkPost.Where(x => x.PostType == "2").Select(x => x.WorkPostId).ToList();
getPersons = getPersons.Where(x => ids.Contains(x.DepartId));
getPersons = getPersons.Where(x => ids.Contains(x.DepartId)).ToList();
}
List<Model.PersonItem> getTrainPersonList = new List<Model.PersonItem>();
var getTrainType = TrainTypeService.GetTrainTypeById(trainTypeId);
@ -651,6 +655,32 @@ namespace BLL
}
return getTrainPersonList;
}
else if (getTrainType != null && getTrainType.IsRepeat.HasValue && getTrainType.IsRepeat == true)//重复的 过滤人员
{
foreach (var item in getPersons)
{
int score = 80;
var sysTestRule = db.Sys_TestRule.FirstOrDefault();
if (sysTestRule != null)
{
if (sysTestRule.PassingScore > 0)
{
score = sysTestRule.PassingScore;
}
}
var getTrainPersonIdList2 = (from x in db.Training_TestRecord
join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId
where x.TestScores > score
select x).FirstOrDefault();
if (getTrainPersonIdList2 != null)
{
continue;
}
getTrainPersonList.Add(item);
}
return getTrainPersonList;
}
else
{
return getPersons.ToList();

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

@ -107,7 +107,7 @@ namespace BLL
isUpdate.HandleIdea = newHazardRegister.HandleIdea;
isUpdate.SafeSupervisionIsOK = newHazardRegister.SafeSupervisionIsOK;
}
isUpdate.RectificationPeriod = newHazardRegister.RectificationPeriod;
isUpdate.States = newHazardRegister.States;
isUpdate.Risk_Level = newHazardRegister.Risk_Level;
}

39
SGGL/BLL/API/HSSE/APITrainingTaskService.cs
View File

@ -248,5 +248,44 @@ namespace BLL
}
}
#endregion
#region 根据TrainingPlanId获取培训任务教材明细列表
/// <summary>
/// 根据TrainingPlanId获取培训任务教材明细列表
/// </summary>
/// <param name="trainingPlanId"></param>
/// <returns>培训计划人员</returns>
public static Model.Training_TaskItem updateTaskItemLearnTime(string taskItemId,DateTime startTime,DateTime endTime)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = from x in db.Training_TaskItem
where x.TaskItemId == taskItemId
select x;
var item = q.FirstOrDefault();
if (!item.StartTime.HasValue)
{
item.StartTime = startTime;
}
if (!item.LearnTime.HasValue)
{
item.LearnTime = 0;
}
var span = endTime.Subtract(startTime);
item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes;
item.EndTime = endTime;
db.SubmitChanges();
return item;
}
}
#endregion
}
}

2
SGGL/BLL/Common/Funs.cs
View File

@ -122,7 +122,7 @@ namespace BLL
{
get;
set;
} = 15;
} = 20;
private static object locker = new object();
/// <summary>
/// 数据库上下文。

2
SGGL/BLL/OpenService/MonitorService.cs
View File

@ -2170,7 +2170,7 @@ namespace BLL
/// </summary>
public static void DoSynchData()
{
GetDataService.CreateTrainingTaskItemByTaskId(null);
//GetDataService.CreateTrainingTaskItemByTaskId(null);
GetDataService.UpdateTestPlanStates();
GetDataService.CreateQRCode();
ServerTestPlanService.EndTestPlan(null);

3
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
View File

@ -806,9 +806,6 @@ namespace FineUIPro.Web.CQMS.WBS
/// </summary>
private void BindGrid()
{
WBS_BreakdownProject d=null;
d.SortIndex = 0;
string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL,SortIndex"
+ @" FROM WBS_BreakdownProject ";

4
SGGL/FineUIPro.Web/Controls/ShowQRImage.aspx.cs
View File

@ -36,7 +36,7 @@ namespace FineUIPro.Web.Controls
string filePath = this.FileUrl + urlName + ".jpg";
if (!File.Exists(Funs.RootPath + filePath))
{
this.CreateCode_Simple(Request.Params["strValue"], urlName);
this.CreateCode_Simple(System.Web.HttpUtility.UrlDecode(Request.Params["strValue"]), urlName);
}
this.divBeImageUrl.InnerHtml = UploadAttachmentService.ShowImage("../", filePath, 280, 280);
@ -54,7 +54,7 @@ namespace FineUIPro.Web.Controls
QRCodeEncoder qrCodeEncoder = new QRCodeEncoder
{
QRCodeEncodeMode = QRCodeEncoder.ENCODE_MODE.BYTE,
QRCodeScale = nr.Length,
QRCodeScale = nr.Length>30?30:nr.Length,
QRCodeVersion = 0,
QRCodeErrorCorrect = QRCodeEncoder.ERROR_CORRECTION.M
};

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls
View File

Binary file not shown.

4
SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs
View File

@ -647,7 +647,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("CH_TrustID", reportId);
keyValuePairs.Add("totalUnit", "中国天辰工程有限公司");
keyValuePairs.Add("totalUnit", "中国成达工程有限公司");
var unitcheck = Funs.DB.Project_ProjectUnit.FirstOrDefault(x => x.ProjectId == trust.ProjectId && x.UnitType == Const.ProjectUnitType_3);
if (unitcheck != null && !string.IsNullOrEmpty(unitcheck.UnitId))
{ keyValuePairs.Add("supUnit", BLL.UnitService.GetUnitNameByUnitId(unitcheck.UnitId).ToString());
@ -1083,7 +1083,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("CH_TrustID", reportId);
keyValuePairs.Add("totalUnit", "中国天辰工程有限公司");
keyValuePairs.Add("totalUnit", "中国成达工程有限公司");
var unitcheck = Funs.DB.Project_ProjectUnit.FirstOrDefault(x => x.ProjectId == trust.ProjectId && x.UnitType == Const.ProjectUnitType_3);
if (unitcheck != null && !string.IsNullOrEmpty(unitcheck.UnitId))
{

5
SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx
View File

@ -25,7 +25,6 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@ -38,9 +37,9 @@
<f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" AutoComplete="true" OnSelectedIndexChanged="BtnAnalyse_Click" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtIsoNo" runat="server" Label="管线号" LabelWidth="80px"></f:TextBox>
<f:TextBox ID="txtIsoNo" runat="server" Label="管线号" LabelWidth="80px" AutoPostBack="true" OnTextChanged="BtnAnalyse_Click"></f:TextBox>
<f:Label ID="Label1" runat="server"></f:Label>
</Items>
</f:FormRow>

5
SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.cs
View File

@ -47,6 +47,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
}
Funs.FineUIPleaseSelect(this.drpWorkArea);
}
BindGrid();
}
}
#endregion
@ -104,6 +105,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
OutputSummaryData();
}
/// <summary>
@ -190,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
OutputSummaryData();
}
#endregion
@ -287,6 +289,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
BLL.WorkAreaService.InitWorkAreaProjectUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);
this.drpWorkArea.SelectedIndex = 0;
}
BindGrid();
}
#endregion
}

15
SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport {
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class DetectionAnalyze {
public partial class DetectionAnalyze
{
/// <summary>
/// form1 控件。
@ -66,15 +68,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>

7
SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx
View File

@ -19,7 +19,6 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@ -32,10 +31,10 @@
<%-- <f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>--%>
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtIsoNo" runat="server" Label="管线号" LabelWidth="80px"></f:TextBox>
<f:CheckBoxList ID="cb_IsStandard" Label="是否非标" runat="server" >
<f:TextBox ID="txtIsoNo" runat="server" Label="管线号" LabelWidth="80px" AutoPostBack="true" OnTextChanged="BtnAnalyse_Click"></f:TextBox>
<f:CheckBoxList ID="cb_IsStandard" Label="是否非标" runat="server" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click" >
<f:CheckItem Text="否" Value="0" Selected="true"/>
<f:CheckItem Text="是" Value="1" />
</f:CheckBoxList>

2
SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs
View File

@ -43,6 +43,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
BLL.WorkAreaService.InitWorkAreaByProjectId(this.drpWorkArea, this.CurrUser.LoginProjectId, true);
}
}
BindGrid();
}
}
#endregion

9
SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.designer.cs generated
View File

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

7
SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx
View File

@ -38,7 +38,6 @@ color: #fff;
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnPrint" runat="server" Icon="TableGo" EnablePostBack="true" Text="导出" OnClick="btnOut_Click" DisableControlBeforePostBack="true"></f:Button>
</Items>
@ -50,10 +49,10 @@ color: #fff;
<%-- <f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>--%>
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
<f:DropDownList ID="drpWorkArea" runat="server" OnSelectedIndexChanged="BtnAnalyse_Click" AutoPostBack="true" LabelWidth="80px" Label="施工区域" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtJointDesc" runat="server" Label="焊口规格" LabelWidth="80px"></f:TextBox>
<f:TextBox ID="txtIsoNo" runat="server" Label="管线号" LabelWidth="80px"></f:TextBox>
<f:TextBox ID="txtJointDesc" runat="server" Label="焊口规格" LabelWidth="80px" OnTextChanged="BtnAnalyse_Click" AutoPostBack="true"></f:TextBox>
<f:TextBox ID="txtIsoNo" AutoPostBack="true" OnTextChanged="BtnAnalyse_Click" runat="server" Label="管线号" LabelWidth="80px"></f:TextBox>
<f:Label ID="Label1" runat="server"></f:Label>
</Items>
</f:FormRow>

1
SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs
View File

@ -53,6 +53,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
BLL.WorkAreaService.InitWorkAreaByProjectId(this.drpWorkArea, this.CurrUser.LoginProjectId, true);
}
}
BindGrid();
}
}
#endregion

9
SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.designer.cs generated
View File

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

6
SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx
View File

@ -25,7 +25,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@ -38,9 +38,9 @@
<f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click">
</f:DropDownList>
<f:DropDownList ID="ddlService" runat="server" LabelWidth="80px" Label="介质" EnableEdit="true">
<f:DropDownList ID="ddlService" runat="server" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click" Label="介质" EnableEdit="true">
</f:DropDownList>
<f:Label ID="Label1" runat="server"></f:Label>
</Items>

5
SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs
View File

@ -48,6 +48,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
Funs.FineUIPleaseSelect(this.drpWorkArea);
}
BLL.Base_TestMediumService.InitMediumDropDownList(this.ddlService, true);//介质
BindGrid();
}
}
#endregion
@ -105,6 +106,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
OutputSummaryData();
}
/// <summary>
@ -248,7 +250,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
OutputSummaryData();
}
#endregion
@ -345,6 +347,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
BLL.WorkAreaService.InitWorkAreaProjectUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);
this.drpWorkArea.SelectedIndex = 0;
}
BindGrid();
}
#endregion
}

15
SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport {
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class MediaComprehensive {
public partial class MediaComprehensive
{
/// <summary>
/// form1 控件。
@ -66,15 +68,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>

5
SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayReport.aspx
View File

@ -28,7 +28,6 @@
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@ -39,9 +38,9 @@
<Rows>
<f:FormRow>
<Items >
<f:DropDownList ID="drpUnit" Width="200px" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
<f:DropDownList ID="drpUnit" Width="200px" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click">
</f:DropDownList>
<f:DatePicker ID="dpDate" runat="server" Label="日期" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" AutoPostBack="true" OnTextChanged="drpUnit_SelectedIndexChanged"></f:DatePicker>
<f:DatePicker ID="dpDate" runat="server" Label="日期" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" AutoPostBack="true" OnTextChanged="BtnAnalyse_Click"></f:DatePicker>
<f:Label runat="server" Hidden="true"></f:Label>

3
SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayReport.aspx.cs
View File

@ -55,6 +55,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
this.GetShowColumn(c.Columns);
}
BindGrid();
}
}
#endregion
@ -514,7 +515,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
/// < param name="e"></param>
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
BindGrid();
}

9
SGGL/FineUIPro.Web/HJGL/WeldingReport/OneDayReport.aspx.designer.cs generated
View File

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

6
SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx
View File

@ -25,7 +25,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@ -38,9 +38,9 @@
<f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click">
</f:DropDownList>
<f:DropDownList ID="drpMaterialId" runat="server" LabelWidth="80px" Label="材质" EnableEdit="true">
<f:DropDownList ID="drpMaterialId" runat="server" LabelWidth="80px" Label="材质" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click">
</f:DropDownList>
<f:Label ID="Label1" runat="server"></f:Label>
</Items>

5
SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs
View File

@ -47,6 +47,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
Funs.FineUIPleaseSelect(this.drpWorkArea);
}
BLL.Base_MaterialService.InitMaterialDropDownList(this.drpMaterialId, true, this.CurrUser.LoginProjectId);//材质
BindGrid();
}
}
#endregion
@ -104,6 +105,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
OutputSummaryData();
}
/// <summary>
@ -190,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
OutputSummaryData();
}
#endregion
@ -287,6 +289,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
BLL.WorkAreaService.InitWorkAreaProjectUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);
this.drpWorkArea.SelectedIndex = 0;
}
BindGrid();
}
#endregion
}

15
SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport {
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class PrefabricatedInstall {
public partial class PrefabricatedInstall
{
/// <summary>
/// form1 控件。
@ -66,15 +68,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>

3
SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx
View File

@ -25,7 +25,6 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@ -38,7 +37,7 @@
<f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click">
</f:DropDownList>
<f:Label ID="Label1" runat="server"></f:Label>
<f:Label ID="Label2" runat="server"></f:Label>

5
SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs
View File

@ -47,6 +47,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
}
Funs.FineUIPleaseSelect(this.drpWorkArea);
}
BindGrid();
}
}
#endregion
@ -88,6 +89,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
OutputSummaryData();
}
/// <summary>
@ -165,7 +167,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
OutputSummaryData();
}
#endregion
@ -262,6 +264,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
BLL.WorkAreaService.InitWorkAreaProjectUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);
this.drpWorkArea.SelectedIndex = 0;
}
BindGrid();
}
#endregion
}

15
SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport {
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class TrustCheck {
public partial class TrustCheck
{
/// <summary>
/// form1 控件。
@ -66,15 +68,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>

12
SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkAreaQuality.aspx
View File

@ -28,7 +28,7 @@
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@ -47,17 +47,17 @@
<f:DropDownList ID="drpInstallation" runat="server" LabelWidth="80px" Label="装置" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpInstallation_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
<f:DropDownList ID="drpWorkArea" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpSteType" runat="server" LabelWidth="80px" Label="钢材类型" EnableEdit="true">
<f:DropDownList ID="drpSteType" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click" runat="server" LabelWidth="80px" Label="钢材类型" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" Label="开始日期" ID="txtStarTime" LabelWidth="80px"></f:DatePicker>
<f:DatePicker runat="server" Label="结束日期" ID="txtEndTime" LabelWidth="80px"></f:DatePicker>
<f:CheckBoxList ID="cb_IsStandard" Label="是否非标" runat="server" >
<f:DatePicker runat="server" AutoPostBack="true" OnTextChanged="BtnAnalyse_Click" Label="开始日期" ID="txtStarTime" LabelWidth="80px"></f:DatePicker>
<f:DatePicker runat="server" AutoPostBack="true" OnTextChanged="BtnAnalyse_Click" Label="结束日期" ID="txtEndTime" LabelWidth="80px"></f:DatePicker>
<f:CheckBoxList ID="cb_IsStandard" Label="是否非标" runat="server" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click">
<f:CheckItem Text="否" Value="0" Selected="true"/>
<f:CheckItem Text="是" Value="1" />
</f:CheckBoxList>

7
SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkAreaQuality.aspx.cs
View File

@ -64,6 +64,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
this.GetShowColumn(c.Columns);
}
BindGrid();
}
}
#endregion
@ -154,6 +156,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
OutputSummaryData();
}
/// <summary>
@ -342,7 +346,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
OutputSummaryData();
}
#endregion
@ -442,6 +445,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
Funs.FineUIPleaseSelect(this.drpWorkArea);
this.drpWorkArea.SelectedValue = BLL.Const._Null;
BindGrid();
}
/// <summary>
@ -454,6 +458,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
this.drpWorkArea.Items.Clear();
WorkAreaService.InitWorkAreaProjectInstallUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.drpInstallation.SelectedValue, this.drpUnit.SelectedValue, true);
this.drpWorkArea.SelectedValue = BLL.Const._Null;
BindGrid();
}
#endregion
}

9
SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkAreaQuality.aspx.designer.cs generated
View File

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

12
SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkareaAnalyze.aspx
View File

@ -28,7 +28,7 @@
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@ -47,17 +47,17 @@
<f:DropDownList ID="drpInstallation" runat="server" LabelWidth="80px" Label="装置" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpInstallation_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
<f:DropDownList ID="drpWorkArea" runat="server" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click" LabelWidth="80px" Label="施工区域" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpSteType" runat="server" LabelWidth="80px" Label="钢材类型" EnableEdit="true">
<f:DropDownList ID="drpSteType" OnSelectedIndexChanged="BtnAnalyse_Click" AutoPostBack="true" runat="server" LabelWidth="80px" Label="钢材类型" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" Label="开始日期" ID="txtStarTime" LabelWidth="80px"></f:DatePicker>
<f:DatePicker runat="server" Label="结束日期" ID="txtEndTime" LabelWidth="80px"></f:DatePicker>
<f:CheckBoxList ID="cb_IsStandard" Label="是否非标" runat="server" >
<f:DatePicker runat="server" AutoPostBack="true" OnTextChanged = "BtnAnalyse_Click" Label="开始日期" ID="txtStarTime" LabelWidth="80px"></f:DatePicker>
<f:DatePicker runat="server" AutoPostBack="true" OnTextChanged = "BtnAnalyse_Click" Label="结束日期" ID="txtEndTime" LabelWidth="80px"></f:DatePicker>
<f:CheckBoxList ID="cb_IsStandard" Label="是否非标" runat="server" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click">
<f:CheckItem Text="否" Value="0" Selected="true"/>
<f:CheckItem Text="是" Value="1" />
</f:CheckBoxList>

6
SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkareaAnalyze.aspx.cs
View File

@ -68,6 +68,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
this.GetShowColumn(c.Columns);
}
BindGrid();
}
}
@ -155,6 +156,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
OutputSummaryData();
}
/// <summary>
@ -335,7 +337,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
OutputSummaryData();
}
#endregion
@ -434,6 +436,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
Funs.FineUIPleaseSelect(this.drpWorkArea);
this.drpWorkArea.SelectedValue = BLL.Const._Null;
BindGrid();
}
/// <summary>
@ -446,6 +449,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
this.drpWorkArea.Items.Clear();
WorkAreaService.InitWorkAreaProjectInstallUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.drpInstallation.SelectedValue, this.drpUnit.SelectedValue, true);
this.drpWorkArea.SelectedValue = BLL.Const._Null;
BindGrid();
}
#endregion
}

9
SGGL/FineUIPro.Web/HJGL/WeldingReport/UnitWorkareaAnalyze.aspx.designer.cs generated
View File

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

12
SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx
View File

@ -25,7 +25,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="BtnOut" OnClick="BtnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@ -35,18 +35,18 @@
<Rows>
<f:FormRow>
<Items>
<f:DatePicker runat="server" Label="开始日期" ID="txtStarTime" LabelWidth="80px"></f:DatePicker>
<f:DatePicker runat="server" Label="结束日期" ID="txtEndTime" LabelWidth="80px"></f:DatePicker>
<f:DatePicker runat="server" Label="开始日期" ID="txtStarTime" AutoPostBack="true" OnTextChanged="BtnAnalyse_Click" LabelWidth="80px"></f:DatePicker>
<f:DatePicker runat="server" Label="结束日期" ID="txtEndTime" AutoPostBack="true" OnTextChanged="BtnAnalyse_Click" LabelWidth="80px"></f:DatePicker>
<f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="单位名称" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true">
<f:DropDownList ID="drpWorkArea" runat="server" LabelWidth="80px" Label="施工区域" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="BtnAnalyse_Click">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox ID="drpSteType" runat="server" Label="母材类别" DataControlID="cbSteType" EnableMultiSelect="true" >
<f:DropDownBox ID="drpSteType" runat="server" Label="母材类别" DataControlID="cbSteType" EnableMultiSelect="true" AutoPostBack="true" OnTextChanged="BtnAnalyse_Click" >
<PopPanel>
<f:SimpleForm ID="SimpleForm3" BodyPadding="10px" runat="server" AutoScroll="true"
ShowBorder="true" ShowHeader="false" Hidden="true">
@ -59,7 +59,7 @@
</f:DropDownBox>
<f:DropDownList ID="drpTeamGroup" runat="server" LabelWidth="80px" Label="班组" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpTeamGroup_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="ddlWloName" runat="server" LabelWidth="80px" Label="焊工" EnableEdit="true">
<f:DropDownList ID="ddlWloName" runat="server" LabelWidth="80px" Label="焊工" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged ="BtnAnalyse_Click" >
</f:DropDownList>
<f:Label ID="Label1" runat="server"></f:Label>
</Items>

7
SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs
View File

@ -52,6 +52,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
Funs.FineUIPleaseSelect(this.ddlWloName);
}
Funs.FineUIPleaseSelect(this.drpTeamGroup);
BindGrid();
}
}
#endregion
@ -154,6 +156,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
OutputSummaryData();
}
/// <summary>
@ -260,7 +263,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
OutputSummaryData();
}
#endregion
@ -360,6 +363,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
BLL.TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);
this.drpTeamGroup.SelectedIndex = 0;
}
BindGrid();
}
/// <summary>
@ -375,6 +379,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
BLL.WelderService.InitWelderListByTeamGroupId(this.ddlWloName, this.CurrUser.LoginProjectId, this.drpTeamGroup.SelectedValue, true, "-请选择-");
this.ddlWloName.SelectedIndex = 0;
}
BindGrid();
}
#endregion
}

9
SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs generated
View File

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

10
SGGL/FineUIPro.Web/HSSE/EduTrain/Task.aspx.cs
View File

@ -39,11 +39,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT Task.TaskId,Task.PlanId,Task.UserId,Task.TaskDate,(CASE Task.States WHEN '0' THEN '未响应' WHEN '1' THEN '已响应' WHEN '2' THEN '已完成' ELSE '' END) AS States,Plans.PlanName,Person.PersonName"
+ @" FROM dbo.Training_Task AS Task "
+ @" LEFT JOIN dbo.Training_Plan AS Plans ON Plans.PlanId=Task.PlanId"
+ @" LEFT JOIN dbo.SitePerson_Person AS Person ON Person.PersonId = Task.UserId "
+ @" WHERE Task.ProjectId='" + this.CurrUser.LoginProjectId + "'";
string strSql = @"SELECT Task.TaskId,Task.PlanId,Task.UserId,Task.TaskDate,(CASE Task.States WHEN '0' THEN '未响应' WHEN '1' THEN '已响应' WHEN '2' THEN '已完成' ELSE '' END) AS States,Plans.PlanName,Person.PersonName
FROM dbo.Training_Task AS Task
LEFT JOIN dbo.Training_Plan AS Plans ON Plans.PlanId=Task.PlanId
LEFT JOIN dbo.SitePerson_Person AS Person ON Person.PersonId = Task.UserId
WHERE Task.ProjectId='" + this.CurrUser.LoginProjectId + "'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
{

43
SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.cs
View File

@ -96,39 +96,16 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// </summary>
private void BindGrid()
{
var task = BLL.TrainingTaskService.GetTaskById(this.TaskId);
if (task != null)
{
string strSql = @"SELECT PlanItem.PlanItemId,PlanItem.PlanId,PlanItem.TrainingEduId,Training.TrainingCode,Training.TrainingId,Training.TrainingName
,TrainingItem.TrainingItemId,TrainingItem.TrainingItemCode,TrainingItem.TrainingItemName
FROM Training_PlanItem AS PlanItem
LEFT JOIN Training_TrainingItem AS TrainingItem ON PlanItem.TrainingEduItemId =TrainingItem.TrainingItemId
LEFT JOIN Training_Training AS Training ON TrainingItem.TrainingId =Training.TrainingId
WHERE PlanItem.TrainingEduItemId is not null and PlanItem.PlanId=@PlanId
union all
SELECT PlanItem.PlanItemId,PlanItem.PlanId,PlanItem.TrainingEduId,Training.CompanyTrainingCode,Training.CompanyTrainingId,Training.CompanyTrainingName
,TrainingItem.CompanyTrainingItemId,TrainingItem.CompanyTrainingItemCode,TrainingItem.CompanyTrainingItemName
FROM Training_PlanItem AS PlanItem
LEFT JOIN Training_CompanyTrainingItem AS TrainingItem ON PlanItem.CompanyTrainingId =TrainingItem.CompanyTrainingId
LEFT JOIN Training_CompanyTraining AS Training ON TrainingItem.CompanyTrainingId =Training.CompanyTrainingId
WHERE PlanItem.CompanyTrainingId is not null and PlanItem.PlanId=@PlanId";
string strSql = @"select TrainingItemId,d.TrainingCode,c.TrainingId,d.TrainingName, b.[TrainingItemCode],b.[TrainingItemName],b.[AttachUrl], c.TrainingItemCode,c.TrainingItemName from
[dbo].[Training_Task] a
left join [dbo].[Training_TaskItem] b on a.[TaskId]=b.[TaskId]
left join Training_TrainingItem c on b.TrainingItemCode=c.TrainingItemCode
LEFT JOIN Training_Training AS d ON c.TrainingId =d.TrainingId
where b.[TaskId] = @TaskId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@PlanId", task.PlanId));
//var user = BLL.UserService.GetUserByUserId(task.UserId);
//if (user != null && !string.IsNullOrEmpty(user.InstallationId))
//{
// List<string> installs = Funs.GetStrListByStr(user.InstallationId, ',');
// if (installs.Count > 0)
// {
// int i = 0;
// foreach (var item in installs)
// {
// strSql += " AND (TrainingEduItem.InstallationIds LIKE @InstallationId" + i.ToString() + " OR TrainingEduItem.InstallationIds IS NULL)";
// listStr.Add(new SqlParameter("@InstallationId" + i.ToString(), item));
// i++;
// }
// }
//}
listStr.Add(new SqlParameter("@TaskId", this.TaskId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@ -136,7 +113,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
}
#endregion

7
SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx
View File

@ -87,7 +87,7 @@
grid: {
left: '3%',
right: '4%',
bottom: '10%',
bottom: '15%',
containLabel: true
},
xAxis: [
@ -104,7 +104,7 @@
],
series: series
};
debugger;
if (xAxis.length > 5) {
option.dataZoom = [{
type: 'slider',
@ -114,7 +114,7 @@
height: '10',
backgroundColor: '#aed0ea',
fillerColor: '#107f8b',
bottom: '0%',
bottom: '10%',
zoomLock: true,
moveOnMouseWheel: true,
brushSelect: true,
@ -128,5 +128,6 @@
rendChart(<%=legend%>,<%=xAxis%>,<%=series%>)
</script>
</html>

2
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
View File

@ -739,7 +739,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
var unit = Funs.DB.Base_Unit.FirstOrDefault(x=>x.UnitId==unitId);
var pu = Funs.DB.Project_ProjectUnit.FirstOrDefault(x => x.UnitId == unitId && x.ProjectId == projectId);
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/ShowQRImage.aspx?strValue={0}&urlName={1}&title={2}", System.Web.HttpUtility.UrlEncode("https://sgglapi.chengda.com/Home/PersonInfo#/pages/add_personnel/add_personnel?id=" + pu.ProjectUnitId), System.Web.HttpUtility.UrlEncode(unit.UnitName), System.Web.HttpUtility.UrlEncode(unit.UnitName), "查看 - "), "二维码查看", 360, 420));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/ShowQRImage.aspx?strValue={0}&urlName={1}&title={2}", System.Web.HttpUtility.UrlEncode("https://sgglapi.chengda.com/Home/P#/?id" + pu.ProjectUnitId), pu.ProjectUnitId, System.Web.HttpUtility.UrlEncode(unit.UnitName), "查看 - "), "二维码查看", 360, 420));
}
else

14
SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx
View File

@ -87,6 +87,20 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths=" 30.33% 5% 33.33%">
<Items>
<f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" Height="30px"
Label="签名" LabelWidth="90px">
</f:Image>
<f:Label Text="(360*150)" runat="server"/>
<f:FileUpload runat="server" ID="fileSignature" EmptyText="请选择"
OnFileSelected="btnSignature_Click" AutoPostBack="true" Width="150px" LabelWidth="90px">
</f:FileUpload>
</Items>
</f:FormRow>
</rows>
<toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

45
SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.cs
View File

@ -20,7 +20,20 @@ namespace FineUIPro.Web.ProjectData
ViewState["ProjectUserId"] = value;
}
}
/// <summary>
/// 签名附件路径
/// </summary>
public string SignatureUrl
{
get
{
return (string)ViewState["SignatureUrl"];
}
set
{
ViewState["SignatureUrl"] = value;
}
}
/// <summary>
/// 加载页面
/// </summary>
@ -60,6 +73,11 @@ namespace FineUIPro.Web.ProjectData
{
this.lbUserCode.Text = User.Account;
this.lbUserName.Text = User.UserName;
}
if (!string.IsNullOrEmpty(User.SignatureUrl))
{
this.SignatureUrl = User.SignatureUrl;
this.Image2.ImageUrl = "~/" + this.SignatureUrl;
}
if (!string.IsNullOrEmpty(projectUser.WorkAreaId))
{
@ -181,6 +199,9 @@ namespace FineUIPro.Web.ProjectData
{
user.ProjectWorkPostId = this.drpWorkPost.SelectedValue;
}
user.SignatureUrl = this.SignatureUrl;
BLL.UserService.UpdateUser(user);
}
BLL.LogService.AddSys_Log(this.CurrUser, this.lbUserCode.Text, newProjectUser.UserId, BLL.Const.ProjectUserMenuId, BLL.Const.BtnModify);
@ -189,7 +210,27 @@ namespace FineUIPro.Web.ProjectData
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
#region 上传签名
/// <summary>
/// 上传签名
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSignature_Click(object sender, EventArgs e)
{
if (fileSignature.HasFile)
{
string fileName = fileSignature.ShortFileName;
if (!ValidateFileType(fileName))
{
ShowNotify("无效的文件类型！", MessageBoxIcon.Warning);
return;
}
this.SignatureUrl = UploadFileService.UploadAttachment(Funs.RootPath, this.fileSignature, this.SignatureUrl, UploadFileService.UserFilePath);
this.Image2.ImageUrl = "~/" + this.SignatureUrl;
}
}
#endregion
/// <summary>
/// 更新用户的项目岗位
/// </summary>

18
SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.designer.cs generated
View File

@ -158,6 +158,24 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.DropDownList drpSystem;
/// <summary>
/// Image2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image2;
/// <summary>
/// fileSignature 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload fileSignature;
/// <summary>
/// Toolbar1 控件。
/// </summary>

2
SGGL/FineUIPro.Web/common/PageBase.cs
View File

@ -483,7 +483,7 @@ namespace FineUIPro.Web
protected DataTable GetPagedDataTable(FineUIPro.Grid Grid1, DataTable tb)
{
int pageIndex = Grid1.PageIndex;
int pageSize = Grid1.PageSize;
int pageSize = Funs.PageSize;// Grid1.PageSize;
string sortField = Grid1.SortField;
string sortDirection = Grid1.SortDirection;

18
SGGL/Model/APIItem/HSSE/TrainingTaskItemItem.cs
View File

@ -87,5 +87,23 @@ namespace Model
get;
set;
}
public DateTime? StartTime
{
get;
set;
}
public int LearnTime
{
get;
set;
}
public DateTime? EndTime
{
get;
set;
}
}
}

72
SGGL/Model/Model.cs
View File

@ -365560,6 +365560,12 @@ namespace Model
private string _AttachUrl;
private System.Nullable<System.DateTime> _StartTime;
private System.Nullable<System.DateTime> _EndTime;
private System.Nullable<int> _LearnTime;
private EntityRef<Training_Plan> _Training_Plan;
private EntityRef<Training_Task> _Training_Task;
@ -365582,6 +365588,12 @@ namespace Model
partial void OnTrainingItemNameChanged();
partial void OnAttachUrlChanging(string value);
partial void OnAttachUrlChanged();
partial void OnStartTimeChanging(System.Nullable<System.DateTime> value);
partial void OnStartTimeChanged();
partial void OnEndTimeChanging(System.Nullable<System.DateTime> value);
partial void OnEndTimeChanged();
partial void OnLearnTimeChanging(System.Nullable<int> value);
partial void OnLearnTimeChanged();
#endregion
public Training_TaskItem()
@ -365739,6 +365751,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StartTime", DbType="DateTime")]
public System.Nullable<System.DateTime> StartTime
{
get
{
return this._StartTime;
}
set
{
if ((this._StartTime != value))
{
this.OnStartTimeChanging(value);
this.SendPropertyChanging();
this._StartTime = value;
this.SendPropertyChanged("StartTime");
this.OnStartTimeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EndTime", DbType="DateTime")]
public System.Nullable<System.DateTime> EndTime
{
get
{
return this._EndTime;
}
set
{
if ((this._EndTime != value))
{
this.OnEndTimeChanging(value);
this.SendPropertyChanging();
this._EndTime = value;
this.SendPropertyChanged("EndTime");
this.OnEndTimeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LearnTime", DbType="Int")]
public System.Nullable<int> LearnTime
{
get
{
return this._LearnTime;
}
set
{
if ((this._LearnTime != value))
{
this.OnLearnTimeChanging(value);
this.SendPropertyChanging();
this._LearnTime = value;
this.SendPropertyChanged("LearnTime");
this.OnLearnTimeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TaskItem_Training_Plan", Storage="_Training_Plan", ThisKey="PlanId", OtherKey="PlanId", IsForeignKey=true)]
public Training_Plan Training_Plan
{

17
SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs
View File

@ -127,5 +127,22 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
[HttpGet]
public Model.ResponeData updateTaskItemLearnTime(string taskItemId, DateTime startTime, DateTime endTime)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = APITrainingTaskService.updateTaskItemLearnTime(taskItemId, startTime, endTime);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
}

2
SGGL/WebAPI/Controllers/HomeController.cs
View File

@ -162,7 +162,7 @@ namespace WebAPI.Controllers
return View();
}
public ActionResult PersonInfo(string id)
public ActionResult P(string id)
{
return View();
}

1
SGGL/WebAPI/Home/static/js/index.a72cd590.js Normal file
View File

File diff suppressed because one or more lines are too long

1
SGGL/WebAPI/Home/static/js/pages-index.4e3434af.js Normal file
View File

File diff suppressed because one or more lines are too long

2
SGGL/WebAPI/Views/Home/PersonInfo.cshtml → SGGL/WebAPI/Views/Home/P.cshtml
View File

@ -16,6 +16,6 @@
<body>
<noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div>
<script src=./static/js/chunk-vendors.243f9a1a.js></script>
<script src=./static/js/index.588a1ec2.js></script>
<script src=./static/js/index.a72cd590.js></script>
</body>
</html>

4
SGGL/WebAPI/WebAPI.csproj
View File

@ -301,8 +301,10 @@
<Content Include="Global.asax" />
<Content Include="Home\static\js\index.03a2f39a.js" />
<Content Include="Home\static\js\index.588a1ec2.js" />
<Content Include="Home\static\js\index.a72cd590.js" />
<Content Include="Home\static\js\pages-add_personnel-add_personnel.bad7c7eb.js" />
<Content Include="Home\static\js\pages-add_personnel-add_personnel.ff016799.js" />
<Content Include="Home\static\js\pages-index.4e3434af.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Areas\HelpPage\Views\Web.config" />
@ -353,7 +355,7 @@
<Content Include="Views\Home\Index.cshtml" />
<Content Include="Views\Shared\Error.cshtml" />
<Content Include="Views\Shared\_Layout.cshtml" />
<Content Include="Views\Home\PersonInfo.cshtml" />
<Content Include="Views\Home\P.cshtml" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />