diff --git a/DataBase/版本日志/SGGLDB_WH_V2025-03-28(菜单调整)-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_V2025-03-28(菜单调整)-xiaj.sql new file mode 100644 index 00000000..db95c3e4 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2025-03-28(菜单调整)-xiaj.sql @@ -0,0 +1,46 @@ + +--˵ + +--1ƽ˵ŵԳģ£ԤԳԳ֮䡾Գƽ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'D98BB86C-CCC4-433B-B367-EFD9E7D2BC39') +BEGIN + --ƽ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('D98BB86C-CCC4-433B-B367-EFD9E7D2BC39','ƽ','',95,'0','Menu_TestRun',0,0,1) +END +GO + + + +update Sys_Menu +set MenuType='Menu_TestRun' , SuperMenu='D98BB86C-CCC4-433B-B367-EFD9E7D2BC39' +where MenuType='Menu_Transfer' and SuperMenu='0' +GO + + +update Sys_Menu +set MenuType='Menu_TestRun' +where MenuType='Menu_Transfer' +GO + + + +--2Ϲ˵ʩһ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '17479694-E342-4046-807A-8905C3B225C1') +BEGIN + --Ϲ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('17479694-E342-4046-807A-8905C3B225C1','Ϲ','',1,'0','Menu_JDGL',0,0,1) +END +GO + +update Sys_Menu +set MenuType='Menu_JDGL' , SuperMenu='17479694-E342-4046-807A-8905C3B225C1' +where MenuType='Menu_CLGL' and SuperMenu='0' +GO + + +update Sys_Menu +set MenuType='Menu_JDGL' +where MenuType='Menu_CLGL' +GO \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx index 6a7d2faa..39ab7c05 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx @@ -174,8 +174,8 @@ 刷新本页 - Schedule manage - 进度管理 + Construction management + 施工管理 Choice language @@ -496,8 +496,8 @@ 停工 - Test management - 试车管理 + Commissioning and Turn-over Mgt. + 试车及移交管理 Under construction diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx index 6d3f1356..09791248 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx @@ -160,7 +160,7 @@ 刷新本页 - 进度管理 + 施工管理 选择语言 @@ -400,7 +400,7 @@ 停工 - 试车管理 + 试车及移交管理 在建 diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx index 12f7a492..173770bd 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx @@ -160,7 +160,7 @@ 刷新本页 - 进度管理 + 施工管理 选择语言 @@ -400,7 +400,7 @@ 停工 - 试车管理 + 试车及移交管理 在建 diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs index e202957b..42142ae3 100644 --- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs +++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs @@ -3013,7 +3013,7 @@ namespace Resources { } /// - /// 查找类似 进度管理 的本地化字符串。 + /// 查找类似 施工管理 的本地化字符串。 /// internal static string ScheduleManage { get { @@ -3148,7 +3148,7 @@ namespace Resources { } /// - /// 查找类似 试车管理 的本地化字符串。 + /// 查找类似 试车及移交管理 的本地化字符串。 /// internal static string TestManagement { get { diff --git a/SGGL/FineUIPro.Web/FileUpload/CheckControl/2025-03/638787749465870865_638766813562593579_踏步少检修不便(通项).jpg b/SGGL/FineUIPro.Web/FileUpload/CheckControl/2025-03/638787749465870865_638766813562593579_踏步少检修不便(通项).jpg new file mode 100644 index 00000000..8293971f Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/CheckControl/2025-03/638787749465870865_638766813562593579_踏步少检修不便(通项).jpg differ diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index 101ae28b..6d7b5edc 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,7 +1,26 @@  - - + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index 4056ca52..3db39735 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -66,6 +66,22 @@ + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 283e3429..91d9fd84 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -1,19 +1,3 @@  - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index 9369032e..e16958e3 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -274,10 +274,10 @@
-
+ <%--
-
-
+
--%> +
@@ -355,9 +355,6 @@