From c5cecce547055d2b02c810d9fa74890a5c46499c Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 7 Nov 2024 14:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../版本日志/SGGLDB_V2024-11-07-gaofei.sql | 4 +++
.../CQMS/WBS/ControlItemAndCycle.aspx | 3 +-
.../WBS/ControlItemAndCycle.aspx.designer.cs | 2 +-
SGGL/FineUIPro.Web/File/Image/wei1.png | Bin 1554 -> 1585 bytes
SGGL/FineUIPro.Web/File/Image/wei11.png | Bin 0 -> 1554 bytes
SGGL/FineUIPro.Web/File/Image/wei2.png | Bin 1428 -> 1786 bytes
SGGL/FineUIPro.Web/File/Image/wei22.png | Bin 0 -> 1428 bytes
SGGL/FineUIPro.Web/File/Image/wei3.png | Bin 1757 -> 1929 bytes
SGGL/FineUIPro.Web/File/Image/wei33.png | Bin 0 -> 1757 bytes
SGGL/FineUIPro.Web/File/Image/wei34.png | Bin 0 -> 1911 bytes
SGGL/FineUIPro.Web/File/Image/wei4.png | Bin 1870 -> 1893 bytes
SGGL/FineUIPro.Web/File/Image/wei44.png | Bin 0 -> 1870 bytes
.../HSSE/Hazard/ConstructionRisk.aspx | 3 +-
.../Hazard/ConstructionRisk.aspx.designer.cs | 2 +-
.../HSSE/Hazard/ConstructionRiskEdit.aspx | 12 +++----
.../HSSE/Hazard/ConstructionRiskEdit.aspx.cs | 5 +++
.../ConstructionRiskEdit.aspx.designer.cs | 29 ++++++---------
.../HSSE/Hazard/ConstructionRiskMap.aspx | 2 +-
.../HSSE/Hazard/ConstructionRiskMap.aspx.cs | 33 +++++++++++++-----
.../ConstructionRiskMap.aspx.designer.cs | 22 ++++++------
20 files changed, 64 insertions(+), 53 deletions(-)
create mode 100644 DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql
create mode 100644 SGGL/FineUIPro.Web/File/Image/wei11.png
create mode 100644 SGGL/FineUIPro.Web/File/Image/wei22.png
create mode 100644 SGGL/FineUIPro.Web/File/Image/wei33.png
create mode 100644 SGGL/FineUIPro.Web/File/Image/wei34.png
create mode 100644 SGGL/FineUIPro.Web/File/Image/wei44.png
diff --git a/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql b/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql
new file mode 100644
index 00000000..afdef161
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx
index 08a3d856..a64f9896 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx
@@ -35,8 +35,7 @@
-
-
+
- protected global::FineUIPro.HiddenField hdSelectId;
+ protected global::FineUIPro.TextBox hdSelectId;
///
/// panelCenterRegion 控件。
diff --git a/SGGL/FineUIPro.Web/File/Image/wei1.png b/SGGL/FineUIPro.Web/File/Image/wei1.png
index 630df419d0ee32e4d744d5810957eced320d03db..20fb38a39bf427b9944a513de2436f11965d8e3e 100644
GIT binary patch
delta 1568
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
Eg6YrD6#xJL
literal 0
HcmV?d00001
diff --git a/SGGL/FineUIPro.Web/File/Image/wei2.png b/SGGL/FineUIPro.Web/File/Image/wei2.png
index 3b2cd8f529cae2f91a4cce07b52381083f9a224a..a45ae1259ce76b3483efc2043b75dc5fce568e2f 100644
GIT binary patch
delta 1770
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°AfOLrHK{{f(eJb#Om^K
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
A8~^|S
delta 1741
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
literal 0
HcmV?d00001
diff --git a/SGGL/FineUIPro.Web/File/Image/wei34.png b/SGGL/FineUIPro.Web/File/Image/wei34.png
new file mode 100644
index 0000000000000000000000000000000000000000..28be27a350dd907956e3d5a7c3db8c0fd998becb
GIT binary patch
literal 1911
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
H==A>ponTBj
delta 1855
zcmV-F2f+B{4$cmcB!2;OQb$4nuFf3k000LFNkl>26y}
zp}>}Q<&X#xj1^FUXozT(NI-#BqY|(OiJ~GgD#as8RJ^)dh%sJ46paTFj7Ow^w1`|S
zg0$0CEu}QwcDGAu_nbHSb}e?>*_qkyu8D~+Y0`GS@Be+j_kX_k&3i)-qp@zUm~htB
zTI8X09u-L*L@{4WxC}zj?GvcOBZyrb=rIk^9Ikh|_jMIdJ|BzFBwCSzo$c4^Iqy9h
zg4;kaL5-fvFTyK`)|TGB=Q`I;yP(D=oJ~{!H|%P8PS4?CK}6DUlJJXY6$G)Odd0*o
z!|`W6!veVagMa23se0`;jzht40}u4m5VG_8Uvln2Iq^rT7cs!9z3l~dw{M4A5GO?%
zOwQivrQRlo?>c9h`FJF{5dj#t@zX%DYs^UPm03xeA#rAACWQR&q|FmaE^vA%_-$1Al)XX?J7ek2bYAgxIwd-
z1(0TGn8^{c4?x;L(ey+OW@RPdqs3#@#JX&w1kmTB&Sr;ywyiY3QAt=8fYHjo0$}}M
zvFGPz;D5oZ{$XN?)!N*WG4IGr#*I0_ZoBz#7xuUI$>!GOp>Nd{n$|=Okh=A>QJbJU
z1wulm`OO8Rv2sdk$gGA7#!9U}c?LOnNR?BcPefBs?^vZ5o#F}@EPM$eunZ2mXyQnG
zxLAGNhl69CYW@BW$;WmNy|cE^^ts$BC;}L*4S(AKBDs`1ZplW9p2OU+BLbaAuThkf
z%q1K^kH`Pg(ZWd^q5?2j`F#YKFC~(dq{Uk|X9WNbwYgCCLkA3r|Fl-6`c-<~>!pW}
ztTJ5}9e{=J_^X66!-?#^W87tcCA-h##d(={VEQQ8+>Up+@#q2N_k<{t`l{vQr$hx{
zw14ufU5rozaQm0%@l-)N9=h5f3vlqf3!7>>l@AYK(t
zq-{+e5;O!)9O}gOx^7tjcGO@;j$I8s*nd{ntq5?*OYJ|eG6l~kVTNMcklVx)Qgk>`
zI58l-a_ZUk&GAChoTvbdmilrKZj+Qq
zL3SecEXfHxn)6W$>K)z?fZVs6@!I^+U~l36QFFnC7k{?nMX#e~v5QX*Tf&&2BKqhNChnDN2y@CafEKzd~(7Uw2I&jFWwH1NZ&
zlWef=m8|2i=eJ(Ga!h(Z*xmGz+9K1|r~opypUI|zu5GYL?kF9Ot_+q>WoQ`B1w3}phGwU4$Ru~W
zY2}F`Q;F;*QF|xOv^3@mg#HAOV1N93R4p4H2!8*!?ICekE4?#68Tn~?$$$8*J$^KF
zdr@_+4?niKhS>Nh?Wwo>ZnPDfPs9X(iGq0!Jh{i6zf9WqPC)GtD6z)ylmi)&Vx
z6gTbQcoDC_Kmob8v>Gt>CKicU4NYRz84Q{xj;048Rz@EZxi3xC52o}_`Lb*;H<
zIKIQ)15&}#-sICGVpr*mva4P}%N>xH4z1v2`EHUr?Zvt5O2Q(V)fbGFN{y0AgkWtZeMQ2%FL%fn_
tx^XR`cqShAHu`TQ|Njd7TeB<|=TBz?c~2cqafSc@002ovPDHLkV1i+ggDU_4
diff --git a/SGGL/FineUIPro.Web/File/Image/wei44.png b/SGGL/FineUIPro.Web/File/Image/wei44.png
new file mode 100644
index 0000000000000000000000000000000000000000..093853607e688928ca9893f9c352a0c0c499f606
GIT binary patch
literal 1870
zcmV-U2eJ5xP)Px+2uVaiRA@u(mseMTZl1UK@^P#5sXKqfV7BQErPVuRxPD8-FCN2Y4@Br`gSdL+u51f
z?yiZ6FKNrcqFbdOU8{k!EU?x
za2NKs_Q~ef<)LrY6`IyW4UoF^v{9R&I|V{QruoeUqp@;IYRIgH3&u*VKY0c@cu18~
zpHD!pW}tTJ5}9e{=J_^X66!-?#^W87tcCA-h##d(={
zVEQQ8+>Up+@#q2N_k<{t`l{vQr$hx{wDPQ7j8Fq``-ctQPFA!4tpLV_6FIhOB21||ymQ(anAOLxF=E4PW59gjr{_Z4Sj%00MGC(D
zy%#SXwJQR6DfJw>%aj-;Kw~W+UKLKHZA~5$Gz3o^>csZCZdm|!)L=)BT@5|hR@bcv
zaLG&UKd&+c&nIDqV%w10#1m3pVga%(V
zUy_AzdT7n@Lere60F0LUau9Bllt@8#BK9oF2|SwfQ48uF-VlJ?x0~_W{Lx@<;r>x`
z!G#xpw&Ud+GGR{B2Ozc{cSz>wa0~CBEXut%DgeW_rp1KPJyIfDuFu5k>7!tC37GN0
z@9+p>2tayeBNpc-L(c)1d^GUGu9IxA?vKiJ*$k=i2D)~En7wx7wS
zg05|_NbV>dj;;)rPi1X4o~#abmC_k$cxFyU;P(v&Z8&T9Vr;S&N!nnwvi&l}n1Fky
z1&<+boOIxe#-XL;_R)^h?Y&bkuD?=tw=3=e7Q|p}c!Pkf8wm0G{Lv_!8cbrrC+ASt
z8N9qia>Q`B1w3}phGwU4$Ru~WY2}F`Q;F;*QF|xOv^3@mg#HAOV1N93R4p4H2!8*!
z?ICekE4?#68Tn~?$@r~3el&D@QFX2lKeoAs*!U>zski%Xv=y6A!~}qegxkzFO-RD`
zE%Ha>{v@(TYB5^kDmpkx3Ov1k*@S16l4s9Vl~BKs(ZW}QK=y2+6qK#XNL~1_ROG&^
zS~hMGAtbol6-Gn=DHXq_>o~3Q89*i|yMj(N>OmwT`vmZ9F5lAT`|?gHCEou$A^_$z
zs)C=zai}Ih=qCuZ5t&8;yHD#vJgA7qF28^2FDob2MIaSf30)R07q!N$rV5DS+DL*8
zv}LU|b42jdj8DK%f=G*NR+tnw?cjJ3ufRY7xwo_$F!m-EiC7IyV&ReHV}4WP6H@>t
zX0Y%Z3Be1)37({ZrFE^jY&gEd-UCv>(%$6fa~iPEE~*C=u%LULxk|M|7{jPaXrQLS
z+HflY`AStnBE8#QI{9N&wy|uZN&yX(d@&JWm9--%w-=i?D`}~H9Ks67N=$oIxr)%`%Qm;*3zqlJGM1fl16k#4q^PA*q7
ztC85m1t0)nZ9D*o*R$W_Q93bgqf#@LVdZb9z?T64f2`EHUr?Zvt5O2Q(V)fbGFN
z{yzzjQPFfoXIWlDypm_SaV?>ECLZ@T`fnuv{|fwDvn&_qPiF&pPaRHih5!Hn07*qo
IM6N<$f
-
-
+
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs
index b58adae9..1996b4e2 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.HiddenField hdState;
+ protected global::FineUIPro.TextBox hdState;
///
/// tvControlItem 控件。
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
index 860d0396..46426014 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
@@ -23,7 +23,7 @@
+ AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
@@ -35,12 +35,12 @@
-
+
-
-
-
-
+
+
+
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
index 33d32e9a..d0724daf 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
+++ b/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)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs
index 476555aa..7b975169 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs
@@ -66,24 +66,6 @@ namespace FineUIPro.Web.HSSE.Hazard {
///
protected global::FineUIPro.DatePicker dpDateZ;
- ///
- /// txtC 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Label txtC;
-
- ///
- /// btnNew 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Button btnNew;
-
///
/// txtConstructionContent 控件。
///
@@ -91,7 +73,16 @@ namespace FineUIPro.Web.HSSE.Hazard {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.Label txtConstructionContent;
+ protected global::FineUIPro.TextBox txtConstructionContent;
+
+ ///
+ /// DropDownList1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList DropDownList1;
///
/// drpWorkArea 控件。
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx
index 5b50b0cf..856ec3bf 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx
@@ -80,7 +80,7 @@
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs
index 0e19fcc6..db6c9ce9 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs
+++ b/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 listStr = new List();
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 listStr = new List();
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 + "') ");
}
}
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.designer.cs
index 9c72682f..2f1c343e 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.designer.cs
@@ -7,13 +7,11 @@
//
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.ProjectData
-{
-
-
- public partial class ConstructionRiskMap
- {
-
+namespace FineUIPro.Web.ProjectData {
+
+
+ public partial class ConstructionRiskMap {
+
///
/// form1 控件。
///
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 控件。
///
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
/// RegionPanel1 控件。
///
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.RegionPanel RegionPanel1;
-
+
///
/// Region2 控件。
///
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Region Region2;
-
+
///
/// drpRiskLevel 控件。
///
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.ProjectData
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpRiskLevel;
-
+
///
/// ContentPanel1 控件。
///