20260401 试压包资料

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>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

HJGL_DS/FineUIPro.Web/SYBData/PressureTestPackageList.aspx.cs

@@ -300,7 +300,8 @@ namespace FineUIPro.Web.SYBData
                 }
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunProc("SYB_TestPackagePipeList", parameter);
-
+                if (tb.Rows.Count > 0)
+                {
                     DataTable dt = new DataTable();
                     dt.TableName = "Data";
                     dt.Columns.Add("Number1");
@@ -336,6 +337,12 @@ namespace FineUIPro.Web.SYBData
                     }
                 }
                 else
+                {
+                    Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            else
             {
                 Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning);
                 return;

HJGL_DS/FineUIPro.Web/SYBData/RTProportionConfirmation.aspx.cs

@@ -14,6 +14,15 @@ namespace FineUIPro.Web.SYBData
 {
     public partial class RTProportionConfirmation : PageBase
     {
+        /// <summary>
+        /// 项目Id
+        /// </summary>
+        private string ProjectId
+        {
+            get { return (string)ViewState["ProjectId"]; }
+            set { ViewState["ProjectId"] = value; }
+        }
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
@@ -25,17 +34,15 @@ namespace FineUIPro.Web.SYBData
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpProjectId);
-                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
-                {
-                    this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
-                }
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                this.drpProjectId.SelectedValue = this.ProjectId;
                 this.InitTreeMenu();//加载树
                 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
-                DataBind();
+                BindGrid();
             }
         }
 
-        #region 加载树
+        #region 加载树项目
         /// <summary>
         /// 加载树
         /// </summary>
@@ -43,51 +50,32 @@ namespace FineUIPro.Web.SYBData
         {
             this.tvControlItem.Nodes.Clear();
             TreeNode rootNode = new TreeNode();
-            rootNode.Text = "施工号";
+            rootNode.Text = "项目";
             rootNode.ToolTip = "项目";
             rootNode.NodeID = "0";
             rootNode.Expanded = true;
             this.tvControlItem.Nodes.Add(rootNode);
 
             List<Model.Base_Project> projects = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
-            if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
-            {
-                projects = projects.Where(x => x.ProjectId == this.drpProjectId.SelectedValue).ToList();
-            }
 
+            if (this.drpProjectId.SelectedValue != BLL.Const._Null)
+            {
+                projects = projects.Where(e => e.ProjectId == this.drpProjectId.SelectedValue).ToList();
+            }
             foreach (var item in projects)
             {
                 TreeNode rootProjectNode = new TreeNode();//定义根节点
                 rootProjectNode.Text = item.ProjectCode;
                 rootProjectNode.NodeID = item.ProjectId;
                 rootProjectNode.EnableClickEvent = true;
+                rootProjectNode.Expanded = true;
                 rootProjectNode.ToolTip = item.ProjectName;
+                rootProjectNode.CommandName = "项目名称";
                 rootNode.Nodes.Add(rootProjectNode);
             }
         }
         #endregion
 
-        #region 绑定数据
-        /// <summary>
-        /// 绑定数据
-        /// </summary>
-        private void BindGrid()
-        {
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
-            {
-                List<SqlParameter> listStr = new List<SqlParameter>();
-                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID));
-                SqlParameter[] parameter = listStr.ToArray();
-                DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_RayCheckConfirmProject", parameter);
-                this.Grid1.RecordCount = tb.Rows.Count;
-                var table = this.GetPagedDataTable(Grid1, tb);
-                Grid1.DataSource = table;
-                Grid1.DataBind();
-            }
-        }
-
-        #endregion
-
         #region 点击TreeView
         /// <summary>
         /// 点击TreeView
@@ -96,8 +84,33 @@ namespace FineUIPro.Web.SYBData
         /// <param name="e"></param>
         protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
         {
-            BindGrid();
+            if (this.tvControlItem.SelectedNodeID != "0")
+            {
+                this.ProjectId = this.tvControlItem.SelectedNodeID;
+                this.BindGrid();
             }
+        }
+        #endregion
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            if (!string.IsNullOrEmpty(this.ProjectId))
+            {
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_RayCheckConfirmProject", parameter);
+                this.Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+            }
+        }
+
         #endregion
 
         #region 排序
@@ -148,8 +161,9 @@ namespace FineUIPro.Web.SYBData
         /// <param name="e"></param>
         protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
         {
+            this.ProjectId = this.drpProjectId.SelectedValue;
             this.InitTreeMenu();
-            this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
+            this.tvControlItem.SelectedNodeID = this.ProjectId;
             BindGrid();
         }
         #endregion

HJGL_DS/FineUIPro.Web/Web.config

@@ -67,7 +67,7 @@
       <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="false" targetFramework="4.6.1">
+    <compilation debug="true" targetFramework="4.6.1">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>

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>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />