Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<?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>
|
||||
|
||||
@@ -225,9 +225,9 @@ namespace FineUIPro.Web.HJGL.DataIn
|
||||
|
||||
}
|
||||
DataRow[] rowsPipe = dtIsoInfo.Select(" pipeline_id='" + isono + "' ");
|
||||
if (rows != null && rows.Length > 0)
|
||||
if (rowsPipe != null && rowsPipe.Length > 0)
|
||||
{
|
||||
string isNeedHead = rows[0]["post_weld_heat_treatment"].ToString();
|
||||
string isNeedHead = rowsPipe[0]["post_weld_heat_treatment"].ToString();
|
||||
if (isNeedHead == "N")
|
||||
{
|
||||
isoInfo.IsHot = "0";
|
||||
@@ -358,24 +358,6 @@ namespace FineUIPro.Web.HJGL.DataIn
|
||||
dtIsoInfo.Columns.Add("insulation_thickness_mm");
|
||||
dtIsoInfo.Columns.Add("post_weld_heat_treatment");
|
||||
dtIsoInfo.Columns.Add("radiographic_examination");
|
||||
|
||||
// 遍历并提取数据
|
||||
foreach (JObject item in jArray)
|
||||
{
|
||||
var row = dt.NewRow();
|
||||
row["id"] = item.Value<string>("id");
|
||||
row["pipe_no"] = item.Value<string>("pipe_no");
|
||||
row["drawing_number"] = item.Value<string>("drawing_number");
|
||||
row["seq_no"] = item.Value<string>("seq_no");
|
||||
row["category"] = item.Value<string>("category");
|
||||
row["description"] = item.Value<string>("description");
|
||||
row["spec"] = item.Value<string>("spec");
|
||||
row["qty"] = item.Value<string>("qty");
|
||||
row["page_no"] = item.Value<string>("page_no");
|
||||
row["remark"] = item.Value<string>("remark");
|
||||
dt.Rows.Add(row);
|
||||
}
|
||||
|
||||
foreach (JObject item in jArrayOther)
|
||||
{
|
||||
var row = dtOther.NewRow();
|
||||
@@ -387,6 +369,30 @@ namespace FineUIPro.Web.HJGL.DataIn
|
||||
dtOther.Rows.Add(row);
|
||||
}
|
||||
|
||||
// 遍历并提取数据
|
||||
foreach (JObject item in jArray)
|
||||
{
|
||||
var row = dt.NewRow();
|
||||
row["id"] = item.Value<string>("id");
|
||||
row["pipe_no"] = item.Value<string>("pipe_no");
|
||||
row["drawing_number"] = item.Value<string>("drawing_number");
|
||||
|
||||
row["seq_no"] = item.Value<string>("seq_no");
|
||||
row["category"] = item.Value<string>("category");
|
||||
row["description"] = item.Value<string>("description");
|
||||
row["spec"] = item.Value<string>("spec");
|
||||
row["qty"] = item.Value<string>("qty");
|
||||
row["page_no"] = item.Value<string>("page_no");
|
||||
row["remark"] = item.Value<string>("remark");
|
||||
if (string.IsNullOrEmpty(row["drawing_number"].ToString()))
|
||||
{
|
||||
var rowOther = dtOther.Select("page= " + row["page_no"].ToString()).FirstOrDefault();
|
||||
row["drawing_number"] = rowOther["text"];
|
||||
}
|
||||
dt.Rows.Add(row);
|
||||
}
|
||||
|
||||
|
||||
foreach (JObject item in jArrayIsoInfo)
|
||||
{
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -7,12 +7,21 @@
|
||||
<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/main-DE8eQLmE.js"></script>
|
||||
<%-- <script type="module" crossorigin="" src="./assets/main-DE8eQLmE.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/main-DSskaVYi.css">
|
||||
<link rel="stylesheet" crossorigin="" href="./assets/main-DSskaVYi.css">--%>
|
||||
|
||||
<script type="module" crossorigin src="./assets/main-BVrK8ZH3.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-DSX1EPGh.js">
|
||||
<link rel="stylesheet" crossorigin href="./assets/styles-RcW4wYEA.css">
|
||||
<link rel="stylesheet" crossorigin href="./assets/main-Ct3Co9Zo.css">
|
||||
|
||||
|
||||
<style type="text/css">
|
||||
.f-grid-row.red {
|
||||
background-color: LightCoral;
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
.menu-item[data-v-bd4e31be]:hover{background-color:#f3f4f6!important}.annotation-detail-panel[data-v-bd4e31be]{background:#f8fafc;border:1px solid #e2e8f0;border-radius:8px;margin-bottom:16px;overflow:hidden}.panel-header[data-v-bd4e31be]{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:#334155;color:#fff}.close-btn[data-v-bd4e31be]{background:transparent;border:none;color:#fff;font-size:18px;cursor:pointer;padding:0 4px;line-height:1}.close-btn[data-v-bd4e31be]:hover{color:#fca5a5}.detail-content[data-v-bd4e31be]{padding:12px}.detail-row[data-v-bd4e31be]{display:flex;align-items:center;gap:8px;margin-bottom:10px}.detail-row label[data-v-bd4e31be]{min-width:70px;font-size:12px;color:#64748b}.detail-row.readonly[data-v-bd4e31be]{color:#94a3b8;font-size:12px}.detail-row.readonly span[data-v-bd4e31be]{color:#475569}.label-preview[data-v-bd4e31be]{flex:1;padding:6px 10px;background:#1e293b;color:#f1f5f9;border-radius:4px;font-family:monospace;font-size:13px;text-align:center}.detail-input[data-v-bd4e31be]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px}.detail-input[data-v-bd4e31be]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-textarea[data-v-bd4e31be]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px;min-height:60px;resize:vertical;font-family:inherit}.detail-textarea[data-v-bd4e31be]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-divider[data-v-bd4e31be]{height:1px;background:#e2e8f0;margin:12px 0}.detail-actions[data-v-bd4e31be]{display:flex;gap:8px;margin-top:12px}.detail-actions .btn-primary[data-v-bd4e31be]{flex:1;padding:8px;background:#3b82f6;color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-primary[data-v-bd4e31be]:hover{background:#2563eb}.detail-actions .btn-danger[data-v-bd4e31be]{padding:8px 12px;background:#fee2e2;color:#dc2626;border:1px solid #fecaca;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-danger[data-v-bd4e31be]:hover{background:#fecaca}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -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=.\MSSQLSERVER2022;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/;"/>
|
||||
|
||||
+22
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user