diff --git a/.gitignore b/.gitignore index 79ca2e1..0623f6c 100644 --- a/.gitignore +++ b/.gitignore @@ -5725,7 +5725,9 @@ HJGLPackFile/版本日志/HJGLDB_2024.05.02.sql /HJGL/FineUIPro.Web/ErrLog.txt /HJGL/FineUIPro.Web/File/Excel/20240510091749 /HJGL/FineUIPro.Web/File/Excel/20240510092516 -/HJGL/FineUIPro.Web/Web.config /HJGL/FineUIPro.Web/File/Excel/20240510100957/out.xlsx /HJGL/FineUIPro.Web/File/Excel/20240510105614 /DataBase/hjglDB_7_2024.05.10.rar +/HJGL/FineUIPro.Web/File/Excel +/HJGLPackFile/PackFile +/HJGL/.vs/HJGL/v17/.suo diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 8829883..8a86b31 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -240,6 +240,14 @@ + + + + + + + + diff --git a/HJGL/FineUIPro.Web/Doc/index.aspx b/HJGL/FineUIPro.Web/Doc/index.aspx deleted file mode 100644 index 125efab..0000000 --- a/HJGL/FineUIPro.Web/Doc/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Doc.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Doc/index.aspx.cs b/HJGL/FineUIPro.Web/Doc/index.aspx.cs deleted file mode 100644 index 1b35a5e..0000000 --- a/HJGL/FineUIPro.Web/Doc/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Doc -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Doc/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Doc/index.aspx.designer.cs deleted file mode 100644 index 57ac6fa..0000000 --- a/HJGL/FineUIPro.Web/Doc/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Doc -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/Downloads/index.aspx b/HJGL/FineUIPro.Web/Downloads/index.aspx deleted file mode 100644 index 3e0081a..0000000 --- a/HJGL/FineUIPro.Web/Downloads/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Downloads.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Downloads/index.aspx.cs b/HJGL/FineUIPro.Web/Downloads/index.aspx.cs deleted file mode 100644 index 8786baa..0000000 --- a/HJGL/FineUIPro.Web/Downloads/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Downloads -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Downloads/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Downloads/index.aspx.designer.cs deleted file mode 100644 index 745e4c8..0000000 --- a/HJGL/FineUIPro.Web/Downloads/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Downloads -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/File/index.aspx b/HJGL/FineUIPro.Web/File/index.aspx deleted file mode 100644 index f9e96a5..0000000 --- a/HJGL/FineUIPro.Web/File/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.File.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/File/index.aspx.cs b/HJGL/FineUIPro.Web/File/index.aspx.cs deleted file mode 100644 index 901f526..0000000 --- a/HJGL/FineUIPro.Web/File/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.File -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/File/index.aspx.designer.cs b/HJGL/FineUIPro.Web/File/index.aspx.designer.cs deleted file mode 100644 index 454aac7..0000000 --- a/HJGL/FineUIPro.Web/File/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.File -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 734d1dc..ef34884 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -246,11 +246,8 @@ - - - @@ -263,7 +260,6 @@ - @@ -354,7 +350,6 @@ - @@ -392,8 +387,6 @@ - - @@ -3474,20 +3467,6 @@ WelderManageView.aspx - - index.aspx - ASPXCodeBehind - - - index.aspx - - - index.aspx - ASPXCodeBehind - - - index.aspx - Encrypt.aspx ASPXCodeBehind @@ -3495,13 +3474,6 @@ Encrypt.aspx - - index.aspx - ASPXCodeBehind - - - index.aspx - HardFeedback.aspx ASPXCodeBehind @@ -3586,13 +3558,6 @@ HotProessTrustItemEdit.aspx - - index.aspx - ASPXCodeBehind - - - index.aspx - Components.aspx ASPXCodeBehind @@ -4424,20 +4389,6 @@ imageUp.ashx - - index.aspx - ASPXCodeBehind - - - index.aspx - - - index.aspx - ASPXCodeBehind - - - index.aspx - CheckManage.aspx ASPXCodeBehind @@ -4902,6 +4853,7 @@ + diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 126cdf8..046bc87 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -11,37 +11,5 @@ - - - - - Login.aspx - SpecificPage - True - False - False - False - - - - - - - - - True - False - True - True - 0 - / - http://localhost:50794/ - False - False - - - - - - + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Images/index.aspx b/HJGL/FineUIPro.Web/Images/index.aspx deleted file mode 100644 index 03f1726..0000000 --- a/HJGL/FineUIPro.Web/Images/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Images.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Images/index.aspx.cs b/HJGL/FineUIPro.Web/Images/index.aspx.cs deleted file mode 100644 index 7a39b97..0000000 --- a/HJGL/FineUIPro.Web/Images/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Images -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Images/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Images/index.aspx.designer.cs deleted file mode 100644 index c086ed8..0000000 --- a/HJGL/FineUIPro.Web/Images/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Images -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/Scripts/index.aspx b/HJGL/FineUIPro.Web/Scripts/index.aspx deleted file mode 100644 index 12a7e2b..0000000 --- a/HJGL/FineUIPro.Web/Scripts/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Scripts.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Scripts/index.aspx.cs b/HJGL/FineUIPro.Web/Scripts/index.aspx.cs deleted file mode 100644 index 5a2e749..0000000 --- a/HJGL/FineUIPro.Web/Scripts/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Scripts -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Scripts/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Scripts/index.aspx.designer.cs deleted file mode 100644 index 18650e6..0000000 --- a/HJGL/FineUIPro.Web/Scripts/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Scripts -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/Styles/index.aspx b/HJGL/FineUIPro.Web/Styles/index.aspx deleted file mode 100644 index bed758a..0000000 --- a/HJGL/FineUIPro.Web/Styles/index.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="FineUIPro.Web.Styles.index" %> - - - - - - - - - -
-
-
-
- - diff --git a/HJGL/FineUIPro.Web/Styles/index.aspx.cs b/HJGL/FineUIPro.Web/Styles/index.aspx.cs deleted file mode 100644 index 72eafe6..0000000 --- a/HJGL/FineUIPro.Web/Styles/index.aspx.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace FineUIPro.Web.Styles -{ - public partial class index : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/Styles/index.aspx.designer.cs b/HJGL/FineUIPro.Web/Styles/index.aspx.designer.cs deleted file mode 100644 index c34bdbf..0000000 --- a/HJGL/FineUIPro.Web/Styles/index.aspx.designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace FineUIPro.Web.Styles -{ - - - public partial class index - { - - /// - /// form1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.HtmlControls.HtmlForm form1; - } -} diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config new file mode 100644 index 0000000..8868ed3 --- /dev/null +++ b/HJGL/FineUIPro.Web/Web.config @@ -0,0 +1,138 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs index 6f49dc7..6c475bd 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs @@ -303,7 +303,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport ws.SetColumnWidth(6, (int)(6.33 * 256)); ws.SetColumnWidth(7, (int)(9.11 * 256)); ws.SetColumnWidth(8, (int)(8.33 * 256)); - ws.SetColumnWidth(9, (int)(7.44 * 256)); + ws.SetColumnWidth(9, (int)(8.40 * 256)); ws.SetColumnWidth(10, (int)(15.67 * 256)); ws.SetColumnWidth(11, (int)(11.67 * 256)); ws.SetColumnWidth(12, (int)(8.22 * 256)); diff --git a/HJGL/WebApi/WebApi.csproj.user b/HJGL/WebApi/WebApi.csproj.user index 6db81e9..33091aa 100644 --- a/HJGL/WebApi/WebApi.csproj.user +++ b/HJGL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU FolderProfile diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache index 2d1ab93..ad71a05 100644 Binary files a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache and b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache differ