Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
commit
cfa70a19a8
|
|
@ -949,6 +949,38 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//自动设置表格样式
|
||||
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
|
||||
}
|
||||
else {
|
||||
isYm = true;
|
||||
numberIndex = 1;
|
||||
whileIndex += 1;
|
||||
table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true);
|
||||
//跳过页眉的表头
|
||||
while (isYm)
|
||||
{
|
||||
if (table.Range.Text.Substring(0, 2) != "序号")
|
||||
{
|
||||
whileIndex += 1;
|
||||
table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
isYm = false;
|
||||
}
|
||||
}
|
||||
//创建合计
|
||||
Row rowhj = new Row(doc);
|
||||
double numcount0 = table.FirstRow.Cells[0].CellFormat.Width;
|
||||
double numcount1 = table.FirstRow.Cells[1].CellFormat.Width;
|
||||
double numcount2 = table.FirstRow.Cells[2].CellFormat.Width;
|
||||
double numcount3 = table.FirstRow.Cells[3].CellFormat.Width;
|
||||
double numcount4 = table.FirstRow.Cells[4].CellFormat.Width;
|
||||
double numcount = numcount0 + numcount1 + numcount2 + numcount3 + numcount4;
|
||||
rowhj.Cells.Add(CreateCell("暂无数据", doc, numcount));
|
||||
table.Rows.Insert(numberIndex + 1, rowhj);
|
||||
|
||||
//自动设置表格样式
|
||||
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 7.3无损检测管理情况
|
||||
|
|
@ -1193,7 +1225,38 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
|
||||
}
|
||||
else {
|
||||
isYm = true;
|
||||
numberIndex = 1;
|
||||
whileIndex += 1;
|
||||
table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true);
|
||||
//跳过页眉的表头
|
||||
while (isYm)
|
||||
{
|
||||
if (table.Range.Text.Substring(0, 2) != "序号")
|
||||
{
|
||||
whileIndex += 1;
|
||||
table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
isYm = false;
|
||||
}
|
||||
}
|
||||
//创建合计
|
||||
Row rowhj = new Row(doc);
|
||||
double numcount0 = table.Rows[0].Cells[0].CellFormat.Width;
|
||||
double numcount1 = table.Rows[0].Cells[1].CellFormat.Width;
|
||||
double numcount2 = table.Rows[0].Cells[2].CellFormat.Width;
|
||||
double numcount3 = table.Rows[0].Cells[3].CellFormat.Width;
|
||||
double numcount4 = table.Rows[0].Cells[4].CellFormat.Width;
|
||||
double numcount5 = table.Rows[0].Cells[5].CellFormat.Width;
|
||||
double numcount6 = table.Rows[0].Cells[6].CellFormat.Width;
|
||||
double numcount = numcount0 + numcount1 + numcount2 + numcount3 + numcount4 + numcount5 + numcount6;
|
||||
rowhj.Cells.Add(CreateCell("暂无数据", doc, numcount));
|
||||
table.Rows.Insert(numberIndex + 1, rowhj);
|
||||
|
||||
//自动设置表格样式
|
||||
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
@ -1252,6 +1315,39 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
//自动设置表格样式
|
||||
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
|
||||
}
|
||||
else {
|
||||
isYm = true;
|
||||
numberIndex = 1;
|
||||
whileIndex += 1;
|
||||
table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true);
|
||||
//跳过页眉的表头
|
||||
while (isYm)
|
||||
{
|
||||
if (table.Range.Text.Substring(0, 2) != "序号")
|
||||
{
|
||||
whileIndex += 1;
|
||||
table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
isYm = false;
|
||||
}
|
||||
}
|
||||
//创建合计
|
||||
Row rowhj = new Row(doc);
|
||||
double numcount0 = table.Rows[0].Cells[0].CellFormat.Width;
|
||||
double numcount1 = table.Rows[0].Cells[1].CellFormat.Width;
|
||||
double numcount2 = table.Rows[0].Cells[2].CellFormat.Width;
|
||||
double numcount3 = table.Rows[0].Cells[3].CellFormat.Width;
|
||||
double numcount4 = table.Rows[0].Cells[4].CellFormat.Width;
|
||||
double numcount5 = table.Rows[0].Cells[5].CellFormat.Width;
|
||||
double numcount = numcount0 + numcount1 + numcount2 + numcount3 + numcount4 + numcount5;
|
||||
rowhj.Cells.Add(CreateCell("暂无数据", doc, numcount));
|
||||
table.Rows.Insert(numberIndex + 1, rowhj);
|
||||
|
||||
//自动设置表格样式
|
||||
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -2022,6 +2022,9 @@
|
|||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="Button1" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
|
||||
</f:Button>
|
||||
|
||||
<f:Button ID="Button5" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnLoad_Click" Hidden="true">
|
||||
</f:Button>
|
||||
<f:HiddenField ID="hdId" runat="server">
|
||||
</f:HiddenField>
|
||||
|
|
@ -2048,4 +2051,18 @@
|
|||
function onGrid10DataLoad(event) {
|
||||
this.mergeColumns(['CreateMan']);
|
||||
}
|
||||
|
||||
var Window1ClientID = '<%= ContentPanel1.ClientID %>';
|
||||
function refresh() {
|
||||
// 第一个参数: 遮罩层的透明度
|
||||
F(Window1ClientID).showLoading(0.8);
|
||||
$('[id$="_Button5"]').click();
|
||||
|
||||
}
|
||||
|
||||
function rehiden() {
|
||||
F(Window1ClientID).hideLoading();
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ using System.Web.UI;
|
|||
using System.Web.UI.WebControls;
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.Threading;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.ManageReportNew
|
||||
{
|
||||
|
|
@ -308,22 +309,28 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
|
|||
{
|
||||
if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()) && !string.IsNullOrEmpty(this.txtEndDate.Text.Trim()))
|
||||
{
|
||||
|
||||
if (Funs.GetNewDateTime(this.txtStartDate.Text.Trim()) > Funs.GetNewDateTime(this.txtEndDate.Text.Trim()))
|
||||
{
|
||||
Alert.ShowInTop("开始时间不能大于结束时间!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (AddOrUpdate == "update")
|
||||
{
|
||||
lodAllGrid("1");
|
||||
}
|
||||
else
|
||||
{
|
||||
lodAllGrid("0");
|
||||
}
|
||||
PageContext.RegisterStartupScript("refresh();");
|
||||
}
|
||||
}
|
||||
|
||||
protected void btnLoad_Click(object sender, EventArgs e) {
|
||||
if (AddOrUpdate == "update")
|
||||
{
|
||||
lodAllGrid("1");
|
||||
PageContext.RegisterStartupScript("rehiden();");
|
||||
}
|
||||
else
|
||||
{
|
||||
lodAllGrid("0");
|
||||
PageContext.RegisterStartupScript("rehiden();");
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 本月质量目标管理情况 Grid1方法
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,136 @@
|
|||
|
||||
错误信息开始=====>
|
||||
错误类型:SqlException
|
||||
错误信息:过程或函数 'Sp_GJSX_getlist' 需要参数 '@ProjectId',但未提供该参数。
|
||||
错误堆栈:
|
||||
在 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.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 276
|
||||
在 FineUIPro.Web.PZHGL.GJSX.GJSXList.BindGrid() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\PZHGL\GJSX\GJSXList.aspx.cs:行号 60
|
||||
在 FineUIPro.Web.PZHGL.GJSX.GJSXList.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\PZHGL\GJSX\GJSXList.aspx.cs:行号 35
|
||||
在 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)
|
||||
出错时间:04/22/2024 11:27:38
|
||||
出错文件:http://localhost:8579/PZHGL/GJSX/GJSXList.aspx
|
||||
IP地址:::1
|
||||
操作人员:JT
|
||||
|
||||
出错时间:04/22/2024 11:27:38
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:ArgumentException
|
||||
错误信息:提供的 URI 方案“http”无效,应为“https”。
|
||||
参数名: via
|
||||
错误堆栈:
|
||||
在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
|
||||
在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.ChannelFactory`1.CreateChannel()
|
||||
在 System.ServiceModel.ClientBase`1.CreateChannel()
|
||||
在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
|
||||
在 System.ServiceModel.ClientBase`1.get_Channel()
|
||||
在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
|
||||
出错时间:04/22/2024 13:27:34
|
||||
出错时间:04/22/2024 13:27:34
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:ArgumentException
|
||||
错误信息:提供的 URI 方案“http”无效,应为“https”。
|
||||
参数名: via
|
||||
错误堆栈:
|
||||
在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
|
||||
在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.ChannelFactory`1.CreateChannel()
|
||||
在 System.ServiceModel.ClientBase`1.CreateChannel()
|
||||
在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
|
||||
在 System.ServiceModel.ClientBase`1.get_Channel()
|
||||
在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
|
||||
出错时间:04/22/2024 13:27:34
|
||||
出错时间:04/22/2024 13:27:34
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:ArgumentException
|
||||
错误信息:提供的 URI 方案“http”无效,应为“https”。
|
||||
参数名: via
|
||||
错误堆栈:
|
||||
在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
|
||||
在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.ChannelFactory`1.CreateChannel()
|
||||
在 System.ServiceModel.ClientBase`1.CreateChannel()
|
||||
在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
|
||||
在 System.ServiceModel.ClientBase`1.get_Channel()
|
||||
在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
|
||||
出错时间:04/22/2024 13:27:34
|
||||
出错时间:04/22/2024 13:27:34
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:ArgumentException
|
||||
错误信息:提供的 URI 方案“http”无效,应为“https”。
|
||||
参数名: via
|
||||
错误堆栈:
|
||||
在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
|
||||
在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
|
||||
在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
|
||||
在 System.ServiceModel.ChannelFactory`1.CreateChannel()
|
||||
在 System.ServiceModel.ClientBase`1.CreateChannel()
|
||||
在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
|
||||
在 System.ServiceModel.ClientBase`1.get_Channel()
|
||||
在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
|
||||
出错时间:04/22/2024 13:27:34
|
||||
出错时间:04/22/2024 13:27:34
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
PK
|
||||
| ||||