Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
commit
0a594115b3
|
|
@ -50,3 +50,4 @@
|
||||||
|
|
||||||
/SGGL/FineUIPro.Web/FileUpload/Transfer/PunchlistFrom/2024-11
|
/SGGL/FineUIPro.Web/FileUpload/Transfer/PunchlistFrom/2024-11
|
||||||
/SGGL/FineUIPro.Web/FileUpload/Transfer/PunchlistFrom/2024-12
|
/SGGL/FineUIPro.Web/FileUpload/Transfer/PunchlistFrom/2024-12
|
||||||
|
/SGGL/FineUIPro.Web/Web.config
|
||||||
|
|
|
||||||
|
|
@ -516,5 +516,28 @@ namespace BLL
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 判断文件类型是否是图片
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="FiletExtension"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static bool IsImage(string FiletExtension)
|
||||||
|
{
|
||||||
|
bool result = false;
|
||||||
|
List<String> list = new List<string>();
|
||||||
|
list.Add(".png");
|
||||||
|
list.Add(".jpg");
|
||||||
|
list.Add(".jpeg");
|
||||||
|
foreach (var item in list)
|
||||||
|
{
|
||||||
|
if (item == FiletExtension)
|
||||||
|
{
|
||||||
|
result = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,17 +10,19 @@
|
||||||
<body>
|
<body>
|
||||||
<form id="form1" runat="server">
|
<form id="form1" runat="server">
|
||||||
<f:PageManager ID="PageManager1" AutoSizePanelID="TabStrip1" runat="server" />
|
<f:PageManager ID="PageManager1" AutoSizePanelID="TabStrip1" runat="server" />
|
||||||
<f:TabStrip ID="TabStrip1" IsFluid="true" ShowBorder="true" ActiveTabIndex="0"
|
<f:TabStrip ID="TabStrip1" IsFluid="true" ShowBorder="true" ActiveTabIndex="0" Hidden="true"
|
||||||
runat="server">
|
runat="server">
|
||||||
<Tabs>
|
<Tabs>
|
||||||
<f:Tab ID="Tab1" EnableIFrame="true"
|
<f:Tab ID="Tab1" EnableIFrame="true" Width="12000px"
|
||||||
Title="预览" runat="server">
|
Title="预览" runat="server">
|
||||||
</f:Tab>
|
</f:Tab>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
</f:TabStrip>
|
</f:TabStrip>
|
||||||
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" hidden="true" Text="关闭" runat="server" Icon="SystemClose" Size="Medium">
|
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Hidden="true" Text="关闭" runat="server" Icon="SystemClose" Size="Medium">
|
||||||
</f:Button>
|
</f:Button>
|
||||||
<iframe id="LookHtml" runat="server" width="700" height="600" name="LookHtml" hidden="hidden"></iframe>
|
<iframe id="LookHtml" runat="server" width="700" height="600" name="LookHtml" hidden="hidden"></iframe>
|
||||||
|
<f:Image ID="Image1" runat="server" ImageMinWidth="1000px" Icon="World" Hidden="true">
|
||||||
|
</f:Image>
|
||||||
</form>
|
</form>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,19 @@ namespace FineUIPro.Web.AttachFile
|
||||||
{
|
{
|
||||||
newurl = Fileurl;
|
newurl = Fileurl;
|
||||||
}
|
}
|
||||||
|
if (AttachFileService.IsImage(FiletExtension))
|
||||||
|
{
|
||||||
|
this.TabStrip1.Hidden = true;
|
||||||
|
this.Image1.Hidden = false;
|
||||||
|
this.Image1.ImageUrl = newurl;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this.TabStrip1.Hidden = false;
|
||||||
|
this.Image1.Hidden = true;
|
||||||
this.LookHtml.Src = newurl;
|
this.LookHtml.Src = newurl;
|
||||||
this.Tab1.IFrameUrl = newurl;
|
this.Tab1.IFrameUrl = newurl;
|
||||||
|
}
|
||||||
//StreamReader fread = new StreamReader(url, System.Text.Encoding.GetEncoding("gb2312"));
|
//StreamReader fread = new StreamReader(url, System.Text.Encoding.GetEncoding("gb2312"));
|
||||||
//string ss = fread.ReadToEnd();
|
//string ss = fread.ReadToEnd();
|
||||||
//Response.Write(ss);
|
//Response.Write(ss);
|
||||||
|
|
|
||||||
|
|
@ -67,5 +67,14 @@ namespace FineUIPro.Web.AttachFile
|
||||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::System.Web.UI.HtmlControls.HtmlIframe LookHtml;
|
protected global::System.Web.UI.HtmlControls.HtmlIframe LookHtml;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Image1 控件。
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// 自动生成的字段。
|
||||||
|
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||||
|
/// </remarks>
|
||||||
|
protected global::FineUIPro.Image Image1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,203 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<!--
|
|
||||||
有关如何配置 ASP.NET 应用程序的详细消息，请访问
|
|
||||||
|
|
||||||
http://go.microsoft.com/fwlink/?LinkId=169433
|
|
||||||
-->
|
|
||||||
<configuration>
|
|
||||||
<configSections>
|
|
||||||
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
|
|
||||||
</configSections>
|
|
||||||
<FineUIPro DebugMode="true" Theme="Cupertino"/>
|
|
||||||
<appSettings>
|
|
||||||
<!--连接字符串-->
|
|
||||||
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
|
|
||||||
<!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
|
|
||||||
<!--系统名称-->
|
|
||||||
<add key="SystemName" value="智慧施工管理信息系统V1.0"/>
|
|
||||||
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
|
||||||
<add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
|
|
||||||
<add key="SGGLUrl" value="http://localhost:8579/"/>
|
|
||||||
<add key="SystemVersion" value="SGGLPackFile_V2021-02-01-001"/>
|
|
||||||
<!--启用与集团实名制 True启用 False 不启用-->
|
|
||||||
<add key="EnableRealName" value="False"/>
|
|
||||||
<add key="RealNameApiUrl" value="https://lwsm.cncecoa.com/share-labour1"/>
|
|
||||||
<add key="ControlApiUrl" value="http://pmptest.cwcec.com"/>
|
|
||||||
<add key="Intervaltime" value="20"/>
|
|
||||||
<!--<add key="RealNameClientId" value="1338326379741057025"/>
|
|
||||||
<add key="RealNameUserName" value="zgwhgcyxgs@CNCEC"/>
|
|
||||||
<add key="RealNamePassWord" value="0nkbqy9n0"/>-->
|
|
||||||
<!--附件上传物理路径-->
|
|
||||||
<add key="localRoot" value="D:\CWCEC\SGGL_CWCEC\SGGL\FineUIPro.Web\"/>
|
|
||||||
<!--视频服务器-->
|
|
||||||
<add key="Video_URL" value="http://camera.cwcec.com:10000/"/>
|
|
||||||
<!--BAIDU AI配置-->
|
|
||||||
<add key="APP_ID" value="23518716"/>
|
|
||||||
<add key="API_KEY" value="9UGmBxS0TOIDGM5adGrOcBnr"/>
|
|
||||||
<add key="SECRET_KEY" value="6yq7q5PTTGfocWDmSN7hjxuiixsfURe1"/>
|
|
||||||
<!--人脸检测参数-->
|
|
||||||
<!--人脸活体检测参数1最好，0最差 建议0.995 -->
|
|
||||||
<add key="BD_face_liveness" value="0.3"/>
|
|
||||||
<!--人脸高宽建议100-200-->
|
|
||||||
<!--<add key="BD_width" value="200" />-->
|
|
||||||
<!--<add key="BD_height" value="200" />-->
|
|
||||||
<!--人脸角度-->
|
|
||||||
<add key="BD_roll" value="40"/>
|
|
||||||
<!--人脸遮档度0最好，1最不好-->
|
|
||||||
<add key="BD_occlusion" value="1"/>
|
|
||||||
<!--人脸模糊度0最好，1最不好-->
|
|
||||||
<add key="BD_blur" value="0.1"/>
|
|
||||||
<add key="CEMS_IMG_URL" value="http://localhost/SGGL/"/>
|
|
||||||
<!--跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版-->
|
|
||||||
<add key="miniprogram_state" value="developer"/>
|
|
||||||
</appSettings>
|
|
||||||
<!--
|
|
||||||
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
|
|
||||||
|
|
||||||
可在 <httpRuntime> 标记上设置以下特性。
|
|
||||||
<system.Web>
|
|
||||||
<httpRuntime targetFramework="4.6.1" />
|
|
||||||
</system.Web>
|
|
||||||
-->
|
|
||||||
<system.web>
|
|
||||||
<!-- 会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
|
|
||||||
<sessionState mode="InProc" cookieless="UseCookies" timeout="1200"/>
|
|
||||||
<pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID">
|
|
||||||
<controls>
|
|
||||||
<add assembly="FineUIPro" namespace="FineUIPro" tagPrefix="f"/>
|
|
||||||
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
|
||||||
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
|
||||||
</controls>
|
|
||||||
</pages>
|
|
||||||
<httpModules>
|
|
||||||
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
|
|
||||||
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
|
||||||
</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"/>
|
|
||||||
</httpHandlers>
|
|
||||||
<compilation debug="false" targetFramework="4.6.1"/>
|
|
||||||
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
|
|
||||||
<authentication mode="Forms">
|
|
||||||
<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="/"/>
|
|
||||||
</providers>
|
|
||||||
</membership>
|
|
||||||
<profile>
|
|
||||||
<providers>
|
|
||||||
<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="/"/>
|
|
||||||
</providers>
|
|
||||||
</roleManager>
|
|
||||||
<customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx"/>
|
|
||||||
</system.web>
|
|
||||||
<location path="res.axd"/>
|
|
||||||
<system.webServer>
|
|
||||||
<staticContent>
|
|
||||||
<mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/>
|
|
||||||
<mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/>
|
|
||||||
</staticContent>
|
|
||||||
<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"/>
|
|
||||||
</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"/>
|
|
||||||
</handlers>
|
|
||||||
<defaultDocument>
|
|
||||||
<files>
|
|
||||||
<add value="Login.aspx"/>
|
|
||||||
</files>
|
|
||||||
</defaultDocument>
|
|
||||||
<security>
|
|
||||||
<requestFiltering>
|
|
||||||
<requestLimits maxAllowedContentLength="500000000"/>
|
|
||||||
</requestFiltering>
|
|
||||||
</security>
|
|
||||||
</system.webServer>
|
|
||||||
<!-- SERVER -->
|
|
||||||
<system.serviceModel>
|
|
||||||
<client>
|
|
||||||
<endpoint address="http://localhost/CNCECHSSE/HSSEService.svc" binding="wsHttpBinding" bindingConfiguration="HSSEServiceEndpoint" contract="CNCECHSSEService.HSSEService" name="HSSEServiceEndpoint"/>
|
|
||||||
<endpoint address="https://mat.cwcec.com/LocWebServices/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="MCSService.WebService1Soap" name="WebService1Soap"/>
|
|
||||||
</client>
|
|
||||||
<serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
|
|
||||||
<services>
|
|
||||||
<service name="BLL.OpenService.HSSEService" behaviorConfiguration="BLL.HSSEServiceBehavior">
|
|
||||||
<endpoint address="" binding="wsHttpBinding" bindingConfiguration="BLL.HSSEServiceBinding" name="BLL.HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService"/>
|
|
||||||
</service>
|
|
||||||
</services>
|
|
||||||
<behaviors>
|
|
||||||
<serviceBehaviors>
|
|
||||||
<behavior name="BLL.HSSEServiceBehavior">
|
|
||||||
<serviceMetadata httpGetEnabled="true"/>
|
|
||||||
<serviceDebug includeExceptionDetailInFaults="false"/>
|
|
||||||
<dataContractSerializer maxItemsInObjectGraph="2147483647"/>
|
|
||||||
<serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647"/>
|
|
||||||
</behavior>
|
|
||||||
</serviceBehaviors>
|
|
||||||
</behaviors>
|
|
||||||
<bindings>
|
|
||||||
<basicHttpBinding>
|
|
||||||
<binding name="WebService1Soap" maxBufferPoolSize="5242880000" maxReceivedMessageSize="2147483647">
|
|
||||||
<security mode="Transport"/>
|
|
||||||
</binding>
|
|
||||||
</basicHttpBinding>
|
|
||||||
<wsHttpBinding>
|
|
||||||
<binding name="BLL.HSSEServiceBinding" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="5242880000" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
|
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="8192000" maxArrayLength="16384000" maxBytesPerRead="4096000" maxNameTableCharCount="16384000"/>
|
|
||||||
<security mode="Transport">
|
|
||||||
<transport clientCredentialType="Windows" proxyCredentialType="None"/>
|
|
||||||
<message clientCredentialType="None" establishSecurityContext="false" negotiateServiceCredential="false"/>
|
|
||||||
</security>
|
|
||||||
</binding>
|
|
||||||
<binding name="HSSEServiceEndpoint" maxBufferPoolSize="5242880000" maxReceivedMessageSize="2147483647">
|
|
||||||
<security mode="Transport">
|
|
||||||
<transport clientCredentialType="Windows" proxyCredentialType="None"/>
|
|
||||||
<message clientCredentialType="None" establishSecurityContext="false" negotiateServiceCredential="false"/>
|
|
||||||
</security>
|
|
||||||
</binding>
|
|
||||||
</wsHttpBinding>
|
|
||||||
</bindings>
|
|
||||||
</system.serviceModel>
|
|
||||||
<runtime>
|
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="Apache.NMS" publicKeyToken="82756feee3957618" culture="neutral"/>
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-1.8.0.0" newVersion="1.8.0.0"/>
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
|
|
||||||
</dependentAssembly>
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1"/>
|
|
||||||
</dependentAssembly>
|
|
||||||
</assemblyBinding>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||||
<UseIISExpress>true</UseIISExpress>
|
<UseIISExpress>true</UseIISExpress>
|
||||||
<Use64BitIISExpress />
|
<Use64BitIISExpress />
|
||||||
<IISExpressSSLPort />
|
<IISExpressSSLPort />
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue