From 1eb96617262b867997656d885c4a4d8a056b97d3 Mon Sep 17 00:00:00 2001 From: "754998852@qq.com" <754998852@qq.com> Date: Mon, 29 Jul 2024 14:45:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_V2024-07-29-phf.sql | 18 +++++++++++++ .../DataIn/NonProcessSystemList导入模板.xls | Bin 20480 -> 20992 bytes .../DataIn/ProcessSystemList导入模板.xls | Bin 20992 -> 21504 bytes .../Transfer/CivilStructure.aspx | 24 +++++++++--------- SGGL/FineUIPro.Web/Transfer/Electrical.aspx | 16 ++++++------ SGGL/FineUIPro.Web/Transfer/Firefighting.aspx | 14 +++++----- .../Transfer/Instrumentation.aspx | 18 ++++++------- .../FineUIPro.Web/Transfer/LHCSystemList.aspx | 2 +- .../Transfer/LHCSystemListDataIn.aspx.cs | 2 +- SGGL/FineUIPro.Web/Transfer/Plumbing.aspx | 14 +++++----- .../Transfer/RotatingEquipment.aspx | 16 ++++++------ .../Transfer/StaticEquipment.aspx | 14 +++++----- SGGL/FineUIPro.Web/Transfer/Telecom.aspx | 16 ++++++------ SGGL/FineUIPro.Web/common/Menu_Transfer.xml | 3 +++ SGGL/WebAPI/WebAPI.csproj.user | 2 +- 15 files changed, 90 insertions(+), 69 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_V2024-07-29-phf.sql 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 9777cbda8ad3b6b34cad5f0e015f26a4d00ab880..1656dd2a82a47360f4a680c22644026e65cf003a 100644 GIT binary patch delta 695 zcmZ`%&uddb5dP+6)4bL|(nQfyYnxhQ@nYIzgg#$W6eR^MqWA-Zh8|2++ThW_P~X+0{*1-In#DYvF(-<5D@FxsID_6L_8hmhG%7&`;uRnZx@b>7ZjOn^sbJ|{Ts^*Il=sC~#k5NPl zFjG7M^qEW4$^{%+E7BE3o5MMiq7>Nb7^AHA~N&qE%dh8L7NR*;8}*I2?E zR8b*T!2+)14qo9hv1R%esVj_JAwGaIks5uSJC?b=rhnZk$e|wdC*^nW$bTYEX-MzS ze7|vmZE|+ZXL3oyHKZGHjge#uG4r1L6qL!+3i?f2kEm?J!9WxVM#Z}k_h>hg9o(KK z5lphm43`ZkQPP6T*@|^uA{}`I3Hq(r%vOLwWA!u4;sP=_j~HacBE6BEAlMrV(X(3e zf@~KTNS`gk#cf?HO*Ilx0-K66@rj-7?cUp%3vxTOi z?%rZlo?Ob(%yip+^DmYV8%F)f{*KPfe;C>~Uv>0jL*r S9+9l9d$fS|ZI1I@!~y^*6F=+# diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/ProcessSystemList导入模板.xls index 35340a31e5527d6d5c10d5d6a11b5f41cd416822..7f6807ddd98bc0dcbf07ef687575c56443ccb3c2 100644 GIT binary patch delta 722 zcmZ`%J5N+W6#mXId%55ytP2FFbc5phDnKf;;4YgbXw*U*V**){U5SaW@F>lK>klwY zMS=x{g31JLr3GkZVP#=76h>&Vn99N!uixCgn^54~oX33U+;hH}Gm9ItxGAr4a%OAf zqsTdvQ1!lk0Dr?UbTU9c+uR3h>XWqnxUv7?`Tm}qH4D0~9*hOQ^`7WAWt$DYd0(%p zi=$?%FjhQ74jq6U=HGy4d#MvXplF>)ED73voUlpSB`E;@d&yJ(!9nn=P?bAb$X(21 znzDd7vMJ&z9^)Avp-QZZ3NGO~p5QdGS;l6ltIV7u-j3Tu<{4|$n5BQ-JS+~WYdQ0p zW-=dqF5VZ_lQEY|L#nLJbm_(5Pi&C9va2MOf^W$?BCR!ux7e55cR*WrHG(#qG8x@j zQ)rJe!7O(ymvNJJIoZJ7-(-XUCR<&c2PMoc&DH;1}JF*211PTuHh#ALuU`KfEu - + - - - + + + + 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