From 0c2fc45bcfbfc57dfb81dc4e4d0c7429a76e63e9 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期四, 29 一月 2026 16:42:26 +0800
Subject: [PATCH] 11
---
screen/src/view/projectHome/index.vue | 2 +-
screen/src/view/hiddenDanger/index.vue | 17 +++++++----------
screen/src/view/hiddenDanger/service.js | 2 +-
screen/src/view/equipmentList/index.vue | 4 ++--
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/screen/src/view/equipmentList/index.vue b/screen/src/view/equipmentList/index.vue
index 30e1352..feedcd0 100644
--- a/screen/src/view/equipmentList/index.vue
+++ b/screen/src/view/equipmentList/index.vue
@@ -398,8 +398,8 @@
this.$router.push({
path: "/hiddenDanger",
query: {
- projectId: this.projectId,
- projectName: this.projectName,
+ projectId: this.projectId || row.projectId,
+ projectName: this.projectName || row.projectName,
activeTab: type,
},
});
diff --git a/screen/src/view/hiddenDanger/index.vue b/screen/src/view/hiddenDanger/index.vue
index 08bd4a0..b4d8daf 100644
--- a/screen/src/view/hiddenDanger/index.vue
+++ b/screen/src/view/hiddenDanger/index.vue
@@ -138,9 +138,9 @@
<el-table-column label="问题描述" prop="description" min-width="200" show-overflow-tooltip />
<el-table-column label="问题部位" prop="problemPart" min-width="150" show-overflow-tooltip />
<el-table-column label="问题备注" prop="remark" min-width="150" show-overflow-tooltip />
- <el-table-column label="隐患等级" min-width="120">
+ <el-table-column label="隐患等级" min-width="120" prop="level">
<template #default="{ row }">
- <span>{{ getLevelText(row.level) }}</span>
+ <span>{{getLevelText(row.level) }}</span>
</template>
</el-table-column>
<el-table-column v-if="activeTab == 1" label="隐患类型" min-width="120">
@@ -157,11 +157,7 @@
</div>
</template>
</el-table-column>
- <el-table-column
- label="检查时间"
- prop="createTime"
- min-width="180"
- />
+ <el-table-column label="检查时间" prop="createTime" min-width="180" />
<el-table-column v-if="showReformedFilter" label="整改状态" min-width="120">
<template #default="{ row }">
<div class="flex a-center j-center">
@@ -644,7 +640,7 @@
return;
}
- const res = await getProjectList({ clientId: clientId,projectCategory:["ongoing", "fixed"][localStorage.getItem('activeTab') - 1] });
+ const res = await getProjectList({ clientId: clientId, projectCategory: ["ongoing", "fixed"][localStorage.getItem('activeTab') - 1] });
if (res && res) {
this.projectList = res.map((item) => ({
label: item.name,
@@ -753,8 +749,9 @@
// 获取隐患等级文本
getLevelText(level) {
- const key = `P${level + 1}`;
- return errorLevelMap[key] || "-";
+ console.log('获取隐患等级文本:', this.levelOptions)
+ console.log('level level',level)
+ return this.levelOptions[level].label || '-'
},
// 获取整改状态文本
diff --git a/screen/src/view/hiddenDanger/service.js b/screen/src/view/hiddenDanger/service.js
index 126dd05..6f616fa 100644
--- a/screen/src/view/hiddenDanger/service.js
+++ b/screen/src/view/hiddenDanger/service.js
@@ -71,7 +71,7 @@
userFiles: item.pictures || item.userFiles || [], // 图片列表
fileNum: item.pictures ? item.pictures.length : (item.fileNum || 0), // 图片数量
// 隐患等级转换：委托方 1-4 -> 项目端 0-3
- level: item.level !== undefined && item.level !== null ? item.level - 1 : item.level,
+ level: item.level !== undefined && item.level !== null ? item.level : item.level,
// 整改状态兼容：委托方 boolean -> 项目端 number
reformed: typeof item.reformed === 'boolean' ? (item.reformed ? 1 : 0) : item.reformed,
}
diff --git a/screen/src/view/projectHome/index.vue b/screen/src/view/projectHome/index.vue
index 0d36fd9..d62cbc2 100644
--- a/screen/src/view/projectHome/index.vue
+++ b/screen/src/view/projectHome/index.vue
@@ -523,7 +523,7 @@
console.log('res', res)
this.projectName = res.name
const permissions = res.permissionProject ? res.permissionProject.split(",") : []
- this.permissionProject = ['1', '2', '3', '4', '5', '6', '7'] || permissions
+ this.permissionProject = permissions
localStorage.setItem("permissionProject", JSON.stringify(permissions));
localStorage.setItem("deviceTemplateId", res.deviceTemplateId);//设备模板id
localStorage.setItem("safetyId", res.safetyId);//安全报告模板id
--
Gitblit v1.7.1