提交代码

DataBase/版本日志/SGGLDB_WH_2024-02-04-lpf.sql

@@ -0,0 +1,6 @@
+
+alter table DriverSub_DriverSub add  DriverSubPlanId  nvarchar(50);
+go
+alter table DriverSub_DriverSub add  DriverSubContractorsId  nvarchar(50);
+go
+alter table DriverSub_DriverSub add  EvaluationData   nvarchar(2000);

DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql

@@ -0,0 +1,13 @@
+--重新导入
+delete from Transfer_Piping;
+delete from Transfer_StaticEquipment;
+delete from Transfer_RotatingEquipment;
+
+--修改时间完成时间
+update Transfer_Instrumentation set CompleteTime=getdate();
+update Transfer_Electrical set CompleteTime=getdate();
+update Transfer_Civil_Structure set CompleteTime=getdate();
+update Transfer_Firefighting set CompleteTime=getdate();
+update Transfer_Telecom set CompleteTime=getdate();
+update Transfer_Plumbing set CompleteTime=getdate();
+update Transfer_HVAC set CompleteTime=getdate();

SGGL/BLL/TestRun/DriverSub/DriverSubService.cs

@@ -20,7 +20,17 @@ namespace BLL
         {
             return Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubId == DriverSubId);
         }
-
+        /// <summary>
+        /// 根据
+        /// </summary>
+        /// <param name="DriverSubPlanId"></param>
+        /// <param name="DriverSubContractorsId"></param>
+        /// <returns></returns>
+        public static Model.DriverSub_DriverSub GetDriverSubBySubPlanIdAndTractorsId(string DriverSubPlanId,
+            string DriverSubContractorsId)
+        {
+            return Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId&& e.DriverSubContractorsId==DriverSubContractorsId);
+        }
         /// <summary>
         /// 添加开车分包管理信息
         /// </summary>
@@ -36,6 +46,9 @@ namespace BLL
             newDriverSub.Instruction = DriverSub.Instruction;
             newDriverSub.AttachUrl = DriverSub.AttachUrl;
             newDriverSub.Remark = DriverSub.Remark;
+            newDriverSub.DriverSubPlanId= DriverSub.DriverSubPlanId;
+            newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId;
+            newDriverSub.EvaluationData = DriverSub.EvaluationData;
             Funs.DB.DriverSub_DriverSub.InsertOnSubmit(newDriverSub);
             Funs.DB.SubmitChanges();
         }
@@ -55,6 +68,9 @@ namespace BLL
                 newDriverSub.Instruction = DriverSub.Instruction;
                 newDriverSub.AttachUrl = DriverSub.AttachUrl;
                 newDriverSub.Remark = DriverSub.Remark;
+                newDriverSub.DriverSubPlanId = DriverSub.DriverSubPlanId;
+                newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId;
+                newDriverSub.EvaluationData = DriverSub.EvaluationData;
                 Funs.DB.SubmitChanges();
             }
         }
@@ -76,5 +92,76 @@ namespace BLL
                 Funs.DB.SubmitChanges();
             }
         }
+        //DriverSubPlanId和DriverSubContractorsId 获取对象的EvaluationData信息，将json数据EvaluationData  转换成List<Model.DriverSubEvaluationData>
+        public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData(string DriverSubPlanId,
+            string DriverSubContractorsId)
+        {
+            List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
+            Model.DriverSub_DriverSub data = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId && e.DriverSubContractorsId == DriverSubContractorsId);
+            if (data != null)
+            {
+                list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.DriverSubEvaluationData>>(data.EvaluationData);
+            }
+            return list;
+        }
+        //将List<Model.DriverSubEvaluationData>转换成json数据
+        public static string GetDriverSubEvaluationDataJson(List<Model.DriverSubEvaluationData> list)
+        {
+            return Newtonsoft.Json.JsonConvert.SerializeObject(list);
+        }
+
+        //DriverSubPlanId和DriverSubContractorsId 删除数据
+        public static void DeleteDriverSubEvaluationData(string DriverSubPlanId, string DriverSubContractorsId)
+        {
+            Model.DriverSub_DriverSub data = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId && e.DriverSubContractorsId == DriverSubContractorsId);
+            if (data != null)
+            {
+                data.EvaluationData = "";
+                Funs.DB.SubmitChanges();
+            }
+        } 
+        /// <summary>
+        /// 根据DriverSubPlanId删除实体
+        /// </summary>
+        /// <param name="DriverSubPlanId"></param>
+        public static void DeleteDriverSubByDriverSubPlanId(string DriverSubPlanId)
+        {
+            var list = Funs.DB.DriverSub_DriverSub.Where(e => e.DriverSubPlanId == DriverSubPlanId).ToList();
+            //先删除对应附件
+            foreach (var item in list)
+            {
+                if (!string.IsNullOrEmpty(item.DriverSubId))
+                {
+                    AttachFileService.DeleteAttachFile(Funs.RootPath, item.DriverSubId, Const.DriverSubMenuId);//删除附件
+                }
+            }
+            if (list.Count > 0)
+            {
+                Funs.DB.DriverSub_DriverSub.DeleteAllOnSubmit(list);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+
+        /// <summary>
+        /// 获取初始化数据List<Model.DriverSubEvaluationData> 
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData()
+        {
+            List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
+            list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "业主人员培训", Grade = "" });
+            list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "编制技术方案", Grade = "" });
+            list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "预试车", Grade = "" });
+            list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "联动试车", Grade = "" });
+            list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "投料试车", Grade = "" });
+            list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "生产试运行", Grade = "" });
+            list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "性能考核", Grade = "" });
+            list.Add(new Model.DriverSubEvaluationData() { Number = 8, Matter = "生产安全", Grade = "" });
+            list.Add(new Model.DriverSubEvaluationData() { Number = 9, Matter = "试车进度", Grade = "" });
+            list.Add(new Model.DriverSubEvaluationData() { Number = 10, Matter = "其他", Grade = "" });
+            return list;
+        }
+
     }
 }

SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs

@@ -415,6 +415,13 @@ namespace Web.Controls
 
                         chart1.Series[dataSourceTeam.DataPointName].Label = "#VAL{P}";//设置标签文本 (在设计期通过属性窗口编辑更直观)
                         chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;//显示标签
+                        if (dataSourceTeam.DataPointName == "Actual Finished(%)")
+                        {
+                            chart1.Series[dataSourceTeam.DataPointName].Color = Color.Red;
+                        }
+                        else {
+                            chart1.Series[dataSourceTeam.DataPointName].Color = Color.Blue;
+                        }
                         foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
                         {
                             chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText, dataSourcePoint.PointValue);

SGGL/FineUIPro.Web/ErrLog.txt

@@ -40,225 +40,38 @@ IP地址:::1
 
 
 错误信息开始=====>
-错误类型:HttpException
+错误类型:SqlException
-错误信息:无法使用前导 .. 在顶级目录上退出。
+错误信息:参数化查询 '(@ProjectId nvarchar(4000))select * from Transfer_Piping C 
+   ' 需要参数 '@ProjectId'，但未提供该参数。
 错误堆栈:
-   在 System.Web.Util.UrlPath.ReduceVirtualPath(String path)
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Web.Util.UrlPath.ReduceVirtualPath(String path)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Web.Util.UrlPath.Reduce(String path)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 System.Web.Util.UrlPath.Combine(String appPath, String basepath, String relative)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 System.Web.UI.Control.ResolveUrl(String relativeUrl)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 (Control , String )
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 FineUIPro.PageContext.ResolveUrl(Control control, String url)
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 FineUIPro.PanelBase.OuDDulWcfFlgpCeErJpdHtJrWfGE(String )
+   在 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)
-   在 (PanelBase , String )
+   在 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)
-   在 FineUIPro.Window.GetShowReference(String iframeUrl, String windowTitle, Unit width, Unit height)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-   在 (Window , String , String , Unit , Unit )
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
-   在 FineUIPro.Window.GetShowReference(String iframeUrl, String windowTitle)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
-   在 (Window , String , String )
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
-   在 FineUIPro.Window.GetShowReference(String iframeUrl)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
-   在 FineUIPro.Web.Transfer.PunchlistFrom.btnAttach_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\PunchlistFrom.aspx.cs:行号 241
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
-   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
-   在 (Button , EventArgs )
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 FineUIPro.Web.Transfer.Piping.BindGrid() 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Piping.aspx.cs:行号 58
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 FineUIPro.Web.Transfer.Piping.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Piping.aspx.cs:行号 24
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:02/04/2024 10:05:40
-出错文件:http://localhost:8579/Transfer/PunchlistFrom.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:02/04/2024 10:05:40
-
-
-错误信息开始=====>
-错误类型:HttpException
-错误信息:无法使用前导 .. 在顶级目录上退出。
-错误堆栈:
-   在 System.Web.Util.UrlPath.ReduceVirtualPath(String path)
-   在 System.Web.Util.UrlPath.ReduceVirtualPath(String path)
-   在 System.Web.Util.UrlPath.Reduce(String path)
-   在 System.Web.Util.UrlPath.Combine(String appPath, String basepath, String relative)
-   在 System.Web.UI.Control.ResolveUrl(String relativeUrl)
-   在 (Control , String )
-   在 FineUIPro.PageContext.ResolveUrl(Control control, String url)
-   在 FineUIPro.PanelBase.OuDDulWcfFlgpCeErJpdHtJrWfGE(String )
-   在 (PanelBase , String )
-   在 FineUIPro.Window.GetShowReference(String iframeUrl, String windowTitle, Unit width, Unit height)
-   在 (Window , String , String , Unit , Unit )
-   在 FineUIPro.Window.GetShowReference(String iframeUrl, String windowTitle)
-   在 (Window , String , String )
-   在 FineUIPro.Window.GetShowReference(String iframeUrl)
-   在 FineUIPro.Web.Transfer.PunchlistFrom.btnAttach_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\PunchlistFrom.aspx.cs:行号 241
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:02/04/2024 10:05:42
-出错文件:http://localhost:8579/Transfer/PunchlistFrom.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:02/04/2024 10:05:42
-
-
-错误信息开始=====>
-错误类型:NotSupportedException
-错误信息:不支持查询运算符“Last”。
-错误堆栈:
-   在 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.Linq.IQueryProvider.Execute[S](Expression expression)
-   在 System.Linq.Queryable.Last[TSource](IQueryable`1 source)
-   在 FineUIPro.Web.Transfer.Chart.PunchlistFromChart.AnalyseData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFromChart.aspx.cs:行号 76
-   在 FineUIPro.Web.Transfer.Chart.PunchlistFromChart.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFromChart.aspx.cs:行号 44
    在 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)
-出错时间:02/04/2024 10:55:41
+出错时间:02/04/2024 10:42:45
-出错文件:http://localhost:8579/Transfer/Chart/PunchlistFromChart.aspx
+出错文件:http://localhost:8579/Transfer/Piping.aspx
 IP地址:::1
 操作人员:JT
 
-出错时间:02/04/2024 10:55:41
+出错时间:02/04/2024 10:42:45
-
-
-错误信息开始=====>
-错误类型:NotSupportedException
-错误信息:不支持查询运算符“Last”。
-错误堆栈:
-   在 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.Linq.IQueryProvider.Execute[S](Expression expression)
-   在 System.Linq.Queryable.Last[TSource](IQueryable`1 source)
-   在 FineUIPro.Web.Transfer.Chart.PunchlistFromChart.AnalyseData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFromChart.aspx.cs:行号 76
-   在 FineUIPro.Web.Transfer.Chart.PunchlistFromChart.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFromChart.aspx.cs:行号 44
-   在 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)
-出错时间:02/04/2024 10:57:35
-出错文件:http://localhost:8579/Transfer/Chart/PunchlistFromChart.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:02/04/2024 10:57:35
-
-
-错误信息开始=====>
-错误类型: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.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
-出错时间:02/04/2024 13:14:09
-出错时间:02/04/2024 13:14:09
-
-
-错误信息开始=====>
-错误类型: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.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
-出错时间:02/04/2024 13:14:09
-出错时间:02/04/2024 13:14:09
-
-
-错误信息开始=====>
-错误类型: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.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
-出错时间:02/04/2024 13:14:09
-出错时间:02/04/2024 13:14:09
-
-
-错误信息开始=====>
-错误类型: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.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
-出错时间:02/04/2024 13:14:09
-出错时间:02/04/2024 13:14:09
 

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1758,7 +1758,7 @@
     <Content Include="TestRun\DriverSub\DriverSub.aspx" />
     <Content Include="TestRun\DriverSub\DriverSubContact.aspx" />
     <Content Include="TestRun\DriverSub\DriverSubContactEdit.aspx" />
-    <Content Include="TestRun\DriverSub\DriverSubContactIn.aspx" />
+    <Content Include="TestRun\DriverSub\DriverSubContactorIn.aspx" />
     <Content Include="TestRun\DriverSub\DriverSubContactorEdit.aspx" />
     <Content Include="TestRun\DriverSub\DriverSubContactorList.aspx" />
     <Content Include="TestRun\DriverSub\DriverSubEdit.aspx" />
@@ -15848,12 +15848,12 @@
     <Compile Include="TestRun\DriverSub\DriverSubContactEdit.aspx.designer.cs">
       <DependentUpon>DriverSubContactEdit.aspx</DependentUpon>
     </Compile>
-    <Compile Include="TestRun\DriverSub\DriverSubContactIn.aspx.cs">
+    <Compile Include="TestRun\DriverSub\DriverSubContactorIn.aspx.cs">
-      <DependentUpon>DriverSubContactIn.aspx</DependentUpon>
+      <DependentUpon>DriverSubContactorIn.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="TestRun\DriverSub\DriverSubContactIn.aspx.designer.cs">
+    <Compile Include="TestRun\DriverSub\DriverSubContactorIn.aspx.designer.cs">
-      <DependentUpon>DriverSubContactIn.aspx</DependentUpon>
+      <DependentUpon>DriverSubContactorIn.aspx</DependentUpon>
     </Compile>
     <Compile Include="TestRun\DriverSub\DriverSubContactorEdit.aspx.cs">
       <DependentUpon>DriverSubContactorEdit.aspx</DependentUpon>

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx

@@ -13,16 +13,16 @@
     <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
         ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
         <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车分包管理" EnableCollapse="true"
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车分包计划" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="DriverSubId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverSubId" AllowSorting="true" SortField="Code"
+                runat="server" BoxFlex="1" DataKeyNames="DriverSubPlanId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverSubPlanId" AllowSorting="true" SortField="Code"
                 SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick">
+                EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick"  ForceFit="True" >
                 <Toolbars>
                     <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
-                                <f:DropDownList ID="drpSubUnitId" runat="server" Label="开车分包单位" LabelAlign="Right" LabelWidth="130px" Width="400px"></f:DropDownList>
+                            <f:DropDownList ID="drpSubUnitId" runat="server" Label="开车分包单位" LabelAlign="Right" LabelWidth="130px" Width="400px" Hidden="True"></f:DropDownList>
                             <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
-                                    EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
+                                EnablePostBack="true" runat="server" OnClick="btnSearch_Click" Hidden="True">
                             </f:Button>
                             <f:ToolbarFill runat="server"></f:ToolbarFill>
                             <f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" runat="server" Hidden="true">
@@ -32,26 +32,19 @@
                 </Toolbars>
                 <Columns>
                     <f:RenderField ColumnID="Code" DataField="Code"
-                            FieldType="String" HeaderText="序号" HeaderTextAlign="Center" Width="55px">
+                        FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center" Width="55px">
                     </f:RenderField>
-                        <f:RenderField ColumnID="Implement" DataField="Implement"
+                    <f:TemplateField   HeaderText="开车分包类别" HeaderTextAlign="Center" TextAlign="Center">
-                            FieldType="String" HeaderText="记录/报告/执行情况" HeaderTextAlign="Center" Width="200px">
+                        <ItemTemplate>
-                        </f:RenderField>
+                            <asp:Label ID="Label1" runat="server" Text='<%# GetDriverSubName(Eval("DriverSubNames")) %>'></asp:Label>
-                        <f:RenderField ColumnID="SubUnitName" DataField="SubUnitName"
+                        </ItemTemplate>
-                            FieldType="String" HeaderText="开车分包单位名称" HeaderTextAlign="Center" Width="250px">
+                    </f:TemplateField>
-                        </f:RenderField>
+                   <%-- <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" CommandName="AttachUrl" ColumnID="AttachUrl"
-                        <f:RenderField ColumnID="Instruction" DataField="Instruction"
-                            FieldType="String" HeaderText="情况说明" HeaderTextAlign="Center" Width="200px" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Remark" DataField="Remark"
-                            FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
                         TextAlign="Center" ToolTip="附件查看" Icon="Find" />
+                   --%>
+
+
                 </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
                 <PageItems>
                     <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                     </f:ToolbarSeparator>
@@ -68,15 +61,15 @@
             </f:Grid>
         </Items>
     </f:Panel>
-        <f:Window ID="Window1" Title="开车分包管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+    <f:Window ID="Window1" Title="开车分包情况" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-            Width="900px" Height="520px">
+        Width="1000px" Height="700px">
     </f:Window>
     <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
         Height="500px">
     </f:Window>
-        <f:Menu ID="Menu1" runat="server">
+   <%-- <f:Menu ID="Menu1" runat="server" Hidden="True">
         <Items>
             <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
             </f:MenuButton>
@@ -84,19 +77,8 @@
                 OnClick="btnMenuDel_Click">
             </f:MenuButton>
         </Items>
-        </f:Menu>
+    </f:Menu>--%>
 </form>   
-    <script type="text/javascript">
-        var menuID = '<%= Menu1.ClientID %>';
  
-        // 返回false，来阻止浏览器右键菜单
-        function onRowContextMenu(event, rowId) {
-            F(menuID).show();  //showAt(event.pageX, event.pageY);
-            return false;
-        }
-        function reloadGrid() {
-            __doPostBack(null, 'reloadGrid');
-        }
-    </script>
 </body>
 </html>

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs

@@ -26,32 +26,51 @@ namespace FineUIPro.Web.TestRun.DriverSub
         //加载列表
         public void BindGrid()
         {
-            string strSql = @"SELECT sub.DriverSubId,
+            var q = from x in Funs.DB.DriverSub_DriverSubContact
-                                     sub.ProjectId,
+                where x.ProjectId == this.CurrUser.LoginProjectId
-                                     sub.Code,
+                select x.DriverSubPlanId;
-                                     sub.SubUnitId,
+            var table = from x in Funs.DB.DriverSub_DriverSubPlan
-                                     sub.Implement,
+                where x.ProjectId == this.CurrUser.LoginProjectId && q.Contains(x.DriverSubPlanId)
-                                     sub.Instruction,
+                select new
-                                     sub.AttachUrl,
-                                     sub.Remark,
-                                     Unit.UnitName AS SubUnitName"
-                            + @" FROM DriverSub_DriverSub AS sub"
-                            + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = sub.SubUnitId WHERE sub.ProjectId=@projectId";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.drpSubUnitId.SelectedValue) && this.drpSubUnitId.SelectedValue != BLL.Const._Null)
                 {
-                strSql += " AND sub.SubUnitId=@subUnitId";
+                    x.DriverSubPlanId,
-                listStr.Add(new SqlParameter("@subUnitId", this.drpSubUnitId.SelectedValue));
+                    x.Code,
-            }
+                    x.SubUnitId,
-            SqlParameter[] parameter = listStr.ToArray();
+                    x.Introductions,
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                    x.Achievement,
-            Grid1.RecordCount = tb.Rows.Count;
+                    x.Cooperation,
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                    x.InstallationIds,
-            var table = this.GetPagedDataTable(Grid1, tb);
+                    x.InstallationNames,
+                    x.AttachUrl,
+                    x.Remark,
+                    x.DriverSubNames,
+                };
+            table = table.Skip(Grid1.PageSize * Grid1.PageIndex).Take(Grid1.PageSize);
             Grid1.DataSource = table;
             Grid1.DataBind();
         }
+
+        public string GetDriverSubName(object str)
+        {
+            string strName = "";
+
+            if (str != null)
+            {
+                string[] strArr = str.ToString().Split(',');
+
+                foreach (string s in strArr)
+                {
+                    foreach (System.Web.UI.WebControls.ListItem item in DropListService.drpDriverSubNameList())
+                    {
+                        if (item.Value == s)
+                        {
+                            strName += item.Text + ",";
+                        }
+                    }
+                }
+            }
+            return strName.TrimEnd(',');
+        }
         #endregion
 
         #region 分页
@@ -125,6 +144,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
             EditData();
         }
 
+
         /// <summary>
         /// 编辑
         /// </summary>
@@ -135,7 +155,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
                 Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
                 return;
             }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubEdit.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubEdit.aspx?DriverSubPlanId={0}", Grid1.SelectedRowID, "编辑 - ")));
         }
         #endregion
 
@@ -147,10 +167,10 @@ namespace FineUIPro.Web.TestRun.DriverSub
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var info = BLL.DriverSubService.GetDriverSubById(rowID);
+                    var info = BLL.DriverSubPlanService.GetDriverSubPlanById(rowID);
                     if (info != null)
                     {
-                        BLL.DriverSubService.DeleteDriverSub(rowID);
+                        BLL.DriverSubPlanService.DeleteDriverSubPlanById(rowID);
                     }
                 }
                 BindGrid();
@@ -170,7 +190,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
             string id = Grid1.DataKeys[e.RowIndex][0].ToString();
             if (e.CommandName == "AttachUrl")
             {
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSub&menuId={1}", id, BLL.Const.DriverSubMenuId)));
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSubPlan&menuId={1}", id, BLL.Const.DriverSubMenuId)));
             }
         }
         #endregion
@@ -184,19 +204,19 @@ namespace FineUIPro.Web.TestRun.DriverSub
             var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DriverSubMenuId);
             if (buttonList.Count() > 0)
             {
-                if (buttonList.Contains(BLL.Const.BtnAdd))
+                //if (buttonList.Contains(BLL.Const.BtnAdd))
-                {
+                //{
-                    this.btnNew.Hidden = false;
+                //    this.btnNew.Hidden = false;
-                }
+                //}
-                if (buttonList.Contains(BLL.Const.BtnModify))
+                //if (buttonList.Contains(BLL.Const.BtnModify))
-                {
+                //{
-                    this.btnMenuModify.Hidden = false;
+                //    this.btnMenuModify.Hidden = false;
-                    this.Grid1.EnableRowDoubleClickEvent = true;
+                //    this.Grid1.EnableRowDoubleClickEvent = true;
-                }
+                //}
-                if (buttonList.Contains(BLL.Const.BtnDelete))
+                //if (buttonList.Contains(BLL.Const.BtnDelete))
-                {
+                //{
-                    this.btnMenuDel.Hidden = false;
+                //    this.btnMenuDel.Hidden = false;
-                }
+                //}
             }
         }
         #endregion

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.TestRun.DriverSub {
+namespace FineUIPro.Web.TestRun.DriverSub
+{
 
 
-    public partial class DriverSub {
+    public partial class DriverSub
+    {
 
         /// <summary>
         /// form1 控件。
@@ -84,6 +86,15 @@ namespace FineUIPro.Web.TestRun.DriverSub {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,32 +139,5 @@ namespace FineUIPro.Web.TestRun.DriverSub {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
-        /// <summary>
-        /// Menu1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Menu Menu1;
-        
-        /// <summary>
-        /// btnMenuModify 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuModify;
-        
-        /// <summary>
-        /// btnMenuDel 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuDel;
     }
 }

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContact.aspx.cs

@@ -33,6 +33,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
                         where x.ProjectId == this.CurrUser.LoginProjectId && q.Contains(x.DriverSubPlanId)
                         select new
                         {
+                            
                             x.DriverSubPlanId,
                             x.Code,
                             x.SubUnitId,
@@ -165,11 +166,9 @@ namespace FineUIPro.Web.TestRun.DriverSub
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var info = BLL.DriverSubContactService.GetDriverSubContactById(rowID);
+                    BLL.DriverSubContactService.DeleteDriverSubContactByDriverSubPlanId(rowID);
-                    if (info != null)
+                    BLL.DriverSubService.DeleteDriverSubByDriverSubPlanId(rowID); //删除分包管理打分信息
-                    {
+
-                        BLL.DriverSubContactService.DeleteDriverSubContactById(rowID);
-                    }
                 }
                 BindGrid();
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx

@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DriverSubContactIn.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverSub.DriverSubContactIn" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DriverSubContactorIn.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverSub.DriverSubContactorIn" %>
 
 <!DOCTYPE html>
 

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.cs

@@ -11,7 +11,7 @@ using System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.TestRun.DriverSub
 {
-    public partial class DriverSubContactIn : PageBase
+    public partial class DriverSubContactorIn : PageBase
     {
         public string ContractId
         {

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.designer.cs

@@ -11,7 +11,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
 {
 
 
-    public partial class DriverSubContactIn
+    public partial class DriverSubContactorIn
     {
 
         /// <summary>

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorList.aspx.cs

@@ -250,7 +250,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
 
         protected void btnImport_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubContactIn.aspx", "编辑 - ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubContactorIn.aspx", "编辑 - ")));
         }
 
         #endregion

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx

@@ -4,88 +4,75 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>开车分包管理</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
-            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-            <Toolbars>
-                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
             <Items>
-                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                        </f:ToolbarFill>
+                    EnableCollapse="False" Width="250px" Title="WBS目录"
-                        <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
+                    ShowBorder="true" Layout="VBox" ShowHeader="False" AutoScroll="true" BodyPadding="5px"
-                        </f:Button>
+                    IconFont="ArrowCircleLeft">
-                        <f:HiddenField ID="hdAttachUrl" runat="server">
+                    <Items>
-                        </f:HiddenField>
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Height="650px" Title="开车分包商" runat="server" ShowBorder="false" EnableCollapse="true"
-                        <f:HiddenField ID="hdId" runat="server"></f:HiddenField>
+                            EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true" AutoScroll="True"
+                            EnableTextSelection="true" OnNodeCommand="tvControlItem_NodeCommand" EnableExpandEvent="true" >
+                            
+                        </f:Tree>
                     </Items>
-                </f:Toolbar>
+                </f:Panel>
-            </Toolbars>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
-            <Rows>
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊接任务单"
-                <f:FormRow>
+                    TitleToolTip="焊接任务单" AutoScroll="true">
                     <Items>
-                        <f:ContentPanel ID="ContentPanel2" ShowBorder="true"
+                        <f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
-                            BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
+                                runat="server" DataKeyNames="Number" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
-                            runat="server">
+                                EnableColumnLines="true" DataIDField="Number" Height="450px">
-                            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                            <Columns>
-                                BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                <f:RenderField ColumnID="Number" DataField="Number" FieldType="String" Width="5px"
-                                <Rows>   
+                                               HeaderText="序号" HeaderTextAlign="Center">
-                                    <f:FormRow>
+                                </f:RenderField>
-                                        <Items>
+                                <f:RenderField ColumnID="Matter" DataField="Matter" FieldType="String"  Width="50px"
-                                            <f:DropDownList ID="drpImplement" runat="server" Label="记录/报告/执行情况" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpImplement_SelectedIndexChanged"></f:DropDownList>
+                                               HeaderText="事项" HeaderTextAlign="Center">
-                                        </Items>
+                                </f:RenderField>
-                                    </f:FormRow>
+                                <f:RenderField ColumnID="Grade" DataField="Grade" FieldType="String"
-                                    <f:FormRow>
+                                               HeaderText="打分" HeaderTextAlign="Center">
-                                        <Items>
+                                    <Editor>
-                                            <f:TextBox ID="txtCode" runat="server" Label="序号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Readonly="true">
+                                        <f:TextBox ID="txtGrade" runat="server"></f:TextBox>
-                                            </f:TextBox>
+                                    </Editor>
-                                        </Items>
+                                </f:RenderField> 
-                                    </f:FormRow>
+                            </Columns>
-                                    <f:FormRow>
+                        </f:Grid>
-                                        <Items>
-                                            <f:DropDownList ID="drpSubUnitId" runat="server" Label="开车分包单位" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true"></f:DropDownList>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:TextArea ID="txtInstruction" runat="server" Label="情况说明" LabelAlign="Right" LabelWidth="150px" MaxLength="500">
-                                            </f:TextArea>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500">
-                                            </f:TextArea>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow runat="server">
-                                        <Items>
-                                            <f:Panel ID="Panel3" Width="300px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
-                                                <Items>
-                                                    <f:Label ID="lblAttach" runat="server" Label="上传附件"
-                                                        LabelWidth="150px">
-                                                    </f:Label>
                         <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                         </f:Button>
                     </Items>
                 </f:Panel>
             </Items>
-                                    </f:FormRow>
+            <Toolbars>
-                                </Rows>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
-                            </f:Form>
+                    <Items>
-                        </f:ContentPanel>
+                        <f:ToolbarFill runat="server">
+                        </f:ToolbarFill>
+                        
+                       
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" ValidateForms="SimpleForm1" Size="Medium"
+                                  OnClick="btnSave_Click">
+                        </f:Button> 
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" Size="Medium">
+                        </f:Button>
                     </Items>
-                </f:FormRow>
+                </f:Toolbar>
-            </Rows>
+            </Toolbars>
-        </f:Form>
+        </f:Panel>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
                   Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
                   Height="500px">
         </f:Window>
+    
     </form>
 </body>
 </html>

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs

@@ -1,10 +1,37 @@
 using BLL;
+using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
 
 namespace FineUIPro.Web.TestRun.DriverSub
 {
     public partial class DriverSubEdit :PageBase
     {
+        public string DriverSubPlanId {
+            get
+            {
+                return (string)ViewState["DriverSubPlanId"];
+            }
+            set
+            {
+                ViewState["DriverSubPlanId"] = value;
+            }
+        }
+        public string DriverSubId
+        {
+            get
+            {
+                return (string)ViewState["DriverSubId"];
+            }
+            set
+            {
+                ViewState["DriverSubId"] = value;
+            }
+        }
+        
+
         #region 加载
         /// <summary>
         /// 页面加载
@@ -15,37 +42,76 @@ namespace FineUIPro.Web.TestRun.DriverSub
         {
             if (!IsPostBack)
             {
-                BLL.UnitService.InitUnitDownList(this.drpSubUnitId, this.CurrUser.LoginProjectId, true);
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-                this.drpImplement.DataTextField = "Text";
+                DriverSubPlanId = Request.Params["DriverSubPlanId"];
-                this.drpImplement.DataValueField = "Value";
+                if (!string.IsNullOrEmpty(DriverSubPlanId))
-                this.drpImplement.DataSource = BLL.DropListService.drpImplementItemList();
-                this.drpImplement.DataBind();
-                Funs.FineUIPleaseSelect(this.drpImplement);
-
-                string id = Request.Params["id"];
-                if (!string.IsNullOrEmpty(id))
                 {
-                    Model.DriverSub_DriverSub data = BLL.DriverSubService.GetDriverSubById(id);
+                     InitTreeMenu();
-                    if (data != null)
-                    {
-                        this.hdId.Text = id;
-                        this.txtCode.Text = data.Code;
-                        if (!string.IsNullOrEmpty(data.SubUnitId))
-                        {
-                            this.drpSubUnitId.SelectedValue = data.SubUnitId;
-                        }
-                        if (!string.IsNullOrEmpty(data.Code))
-                        {
-                            this.drpImplement.SelectedValue = data.Code;
-                        }
-                        this.txtInstruction.Text = data.Instruction;
-                        this.txtRemark.Text = data.Remark;
-                    }
                 }
             }
         }
         #endregion
 
+        void InitTreeMenu()
+        {
+            this.tvControlItem.Nodes.Clear();
+            var subPlanModel= DriverSubPlanService.GetDriverSubPlanById(DriverSubPlanId);
+            if (subPlanModel != null)
+            {
+                foreach (var item in subPlanModel.DriverSubNames.Split(','))
+                {
+                    var name = DropListService.drpDriverSubNameList().Where(x => x.Value == item) .First().Text;    
+                    FineUIPro.TreeNode node = new FineUIPro.TreeNode();
+                    node.NodeID = item;
+                    node.Text = name;
+                    node.CommandName = name;
+                    node.Expanded = true;
+                    this.tvControlItem.Nodes.Add(node);
+                    BindNode(node, item);
+                }
+            }
+        }
+
+        void BindNode(TreeNode node,string type )
+        {
+           var SubContractorsList=  DriverSubContactService.GetDriverSubContactByDriverSubPlanId(DriverSubPlanId)
+                .Where(x => x.SubcontractingType == type).Select(x => x.DriverSubContractorsId).ToArray();
+           foreach (var item in SubContractorsList)
+           {
+               string unitName= BLL.DriversubcontractorsService.GetDriverSub_DriverSubContractorsById(item).SubUnitName;
+                FineUIPro.TreeNode node1 = new FineUIPro.TreeNode();
+                node1.NodeID = item;
+                node1.Text = unitName;
+                node1.CommandName = node1.Text; 
+                node1.EnableClickEvent=true;
+                node.Nodes.Add(node1);
+           }
+        }
+        protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+           var list=  BLL.DriverSubService.GetDriverSubEvaluationData(DriverSubPlanId, tvControlItem.SelectedNodeID);
+           var model=  BLL.DriverSubService.GetDriverSubBySubPlanIdAndTractorsId(DriverSubPlanId,tvControlItem.SelectedNodeID);
+           if (model!=null)
+           {
+               DriverSubId = model.DriverSubId;
+           }
+           else
+           {
+               DriverSubId = "";
+           }
+           if (list.Count>0 )
+           { 
+               Grid1.DataSource = list;
+               Grid1.DataBind();
+           }
+           else
+           { 
+               Grid1.DataSource = BLL.DriverSubService.GetDriverSubEvaluationData();
+               Grid1.DataBind();
+               
+           }
+        }
+
         #region 附件上传
         /// <summary>
         /// 附件上传
@@ -54,11 +120,8 @@ namespace FineUIPro.Web.TestRun.DriverSub
         /// <param name="e"></param>
         protected void btnAttach_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(this.hdId.Text))   //新增记录
+            Save();
-            {
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSub&menuId={1}", DriverSubId, BLL.Const.DriverSubMenuId)));
-                this.hdId.Text = SQLHelper.GetNewID(typeof(Model.DriverSub_DriverSub));
-            }
-            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSub&menuId={1}", this.hdId.Text, BLL.Const.DriverSubMenuId)));
         }
         #endregion
 
@@ -70,65 +133,49 @@ namespace FineUIPro.Web.TestRun.DriverSub
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (this.drpImplement.SelectedValue==BLL.Const._Null)
+
-            {
+            Save();
-                Alert.ShowInTop("请选择开车分包单位！", MessageBoxIcon.Warning);
+            tvControlItem_NodeCommand(null,null);
-                return;
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+           // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
-            if (this.drpSubUnitId.SelectedValue == BLL.Const._Null)
+
+        void Save()
         {
-                Alert.ShowInTop("请选择记录/报告/执行情况！", MessageBoxIcon.Warning);
+            JArray EditorArr = Grid1.GetMergedData();
-                return;
+            //JArray 转换成List<Model.DriverSubEvaluationData>
+            List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
+            foreach (JObject item in EditorArr)
+            {
+                Model.DriverSubEvaluationData data = new Model.DriverSubEvaluationData();
+                data.Number = Convert.ToInt32(item["values"]["Number"]);
+                data.Matter = item["values"]["Matter"].ToString();
+                data.Grade = item["values"]["Grade"].ToString();
+                list.Add(data);
             }
-            string id = Request.Params["id"];
+            //list转换成json数据
+            string json = BLL.DriverSubService.GetDriverSubEvaluationDataJson(list);
             Model.DriverSub_DriverSub newData = new Model.DriverSub_DriverSub();
-            newData.Code = this.txtCode.Text.Trim();
-            if (this.drpSubUnitId.SelectedValue != BLL.Const._Null)
-            {
-                newData.SubUnitId = this.drpSubUnitId.SelectedValue;
-            }
-            if (this.drpImplement.SelectedValue!=BLL.Const._Null)
-            {
-                newData.Implement = this.drpImplement.SelectedItem.Text;
-            }
-            newData.Instruction = this.txtInstruction.Text.Trim();
-            newData.Remark = this.txtRemark.Text.Trim();
             newData.ProjectId = this.CurrUser.LoginProjectId;
-            if (!string.IsNullOrEmpty(id))
+            newData.DriverSubPlanId = DriverSubPlanId;
-            {
+            newData.DriverSubContractorsId = tvControlItem.SelectedNodeID;
-                newData.DriverSubId = id;
+            newData.EvaluationData = json;
-                BLL.DriverSubService.UpdateDriverSub(newData);
+
-            }
+            if (string.IsNullOrEmpty(DriverSubId))
-            else
-            {
-                if (!string.IsNullOrEmpty(this.hdId.Text))
-                {
-                    newData.DriverSubId = this.hdId.Text.Trim();
-                }
-                else
             {
                 newData.DriverSubId = SQLHelper.GetNewID(typeof(Model.DriverSub_DriverSub));
-                    this.hdId.Text = newData.DriverSubId;
+                DriverSubId= newData.DriverSubId;
-                }
+                DriverSubService.AddDriverSub(newData);
-                BLL.DriverSubService.AddDriverSub(newData);
-            }
-            ShowNotify("保存成功！", MessageBoxIcon.Success);
-            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
-        }
-        #endregion
-
-        #region DropDownList下拉选择事件
-        protected void drpImplement_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (this.drpImplement.SelectedValue == BLL.Const._Null)
-            {
-                this.txtCode.Text = string.Empty;
             }
             else
             {
-                this.txtCode.Text = this.drpImplement.SelectedValue;
+                newData.DriverSubId = DriverSubId; 
+                DriverSubService.UpdateDriverSub(newData);
             }
+            
         }
+
         #endregion
+
     }
 }

SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.TestRun.DriverSub {
+namespace FineUIPro.Web.TestRun.DriverSub
+{
 
 
-    public partial class DriverSubEdit {
+    public partial class DriverSubEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -31,139 +33,58 @@ namespace FineUIPro.Web.TestRun.DriverSub {
         protected global::FineUIPro.PageManager PageManager1;
 
         /// <summary>
-        /// SimpleForm1 控件。
+        /// Panel1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Form SimpleForm1;
+        protected global::FineUIPro.Panel Panel1;
 
         /// <summary>
-        /// Toolbar1 控件。
+        /// panelLeftRegion 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar1;
+        protected global::FineUIPro.Panel panelLeftRegion;
 
         /// <summary>
-        /// ToolbarFill1 控件。
+        /// tvControlItem 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        protected global::FineUIPro.Tree tvControlItem;
 
         /// <summary>
-        /// btnSave 控件。
+        /// panelCenterRegion 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Button btnSave;
+        protected global::FineUIPro.Panel panelCenterRegion;
 
         /// <summary>
-        /// hdAttachUrl 控件。
+        /// Grid1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hdAttachUrl;
+        protected global::FineUIPro.Grid Grid1;
 
         /// <summary>
-        /// hdId 控件。
+        /// txtGrade 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hdId;
+        protected global::FineUIPro.TextBox txtGrade;
-        
-        /// <summary>
-        /// ContentPanel2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel2;
-        
-        /// <summary>
-        /// Form2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Form Form2;
-        
-        /// <summary>
-        /// drpImplement 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpImplement;
-        
-        /// <summary>
-        /// txtCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCode;
-        
-        /// <summary>
-        /// drpSubUnitId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpSubUnitId;
-        
-        /// <summary>
-        /// txtInstruction 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtInstruction;
-        
-        /// <summary>
-        /// txtRemark 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtRemark;
-        
-        /// <summary>
-        /// Panel3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel3;
-        
-        /// <summary>
-        /// lblAttach 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label lblAttach;
 
         /// <summary>
         /// btnAttach 控件。
@@ -174,6 +95,33 @@ namespace FineUIPro.Web.TestRun.DriverSub {
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
 
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx

@@ -20,7 +20,7 @@
                     <Items>
                         <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
                             <Rows>
-                                <f:FormRow>
+                                <f:FormRow ColumnWidths="20% 20% 20% 10% 10%">
                                     <Items>
                                         <f:DropDownList ID="drpdateType" runat="server" Label="日期类型" AutoPostBack="true"
                                             OnSelectedIndexChanged="drpdateType_SelectedIndexChanged" Width="100px" LabelWidth="80px">
@@ -28,7 +28,7 @@
                                             <f:ListItem Value="1" Text="按日期"></f:ListItem>
                                         </f:DropDownList>
 
-                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+                                        <f:DatePicker runat="server" Label="时间" ID="txtStarTime" EnableEdit="true" LabelWidth="50px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
                                         <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
@@ -36,11 +36,11 @@
 
                                         <f:DatePicker runat="server" ID="txtEndTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>
 
-                                        <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                        <%--<f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
                                             OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
                                             <f:ListItem Value="Column" Text="柱形图"  Selected="true"></f:ListItem>
                                             <f:ListItem Value="Line" Text="折线图"></f:ListItem>
-                                        </f:DropDownList>
+                                        </f:DropDownList>--%>
 
                                         <%--<f:DropDownList ID="drpChartType" runat="server" LabelWidth="80px" Label="图形类型"
                                             AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
@@ -52,6 +52,9 @@
 
                                         <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
 
+                                        <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
+                                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
+                                        </f:Button>
 
                                     </Items>
                                 </f:FormRow>
@@ -98,6 +101,11 @@
                 </f:Region>
             </Regions>
         </f:RegionPanel>
+
+         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px"
+        Height="500px">
+    </f:Window>
     </form>
 </body>
 </html>

SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs

@@ -230,7 +230,7 @@ namespace FineUIPro.Web.Transfer.Chart
             }
             if (systemBol)
             {
-                this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
+                this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "PROGRESS REPORT", "Column", 1100, 600, false));
             }
             
 
@@ -476,11 +476,33 @@ namespace FineUIPro.Web.Transfer.Chart
                 }
                 if (systemBol)
                 {
-                    this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "SYSTEM PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
+                    this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "SYSTEM PROGRESS REPORT", "Column", 1100, 600, false));
                 }
             }
 
         }
         #endregion
+
+        #region 附件上传
+        /// <summary>
+        /// 上传附件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl_Click(object sender, EventArgs e)
+        {
+            //必须点击系统
+            var SystemName = this.trRectify.SelectedNodeID;
+            if (SystemName=="ALL"|| SystemName=="")
+            {
+                Alert.ShowInTop("请选择系统。", MessageBoxIcon.Warning);
+                return;
+            }
+            var toKeyId = "D142B96F-4D36-429D-AB08-FA0D7C30BB69" + SystemName;
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference
+                (String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/Trancfer&menuId={1}",
+                toKeyId, "E6F5125D-DD94-4978-B7EB-D9C26694D86D")));
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs

@@ -104,15 +104,6 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime1;
 
-        /// <summary>
-        /// drpChartType 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpChartType;
-
         /// <summary>
         /// BtnAnalyse 控件。
         /// </summary>
@@ -122,6 +113,15 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.Button BtnAnalyse;
 
+        /// <summary>
+        /// btnAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
         /// <summary>
         /// Region2 控件。
         /// </summary>
@@ -175,5 +175,14 @@ namespace FineUIPro.Web.Transfer.Chart
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trRectify;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
     }
 }

SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx

@@ -19,7 +19,7 @@
                     <Items>
                         <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
                             <Rows>
-                                <f:FormRow>
+                                <f:FormRow ColumnWidths="30%  20% 3% 20% 15%">
                                     <Items>
                                         <f:DropDownList ID="drpType" runat="server" Label="分类" AutoPostBack="true"
                                              Width="100px" LabelWidth="80px">
@@ -43,8 +43,9 @@
                                             <f:ListItem Value="1" Text="按日期"></f:ListItem>
                                         </f:DropDownList>--%>
 
-                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+                                        <f:DatePicker runat="server" Label="时间" ID="txtStarTime" EnableEdit="true" LabelWidth="50px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
-
+                                         <f:Label ID="Label3" runat="server" Text="至" Width="5px">
+                                </f:Label>
                                         <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
                                        <%-- <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>

SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs

@@ -1784,7 +1784,7 @@ namespace FineUIPro.Web.Transfer.Chart
 
 
             }
-            this.ChartUc.CreateChartBaifenbi(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1100, 600, false));
+            this.ChartUc.CreateChartBaifenbi(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1300, 600, false));
         }
         #endregion
     }

SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx

@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtCivil_Structure" Label="Structure/Civil/Architecture" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
 
+                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>

SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs

@@ -50,6 +50,12 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             strSql += " order by  Civil_Structure ";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/Electrical.aspx

@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtELECTRICAL" Label="ELECTRICAL" LabelWidth="150px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>

SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs

@@ -51,6 +51,12 @@ namespace FineUIPro.Web.Transfer
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
 
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             strSql += " order by ELECTRICAL ";
 
             SqlParameter[] parameter = listStr.ToArray();

SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/Firefighting.aspx

@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtFirefighting" Label="Firefighting" LabelWidth="120px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>

SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs

@@ -50,6 +50,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
 
             strSql += " order by Firefighting "; 
 

SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/HVAC.aspx

@@ -25,6 +25,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtHVAC" Label="HVAC" LabelWidth="80px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>

SGGL/FineUIPro.Web/Transfer/HVAC.aspx.cs

@@ -50,6 +50,12 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             strSql += " order by HVAC ";
             
             SqlParameter[] parameter = listStr.ToArray();

SGGL/FineUIPro.Web/Transfer/HVAC.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx

@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="INSTRUMENTATION" LabelWidth="150px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>

SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs

@@ -51,6 +51,12 @@ namespace FineUIPro.Web.Transfer
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
 
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             strSql += " order by INSTRUMENTATION ";
 
             SqlParameter[] parameter = listStr.ToArray();

SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/Piping.aspx

@@ -24,6 +24,8 @@
                             <Items>
                                 <f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="PIPINGLINENUMBER" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
 
+                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
@@ -63,7 +65,7 @@
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>

SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs

@@ -49,6 +49,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND TestPackageSTART <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SYSTEM like @SYSTEM";
+                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;

SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/Plumbing.aspx

@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtPlumbing" Label="Plumbing" LabelWidth="120px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>

SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs

@@ -51,6 +51,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
 
             strSql += " order by Plumbing ";
             SqlParameter[] parameter = listStr.ToArray();

SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx

@@ -24,6 +24,8 @@
                             <Items>
                                 <f:TextBox runat="server" ID="txtRotatingEquipment" Label="Rotating Equipment" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
 
+                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
@@ -63,7 +65,7 @@
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>

SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs

@@ -49,6 +49,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND TestPackageSTART <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SYSTEM like @SYSTEM";
+                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;

SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx

@@ -24,6 +24,8 @@
                             <Items>
                                 <f:TextBox runat="server" ID="txtStaticEquipment" Label="Static Equipment" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
@@ -63,7 +65,7 @@
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>

SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs

@@ -49,6 +49,12 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND TestPackageSTART <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SYSTEM like @SYSTEM";
+                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;

SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs

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

SGGL/FineUIPro.Web/Transfer/Telecom.aspx

@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtTelecom" Label="Telecom" LabelWidth="120px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>

SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs

@@ -51,6 +51,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
 
             strSql += " order by Telecom ";
 

SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs

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

SGGL/Model/Model.cs

@@ -128540,6 +128540,12 @@ namespace Model
 		
 		private string _Remark;
 		
+		private string _DriverSubPlanId;
+		
+		private string _DriverSubContractorsId;
+		
+		private string _EvaluationData;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -128564,6 +128570,12 @@ namespace Model
     partial void OnAttachUrlChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
+    partial void OnDriverSubPlanIdChanging(string value);
+    partial void OnDriverSubPlanIdChanged();
+    partial void OnDriverSubContractorsIdChanging(string value);
+    partial void OnDriverSubContractorsIdChanged();
+    partial void OnEvaluationDataChanging(string value);
+    partial void OnEvaluationDataChanged();
     #endregion
 		
 		public DriverSub_DriverSub()
@@ -128741,6 +128753,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubPlanId", DbType="NVarChar(50)")]
+		public string DriverSubPlanId
+		{
+			get
+			{
+				return this._DriverSubPlanId;
+			}
+			set
+			{
+				if ((this._DriverSubPlanId != value))
+				{
+					this.OnDriverSubPlanIdChanging(value);
+					this.SendPropertyChanging();
+					this._DriverSubPlanId = value;
+					this.SendPropertyChanged("DriverSubPlanId");
+					this.OnDriverSubPlanIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubContractorsId", DbType="NVarChar(50)")]
+		public string DriverSubContractorsId
+		{
+			get
+			{
+				return this._DriverSubContractorsId;
+			}
+			set
+			{
+				if ((this._DriverSubContractorsId != value))
+				{
+					this.OnDriverSubContractorsIdChanging(value);
+					this.SendPropertyChanging();
+					this._DriverSubContractorsId = value;
+					this.SendPropertyChanged("DriverSubContractorsId");
+					this.OnDriverSubContractorsIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationData", DbType="NVarChar(2000)")]
+		public string EvaluationData
+		{
+			get
+			{
+				return this._EvaluationData;
+			}
+			set
+			{
+				if ((this._EvaluationData != value))
+				{
+					this.OnEvaluationDataChanging(value);
+					this.SendPropertyChanging();
+					this._EvaluationData = value;
+					this.SendPropertyChanged("EvaluationData");
+					this.OnEvaluationDataChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSub_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{

SGGL/Model/Model.csproj

@@ -218,12 +218,14 @@
     <Compile Include="SpSysUserItem.cs" />
     <Compile Include="APIItem\ResponeData.cs" />
     <Compile Include="SpTDesktopItem.cs" />
+    <Compile Include="TestRun\DriverSub\DriverSubEvaluationData.cs" />
     <Compile Include="TokenItem.cs" />
     <Compile Include="ZHGL\DataSync\CQMSDataItem.cs" />
     <Compile Include="ZHGL\DataSync\HJGLDataItem.cs" />
     <Compile Include="ZHGL\DataSync\HSSEDataItem.cs" />
     <Compile Include="ZHGL\DataSync\SYHSEDataItem.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

SGGL/Model/TestRun/DriverSub/DriverSubEvaluationData.cs

@@ -0,0 +1,18 @@
+namespace Model
+{
+    public class DriverSubEvaluationData
+    {
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int  Number { get; set; }
+        /// <summary>
+        /// 事项
+        /// </summary>
+        public string  Matter { get; set; }
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public string Grade { get; set; }
+    }
+}