Browse Source

1. 調整TestLog 超連結

web appsettings.json 加入 "TestLogUncPath": "\\\\10.168.135.236\\TestLog\\SWMLog\\",
PTD
Sai 1 year ago
parent
commit
fb118d09f8
  1. 20
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 18
      AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
  3. 12
      AMESCoreStudio.Web/Views/PCS/PCS009V.cshtml

20
AMESCoreStudio.Web/Controllers/PCSController.cs

@ -4655,14 +4655,13 @@ namespace AMESCoreStudio.Web.Controllers
Result = FileName.Contains("PASS") ? "PASS" : "FAIL", Result = FileName.Contains("PASS") ? "PASS" : "FAIL",
Record_Time = RecordTime, Record_Time = RecordTime,
FileName = FileName, FileName = FileName,
//FilePath = $@"/TestLog/{(string)item.workOrder}/{FileName}" FilePath = $"{(string)item.workOrder}\{FileName}"
}); });
//SopPath = $@"/DocEsop/{Esop.FirstOrDefault().file_path}"
} }
return View(result); return View(result);
} }
public async Task<IActionResult> PCS009T(string sn ,string id) public async Task<IActionResult> PCS009T(string sn, string id)
{ {
var query = await _pcsApi.GetTestLogByMSSql(sn); var query = await _pcsApi.GetTestLogByMSSql(sn);
var result = new List<PCS009TViewModel>(); var result = new List<PCS009TViewModel>();
@ -4723,6 +4722,21 @@ namespace AMESCoreStudio.Web.Controllers
return View(); return View();
} }
public IActionResult PCS009V(string id)
{
string TestLogUncPath = _configuration.GetValue<string>("TestLogUncPath");
// UNC路径
string uncPath = $@"{TestLogUncPath}\{id}";
if (System.IO.File.Exists(uncPath))
{
var fileStream = new FileStream(uncPath, FileMode.Open, FileAccess.Read);
// 读取文件内容
string fileContent = System.IO.File.ReadAllText(uncPath);
ViewBag.Log = fileContent;
}
return View();
}
public class PCS009TViewModel public class PCS009TViewModel
{ {
public string Name { get; set; } public string Name { get; set; }

18
AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml

@ -263,8 +263,7 @@
@index.Record_Time @index.Record_Time
</td> </td>
<td> <td>
@index.FileName <a style="cursor: pointer;" onclick='show("@index.FilePath");'>@index.FileName</a>
@*<a href='@index.FilePath' target='_blank'>@index.FileName</a>*@
</td> </td>
<td> <td>
<a class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" onclick='testLog(@index.TestId);'>測試Log</a> <a class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" onclick='testLog(@index.TestId);'>測試Log</a>
@ -558,5 +557,20 @@
}); });
}); });
}; };
function show(id) {
layui.use('layer', function () {
var layer = layui.layer;
layer.open({
type: 2,
title: '預覽文件',
shadeClose: true,//点击遮罩关闭层
shade: 0.8,
area: ['90%', '90%'],
zIndex: 19891014,
content: `/PCS/PCS009V?id=${id}`
});
});
};
</script> </script>
} }

12
AMESCoreStudio.Web/Views/PCS/PCS009V.cshtml

@ -0,0 +1,12 @@
@{
Layout = "~/Views/Shared/_AMESLayout.cshtml";
}
<div class="layui-card-body">
<div class="layui-row">
<pre>@ViewBag.Log</pre>
</div>
</div>
@section Scripts{
}
Loading…
Cancel
Save