diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index 6ff7546..2f6d20f 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -63,6 +63,9 @@
     <Reference Include="Aspose.Words, Version=21.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
       <HintPath>..\packages\Aspose.Words.21.8.0\lib\net461\Aspose.Words.dll</HintPath>
     </Reference>
+    <Reference Include="Aspose.Words.Pdf2Word, Version=21.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
+      <HintPath>..\packages\Aspose.Words.21.8.0\lib\net461\Aspose.Words.Pdf2Word.dll</HintPath>
+    </Reference>
     <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 6e29203..e3436b8 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs
index f78295d..6f2a707 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs
@@ -11,6 +11,7 @@ using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 using System.Web.UI.DataVisualization.Charting;
+using Aspose.Words.Loading;
 
 namespace FineUIPro.Web.JGZL
 {
@@ -371,7 +372,6 @@ namespace FineUIPro.Web.JGZL
                     var PathB = Funs.RootPath + "FileUpload/" + projectId + "2.docx";
                     BLL.Common.FastReportService.ExportMergeReport(FastReportItemList2, PathB, this.drpPrintType.SelectedValue);
                     Aspose.Words.Document doc2 = new Aspose.Words.Document(PathB);
-
                     //合并 Word DOcx 文档
                     doc1.AppendDocument(doc2, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
                     #endregion
@@ -392,7 +392,6 @@ namespace FineUIPro.Web.JGZL
                     var PathC = Funs.RootPath + "FileUpload/" + projectId + "3.docx";
                     BLL.Common.FastReportService.ExportMergeReport(FastReportItemList3, PathC, this.drpPrintType.SelectedValue);
                     Aspose.Words.Document doc3 = new Aspose.Words.Document(PathC);
-
                     //合并 Word DOcx 文档
                     doc1.AppendDocument(doc3, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
                     #endregion
@@ -638,19 +637,22 @@ namespace FineUIPro.Web.JGZL
                         dt.Columns.Add("FileName");
                         dt.Columns.Add("Remark");
 
-                        DataRow[] rows = tb.DefaultView.ToTable().Select();
-                        int i = 0;
-                        foreach (var row in rows)
+                        if (tb.Rows.Count > 0)
                         {
-                            var newRow = dt.NewRow();
-                            newRow["SerialNumber"] = (i + 1).ToString(); //row["SerialNumber"].ToString();
-                            newRow["FileCode"] = row["FileCode"].ToString();
-                            newRow["FileName"] = row["FileName"].ToString();
-                            newRow["Remark"] = row["Remark"].ToString();
-                            dt.Rows.Add(newRow);
-                            i++;
+                            DataRow[] rows = tb.DefaultView.ToTable().Select();
+                            int i = 0;
+                            foreach (var row in rows)
+                            {
+                                var newRow = dt.NewRow();
+                                newRow["SerialNumber"] = (i + 1).ToString(); //row["SerialNumber"].ToString();
+                                newRow["FileCode"] = row["FileCode"].ToString();
+                                newRow["FileName"] = row["FileName"].ToString();
+                                newRow["Remark"] = row["Remark"].ToString();
+                                dt.Rows.Add(newRow);
+                                i++;
+                            }
+                            BLL.Common.FastReportService.AddFastreportTable(dt);
                         }
-                        BLL.Common.FastReportService.AddFastreportTable(dt);
 
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                         keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
@@ -767,31 +769,30 @@ namespace FineUIPro.Web.JGZL
                     break;
                 case "4"://压力管道安装质量证明
                     {
+                        DataTable dt = new DataTable();
+                        dt.TableName = "Data";
+                        dt.Columns.Add("CertificateCode");
+                        dt.Columns.Add("EngineeringName");
+                        dt.Columns.Add("EngineeringCode");
+                        dt.Columns.Add("DeliveryUnit");
+                        dt.Columns.Add("DeliveryUnitCode");
+                        dt.Columns.Add("InstallStartDate");
+                        dt.Columns.Add("InstallEndDate");
+                        dt.Columns.Add("PipelineLevel");
+                        dt.Columns.Add("PipelineLength");
+                        dt.Columns.Add("DesignUnit");
+                        dt.Columns.Add("DesignLicenseCode");
+                        dt.Columns.Add("SupervisoryAndInspectionAgency");
+                        dt.Columns.Add("QualificationCertificateCode");
+                        dt.Columns.Add("LosslessTestingAgency");
+                        dt.Columns.Add("InstitutionalApprovalCertificate");
+                        dt.Columns.Add("InstallationInspection");
+                        dt.Columns.Add("ConstructionUnit");
+                        dt.Columns.Add("SpecialEquipmentProductionLicenseCode");
+                        dt.Columns.Add("Remark");
                         var report = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateByProjectId(projectId);
                         if (report != null)
-                        {
-                            DataTable dt = new DataTable();
-                            dt.TableName = "Data";
-                            dt.Columns.Add("CertificateCode");
-                            dt.Columns.Add("EngineeringName");
-                            dt.Columns.Add("EngineeringCode");
-                            dt.Columns.Add("DeliveryUnit");
-                            dt.Columns.Add("DeliveryUnitCode");
-                            dt.Columns.Add("InstallStartDate");
-                            dt.Columns.Add("InstallEndDate");
-                            dt.Columns.Add("PipelineLevel");
-                            dt.Columns.Add("PipelineLength");
-                            dt.Columns.Add("DesignUnit");
-                            dt.Columns.Add("DesignLicenseCode");
-                            dt.Columns.Add("SupervisoryAndInspectionAgency");
-                            dt.Columns.Add("QualificationCertificateCode");
-                            dt.Columns.Add("LosslessTestingAgency");
-                            dt.Columns.Add("InstitutionalApprovalCertificate");
-                            dt.Columns.Add("InstallationInspection");
-                            dt.Columns.Add("ConstructionUnit");
-                            dt.Columns.Add("SpecialEquipmentProductionLicenseCode");
-                            dt.Columns.Add("Remark");
-
+                        {  
                             var newRow = dt.NewRow();
                             newRow["CertificateCode"] = report.CertificateCode;
                             newRow["EngineeringName"] = BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName;
@@ -817,22 +818,22 @@ namespace FineUIPro.Web.JGZL
                             dt.Rows.Add(newRow);
 
                             BLL.Common.FastReportService.AddFastreportTable(dt);
-
-                            Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
-                            //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
-                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
-
-                            initTemplatePath = "File\\Fastreport\\JGZL\\压力管道安装质量证明.frx";
-                            List<DataTable> dataTables = new List<DataTable>();
-                            dataTables.Add(dt);
-                            fastReportItem.ReportPath = initTemplatePath;
-                            fastReportItem.ParameterValues = keyValuePairs;
-                            fastReportItem.DataTables = dataTables;
                         }
+                        Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                        //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
+                        BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+
+                        initTemplatePath = "File\\Fastreport\\JGZL\\压力管道安装质量证明.frx";
+                        List<DataTable> dataTables = new List<DataTable>();
+                        dataTables.Add(dt);
+                        fastReportItem.ReportPath = initTemplatePath;
+                        fastReportItem.ParameterValues = keyValuePairs;
+                        fastReportItem.DataTables = dataTables;
                     }
                     break;
                 case "5"://压力管道安装汇总表
                     {
+                        Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                         string strSql = @"SELECT * from JGZL_IndustrialPipelineInstallationSummary where ProjectId = @ProjectId ";
                         List<SqlParameter> listStr = new List<SqlParameter>();
                         listStr.Add(new SqlParameter("@ProjectId", projectId));
@@ -844,36 +845,36 @@ namespace FineUIPro.Web.JGZL
                         }
                         SqlParameter[] parameter = listStr.ToArray();
                         DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+                        DataTable dt = new DataTable();
+                        dt.TableName = "Data";
+                        dt.Columns.Add("Num");
+                        dt.Columns.Add("PipelineCode");
+                        dt.Columns.Add("PipelineLevel");
+                        dt.Columns.Add("DesignPressure");
+                        dt.Columns.Add("DesignTemperature");
+                        dt.Columns.Add("OperatingTemperature");
+                        dt.Columns.Add("Medium");
+                        dt.Columns.Add("Material");
+                        dt.Columns.Add("Specifications");
+                        dt.Columns.Add("Length");
+                        dt.Columns.Add("LayingMethod");
+                        dt.Columns.Add("WeldsNum");
+                        dt.Columns.Add("LosslessRatio");
+                        dt.Columns.Add("VoltageResistantTestMedium");
+                        dt.Columns.Add("VoltageResistantTestPressure");
+                        dt.Columns.Add("VoltageResistantTestDate");
+                        dt.Columns.Add("LeakageTestMedium");
+                        dt.Columns.Add("LeakageTestPressure");
+                        dt.Columns.Add("LeakageTestDate");
+                        dt.Columns.Add("CleaningMethod");
+                        dt.Columns.Add("CorrosionControlMethod");
+                        dt.Columns.Add("InsulationMethod");
+                        dt.Columns.Add("PipelineStartPoint");
+                        dt.Columns.Add("PipelineEndPoint");
+                        dt.Columns.Add("Remark");
                         if (tb.Rows.Count > 0)
                         {
-                            DataTable dt = new DataTable();
-                            dt.TableName = "Data";
-                            dt.Columns.Add("Num");
-                            dt.Columns.Add("PipelineCode");
-                            dt.Columns.Add("PipelineLevel");
-                            dt.Columns.Add("DesignPressure");
-                            dt.Columns.Add("DesignTemperature");
-                            dt.Columns.Add("OperatingTemperature");
-                            dt.Columns.Add("Medium");
-                            dt.Columns.Add("Material");
-                            dt.Columns.Add("Specifications");
-                            dt.Columns.Add("Length");
-                            dt.Columns.Add("LayingMethod");
-                            dt.Columns.Add("WeldsNum");
-                            dt.Columns.Add("LosslessRatio");
-                            dt.Columns.Add("VoltageResistantTestMedium");
-                            dt.Columns.Add("VoltageResistantTestPressure");
-                            dt.Columns.Add("VoltageResistantTestDate");
-                            dt.Columns.Add("LeakageTestMedium");
-                            dt.Columns.Add("LeakageTestPressure");
-                            dt.Columns.Add("LeakageTestDate");
-                            dt.Columns.Add("CleaningMethod");
-                            dt.Columns.Add("CorrosionControlMethod");
-                            dt.Columns.Add("InsulationMethod");
-                            dt.Columns.Add("PipelineStartPoint");
-                            dt.Columns.Add("PipelineEndPoint");
-                            dt.Columns.Add("Remark");
-
                             DataRow[] rows = tb.DefaultView.ToTable().Select();
                             int i = 0;
                             foreach (var row in rows)
@@ -910,7 +911,6 @@ namespace FineUIPro.Web.JGZL
                                 i++;
                             }
                             BLL.Common.FastReportService.AddFastreportTable(dt);
-
                             string certificateCode = string.Empty;
                             string deliveryUnit = string.Empty;
                             string deliveryUnitCode = string.Empty;
@@ -922,28 +922,27 @@ namespace FineUIPro.Web.JGZL
                                 deliveryUnit = certificate.DeliveryUnit;
                                 deliveryUnitCode = certificate.DeliveryUnitCode;
                             }
-                            Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                             keyValuePairs.Add("CertificateCode", certificateCode);
                             keyValuePairs.Add("DeliveryUnit", deliveryUnit);
                             keyValuePairs.Add("DeliveryUnitCode", deliveryUnitCode);
-                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
-
-                            initTemplatePath = "File\\Fastreport\\JGZL\\压力管道安装汇总表.frx";
-                            List<DataTable> dataTables = new List<DataTable>();
-                            dataTables.Add(dt);
-                            fastReportItem.ReportPath = initTemplatePath;
-                            fastReportItem.ParameterValues = keyValuePairs;
-                            fastReportItem.DataTables = dataTables;
                         }
+                        BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+
+                        initTemplatePath = "File\\Fastreport\\JGZL\\压力管道安装汇总表.frx";
+                        List<DataTable> dataTables = new List<DataTable>();
+                        dataTables.Add(dt);
+                        fastReportItem.ReportPath = initTemplatePath;
+                        fastReportItem.ParameterValues = keyValuePairs;
+                        fastReportItem.DataTables = dataTables;
                     }
                     break;
                 case "6"://工程施工开工报告
                     {
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                        keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                         var report = BLL.CommencementReportService.GetCommencementReportByProjectId(projectId);
                         if (report != null)
                         {
-                            keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                             keyValuePairs.Add("ContractNumber", report.ContractNumber);
                             keyValuePairs.Add("DesignUnit", report.DesignUnit);
                             keyValuePairs.Add("PlannedStartDate", report.PlannedStartDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.PlannedStartDate) : "");
@@ -952,8 +951,8 @@ namespace FineUIPro.Web.JGZL
                             keyValuePairs.Add("Conditions", report.Conditions);
                             keyValuePairs.Add("ReviewOpinion", report.ReviewOpinion);
                             keyValuePairs.Add("QualitySupervisionOpinion", report.QualitySupervisionOpinion);
-                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
                         }
+                        BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 
                         initTemplatePath = "File\\Fastreport\\JGZL\\工程施工开工报告.frx";
                         List<DataTable> dataTables = new List<DataTable>();
@@ -966,18 +965,18 @@ namespace FineUIPro.Web.JGZL
                 case "7"://工程中间交接证书
                     {
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                            keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                         var report = BLL.HandoverCertificateService.GetHandoverCertificateByProjectId(projectId);
                         if (report != null)
                         {
-                            keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                             keyValuePairs.Add("ContractNumber", report.ContractNumber);
                             keyValuePairs.Add("HandoverDate", report.HandoverDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.HandoverDate) : "");
                             keyValuePairs.Add("ProjectContent", report.ProjectContent);
                             keyValuePairs.Add("ReceiveOpinions", report.ReceiveOpinions);
                             keyValuePairs.Add("HeaderMan", report.HeaderMan);
                             keyValuePairs.Add("SupervisionOpinion", report.SupervisionOpinion);
-                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
                         }
+                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
                         initTemplatePath = "File\\Fastreport\\JGZL\\工程中间交接证书.frx";
                         List<DataTable> dataTables = new List<DataTable>();
                         //dataTables.Add(dt);
@@ -989,10 +988,10 @@ namespace FineUIPro.Web.JGZL
                 case "8"://工程交工验收证书
                     {
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                            keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                         var report = BLL.AcceptanceCertificateService.GetAcceptanceCertificateByProjectId(projectId);
                         if (report != null)
                         {
-                            keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                             keyValuePairs.Add("ContractNumber", report.ContractNumber);
                             keyValuePairs.Add("StartDate", report.StartDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.StartDate) : "");
                             keyValuePairs.Add("EndDate", report.EndDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.EndDate) : "");
@@ -1000,8 +999,8 @@ namespace FineUIPro.Web.JGZL
                             keyValuePairs.Add("AcceptanceOpinion", report.AcceptanceOpinion);
                             keyValuePairs.Add("HeaderMan", report.HeaderMan);
                             keyValuePairs.Add("SupervisoryOpinion", report.SupervisoryOpinion);
-                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
                         }
+                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
                         initTemplatePath = "File\\Fastreport\\JGZL\\工程交工验收证书.frx";
                         List<DataTable> dataTables = new List<DataTable>();
                         //dataTables.Add(dt);
@@ -1013,10 +1012,10 @@ namespace FineUIPro.Web.JGZL
                 case "9"://工程联络单
                     {
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                            keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                         var report = BLL.ContactService.GetContactByProjectId(projectId, "1");
                         if (report != null)
                         {
-                            keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                             keyValuePairs.Add("ContractNumber", report.ContractNumber);
                             keyValuePairs.Add("DeliveryUnit", report.DeliveryUnit);
                             keyValuePairs.Add("SubjectMatter", report.SubjectMatter);
@@ -1030,8 +1029,8 @@ namespace FineUIPro.Web.JGZL
                             keyValuePairs.Add("OpinionHandDate", report.OpinionHandDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.OpinionHandDate) : "");
                             keyValuePairs.Add("OpinionsReviewer", report.OpinionsReviewer);
                             keyValuePairs.Add("OpinionsDate", report.OpinionsDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.OpinionsDate) : "");
-                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
                         }
+                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
                         initTemplatePath = "File\\Fastreport\\JGZL\\工程联络单.frx";
                         List<DataTable> dataTables = new List<DataTable>();
                         //dataTables.Add(dt);
@@ -1043,10 +1042,10 @@ namespace FineUIPro.Web.JGZL
                 case "10"://施工图核查记录
                     {
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                            keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                         var report = BLL.ConDrawingVerificationService.GetConDrawingVerificationByProjectId(projectId);
                         if (report != null)
                         {
-                            keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                             keyValuePairs.Add("DesignUnit", report.DesignUnit);
                             keyValuePairs.Add("Professional", report.Professional);
                             keyValuePairs.Add("Host", report.Host);
@@ -1059,9 +1058,8 @@ namespace FineUIPro.Web.JGZL
                             keyValuePairs.Add("RecordDate", report.RecordDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.RecordDate) : "");
                             keyValuePairs.Add("Reviewer", report.Reviewer);
                             keyValuePairs.Add("ReviewDate", report.ReviewDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.ReviewDate) : "");
-
-                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
                         }
+                            BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
                         initTemplatePath = "File\\Fastreport\\JGZL\\施工图核查记录.frx";
                         List<DataTable> dataTables = new List<DataTable>();
                         //dataTables.Add(dt);
@@ -1089,21 +1087,23 @@ namespace FineUIPro.Web.JGZL
                         dt.Columns.Add("CertificateNo");
                         dt.Columns.Add("QualifiedProjectCode");
                         dt.Columns.Add("LimitDate");
-
-                        tb.DefaultView.Sort = "Number asc";
-                        DataRow[] rows = tb.DefaultView.ToTable().Select();
-                        foreach (var row in rows)
+                        if (tb.Rows.Count > 0)
                         {
-                            var newRow = dt.NewRow();
-                            newRow["Number"] = row["Number"].ToString();
-                            newRow["WED_Name"] = row["WED_Name"].ToString();
-                            newRow["WED_Code"] = row["WED_Code"].ToString();
-                            newRow["CertificateNo"] = row["CertificateNo"].ToString();
-                            newRow["QualifiedProjectCode"] = row["QualifiedProjectCode"].ToString();
-                            newRow["LimitDate"] = row["LimitDate"].ToString();
-                            dt.Rows.Add(newRow);
+                            tb.DefaultView.Sort = "Number asc";
+                            DataRow[] rows = tb.DefaultView.ToTable().Select();
+                            foreach (var row in rows)
+                            {
+                                var newRow = dt.NewRow();
+                                newRow["Number"] = row["Number"].ToString();
+                                newRow["WED_Name"] = row["WED_Name"].ToString();
+                                newRow["WED_Code"] = row["WED_Code"].ToString();
+                                newRow["CertificateNo"] = row["CertificateNo"].ToString();
+                                newRow["QualifiedProjectCode"] = row["QualifiedProjectCode"].ToString();
+                                newRow["LimitDate"] = row["LimitDate"].ToString();
+                                dt.Rows.Add(newRow);
+                            }
+                            BLL.Common.FastReportService.AddFastreportTable(dt);
                         }
-                        BLL.Common.FastReportService.AddFastreportTable(dt);
 
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                         keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
@@ -1193,27 +1193,30 @@ namespace FineUIPro.Web.JGZL
                         dt.Columns.Add("JOT_PrepareTemp");
                         dt.Columns.Add("WeldDate");
 
-                        DataView dv = tb.DefaultView;//获取表视图
-                        dv.Sort = "JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5 ASC";//按照ID排序
-                        tb = dv.ToTable();//转为表
-                        DataRow[] rows = tb.DefaultView.ToTable().Select();
-                        foreach (var row in rows)
+                        if (tb.Rows.Count > 0)
                         {
-                            var newRow = dt.NewRow();
-                            newRow["ISO_IsoNo"] = row["ISO_IsoNo"].ToString();
-                            newRow["JOT_JointNo"] = row["JOT_JointNo"].ToString();
-                            newRow["WED_Code"] = row["WED_Code"].ToString();
-                            newRow["JOT_JointDesc"] = row["JOT_JointDesc"].ToString();
-                            newRow["STE_Code"] = row["STE_Code"].ToString();
-                            newRow["weldLocal"] = row["weldLocal"].ToString();
-                            newRow["WME_Name"] = row["WME_Name"].ToString();
-                            newRow["WMT_MatName"] = row["WMT_MatName"].ToString();
-                            newRow["JOT_PrepareTemp"] = row["JOT_PrepareTemp"].ToString();
-                            string WeldDate = string.Format("{0:yyyy-MM-dd}", row["WeldDate"]);
-                            newRow["WeldDate"] = WeldDate;
-                            dt.Rows.Add(newRow);
+                            DataView dv = tb.DefaultView;//获取表视图
+                            dv.Sort = "JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5 ASC";//按照ID排序
+                            tb = dv.ToTable();//转为表
+                            DataRow[] rows = tb.DefaultView.ToTable().Select();
+                            foreach (var row in rows)
+                            {
+                                var newRow = dt.NewRow();
+                                newRow["ISO_IsoNo"] = row["ISO_IsoNo"].ToString();
+                                newRow["JOT_JointNo"] = row["JOT_JointNo"].ToString();
+                                newRow["WED_Code"] = row["WED_Code"].ToString();
+                                newRow["JOT_JointDesc"] = row["JOT_JointDesc"].ToString();
+                                newRow["STE_Code"] = row["STE_Code"].ToString();
+                                newRow["weldLocal"] = row["weldLocal"].ToString();
+                                newRow["WME_Name"] = row["WME_Name"].ToString();
+                                newRow["WMT_MatName"] = row["WMT_MatName"].ToString();
+                                newRow["JOT_PrepareTemp"] = row["JOT_PrepareTemp"].ToString();
+                                string WeldDate = string.Format("{0:yyyy-MM-dd}", row["WeldDate"]);
+                                newRow["WeldDate"] = WeldDate;
+                                dt.Rows.Add(newRow);
+                            }
+                            BLL.Common.FastReportService.AddFastreportTable(dt);
                         }
-                        BLL.Common.FastReportService.AddFastreportTable(dt);
 
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                         keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
@@ -1380,36 +1383,39 @@ namespace FineUIPro.Web.JGZL
                         dt.Columns.Add("SMAWWelder");
                         dt.Columns.Add("VTInspector");
 
-                        DataView dv = tb.DefaultView;//获取表视图
-                        dv.Sort = "PipelineNo,WeldingJointNo ASC";//按照ID倒序排序
-                        tb = dv.ToTable();//转为表
-                        DataRow[] rows = tb.DefaultView.ToTable().Select();
-                        int i = 0;
-                        foreach (var row in rows)
+                        if (tb.Rows.Count > 0)
                         {
-                            var newRow = dt.NewRow();
-                            newRow["Num"] = (i + 1).ToString();
-                            string CheckDate = string.Format("{0:yyyy-MM-dd}", row["CheckDate"]);
-                            newRow["CheckDate"] = CheckDate;
-                            newRow["ISO_IsoNo"] = row["PipelineNo"].ToString();
-                            newRow["JOT_JointNo"] = row["WeldingJointNo"].ToString();
-                            newRow["Material"] = row["Material"].ToString();
-                            newRow["InstallationMethod"] = row["InstallationMethod"].ToString();
-                            newRow["InstallationMethod2"] = row["InstallationMethod2"].ToString();
-                            newRow["WeldingWire"] = row["WeldingWire"].ToString();
-                            newRow["WeldingRod"] = row["WeldingRod"].ToString();
-                            newRow["TeamGap"] = row["TeamGap"].ToString();
-                            newRow["TeamPlumber"] = row["TeamPlumber"].ToString();
-                            newRow["TeamWelder"] = row["TeamWelder"].ToString();
-                            newRow["TeamInspector"] = row["TeamInspector"].ToString();
-                            newRow["GTAWWelder"] = row["GTAWWelder"].ToString();
-                            newRow["GTAWInspector"] = row["GTAWInspector"].ToString();
-                            newRow["SMAWWelder"] = row["SMAWWelder"].ToString();
-                            newRow["VTInspector"] = row["VTInspector"].ToString();
-                            dt.Rows.Add(newRow);
-                            i++;
+                            DataView dv = tb.DefaultView;//获取表视图
+                            dv.Sort = "PipelineNo,WeldingJointNo ASC";//按照ID倒序排序
+                            tb = dv.ToTable();//转为表
+                            DataRow[] rows = tb.DefaultView.ToTable().Select();
+                            int i = 0;
+                            foreach (var row in rows)
+                            {
+                                var newRow = dt.NewRow();
+                                newRow["Num"] = (i + 1).ToString();
+                                string CheckDate = string.Format("{0:yyyy-MM-dd}", row["CheckDate"]);
+                                newRow["CheckDate"] = CheckDate;
+                                newRow["ISO_IsoNo"] = row["PipelineNo"].ToString();
+                                newRow["JOT_JointNo"] = row["WeldingJointNo"].ToString();
+                                newRow["Material"] = row["Material"].ToString();
+                                newRow["InstallationMethod"] = row["InstallationMethod"].ToString();
+                                newRow["InstallationMethod2"] = row["InstallationMethod2"].ToString();
+                                newRow["WeldingWire"] = row["WeldingWire"].ToString();
+                                newRow["WeldingRod"] = row["WeldingRod"].ToString();
+                                newRow["TeamGap"] = row["TeamGap"].ToString();
+                                newRow["TeamPlumber"] = row["TeamPlumber"].ToString();
+                                newRow["TeamWelder"] = row["TeamWelder"].ToString();
+                                newRow["TeamInspector"] = row["TeamInspector"].ToString();
+                                newRow["GTAWWelder"] = row["GTAWWelder"].ToString();
+                                newRow["GTAWInspector"] = row["GTAWInspector"].ToString();
+                                newRow["SMAWWelder"] = row["SMAWWelder"].ToString();
+                                newRow["VTInspector"] = row["VTInspector"].ToString();
+                                dt.Rows.Add(newRow);
+                                i++;
+                            }
+                            BLL.Common.FastReportService.AddFastreportTable(dt);
                         }
-                        BLL.Common.FastReportService.AddFastreportTable(dt);
 
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                         keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
@@ -2111,7 +2117,6 @@ namespace FineUIPro.Web.JGZL
                     break;
                 case "21"://管道吹扫、清洗检验记录
                     {
-                        DataTable itemdt = new DataTable();
                         DataTable dt = new DataTable();
                         dt.TableName = "MainData";
                         dt.Columns.Add("ProjectName");
@@ -2124,6 +2129,14 @@ namespace FineUIPro.Web.JGZL
                         dt.Columns.Add("Results");
                         dt.Columns.Add("BlowingCleaningDate");
 
+                        DataTable itemdt = new DataTable();
+                        itemdt.TableName = "Data";
+                        itemdt.Columns.Add("ISO_IsoNo");
+                        itemdt.Columns.Add("STE_Code");
+                        itemdt.Columns.Add("OperatingMedium");
+                        itemdt.Columns.Add("ScrubbingMedium");
+                        itemdt.Columns.Add("CleaningMedium");
+
                         var report = BLL.BlowingCleaningService.GetBlowingCleaningByProjectId(projectId);
                         if (report != null)
                         {
@@ -2141,13 +2154,6 @@ namespace FineUIPro.Web.JGZL
                             dt.Rows.Add(newRow);
                             BLL.Common.FastReportService.AddFastreportTable(dt);
 
-                            itemdt.TableName = "Data";
-                            itemdt.Columns.Add("ISO_IsoNo");
-                            itemdt.Columns.Add("STE_Code");
-                            itemdt.Columns.Add("OperatingMedium");
-                            itemdt.Columns.Add("ScrubbingMedium");
-                            itemdt.Columns.Add("CleaningMedium");
-
                             var blowingCleaningItems = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(report.BlowingCleaningId);
                             if (blowingCleaningItems.Count > 0)
                             {
@@ -2314,7 +2320,14 @@ namespace FineUIPro.Web.JGZL
                     break;
                 case "27"://防腐工程质量验收记录
                     {
-                        DataTable dt = new DataTable();
+                        DataTable dt = new DataTable(); 
+                        dt.TableName = "Data";
+                        dt.Columns.Add("Part");
+                        dt.Columns.Add("MaterialName");
+                        dt.Columns.Add("Grade");
+                        dt.Columns.Add("Manufacturer");
+                        dt.Columns.Add("PlanFilmThickness");
+                        dt.Columns.Add("ActualFilmThickness");
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                         var report = BLL.AnticorrosionEngineeringInspectionRecordService.GetAnticorrosionReportByProjectId(projectId);
                         if (report != null)
@@ -2324,14 +2337,7 @@ namespace FineUIPro.Web.JGZL
                             listStr.Add(new SqlParameter("@anticorrosionId", report.AnticorrosionId));
                             SqlParameter[] parameter = listStr.ToArray();
                             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-
-                            dt.TableName = "Data";
-                            dt.Columns.Add("Part");
-                            dt.Columns.Add("MaterialName");
-                            dt.Columns.Add("Grade");
-                            dt.Columns.Add("Manufacturer");
-                            dt.Columns.Add("PlanFilmThickness");
-                            dt.Columns.Add("ActualFilmThickness");
+                            
                             if (tb.Rows.Count > 0)
                             {
                                 DataRow[] rows = tb.DefaultView.ToTable().Select();
@@ -2383,17 +2389,17 @@ namespace FineUIPro.Web.JGZL
                 case "28"://隔热工程质量验收记录
                     {
                         DataTable dt = new DataTable();
+                        dt.TableName = "MainData";
+                        dt.Columns.Add("ProjectName");
+                        dt.Columns.Add("HeatInsulationArea");
+                        dt.Columns.Add("InsulationStructure");
+                        dt.Columns.Add("AcceptanceConclusion");
+                        dt.Columns.Add("CompileDate");
+
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                         var report = BLL.InsulationAcceptanceRecordService.GetInsulationAcceptanceRecordByProjectId(projectId);
                         if (report != null)
                         {
-                            dt.TableName = "MainData";
-                            dt.Columns.Add("ProjectName");
-                            dt.Columns.Add("HeatInsulationArea");
-                            dt.Columns.Add("InsulationStructure");
-                            dt.Columns.Add("AcceptanceConclusion");
-                            dt.Columns.Add("CompileDate");
-
                             var newRow = dt.NewRow();
                             newRow["ProjectName"] = BLL.Base_ProjectService.GetProjectByProjectId(report.ProjectId).ProjectName;
                             newRow["HeatInsulationArea"] = report.HeatInsulationArea;
@@ -3087,5 +3093,6 @@ namespace FineUIPro.Web.JGZL
             return fastReportItem;
         }
         #endregion
+
     }
 }
\ No newline at end of file
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 557f12f..bf11678 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细消息，请访问
 
@@ -6,39 +6,39 @@
   -->
 <configuration>
   <configSections>
-    <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
+    <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" />
   </configSections>
-  <FineUIPro DebugMode="false" Theme="Cupertino"/>
+  <FineUIPro DebugMode="false" Theme="Cupertino" />
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200" />
     <!--系统名称-->
-    <add key="SystemName" value="诺必达焊接管理系统"/>
-    <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
-    <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
-    <add key="HJGLUrl" value="http://localhost:61590/"/>
-    <add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001"/>
-    <add key="ADomainUrl" value="10.151.130.1"/>
-    <add key="APPUrl" value="https://www.pgyer.com/pWSd"/>
+    <add key="SystemName" value="诺必达焊接管理系统" />
+    <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />
+    <add key="aspnet:MaxHttpCollectionKeys" value="50000" />
+    <add key="HJGLUrl" value="http://localhost:61590/" />
+    <add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001" />
+    <add key="ADomainUrl" value="10.151.130.1" />
+    <add key="APPUrl" value="https://www.pgyer.com/pWSd" />
     <!--系统:焊接管理为：HJGL,焊材管理：HJCLGL-->
-    <add key="SystemCode" value="HJCLGL"/>
-    <add key="http" value="http://localhost/test/"/>
+    <add key="SystemCode" value="HJCLGL" />
+    <add key="http" value="http://localhost/test/" />
     <!--BAIDU AI配置-->
-    <add key="APP_ID" value="119624563"/>
-    <add key="API_KEY" value="qm0iFO9OTHqx5dt5dNIKuvIE"/>
-    <add key="SECRET_KEY" value="NwA68AnLM9SwEcbB2ONCu6cagy2czzVc"/>
+    <add key="APP_ID" value="119624563" />
+    <add key="API_KEY" value="qm0iFO9OTHqx5dt5dNIKuvIE" />
+    <add key="SECRET_KEY" value="NwA68AnLM9SwEcbB2ONCu6cagy2czzVc" />
     <!--人脸检测参数-->
     <!--人脸活体检测参数1最好，0最差 建议0.995 -->
-    <add key="BD_face_liveness" value="0.3"/>
+    <add key="BD_face_liveness" value="0.3" />
     <!--人脸高宽建议100-200-->
     <!--<add key="BD_width" value="200" />-->
     <!--<add key="BD_height" value="200" />-->
     <!--人脸角度-->
-    <add key="BD_roll" value="40"/>
+    <add key="BD_roll" value="40" />
     <!--人脸遮档度0最好，1最不好-->
-    <add key="BD_occlusion" value="1"/>
+    <add key="BD_occlusion" value="1" />
     <!--人脸模糊度0最好，1最不好-->
-    <add key="BD_blur" value="0.1"/>
+    <add key="BD_blur" value="0.1" />
   </appSettings>
   <!--
     有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@@ -50,113 +50,113 @@
   -->
   <system.web>
     <!--  会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
-    <sessionState mode="InProc" cookieless="UseCookies" timeout="1200"/>
+    <sessionState mode="InProc" cookieless="UseCookies" timeout="1200" />
     <!--<processModel enable="true" requestQueueLimit="100000"/>-->
     <pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID">
       <controls>
-        <add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro"/>
-        <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+        <add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro" />
+        <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
       </controls>
     </pages>
     <httpModules>
-      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
+      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
     </httpModules>
     <httpHandlers>
-      <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"/>
-      <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
+      <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" />
+      <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport" />
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="false" targetFramework="4.6.1">
       <assemblies>
-        <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       </assemblies>
     </compilation>
-    <httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000"/>
+    <httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000" />
     <authentication mode="Forms">
-      <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
+      <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/" />
     </authentication>
     <membership>
       <providers>
-        <clear/>
-        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/"/>
+        <clear />
+        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
       </providers>
     </membership>
     <profile>
       <providers>
-        <clear/>
-        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/"/>
+        <clear />
+        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/" />
       </providers>
     </profile>
     <roleManager enabled="false">
       <providers>
-        <clear/>
-        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/"/>
-        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/"/>
+        <clear />
+        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/" />
+        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
       </providers>
     </roleManager>
-    <customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx"/>
+    <customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx" />
     <webServices>
       <protocols>
-        <add name="HttpSoap"/>
-        <add name="HttpPost"/>
-        <add name="HttpGet"/>
-        <add name="Documentation"/>
+        <add name="HttpSoap" />
+        <add name="HttpPost" />
+        <add name="HttpGet" />
+        <add name="Documentation" />
       </protocols>
     </webServices>
   </system.web>
-  <location path="res.axd"/>
+  <location path="res.axd" />
   <system.webServer>
     <staticContent>
-      <mimeMap fileExtension=".mjs" mimeType="application/javascript"/>
-      <mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/>
-      <mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/>
+      <mimeMap fileExtension=".mjs" mimeType="application/javascript" />
+      <mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File" />
+      <mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File" />
     </staticContent>
-    <validation validateIntegratedModeConfiguration="false"/>
+    <validation validateIntegratedModeConfiguration="false" />
     <modules runAllManagedModulesForAllRequests="true">
-      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
-      <remove name="ScriptModule"/>
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
+      <remove name="ScriptModule" />
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
     </modules>
     <handlers>
-      <remove name="ChartImageHandler"/>
-      <add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro"/>
-      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-      <add name="FastReportHandler" path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
+      <remove name="ChartImageHandler" />
+      <add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" />
+      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <add name="FastReportHandler" path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport" />
     </handlers>
     <defaultDocument>
       <files>
-        <add value="Login.aspx"/>
+        <add value="Login.aspx" />
       </files>
     </defaultDocument>
     <security>
       <requestFiltering>
-        <requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647"/>
+        <requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647" />
       </requestFiltering>
     </security>
   </system.webServer>
   <!-- SERVER -->
   <system.serviceModel>
-    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
+    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
     <services>
       <service name="BLL.OpenService.HSSEService" behaviorConfiguration="HSSEServiceBehavior">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HSSEServiceBinding" name="HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService"/>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HSSEServiceBinding" name="HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService" />
       </service>
     </services>
     <behaviors>
       <serviceBehaviors>
         <behavior name="HSSEServiceBehavior">
-          <serviceMetadata httpGetEnabled="true"/>
-          <serviceDebug includeExceptionDetailInFaults="false"/>
-          <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647"/>
+          <serviceMetadata httpGetEnabled="true" />
+          <serviceDebug includeExceptionDetailInFaults="false" />
+          <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
     <bindings>
       <wsHttpBinding>
         <binding name="HSSEServiceBinding" maxReceivedMessageSize="2147483647" useDefaultWebProxy="false" maxBufferPoolSize="2147483647" closeTimeout="20:00:00" openTimeout="00:01:10" receiveTimeout="20:00:00" sendTimeout="20:00:00">
-          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647"/>
-          <security mode="None"/>
+          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647" />
+          <security mode="None" />
         </binding>
       </wsHttpBinding>
     </bindings>
@@ -164,8 +164,8 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index ef14066..8cd7f1f 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />