gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

Browse Source
This commit is contained in:
毕文静
2026-07-02 09:38:36 +08:00
parent 7a8450c65e 70779bd259
commit 733f69a373
7 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+4 -4
View File
@@ -7010,7 +7010,7 @@
</Compile>
<Compile Include="JGZL\Cover.aspx.cs">
<DependentUpon>Cover.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="JGZL\Cover.aspx.designer.cs">
<DependentUpon>Cover.aspx</DependentUpon>
@@ -7080,7 +7080,7 @@
</Compile>
<Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.cs">
<DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.designer.cs">
<DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
@@ -7149,14 +7149,14 @@
<DependentUpon>CommencementReportEdit.aspx</DependentUpon>
</Compile>
<Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
<SubType>Component</SubType>
<DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
</Compile>
<Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.designer.cs">
<DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
</Compile>
<Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
<SubType>Component</SubType>
<DependentUpon>ConcealedWorksInspectionRecordEdit.aspx</DependentUpon>
</Compile>
<Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.designer.cs">
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+2 -2
View File
@@ -1,8 +1,8 @@
<?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">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs
+7 -3
View File
@@ -190,7 +190,7 @@ namespace FineUIPro.Web.HJGL.DataIn
Console.WriteLine(csvContent);
// 3. 上传到服务器
string uploadUrl = "http://47.104.102.122:8000/api/table/clean"; // 替换为实际上传地址
string uploadUrl = "http://localhost:8000/api/table/clean"; // 替换为实际上传地址
string fileName = $"data_{DateTime.Now:yyyyMMddHHmmss}.csv";
//"管线号", "公称直径", "管道等级", "管道材料", "主要介质", "起止点", "操作参数温度", "操作参数压力", "设计参数温度", "设计参数压力", "隔热工程代号", "隔热材料", "厚度", "介质", "压力", "比例", "方法", "合格等级", "PID尾号", "压力管道类别", "应力分析题号", "备注"
@@ -254,7 +254,7 @@ namespace FineUIPro.Web.HJGL.DataIn
Region1.Items.Add(grid1);
setAfterProcess.Tables.Add(dtAfterProcess);
string urlHeaderCorrespondence = "http://47.104.102.122:8000/api/table/head";
string urlHeaderCorrespondence = "http://localhost:8000/api/table/head";
string data = @"{
""source_headers"": " + dynamicObj["headers"].ToString() + @" ,
""target_fields"": [
@@ -346,7 +346,11 @@ namespace FineUIPro.Web.HJGL.DataIn
isoInfo.MaterialStandardId = materialStandards.Where(x => x.MaterialStandardName == row[dataColumn.ColumnName].ToString()||x.MaterialStandardCode == row[dataColumn.ColumnName].ToString()).Select(x => x.MaterialStandardId).FirstOrDefault();
break;
case "介质":
isoInfo.SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
var SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
if (!string.IsNullOrEmpty(SER_ID))
{
isoInfo.SER_ID = SER_ID;
}
break;
case "管道类别":
isoInfo.PipeLineClass = row[dataColumn.ColumnName].ToString();
HJGL_DS/FineUIPro.Web/HJGL/DataIn/ocrz-app.css
+1 -1
View File
File diff suppressed because one or more lines are too long
HJGL_DS/FineUIPro.Web/HJGL/DataIn/ocrz-app.js
+31 -34
View File
File diff suppressed because one or more lines are too long
HJGL_DS/FineUIPro.Web/Web.config
+2 -2
View File
@@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;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/;"/>
@@ -67,7 +67,7 @@
<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="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.6.1">
<compilation debug="true" targetFramework="4.6.1">
<assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</assemblies>
HJGL_DS/WebAPI/WebAPI.csproj.user
+2 -2
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">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />