From 8daba4e189e044aa0bf69dc4c4b10ce36518958b Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Thu, 1 Aug 2024 10:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 32 ++++
.../Transfer/Chart/Systemstatus.aspx.cs | 19 +-
.../Transfer/CivilStructure.aspx | 11 +-
.../Transfer/CivilStructure.aspx.cs | 13 ++
.../Transfer/CivilStructure.aspx.designer.cs | 27 +++
.../Transfer/CivilStructureEdit.aspx | 121 ++++++++++++
.../Transfer/CivilStructureEdit.aspx.cs | 151 +++++++++++++++
.../CivilStructureEdit.aspx.designer.cs | 179 ++++++++++++++++++
SGGL/FineUIPro.Web/Transfer/Firefighting.aspx | 11 +-
.../Transfer/Firefighting.aspx.cs | 13 ++
.../Transfer/Firefighting.aspx.designer.cs | 27 +++
.../Transfer/FirefightingEdit.aspx | 86 +++++++++
.../Transfer/FirefightingEdit.aspx.cs | 127 +++++++++++++
.../FirefightingEdit.aspx.designer.cs | 134 +++++++++++++
SGGL/FineUIPro.Web/Transfer/Plumbing.aspx | 13 +-
SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs | 13 ++
.../Transfer/Plumbing.aspx.designer.cs | 27 +++
SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx | 86 +++++++++
.../Transfer/PlumbingEdit.aspx.cs | 127 +++++++++++++
.../Transfer/PlumbingEdit.aspx.designer.cs | 134 +++++++++++++
SGGL/FineUIPro.Web/Transfer/Telecom.aspx | 11 +-
SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs | 13 ++
.../Transfer/Telecom.aspx.designer.cs | 27 +++
SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx | 92 +++++++++
.../Transfer/TelecomEdit.aspx.cs | 131 +++++++++++++
.../Transfer/TelecomEdit.aspx.designer.cs | 143 ++++++++++++++
26 files changed, 1751 insertions(+), 17 deletions(-)
create mode 100644 SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.designer.cs
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index cac89b50..b538f6f6 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -2031,11 +2031,13 @@
+
+
@@ -2049,6 +2051,7 @@
+
@@ -2062,6 +2065,7 @@
+
@@ -17671,6 +17675,13 @@
CivilStructureDataIn.aspx
+
+ CivilStructureEdit.aspx
+ ASPXCodeBehind
+
+
+ CivilStructureEdit.aspx
+
Electrical.aspx
ASPXCodeBehind
@@ -17706,6 +17717,13 @@
FirefightingDataIn.aspx
+
+ FirefightingEdit.aspx
+ ASPXCodeBehind
+
+
+ FirefightingEdit.aspx
+
HVAC.aspx
ASPXCodeBehind
@@ -17797,6 +17815,13 @@
PlumbingDataIn.aspx
+
+ PlumbingEdit.aspx
+ ASPXCodeBehind
+
+
+ PlumbingEdit.aspx
+
ProjectSetup.aspx
ASPXCodeBehind
@@ -17888,6 +17913,13 @@
TelecomDataIn.aspx
+
+ TelecomEdit.aspx
+ ASPXCodeBehind
+
+
+ TelecomEdit.aspx
+
Video.aspx
ASPXCodeBehind
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
index 64503e1f..489cb0c2 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
@@ -50,42 +50,43 @@ namespace FineUIPro.Web.Transfer.Chart
ISNULL(tpi.PipingCount,0) PipingCount,ISNULL(tpi1.PipingScount,0) PipingScount,
case ISNULL(tpi.PipingCount,0)
when 0 then 0
- else 100*(ISNULL(tpi1.PipingScount,0)/ISNULL(tpi.PipingCount,0)) end PipingPercent,
+ else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi1.PipingScount,0)*1.0/ISNULL(tpi.PipingCount,0))) end PipingPercent,
ISNULL((TseCount+TreCount),0) as EqCount,ISNULL((TseSCount+TreSCount),0) as EqScount,
case ISNULL((TseCount+TreCount),0)
when 0 then 0
- else 100 *(ISNULL((TseSCount+TreSCount),0)/ISNULL((TseCount+TreCount),0)) end EqPercent,
+ else CONVERT(DECIMAL(10,2),100 *(ISNULL((TseSCount+TreSCount),0)*1.0/ISNULL((TseCount+TreCount),0))) end EqPercent,
ISNULL(TeCount,0) TeCount,ISNULL(TeScount,0) TeScount,
case ISNULL(TeCount,0)
when 0 then 0
- else 100*(ISNULL(TeScount,0)/ISNULL(TeCount,0)) end TePercent,
+ else CONVERT(DECIMAL(10,2),100*(ISNULL(TeScount,0)*1.0/ISNULL(TeCount,0))) end TePercent,
ISNULL(TiCount,0) TiCount,ISNULL(TiScount,0) TiScount,
case ISNULL(TiCount,0)
when 0 then 0
- else 100*(ISNULL(TiScount,0)/ISNULL(TiCount,0)) end TiPercent,
+ else CONVERT(DECIMAL(10,2),100*(ISNULL(TiScount,0)*1.0/ISNULL(TiCount,0))) end TiPercent,
ISNULL(TcsCount,0) TcsCount,ISNULL(TcsScount,0) TcsScount,
case ISNULL(TcsCount,0)
when 0 then 0
- else 100*(ISNULL(TcsScount,0)/ISNULL(TcsCount,0)) end TcsPercent,
+ else CONVERT(DECIMAL(10,2),100*(ISNULL(TcsScount,0)*1.0/ISNULL(TcsCount,0))) end TcsPercent,
ISNULL(TfCount,0) TfCount,ISNULL(TfScount,0) TfScount,
case ISNULL(TfCount,0)
when 0 then 0
- else 100*(ISNULL(TfScount,0)/ISNULL(TfCount,0)) end TfPercent,
+ else CONVERT(DECIMAL(10,2),100*(ISNULL(TfScount,0)*1.0/ISNULL(TfCount,0))) end TfPercent,
ISNULL(TtCount,0) TtCount,ISNULL(TtScount,0) TtScount,
case ISNULL(TtCount,0)
when 0 then 0
- else 100*(ISNULL(TtScount,0)/ISNULL(TtCount,0)) end TtPercent,
+ else CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0))) end TtPercent,
+
+ ISNULL(TpCount,0) TpCount,ISNULL(TpScount,0) TpScount,
- ISNULL(TpCount,0) TpCount,ISNULL(TpScount,0) TtScount,
case ISNULL(TpCount,0)
when 0 then 0
- else 100*(ISNULL(TpScount,0)/ISNULL(TpCount,0)) end TpPercent,
+ else CONVERT(DECIMAL(10,2),100*(ISNULL(TpScount,0)*1.0/ISNULL(TpCount,0))) end TpPercent,
ts.PlanPWD,PlanJWD,McPlan,
SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
index 23c52378..4e7e2c41 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
@@ -26,7 +26,7 @@
-
+
@@ -44,7 +44,8 @@
-
+
+
<%--
--%>
@@ -124,12 +125,18 @@
+
+
-
+
+
<%--
--%>
@@ -105,12 +106,18 @@
+
+
-
+
+
<%--
--%>
@@ -97,12 +98,20 @@
+
+
+
-
+
+
<%--
--%>
@@ -108,12 +109,18 @@
+
+