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

提交代码

This commit is contained in:
高飞 2024-10-17 14:50:41 +08:00
parent f0bb5eacc2
commit 1771fc51d5
6 changed files with 86 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -100,7 +100,7 @@
<Reference Include="System.Web.Services" /> <Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" /> <Reference Include="System.EnterpriseServices" />
<Reference Include="ThoughtWorks.QRCode"> <Reference Include="ThoughtWorks.QRCode">
<HintPath>..\..\..\..\ZHJA_HJGL\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath> <HintPath>..\..\..\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Data; using System.Data;
using BLL; using BLL;
using System.Linq;
namespace FineUIPro.Web.HJGL.CheckManage namespace FineUIPro.Web.HJGL.CheckManage
{ {

18
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
View File

@ -118,7 +118,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{ {
string strSql = "select v.*,newid() as New_ID from (SELECT distinct * FROM HJGL_View_InspectionBatch WHERE 1=1"; string strSql = "select v.*,newid() as New_ID from (SELECT distinct * FROM HJGL_View_InspectionBatch WHERE 1=1";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue!="null") if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
{ {
strSql += " AND ProjectId = @ProjectId"; strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue)); listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
@ -248,12 +248,12 @@ namespace FineUIPro.Web.HJGL.WeldingReport
List<string> columns = new List<string>(); List<string> columns = new List<string>();
if (c != null) if (c != null)
{ {
string[] items = c.Columns.Split(','); string[] items = ("0," + c.Columns).Split(',');
columns = new List<string>(items); columns = new List<string>(items);
} }
else else
{ {
for (int i=1; i <= Grid1.Columns.Count; i++) for (int i = 1; i <= Grid1.Columns.Count; i++)
{ {
columns.Add(i.ToString()); columns.Add(i.ToString());
} }
@ -289,7 +289,11 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{ {
if (columns.Contains(column.ColumnIndex.ToString())) if (columns.Contains(column.ColumnIndex.ToString()))
{ {
if (column.ColumnIndex == 1) if (column.ColumnIndex == 0)
{
sb.AppendFormat("<td align='center' style='width:118px;'>{0}</td>", column.HeaderText);
}
else if (column.ColumnIndex == 1)
{ {
sb.AppendFormat("<td align='center' style='width:118px;'>{0}</td>", column.HeaderText); sb.AppendFormat("<td align='center' style='width:118px;'>{0}</td>", column.HeaderText);
} }
@ -381,6 +385,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
} }
} }
sb.Append("</tr>"); sb.Append("</tr>");
int a = 1;
foreach (GridRow row in grid.Rows) foreach (GridRow row in grid.Rows)
{ {
sb.Append("<tr>"); sb.Append("<tr>");
@ -390,6 +395,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
if (columnIndexs.Contains(columnIndex)) if (columnIndexs.Contains(columnIndex))
{ {
string html = value.ToString(); string html = value.ToString();
if (columnIndex == 0)
{
html = a.ToString();
}
if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX)) if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX))
{ {
// 模板列 // 模板列
@ -421,6 +430,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
sb.AppendFormat("<td align='center'>{0}</td>", html); sb.AppendFormat("<td align='center'>{0}</td>", html);
} }
columnIndex++; columnIndex++;
a++;
} }
sb.Append("</tr>"); sb.Append("</tr>");
} }

110
HJGL_ZH/FineUIPro.Web/Web.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0"?>
<!-- <!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问 有关如何配置 ASP.NET 应用程序的详细消息，请访问
@ -6,128 +6,128 @@
--> -->
<configuration> <configuration>
<configSections> <configSections>
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" /> <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections> </configSections>
<FineUIPro DebugMode="false" Theme="Cupertino" /> <FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.\sql2016;Database=HJGLDB_NEW;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200" /> <add key="ConnectionString" value="Server=.\sql2019;Database=HJGLDB_NEW;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统" /> <add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" /> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
<add key="aspnet:MaxHttpCollectionKeys" value="50000" /> <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
<add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001" /> <add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001"/>
<add key="ADomainUrl" value="10.151.130.1" /> <add key="ADomainUrl" value="10.151.130.1"/>
<add key="APPUrl" value="https://www.pgyer.com/pWSd" /> <add key="APPUrl" value="https://www.pgyer.com/pWSd"/>
<!--系统:焊接管理为：HJGL,焊材管理：HJCLGL--> <!--系统:焊接管理为：HJGL,焊材管理：HJCLGL-->
<add key="SystemCode" value="HJCLGL" /> <add key="SystemCode" value="HJCLGL"/>
<add key="http" value="http://localhost/test/" /> <add key="http" value="http://localhost/test/"/>
</appSettings> </appSettings>
<system.web> <system.web>
<!-- 会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" --> <!-- 会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
<sessionState mode="InProc" cookieless="UseCookies" timeout="1200" /> <sessionState mode="InProc" cookieless="UseCookies" timeout="1200"/>
<!--<processModel enable="true" requestQueueLimit="100000"/>--> <!--<processModel enable="true" requestQueueLimit="100000"/>-->
<pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID"> <pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID">
<controls> <controls>
<add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro" /> <add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro"/>
<add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> <add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</controls> </controls>
</pages> </pages>
<httpModules> <httpModules>
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" /> <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
</httpModules> </httpModules>
<httpHandlers> <httpHandlers>
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false" /> <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false" /> <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers> </httpHandlers>
<compilation debug="true" targetFramework="4.0"> <compilation debug="false" targetFramework="4.0">
<assemblies> <assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies> </assemblies>
</compilation> </compilation>
<httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000" /> <httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000"/>
<authentication mode="Forms"> <authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/" /> <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
</authentication> </authentication>
<membership> <membership>
<providers> <providers>
<clear /> <clear/>
<add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" /> <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/"/>
</providers> </providers>
</membership> </membership>
<profile> <profile>
<providers> <providers>
<clear /> <clear/>
<add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/" /> <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/"/>
</providers> </providers>
</profile> </profile>
<roleManager enabled="false"> <roleManager enabled="false">
<providers> <providers>
<clear /> <clear/>
<add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/" /> <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/"/>
<add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" /> <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/"/>
</providers> </providers>
</roleManager> </roleManager>
<customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx" /> <customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx"/>
<webServices> <webServices>
<protocols> <protocols>
<add name="HttpSoap" /> <add name="HttpSoap"/>
<add name="HttpPost" /> <add name="HttpPost"/>
<add name="HttpGet" /> <add name="HttpGet"/>
<add name="Documentation" /> <add name="Documentation"/>
</protocols> </protocols>
</webServices> </webServices>
</system.web> </system.web>
<location path="res.axd" /> <location path="res.axd"/>
<system.webServer> <system.webServer>
<staticContent> <staticContent>
<mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File" /> <mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/>
<mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File" /> <mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/>
</staticContent> </staticContent>
<validation validateIntegratedModeConfiguration="false" /> <validation validateIntegratedModeConfiguration="false"/>
<modules runAllManagedModulesForAllRequests="true"> <modules runAllManagedModulesForAllRequests="true">
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" /> <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
<remove name="ScriptModule" /> <remove name="ScriptModule"/>
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</modules> </modules>
<handlers> <handlers>
<remove name="ChartImageHandler" /> <remove name="ChartImageHandler"/>
<add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" /> <add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro"/>
<add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</handlers> </handlers>
<defaultDocument> <defaultDocument>
<files> <files>
<add value="Login.aspx" /> <add value="Login.aspx"/>
</files> </files>
</defaultDocument> </defaultDocument>
<security> <security>
<requestFiltering> <requestFiltering>
<requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647" /> <requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647"/>
</requestFiltering> </requestFiltering>
</security> </security>
</system.webServer> </system.webServer>
<!-- SERVER --> <!-- SERVER -->
<system.serviceModel> <system.serviceModel>
<serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" /> <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
<services> <services>
<service name="BLL.OpenService.HSSEService" behaviorConfiguration="HSSEServiceBehavior"> <service name="BLL.OpenService.HSSEService" behaviorConfiguration="HSSEServiceBehavior">
<endpoint address="" binding="wsHttpBinding" bindingConfiguration="HSSEServiceBinding" name="HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService" /> <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HSSEServiceBinding" name="HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService"/>
</service> </service>
</services> </services>
<behaviors> <behaviors>
<serviceBehaviors> <serviceBehaviors>
<behavior name="HSSEServiceBehavior"> <behavior name="HSSEServiceBehavior">
<serviceMetadata httpGetEnabled="true" /> <serviceMetadata httpGetEnabled="true"/>
<serviceDebug includeExceptionDetailInFaults="false" /> <serviceDebug includeExceptionDetailInFaults="false"/>
<serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647" /> <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647"/>
</behavior> </behavior>
</serviceBehaviors> </serviceBehaviors>
</behaviors> </behaviors>
<bindings> <bindings>
<wsHttpBinding> <wsHttpBinding>
<binding name="HSSEServiceBinding" maxReceivedMessageSize="2147483647" useDefaultWebProxy="false" maxBufferPoolSize="2147483647" closeTimeout="20:00:00" openTimeout="00:01:10" receiveTimeout="20:00:00" sendTimeout="20:00:00"> <binding name="HSSEServiceBinding" maxReceivedMessageSize="2147483647" useDefaultWebProxy="false" maxBufferPoolSize="2147483647" closeTimeout="20:00:00" openTimeout="00:01:10" receiveTimeout="20:00:00" sendTimeout="20:00:00">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647" /> <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647"/>
<security mode="None" /> <security mode="None"/>
</binding> </binding>
</wsHttpBinding> </wsHttpBinding>
</bindings> </bindings>
@ -135,8 +135,8 @@
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>

BIN
HJGL_ZH/Model/bin/Release/Model.dll
View File

Binary file not shown.

BIN
HJGL_ZH/Model/bin/Release/Model.pdb
View File

Binary file not shown.