lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
李超
2026-05-30 12:34:20 +08:00
parent 47a22572b1
commit 029988ec28
19 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx
+8 -3
View File
@@ -7,13 +7,18 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script type="module" crossorigin="" src="./assets/viewer-Dla4Cfl-.js"></script>
<%-- <script type="module" crossorigin="" src="./assets/viewer-Dla4Cfl-.js"></script>
<link rel="modulepreload" crossorigin="" href="./assets/pdf-lib-D5zKcp81.js">
<link rel="modulepreload" crossorigin="" href="./assets/pdfjs-HfNT2Y4W.js">
<link rel="modulepreload" crossorigin="" href="./assets/styles-Bno-H3Kc.js">
<link rel="stylesheet" crossorigin="" href="./assets/styles-CDHjsf7D.css">
<link rel="stylesheet" crossorigin="" href="./assets/viewer-BilNgxa5.css">
<link rel="stylesheet" crossorigin="" href="./assets/viewer-BilNgxa5.css">--%>
<script type="module" crossorigin src="./assets/viewer-XNlksu4U.js"></script>
<link rel="modulepreload" crossorigin href="./assets/pdf-lib-AfLQbX6n.js">
<link rel="modulepreload" crossorigin href="./assets/pdfjs-DXqArq6h.js">
<link rel="modulepreload" crossorigin href="./assets/styles-BZJ2tAi6.js">
<link rel="stylesheet" crossorigin href="./assets/styles-DNToM_5G.css">
<link rel="stylesheet" crossorigin href="./assets/viewer-BilNgxa5.css">
</head>
<body>
SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs
+4 -4
View File
@@ -101,10 +101,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
SqlParameter[] parameter1 = new SqlParameter[] { new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId) };
DataTable tb1 = SQLHelper.GetDataTableRunText(sqlData, parameter1);
string sqlTrust = @"select a.JOT_ID, c.DetectionTypeCode,b.CH_TrustType from CH_TrustItem AS a
LEFT JOIN CH_Trust AS b ON a.CH_TrustID = b.CH_TrustID
left join Base_DetectionType c on b.CH_NDTMethod = c.DetectionTypeId
where a.JOT_ID in ('" + string.Join("','", jotids) + "') ";
string sqlTrust = @"select a.WeldJointId, c.DetectionTypeCode,b.TrustType from HJGL_Batch_BatchTrustItem AS a
LEFT JOIN HJGL_Batch_BatchTrust AS b ON a.TrustBatchId = b.TrustBatchId
left join Base_DetectionType c on b.DetectionTypeId = c.DetectionTypeId
where a.WeldJointId in ('" + string.Join("','", jotids) + "') ";
DataTable tbTrust = SQLHelper.GetDataTableRunText(sqlTrust, null);
Dictionary<string, string> DetectionTypeDic = new Dictionary<string, string>();
Dictionary<string, string> TrustTypeDic = new Dictionary<string, string>();