From 7c361ad584ec95c33ce1348b3532c76a7f914642 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期四, 05 二月 2026 19:15:51 +0800
Subject: [PATCH] xiugai
---
screen/src/view/projectList/index.vue | 14 ++--
screen/src/view/login/index.vue | 2
screen/src/App.vue | 2
screen/src/view/projectHome/index.vue | 91 +++++++++++++++--------------
screen/src/view/planOfAudit/index.vue | 10 ++-
screen/src/view/equipmentList/index.vue | 10 ++-
6 files changed, 71 insertions(+), 58 deletions(-)
diff --git a/screen/src/App.vue b/screen/src/App.vue
index 89d661e..52cb335 100644
--- a/screen/src/App.vue
+++ b/screen/src/App.vue
@@ -63,8 +63,10 @@
localStorage.setItem("clientId", params.get("clientId"));
localStorage.setItem("clientName", params.get("clientName"));
localStorage.setItem("clientLogo", r.logo);
+ localStorage.setItem("deviceTemplateName", r.deviceTemplateName); //设备模板id
localStorage.setItem("deviceTemplateId", r.deviceTemplateId); //设备模板id
localStorage.setItem("safetyId", r.safetyId); //安全报告模板id
+ localStorage.setItem("safetyName", r.safetyName); //安全报告模板id
localStorage.setItem("bigHiddenDanger", r.bigHiddenDanger); //1开启 2关闭 重大隐患
localStorage.setItem("generalHiddenDanger", r.generalHiddenDanger); //1开启 2关闭 一般隐患
localStorage.setItem("commentType", r.commentType); //1模糊评价 2打分评价
diff --git a/screen/src/view/equipmentList/index.vue b/screen/src/view/equipmentList/index.vue
index 7aa9270..0ced3f1 100644
--- a/screen/src/view/equipmentList/index.vue
+++ b/screen/src/view/equipmentList/index.vue
@@ -607,6 +607,8 @@
// 从 localStorage 获取模板 ID
const deviceTemplateId = localStorage.getItem("deviceTemplateId");
const safetyId = localStorage.getItem("safetyId");
+ const safetyName = localStorage.getItem("safetyName");
+ const deviceTemplateName = localStorage.getItem("deviceTemplateName");
// 检查任务 ID
const checkTaskId = row.id;
@@ -634,7 +636,7 @@
wordBlob = await getFuzzyReportWord({
checkTaskId: checkTaskId,
templateId: safetyId,
- uuid: uuid
+ uuid: safetyName
});
} else {
// 设备报告（打分评价）
@@ -647,7 +649,7 @@
wordBlob = await getScoreReportWord({
checkTaskId: checkTaskId,
templateId: deviceTemplateId,
- uuid: uuid
+ uuid: deviceTemplateName
});
}
} catch (error) {
@@ -671,9 +673,9 @@
let pdfUrlResponse;
try {
if (type === "safe") {
- pdfUrlResponse = await getFuzzyReportPdfUrl({ uuid: uuid });
+ pdfUrlResponse = await getFuzzyReportPdfUrl({ uuid: safetyName });
} else {
- pdfUrlResponse = await getScoreReportPdfUrl({ uuid: uuid });
+ pdfUrlResponse = await getScoreReportPdfUrl({ uuid: deviceTemplateName });
}
} catch (error) {
// 捕获获取PDF链接时的错误
diff --git a/screen/src/view/login/index.vue b/screen/src/view/login/index.vue
index 3ca04bb..5d9a48d 100644
--- a/screen/src/view/login/index.vue
+++ b/screen/src/view/login/index.vue
@@ -357,6 +357,8 @@
localStorage.setItem("clientId", account.id);
localStorage.setItem("deviceTemplateId", re.deviceTemplateId); //设备模板id
localStorage.setItem("safetyId", re.safetyId); //安全报告模板id
+ localStorage.setItem("safetyName", re.safetyName);
+ localStorage.setItem('deviceTemplateName',re.deviceTemplateName)
localStorage.setItem("bigHiddenDanger", re.bigHiddenDanger); //1开启 2关闭 重大隐患
localStorage.setItem("generalHiddenDanger", re.generalHiddenDanger); //1开启 2关闭 一般隐患
localStorage.setItem("commentType", re.commentType); //1模糊评价 2打分评价
diff --git a/screen/src/view/planOfAudit/index.vue b/screen/src/view/planOfAudit/index.vue
index 0e5aece..5351f6c 100644
--- a/screen/src/view/planOfAudit/index.vue
+++ b/screen/src/view/planOfAudit/index.vue
@@ -693,6 +693,8 @@
// 从 localStorage 获取模板 ID
const deviceTemplateId = localStorage.getItem("deviceTemplateId");
const safetyId = localStorage.getItem("safetyId");
+ const safetyName = localStorage.getItem("safetyName");
+ const deviceTemplateName = localStorage.getItem("deviceTemplateName");
// 检查任务 ID
const checkTaskId = row.id;
@@ -720,7 +722,7 @@
wordBlob = await getFuzzyReportWord({
checkTaskId: checkTaskId,
templateId: safetyId,
- uuid: uuid
+ uuid: safetyName
});
} else {
// 设备报告（打分评价）
@@ -733,7 +735,7 @@
wordBlob = await getScoreReportWord({
checkTaskId: checkTaskId,
templateId: deviceTemplateId,
- uuid: uuid
+ uuid: deviceTemplateName
});
}
} catch (error) {
@@ -759,9 +761,9 @@
let pdfUrlResponse;
try {
if (type === "safe") {
- pdfUrlResponse = await getFuzzyReportPdfUrl({ uuid: uuid });
+ pdfUrlResponse = await getFuzzyReportPdfUrl({ uuid: safetyName });
} else {
- pdfUrlResponse = await getScoreReportPdfUrl({ uuid: uuid });
+ pdfUrlResponse = await getScoreReportPdfUrl({ uuid: deviceTemplateName });
}
} catch (error) {
// 捕获获取PDF链接时的错误
diff --git a/screen/src/view/projectHome/index.vue b/screen/src/view/projectHome/index.vue
index 406dd38..8437f77 100644
--- a/screen/src/view/projectHome/index.vue
+++ b/screen/src/view/projectHome/index.vue
@@ -552,7 +552,9 @@
// this.permissionProject = permissions
// localStorage.setItem('permissionProject', JSON.stringify(permissions));
localStorage.setItem('deviceTemplateId', res.deviceTemplateId) // 设备模板id
+ localStorage.setItem('deviceTemplateName', res.deviceTemplateName) // 设备模板id
localStorage.setItem("safetyId", res.safetyId) // 安全报告模板id
+ localStorage.setItem('safetyName', res.safetyName)
localStorage.setItem("bigHiddenDanger", res.bigHiddenDanger) // 1开启 2关闭 重大隐患
localStorage.setItem("generalHiddenDanger", res.generalHiddenDanger) // 1开启 2关闭 一般隐患
localStorage.setItem("commentType", res.commentType) // 1模糊评价 2打分评价
@@ -2830,55 +2832,56 @@
background: rgba(0, 22, 53, 0.95);
}
}
+
.tooltip-content {
- min-width: 200px;
- max-height: 300px;
- overflow-y: auto;
- padding: 4px 0;
+ min-width: 200px;
+ max-height: 300px;
+ overflow-y: auto;
+ padding: 4px 0;
- // 自定义滚动条
- &::-webkit-scrollbar {
- width: 4px;
- }
+ // 自定义滚动条
+ &::-webkit-scrollbar {
+ width: 4px;
+ }
- &::-webkit-scrollbar-track {
- background: rgba(255, 255, 255, 0.1);
- border-radius: 2px;
- }
+ &::-webkit-scrollbar-track {
+ background: rgba(255, 255, 255, 0.1);
+ border-radius: 2px;
+ }
- &::-webkit-scrollbar-thumb {
- background: rgba(50, 197, 255, 0.6);
- border-radius: 2px;
+ &::-webkit-scrollbar-thumb {
+ background: rgba(50, 197, 255, 0.6);
+ border-radius: 2px;
- &:hover {
- background: rgba(50, 197, 255, 0.8);
- }
- }
-
- .tooltip-item {
- padding: 8px 0;
- display: flex;
- align-items: center;
- min-width: 200px;
-
- &:last-child {
- border-bottom: none;
- }
-
- .tooltip-label {
- font-weight: 500;
- font-size: 12px;
- color: #32C5FF;
- margin-bottom: 4px;
- }
-
- .tooltip-value {
- font-weight: 400;
- font-size: 13px;
- color: #FFFFFF;
- line-height: 1.5;
- word-break: break-all;
- }
+ &:hover {
+ background: rgba(50, 197, 255, 0.8);
}
}
+
+ .tooltip-item {
+ padding: 8px 0;
+ display: flex;
+ align-items: center;
+ min-width: 200px;
+
+ &:last-child {
+ border-bottom: none;
+ }
+
+ .tooltip-label {
+ font-weight: 500;
+ font-size: 12px;
+ color: #32C5FF;
+ margin-bottom: 4px;
+ }
+
+ .tooltip-value {
+ font-weight: 400;
+ font-size: 13px;
+ color: #FFFFFF;
+ line-height: 1.5;
+ word-break: break-all;
+ }
+ }
+}
</style>
diff --git a/screen/src/view/projectList/index.vue b/screen/src/view/projectList/index.vue
index ea408dd..36c12aa 100644
--- a/screen/src/view/projectList/index.vue
+++ b/screen/src/view/projectList/index.vue
@@ -804,6 +804,8 @@
// 从 localStorage 获取模板 ID
const deviceTemplateId = localStorage.getItem("deviceTemplateId");
const safetyId = localStorage.getItem("safetyId");
+ const safetyName = localStorage.getItem("safetyName");
+ const deviceTemplateName = localStorage.getItem("deviceTemplateName");
// 检查任务 ID
const checkTaskId = row.id;
@@ -831,7 +833,7 @@
wordBlob = await getFuzzyReportWord({
checkTaskId: checkTaskId,
templateId: safetyId,
- uuid: uuid
+ uuid: safetyName
});
} else {
// 设备报告（打分评价）
@@ -844,7 +846,7 @@
wordBlob = await getScoreReportWord({
checkTaskId: checkTaskId,
templateId: deviceTemplateId,
- uuid: uuid
+ uuid: deviceTemplateName
});
}
} catch (error) {
@@ -857,7 +859,7 @@
}
// 检查 Word 文档是否生成成功
-
+
if (!wordBlob || wordBlob.size === 0) {
this.$message.error("报告生成失败");
@@ -870,9 +872,9 @@
let pdfUrlResponse;
try {
if (type === "safe") {
- pdfUrlResponse = await getFuzzyReportPdfUrl({ uuid: uuid });
+ pdfUrlResponse = await getFuzzyReportPdfUrl({ uuid: safetyName });
} else {
- pdfUrlResponse = await getScoreReportPdfUrl({ uuid: uuid });
+ pdfUrlResponse = await getScoreReportPdfUrl({ uuid: deviceTemplateName });
}
} catch (error) {
// 捕获获取PDF链接时的错误
@@ -883,7 +885,7 @@
return;
}
-
+
// 根据后端返回的数据结构获取PDF链接
// 假设后端返回格式为 { data: "http://xxx.pdf" } 或直接返回字符串
--
Gitblit v1.7.1