diff --git a/.vs/SGGL_CD/v17/.wsuo b/.vs/SGGL_CD/v17/.wsuo index c059299b..78356be0 100644 Binary files a/.vs/SGGL_CD/v17/.wsuo and b/.vs/SGGL_CD/v17/.wsuo differ diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx index d5978ab1..e35f38e1 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx @@ -69,7 +69,7 @@ LabelAlign="Right" Width="150px"> diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs index 50dd97b5..3d7a1a8f 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs @@ -72,7 +72,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection this.drpStates.SelectedValue = "1"; ListItem[] ProblemTypes = new ListItem[2]; ProblemTypes[0] = new ListItem("日常巡检", "1"); - ProblemTypes[1] = new ListItem("专项巡检", "2"); + // ProblemTypes[1] = new ListItem("专项巡检", "2"); + ProblemTypes[1] = new ListItem("风险巡检", "3"); this.drpProblemTypes.DataValueField = "Value"; this.drpProblemTypes.DataTextField = "Text"; this.drpProblemTypes.DataSource = ProblemTypes; @@ -88,7 +89,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection /// private void BindGrid() { - string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes ='1' "; //ProblemTypes in ('1' ,'2') + string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes in ('1' ,'3') "; //ProblemTypes in ('1' ,'2') List listStr = new List(); if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) { diff --git a/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bg.png b/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bg.png index a970d4ff..4be9071f 100644 Binary files a/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bg.png and b/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bg.png differ diff --git a/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bg1.png b/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bg1.png new file mode 100644 index 00000000..c6a64da2 Binary files /dev/null and b/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bg1.png differ diff --git a/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bgold.png b/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bgold.png new file mode 100644 index 00000000..a970d4ff Binary files /dev/null and b/SGGL/FineUIPro.Web/res/indexv1/image/index2/center-bgold.png differ