diff --git a/DataBase/版本日志/SGGLDB_WH_2025-06-13.sql b/DataBase/版本日志/SGGLDB_WH_2025-06-13.sql
new file mode 100644
index 00000000..cf988608
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2025-06-13.sql
@@ -0,0 +1,8 @@
+
+
+Alter TABLE [dbo].[HSSE_TowerCrane]
+add [VideoAccount] [nvarchar](50) NULL,
+ [VideoPassword] [nvarchar](50) NULL,
+
+
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 767aa3c9..85110e64 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1829,7 +1829,9 @@
+
+
@@ -1856,6 +1858,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx
index e9775c33..cbf7aaff 100644
--- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx
@@ -22,6 +22,17 @@
MaxLength="50">
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx.cs
index 83801e4c..f67f2ec3 100644
--- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx.cs
@@ -36,9 +36,7 @@ namespace FineUIPro.Web.HSSE.TowerCrane
if (!IsPostBack)
{
////权限按钮方法
- this.GetButtonPower();
-
-
+ this.GetButtonPower();
this.TowerCraneId = Request.Params["TowerCraneId"];
if (!string.IsNullOrEmpty(this.TowerCraneId))
{
@@ -47,6 +45,8 @@ namespace FineUIPro.Web.HSSE.TowerCrane
{
this.txtTowerCraneName.Text = rectify.TowerCraneName;
this.txtTowerCraneCode.Text = rectify.TowerCraneCode;
+ this.txtVideoAccount.Text = rectify.VideoAccount;
+ this.txtVideoPassword.Text = rectify.VideoPassword;
if (rectify.MaxHoist.HasValue)
{
this.txtMaxHoist.Text = rectify.MaxHoist.Value.ToString("#.##");
@@ -111,6 +111,8 @@ namespace FineUIPro.Web.HSSE.TowerCrane
}
towerCrane.TowerCraneCode = this.txtTowerCraneCode.Text.Trim();
towerCrane.TowerCraneName = this.txtTowerCraneName.Text.Trim();
+ towerCrane.VideoAccount = this.txtVideoAccount.Text.Trim();
+ towerCrane.VideoPassword = this.txtVideoPassword.Text.Trim();
if (!string.IsNullOrEmpty(this.txtMaxHoist.Text))
{
@@ -141,9 +143,7 @@ namespace FineUIPro.Web.HSSE.TowerCrane
towerCrane.TowerCap = "否";
}
towerCrane.Remark = this.txtRemark.Text.Trim();
- Funs.DB.SubmitChanges();
-
-
+ Funs.DB.SubmitChanges();
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx.designer.cs
index 6705f5e9..b50c4f95 100644
--- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneEdit.aspx.designer.cs
@@ -59,6 +59,24 @@ namespace FineUIPro.Web.HSSE.TowerCrane
///
protected global::FineUIPro.TextBox txtTowerCraneName;
+ ///
+ /// txtVideoAccount 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtVideoAccount;
+
+ ///
+ /// txtVideoPassword 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtVideoPassword;
+
///
/// txtMaxHoist 控件。
///
diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneState.aspx b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneState.aspx
index 92a22103..a2a92cf1 100644
--- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneState.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneState.aspx
@@ -6,6 +6,9 @@
塔吊状态
+
+
+
+ runat="server" ShowBorder="false" EnableCollapse="true"
+ AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true" >
@@ -36,7 +39,165 @@
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="塔吊状态"
TitleToolTip="塔吊状态" AutoScroll="true">
-
+
+
+
+
+
+
+
+
+ 0T
+ 吊重
+
+
+
+ 0M
+ 幅度
+
+
+
+ 0度
+ 倾度
+
+
+
+ 0.00M-T
+ 风速
+
+
+
+ 0T
+ 力矩
+
+
+
+ 0M
+ 高度
+
+
+
+
+
+
+
+
@@ -44,9 +205,313 @@
+
+
+