From 0941b1f15909875de9d8a8dbef0eab81adbdaeed Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Fri, 13 Jun 2025 22:47:09 +0800
Subject: [PATCH] 1
---
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 1 +
.../HSSE/TowerCrane/TowerCraneState.aspx.cs | 1 -
SGGL/Model/Model.cs | 48 +++++++++++++++++++
.../PublishProfiles/FolderProfile.pubxml.user | 22 ++++-----
4 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 85110e64..376a5e5b 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1868,6 +1868,7 @@
+
diff --git a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneState.aspx.cs b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneState.aspx.cs
index d6e73982..0b61bde7 100644
--- a/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneState.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneState.aspx.cs
@@ -13,7 +13,6 @@ using System.Runtime.Serialization;
using FineUIPro.Web.ProjectData;
using System.Configuration;
using System.Web.Services;
-using FastReport.Utils;
using Newtonsoft.Json;
using FineUIPro.Web.DataShow;
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 61b47f82..3962903a 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -182712,6 +182712,10 @@ namespace Model
private System.Nullable _CreateDate;
+ private string _VideoAccount;
+
+ private string _VideoPassword;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -182740,6 +182744,10 @@ namespace Model
partial void OnRemarkChanged();
partial void OnCreateDateChanging(System.Nullable value);
partial void OnCreateDateChanged();
+ partial void OnVideoAccountChanging(string value);
+ partial void OnVideoAccountChanged();
+ partial void OnVideoPasswordChanging(string value);
+ partial void OnVideoPasswordChanged();
#endregion
public HSSE_TowerCrane()
@@ -182987,6 +182995,46 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VideoAccount", DbType="NVarChar(50)")]
+ public string VideoAccount
+ {
+ get
+ {
+ return this._VideoAccount;
+ }
+ set
+ {
+ if ((this._VideoAccount != value))
+ {
+ this.OnVideoAccountChanging(value);
+ this.SendPropertyChanging();
+ this._VideoAccount = value;
+ this.SendPropertyChanged("VideoAccount");
+ this.OnVideoAccountChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VideoPassword", DbType="NVarChar(50)")]
+ public string VideoPassword
+ {
+ get
+ {
+ return this._VideoPassword;
+ }
+ set
+ {
+ if ((this._VideoPassword != value))
+ {
+ this.OnVideoPasswordChanging(value);
+ this.SendPropertyChanging();
+ this._VideoPassword = value;
+ this.SendPropertyChanged("VideoPassword");
+ this.OnVideoPasswordChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 7bacdef3..29cf219b 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -6,7 +6,7 @@
<_PublishTargetUrl>G:\发布\五环WebApi
- True|2025-06-04T15:24:01.0324973Z||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;
+ True|2025-06-12T03:00:02.3559090Z||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;
@@ -86,22 +86,22 @@
10/28/2024 14:02:50
- 06/05/2025 01:08:59
+ 06/12/2025 11:00:01
- 06/05/2025 01:08:59
+ 06/12/2025 11:00:00
12/06/2024 20:13:58
- 06/05/2025 01:08:49
+ 06/12/2025 10:40:09
12/26/2024 09:46:52
- 06/05/2025 01:08:49
+ 06/12/2025 10:40:09
12/18/2020 05:32:28
@@ -128,10 +128,10 @@
07/25/2012 19:48:56
- 06/05/2025 01:08:44
+ 06/12/2025 10:40:03
- 06/05/2025 01:08:44
+ 06/12/2025 10:40:03
07/04/2024 14:13:01
@@ -389,13 +389,13 @@
02/09/2013 00:42:28
- 06/05/2025 01:08:50
+ 06/12/2025 10:59:53
- 06/05/2025 01:08:50
+ 06/12/2025 10:59:53
- 06/05/2025 01:08:50
+ 06/12/2025 10:59:53
01/23/2014 21:57:34
@@ -479,7 +479,7 @@
10/28/2024 14:02:50
- 06/05/2025 01:08:51
+ 06/12/2025 10:59:53
10/28/2024 14:02:50