diff --git a/DataBase/版本日志/SGGLDB_2025-04-07-xiaj.sql b/DataBase/版本日志/SGGLDB_2025-04-07-xiaj.sql
index 398bca9..5edbacb 100644
--- a/DataBase/版本日志/SGGLDB_2025-04-07-xiaj.sql
+++ b/DataBase/版本日志/SGGLDB_2025-04-07-xiaj.sql
@@ -142,3 +142,107 @@ set SuperMenu='A6AE443A-66B5-42E3-8BC0-2E6D446E5A7F'
where MenuName like '%ΣԴ%'
GO
+
+
+--1֪ͨ
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'BE6F2B37-3937-4865-A40F-7E81B922388A')
+BEGIN
+ --֪ͨ
+ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+ VALUES('BE6F2B37-3937-4865-A40F-7E81B922388A','֪ͨ','',5,'0','Menu_SJTB',0,0,1)
+END
+GO
+update Sys_Menu
+set MenuType='Menu_SJTB' , SuperMenu='BE6F2B37-3937-4865-A40F-7E81B922388A'
+where MenuType='Menu_Notice'
+GO
+
+
+
+
+
+--ɫ˵Ȩ
+
+--Ա
+INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+SELECT 'E938AE80-EAB2-4EDF-BBC8-FE3F8B14C2BE', 'Menu_Person', 'Ա',1,'MenuType_S'
+WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = 'E938AE80-EAB2-4EDF-BBC8-FE3F8B14C2BE' AND GroupId='MenuType_S');
+INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+SELECT '8FBB9221-CD12-4FCE-BE79-A08FB4314A4E', 'Menu_Person', 'Ա',1,'MenuType_P'
+WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '8FBB9221-CD12-4FCE-BE79-A08FB4314A4E' AND GroupId='MenuType_P');
+GO
+
+--ȫ
+INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+SELECT 'C9216A7E-17CF-4A7D-AFCD-E3529179AD1F', 'Menu_HSSE', 'ȫ',2,'MenuType_S'
+WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = 'C9216A7E-17CF-4A7D-AFCD-E3529179AD1F' AND GroupId='MenuType_S');
+UPDATE Sys_Const SET SortIndex=2 WHERE ConstText = 'ȫ' AND GroupId='MenuType_P'
+GO
+
+--ж
+UPDATE Sys_Const SET SortIndex=3 WHERE ConstText = 'ж' AND GroupId in ('MenuType_S','MenuType_P')
+GO
+
+--
+UPDATE Sys_Const SET SortIndex=4 WHERE ConstText = '' AND GroupId='MenuType_P'
+GO
+
+--Դ
+UPDATE Sys_Const SET SortIndex=4 WHERE ConstText = 'Դ' AND GroupId='MenuType_S'
+GO
+--豸
+INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+SELECT '358B5285-C816-46E0-BF5B-EA9FD034DA71', 'Menu_Device', '豸',6,'MenuType_S'
+WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '358B5285-C816-46E0-BF5B-EA9FD034DA71' AND GroupId='MenuType_S');
+INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+SELECT '39ED2EBB-106F-42AD-B547-31C6D32C419D', 'Menu_Device', '豸',5,'MenuType_P'
+WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '39ED2EBB-106F-42AD-B547-31C6D32C419D' AND GroupId='MenuType_P');
+GO
+--
+INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+SELECT 'CF6A55DD-C4D4-411C-AB88-A956AA147533', 'Menu_CQMS', '',5,'MenuType_S'
+WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = 'CF6A55DD-C4D4-411C-AB88-A956AA147533' AND GroupId='MenuType_S');
+GO
+--Ƶ
+UPDATE Sys_Const SET SortIndex=6 WHERE ConstText = 'Ƶ' AND GroupId='MenuType_P'
+GO
+
+--豸
+UPDATE Sys_Const SET SortIndex=6,ConstValue='Menu_Device' WHERE ConstText = '豸' AND GroupId='MenuType_S'
+UPDATE Sys_Const SET SortIndex=5,ConstValue='Menu_Device' WHERE ConstText = '豸' AND GroupId='MenuType_P'
+GO
+--豸
+UPDATE Sys_Const SET SortIndex=5 WHERE ConstText = '' AND GroupId='MenuType_S'
+GO
+--Ƶ
+INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+SELECT '5E30E46E-4872-47EA-BC46-6C3F3C880F8D', 'Menu_DigitalSite', 'Ƶ',7,'MenuType_S'
+WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '5E30E46E-4872-47EA-BC46-6C3F3C880F8D' AND GroupId='MenuType_S');
+GO
+
+--ͬ
+UPDATE Sys_Const SET SortIndex=8,ConstText = 'ݹ' WHERE ConstText = 'ͬ' AND GroupId='MenuType_S'
+GO
+
+
+
+
+--Ŀ
+UPDATE Sys_Const SET SortIndex=99 WHERE ConstText = 'Ŀ' AND GroupId='MenuType_P'
+GO
+--ϵͳ
+UPDATE Sys_Const SET SortIndex=99 WHERE ConstText = 'ϵͳ' AND GroupId='MenuType_S'
+GO
+--ӹ
+DELETE Sys_Const WHERE ConstText = 'ӹ' AND GroupId='MenuType_P'
+--ֳ
+DELETE Sys_Const WHERE ConstText = 'ֳ' AND GroupId='MenuType_P'
+--ʵҵ
+DELETE Sys_Const WHERE ConstText = 'ʵҵ' AND GroupId='MenuType_P'
+--Ŀ
+DELETE Sys_Const WHERE ConstText = 'Ŀ' AND GroupId='MenuType_S'
+--ۺϹ
+DELETE Sys_Const WHERE ConstText = 'ۺϹ' AND GroupId='MenuType_S'
+--֪ͨ
+DELETE Sys_Const WHERE ConstText = '֪ͨ' AND GroupId='MenuType_S'
+GO
diff --git a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
index 5ed2cb5..5133352 100644
--- a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1510,15 +1510,12 @@
-
-
-
@@ -14730,13 +14727,6 @@
indexProject_three.aspx
-
- indexProject_ZJ.aspx
- ASPXCodeBehind
-
-
- indexProject_ZJ.aspx
-
index_three.aspx
ASPXCodeBehind
@@ -14744,13 +14734,6 @@
index_three.aspx
-
- index_ZJ.aspx
- ASPXCodeBehind
-
-
- index_ZJ.aspx
-
indexProjectShiYe.aspx
ASPXCodeBehind
@@ -14786,13 +14769,6 @@
index_gateway.aspx
-
- Login_ZJ.aspx
- ASPXCodeBehind
-
-
- Login_ZJ.aspx
-
Login.aspx
ASPXCodeBehind
diff --git a/SUBQHSE/FineUIPro.Web/LogOff.aspx.cs b/SUBQHSE/FineUIPro.Web/LogOff.aspx.cs
index aba8344..e6cfdd5 100644
--- a/SUBQHSE/FineUIPro.Web/LogOff.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/LogOff.aspx.cs
@@ -14,19 +14,8 @@ namespace FineUIPro.Web
{
if (!IsPostBack)
{
-
- string loginform = ConfigurationManager.AppSettings["LoginForm"];
- if (string.IsNullOrEmpty(loginform))
- {
- HyperLink1.NavigateUrl = "Login.aspx";
- return;
- }
- else
- {
- HyperLink1.NavigateUrl = "Login_ZJ.aspx";
-
- return;
- }
+ HyperLink1.NavigateUrl = "Login.aspx";
+ return;
}
}
}
diff --git a/SUBQHSE/FineUIPro.Web/Login_ZJ.aspx b/SUBQHSE/FineUIPro.Web/Login_ZJ.aspx
deleted file mode 100644
index 9425022..0000000
--- a/SUBQHSE/FineUIPro.Web/Login_ZJ.aspx
+++ /dev/null
@@ -1,335 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="True" CodeBehind="Login_ZJ.aspx.cs" Inherits="FineUIPro.Web.Login_ZJ" %>
-
-
-
-
-
-
- QHSE管理数字化平台V2.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-