diff --git a/DataBase/版本日志/SGGLDB_V2025-07-10-001_lc.sql b/DataBase/版本日志/SGGLDB_V2025-07-10-001_lc.sql
index e828aeae..eafe8373 100644
--- a/DataBase/版本日志/SGGLDB_V2025-07-10-001_lc.sql
+++ b/DataBase/版本日志/SGGLDB_V2025-07-10-001_lc.sql
@@ -1,6 +1,21 @@
+
+
+
+--ָӵIJ˵ƶȫ-ǻѲ
+update Sys_Menu
+set MenuName='ǻѲ',SortIndex=140,SuperMenu='467A0CB9-737D-4451-965E-869EBC3A4BD6',MenuType='Menu_HSSE'
+where MenuId ='09E6A03F-65C8-4FAC-9659-7A0B56D8CC19'
+GO
+
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'DE0CA5F1-AE72-4752-A244-D474F3F5F9C8')
+BEGIN
INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed])
VALUES (N'DE0CA5F1-AE72-4752-A244-D474F3F5F9C8', N'¼', NULL, N'HSSE/TowerCrane/TowerCraneRecord.aspx', '130', N'28C8EDB9-F1C2-4287-8013-28A976B093E2', N'Menu_HSSE', '1', '1', '1');
+END
+GO
Alter TABLE [dbo].[Base_Project]add
[AQMAccount] [nvarchar](50) NULL,
- [AQMPwd] [nvarchar](50) NULL
\ No newline at end of file
+ [AQMPwd] [nvarchar](50) NULL
+
+ GO
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index 97506a49..9eb6fa64 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -73,6 +73,7 @@
+
@@ -108,6 +109,7 @@
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 9f913e9c..3046cefa 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx
index 9313d861..40ca959e 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@@ -358,9 +358,9 @@
- --%>
@@ -582,7 +582,7 @@
var btnTransferClientID = '<%= btnTransfer.ClientID %>';
var btnPGJSXClientID = '<%= btnPGJSX.ClientID %>';
var btnDigitalSiteClientID = '<%= btnDigitalSite.ClientID %>';
- var btnCommandDispatchClientID = '<%= btnCommandDispatch.ClientID %>';
+ <%-- var btnCommandDispatchClientID = '<%= btnCommandDispatch.ClientID %>';--%>
var btnPDigDataClientID = '<%= btnPDigData.ClientID %>';
var btnOpinionClientID = '<%= btnOpinion.ClientID %>';
var btnDocClientID = '<%= btnDoc.ClientID %>';
@@ -662,12 +662,12 @@
var $item = $('.f-tabstrip-header')
$item.attr('style', ";display:block !important;")
}
- function CommandDispatchClick() {
- parent.removeActiveTab();
- F(btnCommandDispatchClientID).click();
- var $item = $('.f-tabstrip-header')
- $item.attr('style', ";display:block !important;")
- }
+ //function CommandDispatchClick() {
+ // parent.removeActiveTab();
+ // F(btnCommandDispatchClientID).click();
+ // var $item = $('.f-tabstrip-header')
+ // $item.attr('style', ";display:block !important;")
+ //}
// 点击标题栏工具图标 - 查看源代码
var videoURL ='<%=VideoURL %>'
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index e771524f..c321bba4 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -26794,6 +26794,10 @@ namespace Model
private System.Nullable _PlanEndDate;
+ private string _AQMAccount;
+
+ private string _AQMPwd;
+
private EntitySet _Accident_AccidentHandle;
private EntitySet _Accident_AccidentPersonRecord;
@@ -27514,6 +27518,10 @@ namespace Model
partial void OnPlanStartDateChanged();
partial void OnPlanEndDateChanging(System.Nullable value);
partial void OnPlanEndDateChanged();
+ partial void OnAQMAccountChanging(string value);
+ partial void OnAQMAccountChanged();
+ partial void OnAQMPwdChanging(string value);
+ partial void OnAQMPwdChanged();
#endregion
public Base_Project()
@@ -28799,6 +28807,46 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AQMAccount", DbType="NVarChar(50)")]
+ public string AQMAccount
+ {
+ get
+ {
+ return this._AQMAccount;
+ }
+ set
+ {
+ if ((this._AQMAccount != value))
+ {
+ this.OnAQMAccountChanging(value);
+ this.SendPropertyChanging();
+ this._AQMAccount = value;
+ this.SendPropertyChanged("AQMAccount");
+ this.OnAQMAccountChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AQMPwd", DbType="NVarChar(50)")]
+ public string AQMPwd
+ {
+ get
+ {
+ return this._AQMPwd;
+ }
+ set
+ {
+ if ((this._AQMPwd != value))
+ {
+ this.OnAQMPwdChanging(value);
+ this.SendPropertyChanging();
+ this._AQMPwd = value;
+ this.SendPropertyChanged("AQMPwd");
+ this.OnAQMPwdChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet Accident_AccidentHandle
{
@@ -231804,8 +231852,6 @@ namespace Model
private EntityRef _Base_Unit;
- private EntityRef _ProjectData_WorkArea;
-
private EntityRef _Sys_User;
#region 可扩展性方法定义
@@ -231840,7 +231886,6 @@ namespace Model
{
this._Base_Project = default(EntityRef);
this._Base_Unit = default(EntityRef);
- this._ProjectData_WorkArea = default(EntityRef);
this._Sys_User = default(EntityRef);
OnCreated();
}
@@ -231984,10 +232029,6 @@ namespace Model
{
if ((this._WorkAreaId != value))
{
- if (this._ProjectData_WorkArea.HasLoadedOrAssignedValue)
- {
- throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
- }
this.OnWorkAreaIdChanging(value);
this.SendPropertyChanging();
this._WorkAreaId = value;
@@ -232149,40 +232190,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_EquipmentSafetyList_ProjectData_WorkArea", Storage="_ProjectData_WorkArea", ThisKey="WorkAreaId", OtherKey="WorkAreaId", IsForeignKey=true)]
- public ProjectData_WorkArea ProjectData_WorkArea
- {
- get
- {
- return this._ProjectData_WorkArea.Entity;
- }
- set
- {
- ProjectData_WorkArea previousValue = this._ProjectData_WorkArea.Entity;
- if (((previousValue != value)
- || (this._ProjectData_WorkArea.HasLoadedOrAssignedValue == false)))
- {
- this.SendPropertyChanging();
- if ((previousValue != null))
- {
- this._ProjectData_WorkArea.Entity = null;
- previousValue.License_EquipmentSafetyList.Remove(this);
- }
- this._ProjectData_WorkArea.Entity = value;
- if ((value != null))
- {
- value.License_EquipmentSafetyList.Add(this);
- this._WorkAreaId = value.WorkAreaId;
- }
- else
- {
- this._WorkAreaId = default(string);
- }
- this.SendPropertyChanged("ProjectData_WorkArea");
- }
- }
- }
-
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_EquipmentSafetyList_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)]
public Sys_User Sys_User
{
@@ -315204,8 +315211,6 @@ namespace Model
private EntitySet _Check_SupervisionNotice;
- private EntitySet _License_EquipmentSafetyList;
-
private EntityRef _Base_Project;
private EntityRef _Base_Unit;
@@ -315234,7 +315239,6 @@ namespace Model
{
this._Check_CheckDayDetail = new EntitySet(new Action(this.attach_Check_CheckDayDetail), new Action(this.detach_Check_CheckDayDetail));
this._Check_SupervisionNotice = new EntitySet(new Action(this.attach_Check_SupervisionNotice), new Action(this.detach_Check_SupervisionNotice));
- this._License_EquipmentSafetyList = new EntitySet(new Action(this.attach_License_EquipmentSafetyList), new Action(this.detach_License_EquipmentSafetyList));
this._Base_Project = default(EntityRef);
this._Base_Unit = default(EntityRef);
OnCreated();
@@ -315414,19 +315418,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_EquipmentSafetyList_ProjectData_WorkArea", Storage="_License_EquipmentSafetyList", ThisKey="WorkAreaId", OtherKey="WorkAreaId", DeleteRule="NO ACTION")]
- public EntitySet License_EquipmentSafetyList
- {
- get
- {
- return this._License_EquipmentSafetyList;
- }
- set
- {
- this._License_EquipmentSafetyList.Assign(value);
- }
- }
-
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProjectData_WorkArea_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@@ -315538,18 +315529,6 @@ namespace Model
this.SendPropertyChanging();
entity.ProjectData_WorkArea = null;
}
-
- private void attach_License_EquipmentSafetyList(License_EquipmentSafetyList entity)
- {
- this.SendPropertyChanging();
- entity.ProjectData_WorkArea = this;
- }
-
- private void detach_License_EquipmentSafetyList(License_EquipmentSafetyList entity)
- {
- this.SendPropertyChanging();
- entity.ProjectData_WorkArea = null;
- }
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ProjectSupervision_Check1")]