Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql

@@ -0,0 +1,4 @@
+alter table HSSE_ConstructionRisk add SubUnitDutyPerson nvarchar(50) null
+alter table HSSE_ConstructionRisk add MainUnitDutyPerson nvarchar(50) null
+alter table HSSE_ConstructionRisk add MainUnitCheckPerson nvarchar(500) null
+GO

SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx

@@ -35,8 +35,7 @@
                                 <f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
                             </Listeners>
                         </f:Tree>
-                        <f:HiddenField runat="server" ID="hdSelectId">
+                        <f:TextBox runat="server" ID="hdSelectId" Hidden="true"></f:TextBox>
-                        </f:HiddenField>
                     </Items>
                 </f:Panel>
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"

SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.designer.cs

@@ -64,7 +64,7 @@ namespace FineUIPro.Web.CQMS.WBS {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hdSelectId;
+        protected global::FineUIPro.TextBox hdSelectId;
         
         /// <summary>
         /// panelCenterRegion 控件。

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx

@@ -16,8 +16,7 @@
                     EnableCollapse="true" Width="280px" Title="施工作业风险" ShowBorder="true" Layout="VBox"
                     ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
                     <Items>
-                         <f:HiddenField runat="server" ID="hdState">
+                        <f:TextBox runat="server" ID="hdState" Hidden="true"></f:TextBox>
-                        </f:HiddenField>
                           <f:Tree ID="tvControlItem" EnableCollapse="true" ShowHeader="false" Title="WBS"
                                 OnNodeCommand="tvControlItem_NodeCommand111"    AutoLeafIdentification="true" 
                                 runat="server" ShowBorder="false" EnableTextSelection="True"> 

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs

@@ -55,7 +55,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hdState;
+        protected global::FineUIPro.TextBox hdState;
         
         /// <summary>
         /// tvControlItem 控件。

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx

@@ -23,7 +23,7 @@
                 <f:FormRow>
                     <Items>
                         <f:DropDownList ID="drpUnit" runat="server" EnableEdit="true" Label="施工单位" LabelWidth="140px"
-                            AutoPostBack="true">
+                            AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
                         </f:DropDownList>
                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="本周开始日期" ID="dpDateA" LabelWidth="140px" AutoPostBack="true"
                             ShowRedStar="true" Required="true" EnableDateSelectEvent="true" OnDateSelect="dpDateA_SelectedIndexChanged">
@@ -35,12 +35,12 @@
 
                     </Items>
                 </f:FormRow>
-                <f:FormRow ColumnWidths="15% 5% 80%">
+                <f:FormRow ColumnWidths="66% 34%">
                     <Items>
-                        <f:Label runat="server" ID="txtC" LabelWidth="140px" Label="施工内容" ShowRedStar="true"></f:Label>
+                        <f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
-                        <f:Button ID="btnNew" OnClick="btnNew_Click" Icon="Add" EnablePostBack="true" runat="server" ToolTip="选择施工内容">
+                        <f:DropDownList ID="DropDownList1" runat="server" EnableEdit="true" Label="施工单位" LabelWidth="140px"
-                        </f:Button>
+                            >
-                        <f:Label runat="server" ID="txtConstructionContent"></f:Label>
+                        </f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs

@@ -649,5 +649,10 @@ namespace FineUIPro.Web.HSSE.Hazard
                 this.drpHandleMan.SelectedIndex = 0;
             }
         }
+
+        protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs

@@ -66,24 +66,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.DatePicker dpDateZ;
         
-        /// <summary>
-        /// txtC 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label txtC;
-        
-        /// <summary>
-        /// btnNew 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnNew;
-        
         /// <summary>
         /// txtConstructionContent 控件。
         /// </summary>
@@ -91,7 +73,16 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Label txtConstructionContent;
+        protected global::FineUIPro.TextBox txtConstructionContent;
+        
+        /// <summary>
+        /// DropDownList1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList DropDownList1;
         
         /// <summary>
         /// drpWorkArea 控件。

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx

@@ -80,7 +80,7 @@
                         <f:Toolbar runat="server">
                             <Items>
                                 <f:DropDownList ID="drpRiskLevel" runat="server" EnableEdit="true" Label="风险等级" LabelWidth="140px"
-                                    OnSelectedIndexChanged="drpRiskLevel_SelectedIndexChanged"
+                                    OnSelectedIndexChanged="drpRiskLevel_SelectedIndexChanged" EnableMultiSelect="true"
                                     AutoPostBack="true">
                                     <f:ListItem Value="" Text="- 请选择 -" />
                                     <f:ListItem Value="低风险" Text="低风险" />

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs

@@ -10,7 +10,7 @@ namespace FineUIPro.Web.ProjectData
 {
     public partial class ConstructionRiskMap : PageBase
     {
-        
+
         public string Coordinate = "";
         public string ProjectCode = "";
         protected void Page_Load(object sender, EventArgs e)
@@ -25,9 +25,9 @@ namespace FineUIPro.Web.ProjectData
                 listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                foreach(DataRow row in tb.Rows)
+                foreach (DataRow row in tb.Rows)
                 {
-                    Coordinate += row["MainItemId"].ToString() + ";" + row["MainItemName"].ToString() + ";" + row["num"].ToString() + ";" + row["Coordinate"].ToString()+";"+ row["RiskLevel"].ToString() + ",";
+                    Coordinate += row["MainItemId"].ToString() + ";" + row["MainItemName"].ToString() + ";" + row["num"].ToString() + ";" + row["Coordinate"].ToString() + ";" + row["RiskLevel"].ToString() + ",";
                 }
                 Coordinate = Coordinate.TrimEnd(',');
                 ProjectCode = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId);
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.ProjectData
 
 
         [WebMethod]
-        public static string getRisk(string WorkAreaId,string RiskLevel)
+        public static string getRisk(string WorkAreaId, string RiskLevel)
         {
             string res = "";
             string strSql = @"SELECT [ConstructionRiskId] 
@@ -58,9 +58,14 @@ namespace FineUIPro.Web.ProjectData
   where a.WorkAreaId=@WorkAreaId and a.States='4'
                                    ";
 
+            //if (!string.IsNullOrEmpty(RiskLevel))
+            //{
+            //    strSql += " and RiskLevel='" + RiskLevel + "'";
+            //}
             if (!string.IsNullOrEmpty(RiskLevel))
             {
-                strSql += " and RiskLevel='"+ RiskLevel + "'";
+                //strSql += " and RiskLevel='" + drpRiskLevel.SelectedValue + "' ";
+                strSql += " and '" + RiskLevel + "' like '%'+RiskLevel+'%' ";
             }
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@WorkAreaId", WorkAreaId));
@@ -68,7 +73,7 @@ namespace FineUIPro.Web.ProjectData
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             foreach (DataRow row in tb.Rows)
             {
-                res += row["ConstructionRiskId"].ToString() + ";" + row["UnitName"].ToString() + ";" + Funs.GetNewDateTimeOrNow( row["DateA"].ToString()).ToString("yyyy-MM-dd")+"至"+ Funs.GetNewDateTimeOrNow(row["DateZ"].ToString()).ToString("yyyy-MM-dd") + ";" + row["RiskLevel"].ToString() + ";" + row["ConstructionContent"].ToString() + ";" + row["Coordinate"].ToString() + ",";
+                res += row["ConstructionRiskId"].ToString() + ";" + row["UnitName"].ToString() + ";" + Funs.GetNewDateTimeOrNow(row["DateA"].ToString()).ToString("yyyy-MM-dd") + "至" + Funs.GetNewDateTimeOrNow(row["DateZ"].ToString()).ToString("yyyy-MM-dd") + ";" + row["RiskLevel"].ToString() + ";" + row["ConstructionContent"].ToString() + ";" + row["Coordinate"].ToString() + ",";
             }
             res = res.TrimEnd(',');
 
@@ -77,15 +82,25 @@ namespace FineUIPro.Web.ProjectData
 
         protected void drpRiskLevel_SelectedIndexChanged(object sender, EventArgs e)
         {
+            string riskLevel = "";
             string strSql = @"SELECT b.[MainItemId],b.[Coordinate],b.[MainItemName],count(*) num ,max(case when RiskLevel='低风险' then 1 when  RiskLevel='一般风险' then 2 when RiskLevel='较大风险' then 3 else 4 end) RiskLevel
                                   FROM [dbo].[HSSE_ConstructionRisk] a left join  [dbo].[ProjectData_MainItem] b on a.[WorkAreaId]=b.[MainItemId]
                                   where a.ProjectId=@ProjectId and a.States='4'
                                   ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(drpRiskLevel.SelectedValue))
+            if (drpRiskLevel.SelectedItemArray.Length == 1 && this.drpRiskLevel.SelectedValue == string.Empty)
             {
-                strSql += " and RiskLevel='" + drpRiskLevel.SelectedValue + "' ";
+
+            }
+            else
+            {
+                foreach (var item in this.drpRiskLevel.SelectedValueArray)
+                {
+                    riskLevel += item + ",";
+                }
+                //strSql += " and RiskLevel='" + drpRiskLevel.SelectedValue + "' ";
+                strSql += " and '"+riskLevel+"' like '%'+RiskLevel+'%' ";
             }
             strSql += " group by b.[MainItemId],b.[Coordinate],b.[MainItemName] ";
             SqlParameter[] parameter = listStr.ToArray();
@@ -96,7 +111,7 @@ namespace FineUIPro.Web.ProjectData
             }
             Coordinate = Coordinate.TrimEnd(',');
 
-            PageContext.RegisterStartupScript(" setRiskLevel('" + drpRiskLevel.SelectedValue + "'); clearOverlays() ;   drawMap('" + Coordinate + "')  ");
+            PageContext.RegisterStartupScript(" setRiskLevel('" + riskLevel + "'); clearOverlays() ;   drawMap('" + Coordinate + "')  ");
 
         }
     }

SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.designer.cs

@@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData
+namespace FineUIPro.Web.ProjectData {
-{
+    
-
+    
-
+    public partial class ConstructionRiskMap {
-    public partial class ConstructionRiskMap
+        
-    {
-
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// RegionPanel1 控件。
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RegionPanel RegionPanel1;
-
+        
         /// <summary>
         /// Region2 控件。
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Region Region2;
-
+        
         /// <summary>
         /// drpRiskLevel 控件。
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpRiskLevel;
-
+        
         /// <summary>
         /// ContentPanel1 控件。
         /// </summary>