20240507
This commit is contained in:
parent
0ede39d15e
commit
a041fdd85d
|
|
@ -27,7 +27,7 @@ REM --------------
|
|||
@echo.
|
||||
@call "%VS150%"
|
||||
|
||||
SqlMetal /views /server:DESKTOP-1QITK9E\MSSQLSERVER2 /database:SGGLDB_CD /code:%Model_ROOT%\Model.cs /namespace:Model
|
||||
SqlMetal /views /server:. /database:SGGLDB_CD /code:%Model_ROOT%\Model.cs /namespace:Model
|
||||
|
||||
@ECHO 完成
|
||||
pause
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ namespace BLL
|
|||
var res = getDataLists.ToList();
|
||||
foreach (var x in res)
|
||||
{
|
||||
x.child = getAllDataLists.Where(xx => xx.SupResourcesId == x.ResourcesId).ToList();
|
||||
x.child = getTestTrainingListBySupTrainingId(x.ResourcesId);
|
||||
}
|
||||
return res;
|
||||
|
||||
|
|
|
|||
|
|
@ -252,6 +252,7 @@ namespace BLL
|
|||
ViceCNProfessionalId = user.ViceCNProfessionalId,
|
||||
WorkNo = user.WorkNo,
|
||||
HomePageType = user.HomePageType,
|
||||
IsExpertArgumentationIsAuditor=user.IsExpertArgumentationIsAuditor
|
||||
};
|
||||
db.Sys_User.InsertOnSubmit(newUser);
|
||||
db.SubmitChanges();
|
||||
|
|
@ -335,6 +336,7 @@ namespace BLL
|
|||
newUser.ViceCNProfessionalId = user.ViceCNProfessionalId;
|
||||
newUser.WorkNo = user.WorkNo;
|
||||
newUser.HomePageType = user.HomePageType;
|
||||
newUser.IsExpertArgumentationIsAuditor = user.IsExpertArgumentationIsAuditor;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1799,3 +1799,212 @@ IP地址:::1
|
|||
出错时间:04/07/2024 11:20:26
|
||||
出错时间:04/07/2024 11:20:26
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:SqlException
|
||||
错误信息:列名 'InDate' 无效。
|
||||
列名 'EququalityExpireDate' 无效。
|
||||
列名 'InsuredAmount' 无效。
|
||||
列名 'OperatorName' 无效。
|
||||
列名 'OperatorIdentityCard' 无效。
|
||||
列名 'OperatorQualityExpireDate' 无效。
|
||||
列名 'CertificationDepartment' 无效。
|
||||
错误堆栈:
|
||||
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
|
||||
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
|
||||
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
|
||||
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
|
||||
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
|
||||
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
|
||||
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
|
||||
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
|
||||
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
|
||||
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
|
||||
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
|
||||
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
|
||||
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
|
||||
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
|
||||
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
|
||||
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
|
||||
在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 D:\project\vs\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
|
||||
在 FineUIPro.Web.HSSE.InApproveManager.EquipmentIn.BindGrid() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\InApproveManager\EquipmentIn.aspx.cs:行号 98
|
||||
在 FineUIPro.Web.HSSE.InApproveManager.EquipmentIn.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\InApproveManager\EquipmentIn.aspx.cs:行号 56
|
||||
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
|
||||
在 System.EventHandler.Invoke(Object sender, EventArgs e)
|
||||
在 System.Web.UI.Control.OnLoad(EventArgs e)
|
||||
在 System.Web.UI.Control.LoadRecursive()
|
||||
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
|
||||
出错时间:05/06/2024 19:28:03
|
||||
出错文件:http://localhost:1295/HSSE/InApproveManager/EquipmentIn.aspx
|
||||
IP地址:::1
|
||||
操作人员:JT
|
||||
|
||||
出错时间:05/06/2024 19:28:03
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:HttpParseException
|
||||
错误信息:类型“FineUIPro.Panel”不具有名为“Grid”的公共属性。
|
||||
错误堆栈:
|
||||
在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
|
||||
在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
|
||||
在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
|
||||
----错误类型:HttpException
|
||||
----错误信息:
|
||||
----类型“FineUIPro.Panel”不具有名为“Grid”的公共属性。
|
||||
----错误堆栈:
|
||||
在 System.Web.UI.ControlBuilder.GetChildPropertyBuilder(String tagName, IDictionary attribs, Type& childType, TemplateParser templateParser, Boolean defaultProperty)
|
||||
在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty)
|
||||
在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText)
|
||||
在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
|
||||
出错时间:05/07/2024 12:20:26
|
||||
出错文件:http://localhost:1295/ZHGL/Supervise/SuperviseCheckReport.aspx
|
||||
IP地址:::1
|
||||
|
||||
出错时间:05/07/2024 12:20:26
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:无法按类型“<>f__AnonymousType66`1[System.Nullable`1[System.DateTime]]”排序。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitOrderBy(Expression sequence, LambdaExpression expression, SqlOrderType orderType)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
|
||||
在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable<T>.GetEnumerator()
|
||||
在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
|
||||
在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.InitTreeMenu() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 46
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 33
|
||||
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
|
||||
在 System.EventHandler.Invoke(Object sender, EventArgs e)
|
||||
在 System.Web.UI.Control.OnLoad(EventArgs e)
|
||||
在 System.Web.UI.Control.LoadRecursive()
|
||||
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
|
||||
出错时间:05/07/2024 14:22:14
|
||||
出错文件:http://localhost:1295/ZHGL/Supervise/SuperviseCheckReport.aspx
|
||||
IP地址:::1
|
||||
操作人员:JT
|
||||
|
||||
出错时间:05/07/2024 14:22:14
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:无法按类型“<>f__AnonymousType66`1[System.Nullable`1[System.DateTime]]”排序。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitOrderBy(Expression sequence, LambdaExpression expression, SqlOrderType orderType)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
|
||||
在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable<T>.GetEnumerator()
|
||||
在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
|
||||
在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.InitTreeMenu() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 46
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 33
|
||||
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
|
||||
在 System.EventHandler.Invoke(Object sender, EventArgs e)
|
||||
在 System.Web.UI.Control.OnLoad(EventArgs e)
|
||||
在 System.Web.UI.Control.LoadRecursive()
|
||||
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
|
||||
出错时间:05/07/2024 14:22:48
|
||||
出错文件:http://localhost:1295/ZHGL/Supervise/SuperviseCheckReport.aspx
|
||||
IP地址:::1
|
||||
操作人员:JT
|
||||
|
||||
出错时间:05/07/2024 14:22:48
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:无法按类型“<>f__AnonymousType66`1[System.Nullable`1[System.DateTime]]”排序。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitOrderBy(Expression sequence, LambdaExpression expression, SqlOrderType orderType)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
|
||||
在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable<T>.GetEnumerator()
|
||||
在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
|
||||
在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.InitTreeMenu() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 46
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 33
|
||||
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
|
||||
在 System.EventHandler.Invoke(Object sender, EventArgs e)
|
||||
在 System.Web.UI.Control.OnLoad(EventArgs e)
|
||||
在 System.Web.UI.Control.LoadRecursive()
|
||||
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
|
||||
出错时间:05/07/2024 14:23:53
|
||||
出错文件:http://localhost:1295/ZHGL/Supervise/SuperviseCheckReport.aspx
|
||||
IP地址:::1
|
||||
操作人员:JT
|
||||
|
||||
出错时间:05/07/2024 14:23:53
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:无法按类型“<>f__AnonymousType66`1[System.Nullable`1[System.DateTime]]”排序。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitOrderBy(Expression sequence, LambdaExpression expression, SqlOrderType orderType)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
|
||||
在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable<T>.GetEnumerator()
|
||||
在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
|
||||
在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.InitTreeMenu() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 46
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 33
|
||||
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
|
||||
在 System.EventHandler.Invoke(Object sender, EventArgs e)
|
||||
在 System.Web.UI.Control.OnLoad(EventArgs e)
|
||||
在 System.Web.UI.Control.LoadRecursive()
|
||||
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
|
||||
出错时间:05/07/2024 14:24:26
|
||||
出错文件:http://localhost:1295/ZHGL/Supervise/SuperviseCheckReport.aspx
|
||||
IP地址:::1
|
||||
操作人员:JT
|
||||
|
||||
出错时间:05/07/2024 14:24:26
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:无法按类型“<>f__AnonymousType66`1[System.Nullable`1[System.DateTime]]”排序。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitOrderBy(Expression sequence, LambdaExpression expression, SqlOrderType orderType)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitSequenceOperatorCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitMethodCall(MethodCallExpression mc)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.VisitInner(Expression node)
|
||||
在 System.Data.Linq.SqlClient.QueryConverter.ConvertOuter(Expression node)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations)
|
||||
在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
|
||||
在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable<T>.GetEnumerator()
|
||||
在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
|
||||
在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.InitTreeMenu() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 46
|
||||
在 FineUIPro.Web.ZHGL.Supervise.SuperviseCheckReport.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\Supervise\SuperviseCheckReport.aspx.cs:行号 33
|
||||
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
|
||||
在 System.EventHandler.Invoke(Object sender, EventArgs e)
|
||||
在 System.Web.UI.Control.OnLoad(EventArgs e)
|
||||
在 System.Web.UI.Control.LoadRecursive()
|
||||
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
|
||||
出错时间:05/07/2024 14:24:40
|
||||
出错文件:http://localhost:1295/ZHGL/Supervise/SuperviseCheckReport.aspx
|
||||
IP地址:::1
|
||||
操作人员:JT
|
||||
|
||||
出错时间:05/07/2024 14:24:40
|
||||
|
||||
|
|
|
|||
|
|
@ -39,10 +39,10 @@
|
|||
</f:RadioButtonList>
|
||||
<f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人次" LabelWidth="100px"></f:NumberBox>
|
||||
<f:DropDownList ID="drpStates" runat="server" Label="状态" LabelAlign="Right" >
|
||||
<f:ListItem Text="审批完成" Value="1"/>
|
||||
<%-- <f:ListItem Text="审批完成" Value="1"/>--%>
|
||||
<f:ListItem Text="作业中" Value="2"/>
|
||||
<f:ListItem Text="已关闭" Value="3"/>
|
||||
<f:ListItem Text="已取消" Value="0"/>
|
||||
<%-- <f:ListItem Text="已取消" Value="0"/>--%>
|
||||
</f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
|
|
|
|||
|
|
@ -20,6 +20,11 @@
|
|||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList runat="server" Required="true" ShowRedStar="true" ID="drpInstallation" Label="装置/单元设置" LabelWidth="150px" ></f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow runat="server">
|
||||
<Items>
|
||||
<f:TextBox ID="txtUnitWorkName" runat="server" Label="单位工程名称"
|
||||
|
|
@ -27,11 +32,7 @@
|
|||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList runat="server" Required="true" ShowRedStar="true" ID="drpInstallation" Label="装置/单元设置" LabelWidth="150px" ></f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:NumberBox runat="server" ID="txtCosts" Label="建安工程费（万元）" Hidden="true" LabelWidth="150px" NoDecimal="false" NoNegative="true"></f:NumberBox>
|
||||
|
|
|
|||
|
|
@ -50,15 +50,6 @@ namespace FineUIPro.Web.ProjectData
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtUnitWorkCode;
|
||||
|
||||
/// <summary>
|
||||
/// txtUnitWorkName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtUnitWorkName;
|
||||
|
||||
/// <summary>
|
||||
/// drpInstallation 控件。
|
||||
/// </summary>
|
||||
|
|
@ -68,6 +59,15 @@ namespace FineUIPro.Web.ProjectData
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpInstallation;
|
||||
|
||||
/// <summary>
|
||||
/// txtUnitWorkName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtUnitWorkName;
|
||||
|
||||
/// <summary>
|
||||
/// txtCosts 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -62,11 +62,12 @@
|
|||
</f:RadioButtonList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow ColumnWidths="33.33% ">
|
||||
<f:FormRow ColumnWidths="33.33% 33.33% ">
|
||||
<Items>
|
||||
<f:DropDownList ID="drpIsPost" runat="server" Label="在岗" EnableEdit="true" ForceSelection="false"
|
||||
Required="true" ShowRedStar="true" LabelWidth="90px">
|
||||
</f:DropDownList>
|
||||
<f:CheckBox Text="是否专家论证审核人员" ID="cbExpertArgumentationIsAuditor" runat="server" LabelAlign="Right" Width="150px" LabelWidth="90px" MarginLeft="50px"></f:CheckBox>
|
||||
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
|
|
@ -80,8 +81,12 @@
|
|||
<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">
|
||||
|
|
|
|||
|
|
@ -109,6 +109,10 @@ namespace FineUIPro.Web.SysManage
|
|||
{
|
||||
this.drpIsPost.SelectedValue = Convert.ToString(user.IsPost);
|
||||
}
|
||||
if(user.IsExpertArgumentationIsAuditor.HasValue && user.IsExpertArgumentationIsAuditor.Value)
|
||||
{
|
||||
this.cbExpertArgumentationIsAuditor.Checked = true;
|
||||
}
|
||||
this.txtTelephone.Text = user.Telephone;
|
||||
if (user.IsOffice == true)
|
||||
{
|
||||
|
|
@ -202,6 +206,15 @@ namespace FineUIPro.Web.SysManage
|
|||
{
|
||||
newUser.UnitId = this.drpUnit.SelectedValue;
|
||||
}
|
||||
if (this.cbExpertArgumentationIsAuditor.Checked == true )
|
||||
{
|
||||
newUser.IsExpertArgumentationIsAuditor =true ;
|
||||
}
|
||||
else
|
||||
{
|
||||
newUser.IsExpertArgumentationIsAuditor = false;
|
||||
|
||||
}
|
||||
if (!BLL.CommonService.IsMainUnitOrAdmin(this.CurrUser.UserId)) ///不是企业单位或者管理员
|
||||
{
|
||||
newUser.UnitId = this.CurrUser.UnitId;
|
||||
|
|
|
|||
|
|
@ -167,6 +167,15 @@ namespace FineUIPro.Web.SysManage
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpIsPost;
|
||||
|
||||
/// <summary>
|
||||
/// cbExpertArgumentationIsAuditor 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox cbExpertArgumentationIsAuditor;
|
||||
|
||||
/// <summary>
|
||||
/// Image2 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -21,8 +21,25 @@
|
|||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
|
||||
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
|
||||
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
|
||||
|
||||
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
|
||||
|
||||
<Items>
|
||||
|
||||
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
|
||||
EnableCollapse="true" Width="320px" Title="" ShowBorder="true" Layout="VBox"
|
||||
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
|
||||
<Items>
|
||||
<f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="年份" OnNodeCommand="tvControlItem_NodeCommand"
|
||||
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
|
||||
AutoLeafIdentification="true" EnableTextSelection="true" Expanded="true">
|
||||
</f:Tree>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
|
||||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
|
||||
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle"
|
||||
AutoScroll="true">
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全监督检查报告" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="SuperviseCheckReportId" AllowCellEditing="true"
|
||||
|
|
@ -120,6 +137,9 @@
|
|||
</f:Grid>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<f:Window ID="Window1" Title="编辑安全监督检查整改" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"
|
||||
Width="1300px" Height="500px">
|
||||
|
|
|
|||
|
|
@ -30,11 +30,49 @@ namespace FineUIPro.Web.ZHGL.Supervise
|
|||
btnDelete.ConfirmText = String.Format("你确定要删除选中的 <b><script>{0}</script></b> 行数据吗？", Grid1.GetSelectedCountReference());
|
||||
|
||||
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||
InitTreeMenu();
|
||||
// 绑定表格
|
||||
BindGrid();
|
||||
}
|
||||
}
|
||||
private void InitTreeMenu()
|
||||
{
|
||||
this.tvControlItem.Nodes.Clear();
|
||||
var CheckDate = (from x in Funs.DB.Supervise_SuperviseCheckReport
|
||||
select new { x.CheckDate }).Distinct().OrderByDescending(x=>x.CheckDate).ToList();
|
||||
List<string> years = new List<string>();
|
||||
Dictionary<string, List<string>> yearsDic = new Dictionary<string, List<string> >();
|
||||
|
||||
foreach (var x in CheckDate)
|
||||
{
|
||||
if (!years.Contains(x.CheckDate.Value.ToString("yyyy年")))
|
||||
{
|
||||
years.Add(x.CheckDate.Value.ToString("yyyy年"));
|
||||
yearsDic.Add(x.CheckDate.Value.ToString("yyyy年"),new List<string>());
|
||||
}
|
||||
yearsDic[x.CheckDate.Value.ToString("yyyy年")].Add(x.CheckDate.Value.ToString("yyyy-MM-dd"));
|
||||
}
|
||||
|
||||
foreach (var year in years)
|
||||
{
|
||||
TreeNode tnYear = new TreeNode();//年节点
|
||||
tnYear.Text = year;
|
||||
tnYear.NodeID = year;
|
||||
tnYear.ToolTip = year;
|
||||
tvControlItem.Nodes.Add(tnYear);
|
||||
foreach (var date in yearsDic[year])
|
||||
{
|
||||
TreeNode tnDate = new TreeNode();//年节点
|
||||
tnDate.Text = date;
|
||||
tnDate.NodeID = date;
|
||||
tnDate.ToolTip = date;
|
||||
tnDate.EnableClickEvent= true;
|
||||
tnYear.Nodes.Add(tnDate);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 绑定数据
|
||||
/// </summary>
|
||||
|
|
@ -46,6 +84,13 @@ namespace FineUIPro.Web.ZHGL.Supervise
|
|||
+ @" LEFT JOIN dbo.Base_Unit AS U ON U.UnitId=S.UnitId"
|
||||
+ @" WHERE 1=1 ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
if (tvControlItem.SelectedNodeID!=null)
|
||||
{
|
||||
|
||||
strSql += " AND S.CheckDate = @CheckDate ";
|
||||
listStr.Add(new SqlParameter("@CheckDate", tvControlItem.SelectedNodeID));
|
||||
|
||||
}
|
||||
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
|
||||
{
|
||||
strSql += " AND (S.SuperviseCheckReportCode like @name OR P.ProjectName like @name OR u.UnitName like @name OR S.CheckTeam like @name OR S.EvaluationResult like @name)";
|
||||
|
|
@ -598,5 +643,11 @@ namespace FineUIPro.Web.ZHGL.Supervise
|
|||
this.BindGrid();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
|
||||
{
|
||||
this.BindGrid();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7,10 +7,12 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.ZHGL.Supervise {
|
||||
namespace FineUIPro.Web.ZHGL.Supervise
|
||||
{
|
||||
|
||||
|
||||
public partial class SuperviseCheckReport {
|
||||
public partial class SuperviseCheckReport
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
|
|
@ -39,6 +41,33 @@ namespace FineUIPro.Web.ZHGL.Supervise {
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel1;
|
||||
|
||||
/// <summary>
|
||||
/// panelLeftRegion 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelLeftRegion;
|
||||
|
||||
/// <summary>
|
||||
/// tvControlItem 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Tree tvControlItem;
|
||||
|
||||
/// <summary>
|
||||
/// panelCenterRegion 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel panelCenterRegion;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -69,6 +69,33 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sd-section">
|
||||
<div class="sd-section-title ellipsis">危大工程</div>
|
||||
<div class="sd-section-content">
|
||||
<div class="sd-section4-inner">
|
||||
<div class="sd-security">
|
||||
<div class="sd-security-label">总数</div>
|
||||
<div class="sd-security-value" runat="server" id="LargerHazard1">0</div>
|
||||
</div>
|
||||
<div class="sd-security-ratios">
|
||||
<div class="sd-security-ratio">
|
||||
<div class="sd-security-ratio-value">
|
||||
<span
|
||||
class="sd-security-ratio-value--yellow" runat="server" id="LargerHazard2">0</span>
|
||||
</div>
|
||||
<div class="sd-security-ratio-label">在建</div>
|
||||
</div>
|
||||
<div class="sd-security-ratio">
|
||||
<div class="sd-security-ratio-value">
|
||||
<span
|
||||
class="sd-security-ratio-value--blue" runat="server" id="LargerHazard3">0</span>
|
||||
</div>
|
||||
<div class="sd-security-ratio-label">完成</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sd-body-center">
|
||||
<div class="sd-body-menus">
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ namespace FineUIPro.Web.common
|
|||
getCQMSProblem();
|
||||
/// 获取施工产值
|
||||
getOutputValue(getProjectLists);
|
||||
///危大工程
|
||||
getSolutionLargerHazard();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -405,5 +407,17 @@ namespace FineUIPro.Web.common
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void getSolutionLargerHazard()
|
||||
{
|
||||
var num1 = Funs.DB.Solution_LargerHazard.Where(x => x.States == "2").Count();
|
||||
var num2 = Funs.DB.Solution_LargerHazard.Where(x => x.States == "3").Count();
|
||||
|
||||
LargerHazard1.InnerText = "" + (num1 + num2);
|
||||
LargerHazard2.InnerText = "" + (num1);
|
||||
LargerHazard3.InnerText = "" + (num2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,10 +7,12 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.common {
|
||||
namespace FineUIPro.Web.common
|
||||
{
|
||||
|
||||
|
||||
public partial class main {
|
||||
public partial class main
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Head1 控件。
|
||||
|
|
@ -39,6 +41,33 @@ namespace FineUIPro.Web.common {
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divZYPerson;
|
||||
|
||||
/// <summary>
|
||||
/// LargerHazard1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl LargerHazard1;
|
||||
|
||||
/// <summary>
|
||||
/// LargerHazard2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl LargerHazard2;
|
||||
|
||||
/// <summary>
|
||||
/// LargerHazard3 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl LargerHazard3;
|
||||
|
||||
/// <summary>
|
||||
/// divProjectNum 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -217275,7 +217275,7 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherAttach", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherAttach", DbType="VarChar(500)")]
|
||||
public string OtherAttach
|
||||
{
|
||||
get
|
||||
|
|
@ -340374,6 +340374,8 @@ namespace Model
|
|||
|
||||
private string _HomePageType;
|
||||
|
||||
private System.Nullable<bool> _IsExpertArgumentationIsAuditor;
|
||||
|
||||
private EntitySet<Comprehensive_NCRManagement> _Comprehensive_NCRManagement;
|
||||
|
||||
private EntitySet<Comprehensive_PressurePipe> _Comprehensive_PressurePipe;
|
||||
|
|
@ -341132,6 +341134,8 @@ namespace Model
|
|||
partial void OnWorkNoChanged();
|
||||
partial void OnHomePageTypeChanging(string value);
|
||||
partial void OnHomePageTypeChanged();
|
||||
partial void OnIsExpertArgumentationIsAuditorChanging(System.Nullable<bool> value);
|
||||
partial void OnIsExpertArgumentationIsAuditorChanged();
|
||||
#endregion
|
||||
|
||||
public Sys_User()
|
||||
|
|
@ -342482,6 +342486,26 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsExpertArgumentationIsAuditor", DbType="Bit")]
|
||||
public System.Nullable<bool> IsExpertArgumentationIsAuditor
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._IsExpertArgumentationIsAuditor;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._IsExpertArgumentationIsAuditor != value))
|
||||
{
|
||||
this.OnIsExpertArgumentationIsAuditorChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._IsExpertArgumentationIsAuditor = value;
|
||||
this.SendPropertyChanged("IsExpertArgumentationIsAuditor");
|
||||
this.OnIsExpertArgumentationIsAuditorChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Comprehensive_NCRManagement", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
|
||||
public EntitySet<Comprehensive_NCRManagement> Comprehensive_NCRManagement
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
-->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<DeleteExistingFiles>False</DeleteExistingFiles>
|
||||
<ExcludeApp_Data>False</ExcludeApp_Data>
|
||||
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
|
||||
<DeleteExistingFiles>false</DeleteExistingFiles>
|
||||
<ExcludeApp_Data>false</ExcludeApp_Data>
|
||||
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
|
||||
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
|
||||
<LastUsedPlatform>Any CPU</LastUsedPlatform>
|
||||
<PublishProvider>FileSystem</PublishProvider>
|
||||
<PublishUrl>E:\发布\辰达</PublishUrl>
|
||||
<PublishUrl>D:\发布\辰达</PublishUrl>
|
||||
<WebPublishMethod>FileSystem</WebPublishMethod>
|
||||
<_TargetId>Folder</_TargetId>
|
||||
<SiteUrlToLaunchAfterPublish />
|
||||
|
|
|
|||
Loading…
Reference in New Issue