1

SGGL/BLL/BLL.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BLL</RootNamespace>
     <AssemblyName>BLL</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>

SGGL/BLL/Service References/CNCECHSSEService/Reference.cs

@@ -10998,8 +10998,7 @@ namespace BLL.CNCECHSSEService {
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     [System.Runtime.Serialization.DataContractAttribute(Name="Information_MillionsMonthlyReport", Namespace="http://schemas.datacontract.org/2004/07/BLL.OpenService")]
     [System.SerializableAttribute()]
-    public partial class Information_MillionsMonthlyReport : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
+    public partial class Information_MillionsMonthlyReport : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
-    {
         
         [System.NonSerializedAttribute()]
         private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
@@ -11040,353 +11039,23 @@ namespace BLL.CNCECHSSEService {
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Nullable<int> YearField;
         
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<decimal> InputCostsField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> TrainNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> GeneralHazardNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> MajorHazardNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> NotProofLargeProjectNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> ProofLargeProjectNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> FireLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> LimitLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> HighLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> HoistingLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> BreakGroundLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> ElectricityLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> RTLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> NightLicenseNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> CommissionerNumField;
-
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private System.Nullable<int> SoleDutyNumField;
-
         [global::System.ComponentModel.BrowsableAttribute(false)]
-
+        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
-        [System.Runtime.Serialization.DataMemberAttribute()]
+            get {
-        public System.Nullable<int> SoleDutyNum
-        {
-            get
-            {
-                return this.SoleDutyNumField;
-            }
-            set
-            {
-                if ((this.SoleDutyNumField.Equals(value) != true))
-                {
-                    this.SoleDutyNumField = value;
-                    this.RaisePropertyChanged("SoleDutyNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> CommissionerNum
-        {
-            get
-            {
-                return this.CommissionerNumField;
-            }
-            set
-            {
-                if ((this.CommissionerNumField.Equals(value) != true))
-                {
-                    this.CommissionerNumField = value;
-                    this.RaisePropertyChanged("CommissionerNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> NightLicenseNum
-        {
-            get
-            {
-                return this.NightLicenseNumField;
-            }
-            set
-            {
-                if ((this.NightLicenseNumField.Equals(value) != true))
-                {
-                    this.NightLicenseNumField = value;
-                    this.RaisePropertyChanged("NightLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> RTLicenseNum
-        {
-            get
-            {
-                return this.RTLicenseNumField;
-            }
-            set
-            {
-                if ((this.RTLicenseNumField.Equals(value) != true))
-                {
-                    this.RTLicenseNumField = value;
-                    this.RaisePropertyChanged("RTLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> ElectricityLicenseNum
-        {
-            get
-            {
-                return this.ElectricityLicenseNumField;
-            }
-            set
-            {
-                if ((this.ElectricityLicenseNumField.Equals(value) != true))
-                {
-                    this.ElectricityLicenseNumField = value;
-                    this.RaisePropertyChanged("ElectricityLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> BreakGroundLicenseNum
-        {
-            get
-            {
-                return this.BreakGroundLicenseNumField;
-            }
-            set
-            {
-                if ((this.BreakGroundLicenseNumField.Equals(value) != true))
-                {
-                    this.BreakGroundLicenseNumField = value;
-                    this.RaisePropertyChanged("BreakGroundLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> HoistingLicenseNum
-        {
-            get
-            {
-                return this.HoistingLicenseNumField;
-            }
-            set
-            {
-                if ((this.HoistingLicenseNumField.Equals(value) != true))
-                {
-                    this.HoistingLicenseNumField = value;
-                    this.RaisePropertyChanged("HoistingLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> HighLicenseNum
-        {
-            get
-            {
-                return this.HighLicenseNumField;
-            }
-            set
-            {
-                if ((this.HighLicenseNumField.Equals(value) != true))
-                {
-                    this.HighLicenseNumField = value;
-                    this.RaisePropertyChanged("HighLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> LimitLicenseNum
-        {
-            get
-            {
-                return this.LimitLicenseNumField;
-            }
-            set
-            {
-                if ((this.LimitLicenseNumField.Equals(value) != true))
-                {
-                    this.LimitLicenseNumField = value;
-                    this.RaisePropertyChanged("LimitLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> FireLicenseNum
-        {
-            get
-            {
-                return this.FireLicenseNumField;
-            }
-            set
-            {
-                if ((this.FireLicenseNumField.Equals(value) != true))
-                {
-                    this.FireLicenseNumField = value;
-                    this.RaisePropertyChanged("FireLicenseNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> ProofLargeProjectNum
-        {
-            get
-            {
-                return this.ProofLargeProjectNumField;
-            }
-            set
-            {
-                if ((this.ProofLargeProjectNumField.Equals(value) != true))
-                {
-                    this.ProofLargeProjectNumField = value;
-                    this.RaisePropertyChanged("ProofLargeProjectNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> NotProofLargeProjectNum
-        {
-            get
-            {
-                return this.NotProofLargeProjectNumField;
-            }
-            set
-            {
-                if ((this.NotProofLargeProjectNumField.Equals(value) != true))
-                {
-                    this.NotProofLargeProjectNumField = value;
-                    this.RaisePropertyChanged("NotProofLargeProjectNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> MajorHazardNum
-        {
-            get
-            {
-                return this.MajorHazardNumField;
-            }
-            set
-            {
-                if ((this.MajorHazardNumField.Equals(value) != true))
-                {
-                    this.MajorHazardNumField = value;
-                    this.RaisePropertyChanged("MajorHazardNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> GeneralHazardNum
-        {
-            get
-            {
-                return this.GeneralHazardNumField;
-            }
-            set
-            {
-                if ((this.GeneralHazardNumField.Equals(value) != true))
-                {
-                    this.GeneralHazardNumField = value;
-                    this.RaisePropertyChanged("GeneralHazardNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> TrainNum
-        {
-            get
-            {
-                return this.TrainNumField;
-            }
-            set
-            {
-                if ((this.TrainNumField.Equals(value) != true))
-                {
-                    this.TrainNumField = value;
-                    this.RaisePropertyChanged("TrainNum");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> InputCosts
-        {
-            get
-            {
-                return this.InputCostsField;
-            }
-            set
-            {
-                if ((this.InputCostsField.Equals(value) != true))
-                {
-                    this.InputCostsField = value;
-                    this.RaisePropertyChanged("InputCosts");
-                }
-            }
-        }
-
-        [System.Runtime.Serialization.DataMemberAttribute()]
-
-        public System.Runtime.Serialization.ExtensionDataObject ExtensionData
-        {
-            get
-            {
                 return this.extensionDataField;
             }
-            set
+            set {
-            {
                 this.extensionDataField = value;
             }
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> AccidentMortality
+        public System.Nullable<decimal> AccidentMortality {
-        {
+            get {
-            get
-            {
                 return this.AccidentMortalityField;
             }
-            set
+            set {
-            {
+                if ((this.AccidentMortalityField.Equals(value) != true)) {
-                if ((this.AccidentMortalityField.Equals(value) != true))
-                {
                     this.AccidentMortalityField = value;
                     this.RaisePropertyChanged("AccidentMortality");
                 }
@@ -11394,16 +11063,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> DeathAccidentFrequency
+        public System.Nullable<decimal> DeathAccidentFrequency {
-        {
+            get {
-            get
-            {
                 return this.DeathAccidentFrequencyField;
             }
-            set
+            set {
-            {
+                if ((this.DeathAccidentFrequencyField.Equals(value) != true)) {
-                if ((this.DeathAccidentFrequencyField.Equals(value) != true))
-                {
                     this.DeathAccidentFrequencyField = value;
                     this.RaisePropertyChanged("DeathAccidentFrequency");
                 }
@@ -11411,16 +11076,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public string DutyPerson
+        public string DutyPerson {
-        {
+            get {
-            get
-            {
                 return this.DutyPersonField;
             }
-            set
+            set {
-            {
+                if ((object.ReferenceEquals(this.DutyPersonField, value) != true)) {
-                if ((object.ReferenceEquals(this.DutyPersonField, value) != true))
-                {
                     this.DutyPersonField = value;
                     this.RaisePropertyChanged("DutyPerson");
                 }
@@ -11428,16 +11089,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<System.DateTime> FillingDate
+        public System.Nullable<System.DateTime> FillingDate {
-        {
+            get {
-            get
-            {
                 return this.FillingDateField;
             }
-            set
+            set {
-            {
+                if ((this.FillingDateField.Equals(value) != true)) {
-                if ((this.FillingDateField.Equals(value) != true))
-                {
                     this.FillingDateField = value;
                     this.RaisePropertyChanged("FillingDate");
                 }
@@ -11445,16 +11102,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public string FillingMan
+        public string FillingMan {
-        {
+            get {
-            get
-            {
                 return this.FillingManField;
             }
-            set
+            set {
-            {
+                if ((object.ReferenceEquals(this.FillingManField, value) != true)) {
-                if ((object.ReferenceEquals(this.FillingManField, value) != true))
-                {
                     this.FillingManField = value;
                     this.RaisePropertyChanged("FillingMan");
                 }
@@ -11462,16 +11115,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> LostTimeInjuryRate
+        public System.Nullable<decimal> LostTimeInjuryRate {
-        {
+            get {
-            get
-            {
                 return this.LostTimeInjuryRateField;
             }
-            set
+            set {
-            {
+                if ((this.LostTimeInjuryRateField.Equals(value) != true)) {
-                if ((this.LostTimeInjuryRateField.Equals(value) != true))
-                {
                     this.LostTimeInjuryRateField = value;
                     this.RaisePropertyChanged("LostTimeInjuryRate");
                 }
@@ -11479,16 +11128,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> LostTimeRate
+        public System.Nullable<decimal> LostTimeRate {
-        {
+            get {
-            get
-            {
                 return this.LostTimeRateField;
             }
-            set
+            set {
-            {
+                if ((this.LostTimeRateField.Equals(value) != true)) {
-                if ((this.LostTimeRateField.Equals(value) != true))
-                {
                     this.LostTimeRateField = value;
                     this.RaisePropertyChanged("LostTimeRate");
                 }
@@ -11496,16 +11141,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public string MillionsMonthlyReportId
+        public string MillionsMonthlyReportId {
-        {
+            get {
-            get
-            {
                 return this.MillionsMonthlyReportIdField;
             }
-            set
+            set {
-            {
+                if ((object.ReferenceEquals(this.MillionsMonthlyReportIdField, value) != true)) {
-                if ((object.ReferenceEquals(this.MillionsMonthlyReportIdField, value) != true))
-                {
                     this.MillionsMonthlyReportIdField = value;
                     this.RaisePropertyChanged("MillionsMonthlyReportId");
                 }
@@ -11513,16 +11154,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> Month
+        public System.Nullable<int> Month {
-        {
+            get {
-            get
-            {
                 return this.MonthField;
             }
-            set
+            set {
-            {
+                if ((this.MonthField.Equals(value) != true)) {
-                if ((this.MonthField.Equals(value) != true))
-                {
                     this.MonthField = value;
                     this.RaisePropertyChanged("Month");
                 }
@@ -11530,16 +11167,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<decimal> RecordableIncidentRate
+        public System.Nullable<decimal> RecordableIncidentRate {
-        {
+            get {
-            get
-            {
                 return this.RecordableIncidentRateField;
             }
-            set
+            set {
-            {
+                if ((this.RecordableIncidentRateField.Equals(value) != true)) {
-                if ((this.RecordableIncidentRateField.Equals(value) != true))
-                {
                     this.RecordableIncidentRateField = value;
                     this.RaisePropertyChanged("RecordableIncidentRate");
                 }
@@ -11547,16 +11180,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public string UnitId
+        public string UnitId {
-        {
+            get {
-            get
-            {
                 return this.UnitIdField;
             }
-            set
+            set {
-            {
+                if ((object.ReferenceEquals(this.UnitIdField, value) != true)) {
-                if ((object.ReferenceEquals(this.UnitIdField, value) != true))
-                {
                     this.UnitIdField = value;
                     this.RaisePropertyChanged("UnitId");
                 }
@@ -11564,16 +11193,12 @@ namespace BLL.CNCECHSSEService {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public System.Nullable<int> Year
+        public System.Nullable<int> Year {
-        {
+            get {
-            get
-            {
                 return this.YearField;
             }
-            set
+            set {
-            {
+                if ((this.YearField.Equals(value) != true)) {
-                if ((this.YearField.Equals(value) != true))
-                {
                     this.YearField = value;
                     this.RaisePropertyChanged("Year");
                 }
@@ -11582,11 +11207,9 @@ namespace BLL.CNCECHSSEService {
         
         public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
         
-        protected void RaisePropertyChanged(string propertyName)
+        protected void RaisePropertyChanged(string propertyName) {
-        {
             System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null))
+            if ((propertyChanged != null)) {
-            {
                 propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
             }
         }

SGGL/BLL/WebService/CNCECHSSEWebService.cs

@@ -109,22 +109,22 @@
                                        LostTimeInjuryRate = x.LostTimeInjuryRate,
                                        DeathAccidentFrequency = x.DeathAccidentFrequency,
                                        AccidentMortality = x.AccidentMortality,
-                                       InputCosts = x.InputCosts,
+                                       //InputCosts = x.InputCosts,
-                                       TrainNum = x.TrainNum,
+                                       //TrainNum = x.TrainNum,
-                                       GeneralHazardNum = x.GeneralHazardNum,
+                                       //GeneralHazardNum = x.GeneralHazardNum,
-                                       MajorHazardNum = x.MajorHazardNum,
+                                       //MajorHazardNum = x.MajorHazardNum,
-                                       NotProofLargeProjectNum = x.NotProofLargeProjectNum,
+                                       //NotProofLargeProjectNum = x.NotProofLargeProjectNum,
-                                       ProofLargeProjectNum = x.ProofLargeProjectNum,
+                                       //ProofLargeProjectNum = x.ProofLargeProjectNum,
-                                       FireLicenseNum = x.FireLicenseNum,
+                                       //FireLicenseNum = x.FireLicenseNum,
-                                       LimitLicenseNum = x.LimitLicenseNum,
+                                       //LimitLicenseNum = x.LimitLicenseNum,
-                                       HighLicenseNum = x.HighLicenseNum,
+                                       //HighLicenseNum = x.HighLicenseNum,
-                                       HoistingLicenseNum = x.HoistingLicenseNum,
+                                       //HoistingLicenseNum = x.HoistingLicenseNum,
-                                       BreakGroundLicenseNum = x.BreakGroundLicenseNum,
+                                       //BreakGroundLicenseNum = x.BreakGroundLicenseNum,
-                                       ElectricityLicenseNum = x.ElectricityLicenseNum,
+                                       //ElectricityLicenseNum = x.ElectricityLicenseNum,
-                                       RTLicenseNum = x.RTLicenseNum,
+                                       //RTLicenseNum = x.RTLicenseNum,
-                                       NightLicenseNum = x.NightLicenseNum,
+                                       //NightLicenseNum = x.NightLicenseNum,
-                                       CommissionerNum = x.CommissionerNum,
+                                       //CommissionerNum = x.CommissionerNum,
-                                       SoleDutyNum = x.SoleDutyNum,
+                                       //SoleDutyNum = x.SoleDutyNum,
                                    };
 
                     var upReportItem = from x in db.Information_MillionsMonthlyReportItem

SGGL/BLL/app.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -61,4 +61,4 @@
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx

@@ -0,0 +1,78 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PointCropping.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.Control.PointCropping" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" Layout="VBox" AutoScroll="true" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" IsFluid="true" ShowBorder="true" ShowHeader="true" Title="现场控制点裁剪"
+                    runat="server" EnableCollapse="true" DataKeyNames="ControlId,ParentId,ControlLevel" EnableTree="true"
+                    TreeColumn="DetectionItems" DataIDField="ControlId" AllowPaging="false" DataParentIDField="ParentId" OnRowDataBound="Grid1_RowDataBound"
+                    AllowCellEditing="false" ClicksToEdit="1" OnRowCommand="Grid1_RowCommand"
+                    EnableMultiSelect="false">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" runat="server">
+                            <Items>
+                                <f:TextBox runat="server" ID="sDetectionItems"></f:TextBox>
+                                <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索" EnablePostBack="true" runat="server" OnClick="btnSearch_Click"></f:Button>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnAdd" Icon="Add" ToolTip="新增" Text="新增" runat="server" OnClick="btnAdd_Click"></f:Button>
+                                <f:Button ID="btnParentAdd" Icon="Add" ToolTip="新增子级别" Text="新增子级别" runat="server" OnClick="btnParentAdd_Click"></f:Button>
+                                <f:Button ID="btnEdit" Icon="BulletEdit" ToolTip="编辑" Text="编辑" runat="server" OnClick="btnEdit_Click"></f:Button>
+                                <f:Button ID="btnDelete" Text="删除" Icon="Delete" OnClick="btnDelete_Click" ConfirmText="删除当前选中数据和所有子节点数据？" runat="server"></f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField />
+                        <f:RenderField ColumnID="DetectionItems" ExpandUnusedSpace="true" Width="120px" DataField="DetectionItems" HeaderText="质量控制点检查、检测项">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="BasedCriterion" Width="200px" DataField="BasedCriterion" HeaderText="执行依据或准则">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="QualityRecordName" DataField="QualityRecordName" HeaderText="质量记录名称">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="RecordNumber" DataField="RecordNumber" HeaderText="记录格式文本号">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ControlCode" Width="100px" DataField="ControlCode" HeaderText="编码">
+                        </f:RenderField>
+                        <f:LinkButtonField Width="100px" ConfirmText="删除当前选中数据和所有子节点数据？" HeaderText="操作" ConfirmTarget="Top"
+                            CommandName="Delete" Icon="Delete" />
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close" CloseAction="HidePostBack"
+            Width="800px" Height="600px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil"
+                    OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuParentAdd" EnablePostBack="true" runat="server" Text="新增子级别" Icon="ApplicationViewIcons"
+                    OnClick="btnMenuParentAdd_Click">
+                </f:MenuButton>
+            </Items>
+        </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;
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx.cs

@@ -0,0 +1,209 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+    public partial class PointCropping : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                DataBrid();
+            }
+        }
+
+        #region 数据绑定和事件
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void DataBrid()
+        {
+            string strSql = @"select a.ControlId,a.ProjectId,a.ParentId,a.ControlCode,a.ControlLevel,a.PlanId,a.PlanTypeId,a.SubItemsId,a.DetectionItems,a.BasedCriterion,a.QualityRecordName,a.RecordNumber,a.Subcontractors,a.OperateTime,a.Sort from Control_PointCropping as a order by a.ControlLevel,a.Sort asc";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            if (!string.IsNullOrEmpty(sDetectionItems.Text.Trim()))
+            {
+                strSql += " and a.DetectionItems like '%@DetectionItems%'";
+                listStr.Add(new SqlParameter("@DetectionItems", this.sDetectionItems.Text.Trim()));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.DataSource = tb;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 行点击 事件
+        /// </summary>
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            if (e.CommandName == "Delete")
+            {
+                string rowID = e.RowID;
+                DeleteRowByIDInternal(rowID);
+                DataBrid();
+                ShowNotify("删除成功!");
+            }
+        }
+
+        /// <summary>
+        /// 行加载事件
+        /// </summary>
+        protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
+        {
+            int controlLevel = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : 2;
+            if (controlLevel < 2)
+            {
+                e.TreeNodeExpanded = true;
+            }
+        }
+
+        #endregion
+
+        #region 按钮
+
+        /// <summary>
+        /// 搜索
+        /// </summary>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            DataBrid();
+        }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                ShowNotify("至少选择一条数据！");
+                return;
+            }
+            foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+            {
+                string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                DeleteRowByIDInternal(rowID);
+            }
+            DataBrid();
+            ShowNotify("删除成功!");
+
+        }
+
+        /// <summary>
+        /// 新增
+        /// </summary>
+        protected void btnAdd_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference($"PointCroppingEdit.aspx?ControlId=&ParentId=", "新增"));
+        }
+
+        /// <summary>
+        /// 添加子级
+        /// </summary>
+        protected void btnParentAdd_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                ShowNotify("请选择一条数据!", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var rowIndex = Grid1.SelectedRowIndex;
+            var rowId = Grid1.DataKeys[rowIndex][0].ToString();
+            var controlLevel = Grid1.DataKeys[rowIndex][2] != null ? Convert.ToInt32(Grid1.DataKeys[rowIndex][2]) : 1;
+            if (controlLevel > 2)
+            {
+                ShowNotify("最小节点无子节点!", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference($"PointCroppingEdit.aspx?ControlId=&ParentId={rowId}", "添加子级"));
+        }
+
+        /// <summary>
+        /// 编辑
+        /// </summary>
+        protected void btnEdit_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                ShowNotify("请选择一条数据!", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var rowIndex = Grid1.SelectedRowIndex;
+            var rowId = Grid1.DataKeys[rowIndex][0].ToString();
+            var parentId = Grid1.DataKeys[rowIndex][1] != null ? Grid1.DataKeys[rowIndex][1].ToString() : string.Empty;
+            PageContext.RegisterStartupScript(Window1.GetShowReference($"PointCroppingEdit.aspx?ControlId={rowId}&ParentId={parentId}", "编辑"));
+        }
+
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            DataBrid();
+        }
+
+        /// <summary>
+        /// 右击修改
+        /// </summary>
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            btnEdit_Click(sender, e);
+        }
+
+        /// <summary>
+        /// 右击新增子级别
+        /// </summary>
+        protected void btnMenuParentAdd_Click(object sender, EventArgs e)
+        {
+            btnParentAdd_Click(sender, e);
+        }
+
+        #endregion
+
+        #region 私有方法
+
+        /// <summary>
+        /// 根据行ID来删除行数据
+        /// </summary>
+        private void DeleteRowByIDInternal(string rowID)
+        {
+            var model = Funs.DB.Control_PointCropping.FirstOrDefault(p => p.ControlId == rowID);
+            if (model != null)
+            {
+                Funs.DB.Control_PointCropping.DeleteOnSubmit(model);
+                GetDevice(rowID);
+            }
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        private void GetDevice(string id)
+        {
+            var model = Funs.DB.Control_PointCropping.FirstOrDefault(p => p.ParentId == id);
+            if (model != null)
+            {
+                Funs.DB.Control_PointCropping.DeleteOnSubmit(model);
+                GetDevice(model.ControlId);
+            }
+        }
+
+        #endregion
+
+    }
+}

SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx.designer.cs

@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+
+
+    public partial class PointCropping
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// sDetectionItems 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox sDetectionItems;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// btnAdd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAdd;
+
+        /// <summary>
+        /// btnParentAdd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnParentAdd;
+
+        /// <summary>
+        /// btnEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnEdit;
+
+        /// <summary>
+        /// btnDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDelete;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
+        /// <summary>
+        /// btnMenuParentAdd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuParentAdd;
+    }
+}

SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx

@@ -0,0 +1,103 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PointCroppingEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.Control.PointCroppingEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>编辑</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            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:ToolbarFill>
+                        <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
+                            runat="server">
+                            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                <Rows>
+
+                                    <f:FormRow runat="server" ID="one" Hidden="true">
+                                        <Items>
+                                            <f:Label ID="lblOneDetectionItems" runat="server" Label="一级质量控制点检查、检测项" LabelAlign="Right" LabelWidth="200px">
+                                            </f:Label>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow runat="server" ID="two" Hidden="true">
+                                        <Items>
+                                            <f:Label ID="lblTwoDetectionItems" runat="server" Label="二级质量控制点检查、检测项" LabelAlign="Right" LabelWidth="200px">
+                                            </f:Label>
+                                        </Items>
+                                    </f:FormRow>
+
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtDetectionItems" runat="server" Label="质量控制点检查、检测项" LabelAlign="Right" Required="true" LabelWidth="200px">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtBasedCriterion" runat="server" Label="执行依据或准则" LabelAlign="Right" LabelWidth="200px">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtQualityRecordName" runat="server" Label="质量记录名称" LabelAlign="Right" LabelWidth="200px">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtRecordNumber" runat="server" Label="记录格式文本号" LabelAlign="Right" LabelWidth="200px">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtPartition" runat="server" Label="等级划分" LabelAlign="Right" LabelWidth="200px">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtControlCode" runat="server" Label="序号" LabelAlign="Right" LabelWidth="200px">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextArea runat="server" ID="txtRemark" Label="备注" LabelAlign="Right" LabelWidth="200px"></f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:NumberBox runat="server" Label="排序" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="150"></f:NumberBox>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.cs

@@ -0,0 +1,217 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+    public partial class PointCroppingEdit : PageBase
+    {
+        /// <summary>
+        /// 上级主键
+        /// </summary>
+        public string ParentId
+        {
+            get { return (string)ViewState["ParentId"]; }
+            set { ViewState["ParentId"] = value; }
+        }
+
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ControlId
+        {
+            get { return (string)ViewState["ControlId"]; }
+            set { ViewState["ControlId"] = value; }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ControlId = Request.Params["ControlId"];
+                this.ParentId = Request.Params["ParentId"];
+                //绑定数据
+                PageIn();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        /// <param name="runId">主键</param>
+        /// <param name="parentId">上级主键</param>
+        public void PageIn()
+        {
+            var num = 0;
+            if (!string.IsNullOrWhiteSpace(this.ParentId))
+            {
+                var parenLs = GetAllCropping(this.ParentId);
+                if (parenLs.Count > 0)
+                {
+                    var itemModel = parenLs.FirstOrDefault(p => p.ControlId == this.ParentId);
+                    if (itemModel != null)
+                    {
+                        if (itemModel.ControlLevel == 1)
+                        {
+                            one.Hidden = false;
+                            var oneModel = parenLs.FirstOrDefault(p => p.ControlLevel == 1);
+                            if (oneModel != null)
+                            {
+                                lblOneDetectionItems.Text = oneModel.DetectionItems;
+                                if (string.IsNullOrWhiteSpace(this.ControlId))
+                                {
+                                    num = Funs.DB.Control_PointCropping.Count() + 1;
+                                    txtSort.Text = num.ToString();
+                                }
+                            }
+                        }
+                        else if (itemModel.ControlLevel == 2)
+                        {
+                            one.Hidden = false;
+                            two.Hidden = false;
+                            var oneModel = parenLs.FirstOrDefault(p => p.ControlLevel == 1);
+                            if (oneModel != null)
+                            {
+                                lblOneDetectionItems.Text = oneModel.DetectionItems;
+                            }
+                            var twoModel = parenLs.FirstOrDefault(p => p.ControlLevel == 2);
+                            if (twoModel != null)
+                            {
+                                lblTwoDetectionItems.Text = twoModel.DetectionItems;
+                            }
+                            if (string.IsNullOrWhiteSpace(this.ControlId))
+                            {
+                                num = Funs.DB.Control_PointCropping.Count() + 1;
+                                txtSort.Text = num.ToString();
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(this.ControlId))
+                {
+                    num = Funs.DB.Control_PointCropping.Count() + 1;
+                    txtSort.Text = num.ToString();
+                }
+            }
+            if (!string.IsNullOrWhiteSpace(this.ControlId))
+            {
+                var controModel = Funs.DB.Control_PointCropping.FirstOrDefault(p => p.ControlId == this.ControlId);
+                if (controModel != null)
+                {
+                    txtRemark.Text = controModel.Remark;
+                    txtSort.Text = controModel.Sort.ToString();
+                    txtDetectionItems.Text = controModel.DetectionItems;
+                    txtBasedCriterion.Text = controModel.BasedCriterion;
+                    txtQualityRecordName.Text = controModel.QualityRecordName;
+                    txtRecordNumber.Text = controModel.RecordNumber;
+                    txtPartition.Text = controModel.Partition;
+                    txtControlCode.Text = controModel.ControlCode;
+                    txtRemark.Text = controModel.Remark;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存
+        /// </summary>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Control_PointCropping();
+            model.ControlId = Guid.NewGuid().ToString();
+            var oneControlId = string.Empty;
+            var twoControlId = string.Empty;
+            if (!string.IsNullOrWhiteSpace(this.ControlId))
+            {
+                model = Funs.DB.Control_PointCropping.FirstOrDefault(p => p.ControlId == this.ControlId);
+            }
+            if (model == null)
+            {
+                ShowNotify("传递参数错误!", MessageBoxIcon.Error);
+                return;
+            }
+            //model.ProjectId = CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(this.ParentId))
+            {
+                var parenLs = GetAllCropping(this.ParentId);
+                if (parenLs.Count > 0)
+                {
+                    var oneModel = parenLs.FirstOrDefault(p => p.ControlLevel == 1);
+                    if (oneModel != null)
+                    {
+                        model.PlanId = oneModel.ControlId;
+                        model.ParentId = oneModel.ControlId;
+                        model.PlanTypeId = model.ControlId;
+                        model.ControlLevel = 2;
+                    }
+                    var twoModel = parenLs.FirstOrDefault(p => p.ControlLevel == 2);
+                    if (twoModel != null)
+                    {
+                        model.PlanId = twoModel.PlanId;
+                        model.ParentId = twoModel.ControlId;
+                        model.PlanTypeId = twoModel.ControlId;
+                        model.SubItemsId = model.ControlId;
+                        model.ControlLevel = 3;
+                    }
+                }
+            }
+            else
+            {
+                model.ControlLevel = 1;
+            }
+            model.AddUser = this.CurrUser.UserId;
+            model.OperateTime = DateTime.Now;
+            model.Sort = !string.IsNullOrEmpty(txtSort.Text) ? int.Parse(txtSort.Text) : Funs.DB.Control_PointCropping.Count() + 1;
+            model.DetectionItems = txtDetectionItems.Text;
+            model.BasedCriterion = txtBasedCriterion.Text;
+            model.QualityRecordName = txtQualityRecordName.Text;
+            model.RecordNumber = txtRecordNumber.Text;
+            model.Partition = txtPartition.Text;
+            model.ControlCode = txtControlCode.Text;
+            model.Remark = txtRemark.Text;
+            if (string.IsNullOrWhiteSpace(this.ControlId)) Funs.DB.Control_PointCropping.InsertOnSubmit(model);
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功!", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+        }
+
+
+        #region 私有方法
+
+        /// <summary>
+        /// 根据主键获取所有节点
+        /// </summary>
+        /// <returns></returns>
+        public List<Control_PointCropping> GetAllCropping(string parentId)
+        {
+            var result = new List<Control_PointCropping>();
+
+            var ids = new List<string>();
+            var itemCropping = Funs.DB.Control_PointCropping.FirstOrDefault(p => p.ControlId == parentId);
+            if (itemCropping != null)
+            {
+                ids.Add(itemCropping.ControlId);
+                if (!string.IsNullOrWhiteSpace(itemCropping.PlanId))
+                {
+                    ids.Add(itemCropping.PlanId);
+                }
+                if (!string.IsNullOrWhiteSpace(itemCropping.PlanTypeId))
+                {
+                    ids.Add(itemCropping.PlanTypeId);
+                }
+                result = Funs.DB.Control_PointCropping.Where(p => ids.Contains(p.ControlId)).ToList();
+            }
+            return result;
+        }
+
+        #endregion
+
+    }
+}

SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.designer.cs

@@ -0,0 +1,197 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+
+
+    public partial class PointCroppingEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// one 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow one;
+
+        /// <summary>
+        /// lblOneDetectionItems 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblOneDetectionItems;
+
+        /// <summary>
+        /// two 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow two;
+
+        /// <summary>
+        /// lblTwoDetectionItems 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblTwoDetectionItems;
+
+        /// <summary>
+        /// txtDetectionItems 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDetectionItems;
+
+        /// <summary>
+        /// txtBasedCriterion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtBasedCriterion;
+
+        /// <summary>
+        /// txtQualityRecordName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtQualityRecordName;
+
+        /// <summary>
+        /// txtRecordNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRecordNumber;
+
+        /// <summary>
+        /// txtPartition 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPartition;
+
+        /// <summary>
+        /// txtControlCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtControlCode;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// txtSort 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtSort;
+    }
+}

SGGL/FineUIPro.Web/ErrLog.txt

@@ -0,0 +1,42 @@
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:文件“/CQMS/WBS/Control/PointCroppingEdit.aspx”不存在。
+错误堆栈:
+   在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:05/08/2024 01:15:14
+出错文件:http://localhost:8579/CQMS/WBS/Control/PointCroppingEdit.aspx?ControlId=&ParentId=
+IP地址:::1
+
+出错时间:05/08/2024 01:15:14
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:文件“/CQMS/WBS/Control/PointCroppingEdit.aspx”不存在。
+错误堆栈:
+   在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:05/08/2024 01:15:20
+出错文件:http://localhost:8579/CQMS/WBS/Control/PointCroppingEdit.aspx?ControlId=&ParentId=A9CBACE9-59C6-40CF-B587-EB1367A16137
+IP地址:::1
+
+出错时间:05/08/2024 01:15:20
+

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FineUIPro.Web</RootNamespace>
     <AssemblyName>FineUIPro.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <SccProjectName>
     </SccProjectName>
@@ -581,6 +581,8 @@
     <Content Include="CQMS\WBS\ControlItemInitSet.aspx" />
     <Content Include="CQMS\WBS\ControlItemProjectEdit.aspx" />
     <Content Include="CQMS\WBS\ControlPoint.aspx" />
+    <Content Include="CQMS\WBS\Control\PointCropping.aspx" />
+    <Content Include="CQMS\WBS\Control\PointCroppingEdit.aspx" />
     <Content Include="CQMS\WBS\EditBreakdown.aspx" />
     <Content Include="CQMS\WBS\EditBreakdownProject.aspx" />
     <Content Include="CQMS\WBS\EditDivision.aspx" />
@@ -8463,6 +8465,20 @@
     <Compile Include="CQMS\WBS\ControlPoint.aspx.designer.cs">
       <DependentUpon>ControlPoint.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\WBS\Control\PointCropping.aspx.cs">
+      <DependentUpon>PointCropping.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\PointCropping.aspx.designer.cs">
+      <DependentUpon>PointCropping.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\PointCroppingEdit.aspx.cs">
+      <DependentUpon>PointCroppingEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\PointCroppingEdit.aspx.designer.cs">
+      <DependentUpon>PointCroppingEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\WBS\EditBreakdown.aspx.cs">
       <DependentUpon>EditBreakdown.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -18759,7 +18775,7 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -16,8 +16,9 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <StartPageUrl>Login.aspx</StartPageUrl>
+          <StartPageUrl>
-          <StartAction>SpecificPage</StartAction>
+          </StartPageUrl>
+          <StartAction>CurrentPage</StartAction>
           <AspNetDebugging>True</AspNetDebugging>
           <SilverlightDebugging>False</SilverlightDebugging>
           <NativeDebugging>False</NativeDebugging>

SGGL/FineUIPro.Web/Web.config

@@ -12,7 +12,7 @@
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.8"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

SGGL/FineUIPro.Web/common/Menu_CQMS.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
   <TreeNode id="3B322232-38A1-4291-9832-CD4A01C2A975" Text="WBS数据" NavigateUrl="">
-    <TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="现场控制点裁剪" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx">
+    <TreeNode id="1025D812-2325-4FE9-A1E9-D53F2CAACDC6" Text="现场控制点裁剪(新)" NavigateUrl="CQMS/WBS/Control/PointCropping.aspx">
     </TreeNode>
+<TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="现场控制点裁剪" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode>
 <TreeNode id="88F115C3-D193-4455-8E8D-76F2EAF56291" Text="现场控制点资料柜" NavigateUrl="CQMS/WBS/ProjectControlPointFile.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="4a0e62cb-ee50-4a14-80b7-377602e9902c" Text="综合管理" NavigateUrl=""><TreeNode id="6c2c1e5e-1812-4e1c-a683-7125518e28c7" Text="设备材料报验" NavigateUrl="CQMS/Comprehensive/InspectionEquipment.aspx"></TreeNode>

SGGL/FineUIPro.Web/common/Menu_JDGL.xml

@@ -10,6 +10,7 @@
 <TreeNode id="59AAE0F0-2DB6-4065-B304-7E2C56EC3E5D" Text="赢得值曲线" NavigateUrl="JDGL/CostAnalysis/EarnedValueCurve.aspx"></TreeNode>
 <TreeNode id="D1FC6ACA-C789-401C-B9FB-3A96FFE4C8AC" Text="进度报表" NavigateUrl="JDGL/CostAnalysis/JDReport.aspx"></TreeNode>
 <TreeNode id="9CAF311E-C234-4DA4-B235-D4E478FBD80E" Text="里程碑" NavigateUrl="JDGL/WBS/MilePost.aspx"></TreeNode>
+<TreeNode id="94287B92-7E96-4B90-BC6F-DAF30AE3B314" Text="月度计划情况" NavigateUrl="JDGL/Check/MonthPlan.aspx"></TreeNode>
 <TreeNode id="92CBD072-20F8-45B1-9D17-6F7494DD2020" Text="数据导入" NavigateUrl=""><TreeNode id="F3AA42B3-5776-4992-A625-1216C579FEDE" Text="项目进度情况" NavigateUrl="JDGL/Check/ProgressCompletion.aspx"></TreeNode>
 <TreeNode id="2AE9D982-A499-497F-8F54-ADDA5856887E" Text="工程量完成情况" NavigateUrl="JDGL/Check/QuantityCompletion.aspx"></TreeNode>
 <TreeNode id="82E513B9-1A6F-495A-A633-EBC89CE5273A" Text="低温储罐完成情况" NavigateUrl="JDGL/Check/LowTankCompletion.aspx"></TreeNode>

SGGL/FineUIPro.Web/common/Menu_TestRun.xml

@@ -46,12 +46,12 @@
 <TreeNode id="D9D90BA4-BF34-4045-977F-DCE9D507F40F" Text="生成工作包检查表" NavigateUrl="TestRun/BeforeTestRun/SubInspectTerm.aspx"></TreeNode>
 <TreeNode id="150A6D3D-CAA2-4246-947C-6730A18BCC83" Text="检查表条件确认" NavigateUrl="TestRun/BeforeTestRun/SubWorkInspect.aspx"></TreeNode>
 <TreeNode id="B6A6EA7D-EDAB-40C8-920D-A106731D0E08" Text="检查表尾项管理" NavigateUrl="TestRun/BeforeTestRun/InspectTailTermList.aspx"></TreeNode>
-<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="检查项确认" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
+<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="尾项处理" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
-<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表流转" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
+<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="尾项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
-<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="检查项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
+<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表会签" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
+<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
 <TreeNode id="F184E0FC-96E3-48A5-9515-21EAD37053B3" Text="现场实施" NavigateUrl="TestRun/BeforeTestRun/SiteImplementationList.aspx"></TreeNode>
 <TreeNode id="19865B64-E0AA-4D32-9712-05C14FE6288F" Text="试车记录上传" NavigateUrl="TestRun/BeforeTestRun/TestRunRecordUploadList.aspx"></TreeNode>
-<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
 <TreeNode id="FCC050F0-0F13-4CE5-BE33-623377562965" Text="三查四定尾项清单" NavigateUrl="TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx"></TreeNode>
 <TreeNode id="4822760B-395B-4979-B547-EA0D715C8A2C" Text="三查四定提出人处理" NavigateUrl="TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx"></TreeNode>
 <TreeNode id="E673FC27-74F1-479C-8DE1-950183566725" Text="三查四定责任人销项" NavigateUrl="TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx"></TreeNode>
@@ -71,6 +71,7 @@
 <TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
 <TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
 <TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
+<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
 <TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
 <TreeNode id="2232ED9A-EA3C-4CB5-A53C-D96D3F5E0527" Text="尾项处理" NavigateUrl="TestRun/TestRunManage/TailTermHandleList.aspx"></TreeNode>
 <TreeNode id="9489BD6A-1A95-43BC-85C0-A65751C2C85E" Text="尾项审核" NavigateUrl="TestRun/TestRunManage/TailTermApproveList.aspx"></TreeNode>
@@ -119,7 +120,8 @@
 <TreeNode id="EC4B11B4-AF9B-44E9-8CD4-364A5633CB76" Text="性能考核报告" NavigateUrl="TestRun/DriverReport/PropertyReport.aspx"></TreeNode>
 <TreeNode id="0D5C3347-0484-4455-AD32-D558BCFF0D0B" Text="开车完工报告" NavigateUrl="TestRun/DriverReport/DriverRunComplete.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="ECDC614F-6239-44D2-9523-6A25D42C6A45" Text="项目开车总结" NavigateUrl=""><TreeNode id="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="专项总结" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></TreeNode>
+<TreeNode id="ECDC614F-6239-44D2-9523-6A25D42C6A45" Text="项目开车总结" NavigateUrl=""><TreeNode id="9B32C4BF-62E9-4561-8632-97AC0F581701" Text="月技术总结" NavigateUrl="TestRun/DriverSummary/MonthSummary.aspx"></TreeNode>
+<TreeNode id="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="专项总结" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></TreeNode>
 <TreeNode id="9EBA628D-E725-4A0B-B765-171F405D0821" Text="完工后个人总结" NavigateUrl="TestRun/DriverSummary/PersonalSummary.aspx"></TreeNode>
 <TreeNode id="AA88BD56-E0B4-4B9C-9238-3F48EA59C50A" Text="开车完工报告" NavigateUrl="TestRun/DriverSummary/CompleteSummary.aspx"></TreeNode>
 </TreeNode>

SGGL/Model/Model.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Model</RootNamespace>
     <AssemblyName>Model</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>

SGGL/SgManager.AI/SgManager.AI.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SgManager.AI</RootNamespace>
     <AssemblyName>SgManager.AI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

SGGL/SgManager.AI/app.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -8,4 +8,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

SGGL/WebAPI/Web.config

@@ -46,7 +46,7 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.8"/>
     <httpRuntime/>
     <pages controlRenderingCompatibilityVersion="4.0"/>
   </system.web>

SGGL/WebAPI/WebAPI.csproj

@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebAPI</RootNamespace>
     <AssemblyName>WebAPI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />

SGGL/WebAPI/WebAPI.csproj.user

@@ -39,7 +39,7 @@
           <StartWorkingDirectory>
           </StartWorkingDirectory>
           <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
+          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>