指挥调度中心菜单移动到安全检查下面-智慧巡检
This commit is contained in:
parent
016911d097
commit
2566255f90
|
@ -1,6 +1,21 @@
|
|||
|
||||
|
||||
|
||||
--指挥调度中心菜单移动到安全检查下面-智慧巡检
|
||||
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
|
||||
[AQMPwd] [nvarchar](50) NULL
|
||||
|
||||
GO
|
||||
|
|
|
@ -73,6 +73,7 @@
|
|||
<TreeNode id="7B272C3F-39D2-496D-A87C-E2C89A20E4EF" Text="HSE巡检统计(图表)" NavigateUrl="HSSE/HiddenInspection/RiskAnalysisChart.aspx"></TreeNode>
|
||||
<TreeNode id="4E312813-1A2E-4AF7-8106-9210A6E83926" Text="隐患整改统计" NavigateUrl="HSSE/Check/RectifyNoticesStatistics.aspx"></TreeNode>
|
||||
<TreeNode id="5DC49905-6A1C-4353-A06C-D9D1A8D6B6F9" Text="隐患排查与治理统计" NavigateUrl="HSSE/Check/HiddenTroubleManager.aspx"></TreeNode>
|
||||
<TreeNode id="09E6A03F-65C8-4FAC-9659-7A0B56D8CC19" Text="指挥调度中心" NavigateUrl="ZHDD/ZHDD.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="5309E7E0-395E-4F11-8F5E-D52E11526A2A" Text="HSE会议" NavigateUrl=""><TreeNode id="DFB56743-17BA-40BA-82EA-FCB9B0DBFAFF" Text="安全领导小组会议" NavigateUrl="HSSE/Meeting/SafetyLeaderGroupMeeting.aspx"></TreeNode>
|
||||
<TreeNode id="5236B1D9-8B57-495E-8644-231DF5D066CE" Text="HSE周例会" NavigateUrl="HSSE/Meeting/WeekMeeting.aspx"></TreeNode>
|
||||
|
@ -108,6 +109,7 @@
|
|||
</TreeNode>
|
||||
<TreeNode id="9DE9B74A-0823-4857-8B50-2DAA5E635EC4" Text="塔吊" NavigateUrl="HSSE/TowerCrane/TowerCrane.aspx"></TreeNode>
|
||||
<TreeNode id="960812BA-ADE3-41C2-AE4A-BF24A58DE4CB" Text="塔吊状态" NavigateUrl="HSSE/TowerCrane/TowerCraneState.aspx"></TreeNode>
|
||||
<TreeNode id="DE0CA5F1-AE72-4752-A244-D474F3F5F9C8" Text="塔吊记录" NavigateUrl="HSSE/TowerCrane/TowerCraneRecord.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="012DF857-AD6B-49AA-87A8-030CD5F66D4C" Text="HSE奖惩" NavigateUrl=""><TreeNode id="96F21A83-6871-4CC4-8901-1B99C376395C" Text="奖励通知单" NavigateUrl="HSSE/Check/IncentiveNotice.aspx"></TreeNode>
|
||||
<TreeNode id="C13F1CE7-DAEF-4604-A13F-192621D28DF5" Text="奖励统计" NavigateUrl="HSSE/Check/IncentiveNoticeStatistics.aspx"></TreeNode>
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
<TreeNode id="70E51ABF-81C8-49CB-89AC-CF0542A201D6" Text="HSSE管理工作报告" NavigateUrl=""><TreeNode id="D67D1C85-3798-47A9-A0DB-B4DB47FF2E7D" Text="报表上报情况" NavigateUrl="ZHGL/ManagementReport/ReportRemind.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="CD9FC4C8-4B02-4619-8B02-50DA6AE6146E" Text="企业大检查" NavigateUrl=""><TreeNode id="40387C48-95A0-435C-82FB-57AF0A81B9D4" Text="监督检查报告" NavigateUrl="ZHGL/Supervise/SuperviseCheckReport.aspx"></TreeNode>
|
||||
<TreeNode id="A02E0365-383C-49A0-BF1A-B3E42052959B" Text="安全监督检查整改" NavigateUrl="ZHGL/Supervise/SuperviseCheckRectify.aspx"></TreeNode>
|
||||
<TreeNode id="A02E0365-383C-49A0-BF1A-B3E42052959B" Text="监督检查整改" NavigateUrl="ZHGL/Supervise/SuperviseCheckRectify.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="DEAA1931-C0D7-4277-9B34-23963D1C538A" Text="集团安全监督" NavigateUrl=""><TreeNode id="1969C3C3-9257-49CD-977D-546CA18DC91C" Text="安全监督检查通知单" NavigateUrl="ZHGL/ServerCheck/CheckNotice.aspx"></TreeNode>
|
||||
<TreeNode id="B9950CB5-C47A-4C0A-A6CC-C7DDBBDE7D1E" Text="企业上报监督检查报告" NavigateUrl="ZHGL/ServerCheck/UpCheckReport.aspx"></TreeNode>
|
||||
|
|
|
@ -358,9 +358,9 @@
|
|||
<div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor: pointer">
|
||||
<asp:Literal runat="server" Text="<%$ Resources:Lan,VideoSurveillance %>" />
|
||||
</div>
|
||||
<div class="n-btn-r c-n-btn-r" onclick="CommandDispatchClick();" style="cursor: pointer; width: 1.475rem; height: .305rem; line-height: .35rem;">
|
||||
<%--<div class="n-btn-r c-n-btn-r" onclick="CommandDispatchClick();" style="cursor: pointer; width: 1.475rem; height: .305rem; line-height: .35rem;">
|
||||
<asp:Literal runat="server" Text="<%$ Resources:Lan,CommandDispatchCenter %>" />
|
||||
</div>
|
||||
</div>--%>
|
||||
<div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor: pointer">
|
||||
<asp:Literal runat="server" Text="<%$ Resources:Lan,OnSiteAttendance %>" />
|
||||
</div>
|
||||
|
@ -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 %>'
|
||||
|
||||
|
|
|
@ -26794,6 +26794,10 @@ namespace Model
|
|||
|
||||
private System.Nullable<System.DateTime> _PlanEndDate;
|
||||
|
||||
private string _AQMAccount;
|
||||
|
||||
private string _AQMPwd;
|
||||
|
||||
private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
|
||||
|
||||
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
|
||||
|
@ -27514,6 +27518,10 @@ namespace Model
|
|||
partial void OnPlanStartDateChanged();
|
||||
partial void OnPlanEndDateChanging(System.Nullable<System.DateTime> 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> Accident_AccidentHandle
|
||||
{
|
||||
|
@ -231804,8 +231852,6 @@ namespace Model
|
|||
|
||||
private EntityRef<Base_Unit> _Base_Unit;
|
||||
|
||||
private EntityRef<ProjectData_WorkArea> _ProjectData_WorkArea;
|
||||
|
||||
private EntityRef<Sys_User> _Sys_User;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
|
@ -231840,7 +231886,6 @@ namespace Model
|
|||
{
|
||||
this._Base_Project = default(EntityRef<Base_Project>);
|
||||
this._Base_Unit = default(EntityRef<Base_Unit>);
|
||||
this._ProjectData_WorkArea = default(EntityRef<ProjectData_WorkArea>);
|
||||
this._Sys_User = default(EntityRef<Sys_User>);
|
||||
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> _Check_SupervisionNotice;
|
||||
|
||||
private EntitySet<License_EquipmentSafetyList> _License_EquipmentSafetyList;
|
||||
|
||||
private EntityRef<Base_Project> _Base_Project;
|
||||
|
||||
private EntityRef<Base_Unit> _Base_Unit;
|
||||
|
@ -315234,7 +315239,6 @@ namespace Model
|
|||
{
|
||||
this._Check_CheckDayDetail = new EntitySet<Check_CheckDayDetail>(new Action<Check_CheckDayDetail>(this.attach_Check_CheckDayDetail), new Action<Check_CheckDayDetail>(this.detach_Check_CheckDayDetail));
|
||||
this._Check_SupervisionNotice = new EntitySet<Check_SupervisionNotice>(new Action<Check_SupervisionNotice>(this.attach_Check_SupervisionNotice), new Action<Check_SupervisionNotice>(this.detach_Check_SupervisionNotice));
|
||||
this._License_EquipmentSafetyList = new EntitySet<License_EquipmentSafetyList>(new Action<License_EquipmentSafetyList>(this.attach_License_EquipmentSafetyList), new Action<License_EquipmentSafetyList>(this.detach_License_EquipmentSafetyList));
|
||||
this._Base_Project = default(EntityRef<Base_Project>);
|
||||
this._Base_Unit = default(EntityRef<Base_Unit>);
|
||||
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> 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")]
|
||||
|
|
Loading…
Reference in New Issue