From 1e918b7a92e3baf3f9a04d4809e464bd2ae3a496 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 30 Sep 2024 14:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/mappers/app/PrimaryDataAppMapper.xml | 3 ++-
src/main/resources/static/index.html | 3 ++-
src/main/resources/static/js/expireDataList.js | 4 ++++
.../static/js/primaryData/child/viewOriginalRecord.js | 4 ++--
.../static/pages/primaryData/child/viewOriginalRecord.html | 7 +++----
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mappers/app/PrimaryDataAppMapper.xml b/src/main/resources/mappers/app/PrimaryDataAppMapper.xml
index 7713135..6daaf03 100644
--- a/src/main/resources/mappers/app/PrimaryDataAppMapper.xml
+++ b/src/main/resources/mappers/app/PrimaryDataAppMapper.xml
@@ -101,7 +101,8 @@
te.exper_conclu AS experConclu,
te.remarsk AS remarsk,
su.user_name AS experUserName,
- te.audit_user_name AS auditUserName
+ te.audit_user_name AS auditUserName,
+ su.sign_img AS syUrl
FROM tb_exper te
LEFT JOIN tb_custom tc ON te.submit_unit = tc.id AND tc.del_flag = 0
LEFT JOIN sys_user su ON te.update_user = su.id AND su.del_flag = 0
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index e8c518e..0658157 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -102,8 +102,9 @@
-
+
+
diff --git a/src/main/resources/static/js/expireDataList.js b/src/main/resources/static/js/expireDataList.js
index 2e916e0..9f4304f 100644
--- a/src/main/resources/static/js/expireDataList.js
+++ b/src/main/resources/static/js/expireDataList.js
@@ -36,6 +36,10 @@ function pages(pageNum, pageSize, typeNum) {
}
+function setParams(params){
+
+}
+
function laypages(total, page, limit) {
layui.use(['laypage'], function () {
let laypage = layui.laypage;
diff --git a/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js b/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js
index 2747b9f..b6983b2 100644
--- a/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js
+++ b/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js
@@ -97,8 +97,8 @@ function setTableInfo(obj) {
$('#sampleUnit').html(obj.customName);
$('#sampleDate').html(formatDate(obj.sampleDate));
$('#experTime').html(formatDate(obj.experTime));
- $('#experUserName').html(obj.experUserName);
- $('#auditUserName').html(obj.auditUserName);
+ document.getElementById("experUserName").src = dataUrl+"/statics/"+obj.syUrl;
+ document.getElementById("auditUserName").src = dataUrl+"/statics/"+obj.shUrl;
$('#titleName').html(obj.devTypeName + "检测原始记录");
devTypeName = obj.devTypeName;
$('#recordNum').html(obj.recordNum);
diff --git a/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html b/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html
index 98eea23..46ce24d 100644
--- a/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html
+++ b/src/main/resources/static/pages/primaryData/child/viewOriginalRecord.html
@@ -77,10 +77,9 @@