提交代码
This commit is contained in:
parent
f0bb5eacc2
commit
1771fc51d5
|
|
@ -100,7 +100,7 @@
|
|||
<Reference Include="System.Web.Services" />
|
||||
<Reference Include="System.EnterpriseServices" />
|
||||
<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>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||
using System.Data.SqlClient;
|
||||
using System.Data;
|
||||
using BLL;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.HJGL.CheckManage
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
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";
|
||||
listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
|
||||
|
|
@ -155,7 +155,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
|||
{
|
||||
this.GetShowColumn(c.Columns);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -192,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
|||
// BindGrid();
|
||||
//}
|
||||
//#endregion
|
||||
|
||||
|
||||
#region 分页
|
||||
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
|
||||
{
|
||||
|
|
@ -227,7 +227,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
|||
#endregion
|
||||
|
||||
#region 导出
|
||||
|
||||
|
||||
/// 导出按钮
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
|
|
@ -244,20 +244,20 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
|||
// n++;
|
||||
//}
|
||||
|
||||
Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3");
|
||||
List<string> columns = new List<string>();
|
||||
if (c != null)
|
||||
{
|
||||
string[] items = c.Columns.Split(',');
|
||||
columns = new List<string>(items);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i=1; i <= Grid1.Columns.Count; i++)
|
||||
{
|
||||
columns.Add(i.ToString());
|
||||
}
|
||||
}
|
||||
Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3");
|
||||
List<string> columns = new List<string>();
|
||||
if (c != null)
|
||||
{
|
||||
string[] items = ("0," + c.Columns).Split(',');
|
||||
columns = new List<string>(items);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 1; i <= Grid1.Columns.Count; i++)
|
||||
{
|
||||
columns.Add(i.ToString());
|
||||
}
|
||||
}
|
||||
Response.ClearContent();
|
||||
string filename = Funs.GetNewFileName();
|
||||
//string style = @"<style> .text { mso-number-format:\@; } </script> ";
|
||||
|
|
@ -289,7 +289,11 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
|||
{
|
||||
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);
|
||||
}
|
||||
|
|
@ -381,6 +385,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
|||
}
|
||||
}
|
||||
sb.Append("</tr>");
|
||||
int a = 1;
|
||||
foreach (GridRow row in grid.Rows)
|
||||
{
|
||||
sb.Append("<tr>");
|
||||
|
|
@ -390,6 +395,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
|||
if (columnIndexs.Contains(columnIndex))
|
||||
{
|
||||
string html = value.ToString();
|
||||
if (columnIndex == 0)
|
||||
{
|
||||
html = a.ToString();
|
||||
}
|
||||
if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX))
|
||||
{
|
||||
// 模板列
|
||||
|
|
@ -421,6 +430,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
|
|||
sb.AppendFormat("<td align='center'>{0}</td>", html);
|
||||
}
|
||||
columnIndex++;
|
||||
a++;
|
||||
}
|
||||
sb.Append("</tr>");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
有关如何配置 ASP.NET 应用程序的详细消息，请访问
|
||||
|
||||
|
|
@ -6,128 +6,128 @@
|
|||
-->
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" />
|
||||
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
|
||||
</configSections>
|
||||
<FineUIPro DebugMode="false" Theme="Cupertino" />
|
||||
<FineUIPro DebugMode="false" Theme="Cupertino"/>
|
||||
<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="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />
|
||||
<add key="aspnet:MaxHttpCollectionKeys" value="50000" />
|
||||
<add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001" />
|
||||
<add key="ADomainUrl" value="10.151.130.1" />
|
||||
<add key="APPUrl" value="https://www.pgyer.com/pWSd" />
|
||||
<add key="SystemName" value="诺必达焊接管理系统"/>
|
||||
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
||||
<add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
|
||||
<add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001"/>
|
||||
<add key="ADomainUrl" value="10.151.130.1"/>
|
||||
<add key="APPUrl" value="https://www.pgyer.com/pWSd"/>
|
||||
<!--系统:焊接管理为：HJGL,焊材管理：HJCLGL-->
|
||||
<add key="SystemCode" value="HJCLGL" />
|
||||
<add key="http" value="http://localhost/test/" />
|
||||
<add key="SystemCode" value="HJCLGL"/>
|
||||
<add key="http" value="http://localhost/test/"/>
|
||||
</appSettings>
|
||||
<system.web>
|
||||
<!-- 会话状态设置 默认情况下，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"/>-->
|
||||
<pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID">
|
||||
<controls>
|
||||
<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="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"/>
|
||||
</controls>
|
||||
</pages>
|
||||
<httpModules>
|
||||
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
|
||||
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
|
||||
</httpModules>
|
||||
<httpHandlers>
|
||||
<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 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"/>
|
||||
</httpHandlers>
|
||||
<compilation debug="true" targetFramework="4.0">
|
||||
<compilation debug="false" targetFramework="4.0">
|
||||
<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>
|
||||
</compilation>
|
||||
<httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000" />
|
||||
<httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000"/>
|
||||
<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>
|
||||
<membership>
|
||||
<providers>
|
||||
<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="/" />
|
||||
<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="/"/>
|
||||
</providers>
|
||||
</membership>
|
||||
<profile>
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/" />
|
||||
<clear/>
|
||||
<add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/"/>
|
||||
</providers>
|
||||
</profile>
|
||||
<roleManager enabled="false">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/" />
|
||||
<add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
|
||||
<clear/>
|
||||
<add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/"/>
|
||||
<add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/"/>
|
||||
</providers>
|
||||
</roleManager>
|
||||
<customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx" />
|
||||
<customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx"/>
|
||||
<webServices>
|
||||
<protocols>
|
||||
<add name="HttpSoap" />
|
||||
<add name="HttpPost" />
|
||||
<add name="HttpGet" />
|
||||
<add name="Documentation" />
|
||||
<add name="HttpSoap"/>
|
||||
<add name="HttpPost"/>
|
||||
<add name="HttpGet"/>
|
||||
<add name="Documentation"/>
|
||||
</protocols>
|
||||
</webServices>
|
||||
</system.web>
|
||||
<location path="res.axd" />
|
||||
<location path="res.axd"/>
|
||||
<system.webServer>
|
||||
<staticContent>
|
||||
<mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File" />
|
||||
<mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File" />
|
||||
<mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/>
|
||||
<mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/>
|
||||
</staticContent>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
<validation validateIntegratedModeConfiguration="false"/>
|
||||
<modules runAllManagedModulesForAllRequests="true">
|
||||
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
|
||||
<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="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
|
||||
<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"/>
|
||||
</modules>
|
||||
<handlers>
|
||||
<remove name="ChartImageHandler" />
|
||||
<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" />
|
||||
<remove name="ChartImageHandler"/>
|
||||
<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"/>
|
||||
</handlers>
|
||||
<defaultDocument>
|
||||
<files>
|
||||
<add value="Login.aspx" />
|
||||
<add value="Login.aspx"/>
|
||||
</files>
|
||||
</defaultDocument>
|
||||
<security>
|
||||
<requestFiltering>
|
||||
<requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647" />
|
||||
<requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647"/>
|
||||
</requestFiltering>
|
||||
</security>
|
||||
</system.webServer>
|
||||
<!-- SERVER -->
|
||||
<system.serviceModel>
|
||||
<serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
|
||||
<serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
|
||||
<services>
|
||||
<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>
|
||||
</services>
|
||||
<behaviors>
|
||||
<serviceBehaviors>
|
||||
<behavior name="HSSEServiceBehavior">
|
||||
<serviceMetadata httpGetEnabled="true" />
|
||||
<serviceDebug includeExceptionDetailInFaults="false" />
|
||||
<serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647" />
|
||||
<serviceMetadata httpGetEnabled="true"/>
|
||||
<serviceDebug includeExceptionDetailInFaults="false"/>
|
||||
<serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647"/>
|
||||
</behavior>
|
||||
</serviceBehaviors>
|
||||
</behaviors>
|
||||
<bindings>
|
||||
<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">
|
||||
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647" />
|
||||
<security mode="None" />
|
||||
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647"/>
|
||||
<security mode="None"/>
|
||||
</binding>
|
||||
</wsHttpBinding>
|
||||
</bindings>
|
||||
|
|
@ -135,8 +135,8 @@
|
|||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue