diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-07-29-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-07-29-phf.sql new file mode 100644 index 00000000..3ce4c526 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-07-29-phf.sql @@ -0,0 +1,18 @@ + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('E305689E-5D84-4C1A-BF67-85FA2D828115','ƽͳƱ','Transfer/Chart/Systemstatus.aspx',50,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B' +,'Menu_Transfer',0,1,1) +go + + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('60838E30-4A46-4878-B299-C234900B10B7','ƽͳͼ','Transfer/Chart/SystemstatusChart.aspx',51,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B' +,'Menu_Transfer',0,1,1) +go + + +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +values('25C13642-AE77-42E2-B0FB-32663B68F93F','ƽ״̬ܱ','Transfer/Chart/SystemStatusSummary.aspx',60,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B', +'Menu_Transfer',0,1,1) +go + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls index 9777cbda..1656dd2a 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/NonProcessSystemList导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls index 35340a31..7f6807dd 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx index c8ca38dc..7fa70d67 100644 --- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx +++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx @@ -56,50 +56,50 @@ - + - - - + + + + HeaderTextAlign="Center" minWidth="120px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="120px"> + HeaderTextAlign="Center" minWidth="120px"> + HeaderTextAlign="Center" minWidth="120px"> + HeaderTextAlign="Center" minWidth="120px"> + HeaderTextAlign="Center" minWidth="100px"> diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx index dd3bc5e2..9d1ce25b 100644 --- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx @@ -57,34 +57,34 @@ - + - - - + + + + HeaderTextAlign="Center" minWidth="150px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="140px"> diff --git a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx index d5b7e303..d51dc8ba 100644 --- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx @@ -57,30 +57,30 @@ - + - - - + + + + HeaderTextAlign="Center" minWidth="120px"> + HeaderTextAlign="Center" minWidth="120px"> + HeaderTextAlign="Center" minWidth="140px"> diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx index 999b3a27..3364d560 100644 --- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx @@ -57,38 +57,38 @@ - + - - - + + + + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="150px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="140px"> diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx index 798f356c..bb2347b8 100644 --- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx +++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx @@ -81,7 +81,7 @@ + HeaderText="Plan Finish of Testing Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="200px"> - + - - - + + + + HeaderTextAlign="Center" minWidth="100px"> + HeaderTextAlign="Center" minWidth="120px"> + HeaderTextAlign="Center" minWidth="120px"> diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx index 4c737b46..696b4ccc 100644 --- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx @@ -57,36 +57,36 @@ --%> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="160px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" Width="140px"> + HeaderTextAlign="Center" minWidth="140px"> + HeaderTextAlign="Center" minWidth="200px"> diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx index 14c8f360..bce04724 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx @@ -59,35 +59,35 @@ + HeaderTextAlign="Center" Width="140px"> + HeaderTextAlign="Center" Width="140px"> + HeaderTextAlign="Center" Width="140px"> + HeaderTextAlign="Center" Width="160px"> + HeaderTextAlign="Center" Width="160px"> + HeaderTextAlign="Center" Width="160px"> + HeaderTextAlign="Center" Width="160px"> diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx index 9304dda6..1ba45ea0 100644 --- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx +++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx @@ -56,34 +56,34 @@ - + - - - + + + + HeaderTextAlign="Center" minWidth="160px"> + HeaderTextAlign="Center" minWidth="160px"> + HeaderTextAlign="Center" minWidth="160px"> + HeaderTextAlign="Center" minWidth="160px"> diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 9b851a04..cfea114a 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -16,5 +16,8 @@ + + + \ No newline at end of file diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true