lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lpf:7317b985fe29f8451d64d1c0228bdbdab51a32c7
Branches Tags
lpf:master
lpf:panhf_20240125
..
compare: lpf:58911e2714a46f11cf4ea4f88d39f11a6f91c529
Branches Tags
lpf:master
lpf:panhf_20240125

No commits in common. "7317b985fe29f8451d64d1c0228bdbdab51a32c7" and "58911e2714a46f11cf4ea4f88d39f11a6f91c529" have entirely different histories.
7317b985fe ... 58911e2714

9 changed files with 65 additions and 78 deletions
Show Stats Expand all files Collapse all files

2
SGGL/BLL/.vs/BLL.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

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

@ -19325,7 +19325,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

2
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
View File

@ -208,13 +208,11 @@
<f:GroupPanel Layout="Anchor" Title="其他信息" runat="server"> <f:GroupPanel Layout="Anchor" Title="其他信息" runat="server">
<Items> <Items>
<f:DropDownList ID="ddlElectricHeatTracing" runat="server" Label="电伴热" LabelWidth="180px"> <f:DropDownList ID="ddlElectricHeatTracing" runat="server" Label="电伴热" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Y" Text="Y"></f:ListItem> <f:ListItem Value="Y" Text="Y"></f:ListItem>
<f:ListItem Value="N" Text="N"></f:ListItem> <f:ListItem Value="N" Text="N"></f:ListItem>
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlInsulation" runat="server" Label="保温/冷" LabelWidth="180px"> <f:DropDownList ID="ddlInsulation" runat="server" Label="保温/冷" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Y" Text="Y"></f:ListItem> <f:ListItem Value="Y" Text="Y"></f:ListItem>
<f:ListItem Value="N" Text="N"></f:ListItem> <f:ListItem Value="N" Text="N"></f:ListItem>

2
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
View File

@ -168,7 +168,7 @@ namespace FineUIPro.Web.Transfer
newModel.SN = model.SN; newModel.SN = model.SN;
newModel.PIPINGLINENUMBER = model.PIPINGLINENUMBER; newModel.PIPINGLINENUMBER = model.PIPINGLINENUMBER;
newModel.SYSTEM = model.SYSTEM; newModel.SYSTEM = model.SYSTEM;
newModel.Subsystem = model.Subsystem; newModel.Subsystem = newModel.Subsystem;
newModel.TestPackage = txtTestPackage.Text; newModel.TestPackage = txtTestPackage.Text;
//newModel.PWD = ddlPWD.SelectedValue; //newModel.PWD = ddlPWD.SelectedValue;
//newModel.Apunchclosed = ddlApunchclosed.SelectedValue; //newModel.Apunchclosed = ddlApunchclosed.SelectedValue;

6
SGGL/FineUIPro.Web/Web.config
View File

@ -11,8 +11,8 @@
<FineUIPro DebugMode="true" Theme="Cupertino" /> <FineUIPro DebugMode="true" Theme="Cupertino" />
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/> <!--<add key="ConnectionString" value="Server=.;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="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200" />
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0" /> <add key="SystemName" value="智慧施工管理信息系统V1.0" />
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" /> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />
@ -77,7 +77,7 @@
<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="false" targetFramework="4.6.1"/> <compilation debug="true" targetFramework="4.6.1" />
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000" /> <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" 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="/" />

2
SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

1
SGGL/WebAPI/Controllers/CQMS/ContactController.cs
View File

@ -5,6 +5,7 @@ using System.Linq;
using System.Web; using System.Web;
using System.Web.Http; using System.Web.Http;
using BLL; using BLL;
using Model;
using System.Collections; using System.Collections;
namespace Web.obj namespace Web.obj

14
SGGL/WebAPI/Web.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
有关如何配置 ASP.NET 应用程序的详细信息，请访问 有关如何配置 ASP.NET 应用程序的详细信息，请访问
https://go.microsoft.com/fwlink/?LinkId=301879 https://go.microsoft.com/fwlink/?LinkId=301879
@ -68,18 +68,6 @@
</system.webServer> </system.webServer>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<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="Aspose.Words" publicKeyToken="716FCC553A201E56" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-24.12.0.0" newVersion="24.12.0.0"/>
</dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" /> <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" /> <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />

6
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -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>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
@ -9,7 +9,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth> <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
@ -39,7 +39,7 @@
<StartWorkingDirectory> <StartWorkingDirectory>
</StartWorkingDirectory> </StartWorkingDirectory>
<EnableENC>True</EnableENC> <EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug> <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties> </WebProjectProperties>
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>