shecs/Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

112

Browse Source
This commit is contained in:
佘春生
2024-05-17 17:18:29 +08:00
parent c41a8f7903
commit 254653611f
14 changed files with 240 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/.vs/HJGL/config/applicationhost.config
+2 -2
View File
@@ -162,7 +162,7 @@
</site>
<site name="WebApi" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:3862:localhost" />
@@ -250,7 +250,7 @@
</site>
<site name="FineUIPro.Web(10)" id="13">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:13960:localhost" />
HJGL/.vs/HJGL/v17/.suo
BIN
View File
Binary file not shown.
HJGL/BLL/.vs/BLL.csproj.dtbcache.json
+1
View File
File diff suppressed because one or more lines are too long
HJGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json
+1 -1
View File
File diff suppressed because one or more lines are too long
HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+9
View File
@@ -4303,54 +4303,63 @@
</Compile>
<Compile Include="Email_Send\Email_Params_Edit.aspx.cs">
<DependentUpon>Email_Params_Edit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Email_Send\Email_Params_Edit.aspx.designer.cs">
<DependentUpon>Email_Params_Edit.aspx</DependentUpon>
</Compile>
<Compile Include="Email_Send\Email_Params_List.aspx.cs">
<DependentUpon>Email_Params_List.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Email_Send\Email_Params_List.aspx.designer.cs">
<DependentUpon>Email_Params_List.aspx</DependentUpon>
</Compile>
<Compile Include="Email_Send\Email_Pop_Edit.aspx.cs">
<DependentUpon>Email_Pop_Edit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Email_Send\Email_Pop_Edit.aspx.designer.cs">
<DependentUpon>Email_Pop_Edit.aspx</DependentUpon>
</Compile>
<Compile Include="Email_Send\Email_SendLog_List.aspx.cs">
<DependentUpon>Email_SendLog_List.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Email_Send\Email_SendLog_List.aspx.designer.cs">
<DependentUpon>Email_SendLog_List.aspx</DependentUpon>
</Compile>
<Compile Include="Email_Send\Email_SendTemplate_Edit.aspx.cs">
<DependentUpon>Email_SendTemplate_Edit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Email_Send\Email_SendTemplate_Edit.aspx.designer.cs">
<DependentUpon>Email_SendTemplate_Edit.aspx</DependentUpon>
</Compile>
<Compile Include="Email_Send\Email_SendTemplate_List.aspx.cs">
<DependentUpon>Email_SendTemplate_List.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Email_Send\Email_SendTemplate_List.aspx.designer.cs">
<DependentUpon>Email_SendTemplate_List.aspx</DependentUpon>
</Compile>
<Compile Include="Email_Send\Email_Send_Edit.aspx.cs">
<DependentUpon>Email_Send_Edit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Email_Send\Email_Send_Edit.aspx.designer.cs">
<DependentUpon>Email_Send_Edit.aspx</DependentUpon>
</Compile>
<Compile Include="Email_Send\SelectRoleControl.ascx.cs">
<DependentUpon>SelectRoleControl.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Email_Send\SelectRoleControl.ascx.designer.cs">
<DependentUpon>SelectRoleControl.ascx</DependentUpon>
</Compile>
<Compile Include="Email_Send\SelectUserControl.ascx.cs">
<DependentUpon>SelectUserControl.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Email_Send\SelectUserControl.ascx.designer.cs">
<DependentUpon>SelectUserControl.ascx</DependentUpon>
HJGL/FineUIPro.Web/Web.config
+2 -2
View File
@@ -9,12 +9,12 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>
<FineUIPro DebugMode="false" CustomTheme="Metro_Dark_Blue" EnableAnimation="true" JSLibrary="All"/>
<appSettings>
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=HJGLDB;Integrated Security=False; User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>-->
<!--系统名称-->
HJGL/Model/Model.cs
+25 -25
View File
@@ -22456,12 +22456,12 @@ namespace Model
private string _DetectionStandard;
private string _Tabler;
private string _Remark;
private System.Nullable<System.DateTime> _CreatedTime;
private string _Tabler;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -22480,12 +22480,12 @@ namespace Model
partial void OnUnitIdChanged();
partial void OnDetectionStandardChanging(string value);
partial void OnDetectionStandardChanged();
partial void OnTablerChanging(string value);
partial void OnTablerChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
partial void OnCreatedTimeChanged();
partial void OnTablerChanging(string value);
partial void OnTablerChanged();
#endregion
public PMI_Delegation()
@@ -22633,6 +22633,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")]
public string Tabler
{
get
{
return this._Tabler;
}
set
{
if ((this._Tabler != value))
{
this.OnTablerChanging(value);
this.SendPropertyChanging();
this._Tabler = value;
this.SendPropertyChanged("Tabler");
this.OnTablerChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")]
public string Remark
{
@@ -22673,26 +22693,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")]
public string Tabler
{
get
{
return this._Tabler;
}
set
{
if ((this._Tabler != value))
{
this.OnTablerChanging(value);
this.SendPropertyChanging();
this._Tabler = value;
this.SendPropertyChanged("Tabler");
this.OnTablerChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -46227,7 +46227,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="VarChar(1000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string WelderIds
{
get
HJGL/WebApi/.vs/WebApi.csproj.dtbcache.json
+1
View File
File diff suppressed because one or more lines are too long
HJGL/WebApi/Controllers/TaskController.cs
+2
View File
@@ -30,5 +30,7 @@ namespace WebApi.Controllers
}
return model;
}
}
}
HJGL/WebApi/Web.config
+2 -2
View File
@@ -10,7 +10,7 @@
<add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.;Database=HJGLDB_ZJBSF;Integrated Security=False;User ID=sa;Password=Sh@nghai9;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\sql2016;Database=HJGLDB_ZJBSF;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--版本号-->
<add key="SystemVersion" value="WebApi_V2019-09-20-001"/>
<!--附件上传物理路径-->
@@ -27,7 +27,7 @@
</system.Web>
-->
<system.web>
<compilation debug="true" targetFramework="4.8"/>
<compilation debug="false" targetFramework="4.8"/>
<httpRuntime targetFramework="4.6.1"/>
</system.web>
<system.webServer>
HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.