From b836c0d9a9e5c2310b9e5ecf6609bfeab25590fb Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期四, 29 一月 2026 17:39:04 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/smartBuilding
---
screen/src/view/projectList/index.vue | 4 +-
screen/src/view/personnelOnDuty/index.vue | 15 +++++--
screen/src/view/planOfAudit/service.js | 2
screen/src/view/projectHome/index.vue | 19 +++------
screen/src/utils/request.js | 2
screen/src/view/hiddenDanger/index.vue | 9 +---
screen/src/view/planOfAudit/index.vue | 4 +-
screen/src/view/subentry/index.vue | 2
screen/src/view/projectProgress/index.vue | 2
screen/src/view/projectList/service.js | 2
screen/src/view/equipmentList/index.vue | 12 +++---
screen/src/view/header/index.vue | 3 -
12 files changed, 35 insertions(+), 41 deletions(-)
diff --git a/screen/src/utils/request.js b/screen/src/utils/request.js
index 5f35ce3..914026a 100644
--- a/screen/src/utils/request.js
+++ b/screen/src/utils/request.js
@@ -6,7 +6,7 @@
withCredentials: false,
timeout: 30000,
})
-console.log('process.env.VUE_APP_BASE_URL',process.env.VUE_APP_BASE_URL)
+
// 请求拦截
service.interceptors.request.use(
diff --git a/screen/src/view/equipmentList/index.vue b/screen/src/view/equipmentList/index.vue
index feedcd0..5534bb7 100644
--- a/screen/src/view/equipmentList/index.vue
+++ b/screen/src/view/equipmentList/index.vue
@@ -429,7 +429,7 @@
// 使用统一方法，根据用户类型调用对应接口
getDeviceListByType({ ...params }, this.isClient).then(res => {
- console.log('设备列表', res)
+
// 处理 properties 字段
this.tableList = res.records.map(item => {
return {
@@ -476,14 +476,14 @@
},
handleSizeChange(val) {
- console.log(`每页 ${val} 条`);
+
this.pageSize = val;
this.currentPage = 1; // 改变每页条数时重置到第一页
this.getList();
},
handleCurrentChange(val) {
- console.log(`当前页: ${val}`);
+
this.currentPage = val;
this.getList();
},
@@ -545,7 +545,7 @@
// 使用统一方法，根据用户类型调用对应接口
getDeviceDetailCheckListByType(params, this.isClient).then(res => {
- console.log('设备详情检查列表', res);
+
this.detailCheckList = res.records || [];
this.detailTotal = res.total || 0;
}).catch(err => {
@@ -557,7 +557,7 @@
// 详情弹窗分页 - 每页条数改变
handleDetailSizeChange(val) {
- console.log(`详情每页 ${val} 条`);
+
this.detailPageSize = val;
this.detailCurrentPage = 1;
this.getDetailCheckList();
@@ -565,7 +565,7 @@
// 详情弹窗分页 - 当前页改变
handleDetailCurrentChange(val) {
- console.log(`详情当前页: ${val}`);
+
this.detailCurrentPage = val;
this.getDetailCheckList();
},
diff --git a/screen/src/view/header/index.vue b/screen/src/view/header/index.vue
index 4ca9fb6..1e33a86 100644
--- a/screen/src/view/header/index.vue
+++ b/screen/src/view/header/index.vue
@@ -5,7 +5,7 @@
class="flex a-center c-fff absolute adress1 cursor-pointer"
>
<img
- :src="clientLogo ? VUE_APP_BASE_URL + '/project/download/' + clientLogo : require('../../assets/img/logo.png')"
+ :src="clientLogo ? VUE_APP_IMAGE_BASE_URL + '/project/download/' + clientLogo : require('../../assets/img/logo.png')"
class="w--30 h--30 shrink0 mr--10"
/>
<div class="color2 lh--30 fs--30 SHSBold">
@@ -64,7 +64,6 @@
clientName: localStorage.getItem("clientName"),
clientLogo: localStorage.getItem("clientLogo"),
VUE_APP_IMAGE_BASE_URL: process.env.VUE_APP_IMAGE_BASE_URL,
- VUE_APP_BASE_URL: process.env.VUE_APP_BASE_URL,
showLogoutDialog: false,
};
},
diff --git a/screen/src/view/hiddenDanger/index.vue b/screen/src/view/hiddenDanger/index.vue
index 496f9fd..9d6a08a 100644
--- a/screen/src/view/hiddenDanger/index.vue
+++ b/screen/src/view/hiddenDanger/index.vue
@@ -805,11 +805,6 @@
this.generalHiddenDangerConfig = generalHiddenDanger
? Number(generalHiddenDanger)
: 1;
-
- console.log("隐患配置加载:", {
- bigHiddenDanger: this.bigHiddenDangerConfig,
- generalHiddenDanger: this.generalHiddenDangerConfig,
- });
} catch (error) {
console.error("加载配置失败:", error);
// 默认都开启
@@ -977,8 +972,8 @@
// 获取隐患等级文本
getLevelText(level) {
- console.log('获取隐患等级文本:', this.levelOptions)
- console.log('level level',level)
+
+
return this.levelOptions[level].label || '-'
},
diff --git a/screen/src/view/personnelOnDuty/index.vue b/screen/src/view/personnelOnDuty/index.vue
index a58d82c..a4d3fe2 100644
--- a/screen/src/view/personnelOnDuty/index.vue
+++ b/screen/src/view/personnelOnDuty/index.vue
@@ -142,7 +142,11 @@
v-loading="loading"
>
<el-table-column label="计划名称" prop="planName" min-width="120" />
- <el-table-column label="检查内容" prop="checkContent" min-width="150" show-overflow-tooltip />
+ <el-table-column label="检查内容" prop="checkContent" min-width="150" show-overflow-tooltip >
+ <template>
+ <div>人员在岗</div>
+ </template>
+ </el-table-column>
<el-table-column label="岗位" prop="postName" min-width="100" />
<el-table-column label="问题备注" prop="remark" min-width="150" show-overflow-tooltip />
<el-table-column label="图片" min-width="80">
@@ -270,14 +274,14 @@
<div class="SHSR fs--16 lh--16 mb--17 color1">图片：</div>
<div class="flex a-center oa gap--14">
<img
- v-for="(item, index) in detailData.img ? detailData.img.split(',').filter(i => i) : []"
+ v-for="(item, index) in detailData.img ? detailData.img.split(',').map(i => VUE_APP_IMAGE_BASE_URL + i) : []"
:key="index"
:src="item"
class="w--150 h--120 cursor-pointer"
- style="object-fit: cover; border-radius: 4px;"
+ style="border-radius: 4px;"
@click="previewImage(detailData)"
/>
- <div v-if="!detailData.img || !detailData.img.split(',').filter(i => i).length" class="c-fff SHSR">暂无图片</div>
+ <div v-if="!detailData.img || !detailData.img.split(',').map(i => i).length" class="c-fff SHSR">暂无图片</div>
</div>
</div>
</div>
@@ -327,6 +331,7 @@
detailLoading: false,
// 图片预览数据
previewImages: [],
+ VUE_APP_IMAGE_BASE_URL: process.env.VUE_APP_IMAGE_BASE_URL + '/project/download/'
};
},
computed: {
@@ -489,7 +494,7 @@
previewImage(row) {
if (row.img) {
// 如果img是字符串，可能是逗号分隔的多张图片
- this.previewImages = row.img.split(",").filter((item) => item);
+ this.previewImages = row.img.split(",").map((item) => this.VUE_APP_IMAGE_BASE_URL + item);
this.previewVisible = true;
} else {
this.$message.warning("暂无图片");
diff --git a/screen/src/view/planOfAudit/index.vue b/screen/src/view/planOfAudit/index.vue
index c3450aa..fc7f654 100644
--- a/screen/src/view/planOfAudit/index.vue
+++ b/screen/src/view/planOfAudit/index.vue
@@ -729,7 +729,7 @@
}
// 检查 Word 文档是否生成成功
- console.log('Word文档生成成功:', wordBlob instanceof Blob, 'size:', wordBlob.size);
+
if (!wordBlob || wordBlob.size === 0) {
this.$message.error("报告生成失败");
@@ -755,7 +755,7 @@
return;
}
- console.log('PDF链接响应:', pdfUrlResponse);
+
// 根据后端返回的数据结构获取PDF链接
// 假设后端返回格式为 { data: "http://xxx.pdf" } 或直接返回字符串
diff --git a/screen/src/view/planOfAudit/service.js b/screen/src/view/planOfAudit/service.js
index 836880e..7db72c3 100644
--- a/screen/src/view/planOfAudit/service.js
+++ b/screen/src/view/planOfAudit/service.js
@@ -7,7 +7,7 @@
withCredentials: false,
timeout: 60000, // 文件下载可能需要更长时间
})
-console.log('process.env.VUE_ADMIN_BASE_URL',process.env.VUE_ADMIN_BASE_URL)
+
// 请求拦截 - 添加 token
reportRequest.interceptors.request.use(
diff --git a/screen/src/view/projectHome/index.vue b/screen/src/view/projectHome/index.vue
index 4b3fcab..df36c58 100644
--- a/screen/src/view/projectHome/index.vue
+++ b/screen/src/view/projectHome/index.vue
@@ -520,7 +520,7 @@
this.projectId = this.$route.query.projectId || ''
// 添加错误处理，确保登录信息获取失败不影响其他模块
getLoginInfo({ id: this.projectId, type: 2 }).then(res => {
- console.log('res', res)
+
this.projectName = res.name
const permissions = res.permissionProject ? res.permissionProject.split(",") : []
this.permissionProject = permissions
@@ -663,7 +663,7 @@
});
const contentType = response.headers.get('Content-Type') || '';
- console.log(`URL: ${url}, Content-Type: ${contentType}`);
+
// 判断是否为视频
if (contentType.startsWith('video/')) {
@@ -731,7 +731,7 @@
developmentCompanyInfo: developmentCompanyInfo,
supervisorCompanyInfo: supervisorCompanyInfo,
}
- console.log('projectInfo projectInfo', this.projectInfo)
+
}).catch(err => {
console.error('获取项目详情失败:', err)
// 设置默认值
@@ -768,7 +768,7 @@
// 隐患数量 - 添加错误处理
getDangerCount(this.projectId).then(res => {
this.dangerCount = res
- console.log('getDangerCount getDangerCount', res)
+
}).catch(err => {
console.error('获取隐患数量失败:', err)
this.dangerCount = {
@@ -1323,7 +1323,7 @@
// 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation，也就是实现每一个扇形。
for (let i = 0; i < series.length; i++) {
endValue = startValue + series[i].pieData.value;
- console.log(series[i]);
+
series[i].pieData.startRatio = startValue / sumValue;
series[i].pieData.endRatio = endValue / sumValue;
series[i].parametricEquation = this.getParametricEquation(
@@ -1407,7 +1407,7 @@
try {
const res = await getProjectDangerousTrend(params);
- console.log('项目风险趋势数据:', res);
+
if (res && Array.isArray(res)) {
// 处理接口返回的数据
@@ -1415,13 +1415,8 @@
// 将A、B、C转换为数值 3、2、1
this.riskTrendData.seriesData = res.map(item => {
const value = this.levelToValue(item.level);
- console.log(`level: ${item.level} -> value: ${value}`);
+
return value;
- });
-
- console.log('转换后的数据:', {
- xAxisData: this.riskTrendData.xAxisData,
- seriesData: this.riskTrendData.seriesData
});
// 更新图表
diff --git a/screen/src/view/projectList/index.vue b/screen/src/view/projectList/index.vue
index 481d0e8..ea408dd 100644
--- a/screen/src/view/projectList/index.vue
+++ b/screen/src/view/projectList/index.vue
@@ -857,7 +857,7 @@
}
// 检查 Word 文档是否生成成功
- console.log('Word文档生成成功:', wordBlob instanceof Blob, 'size:', wordBlob.size);
+
if (!wordBlob || wordBlob.size === 0) {
this.$message.error("报告生成失败");
@@ -883,7 +883,7 @@
return;
}
- console.log('PDF链接响应:', pdfUrlResponse);
+
// 根据后端返回的数据结构获取PDF链接
// 假设后端返回格式为 { data: "http://xxx.pdf" } 或直接返回字符串
diff --git a/screen/src/view/projectList/service.js b/screen/src/view/projectList/service.js
index b25d43f..f4258bc 100644
--- a/screen/src/view/projectList/service.js
+++ b/screen/src/view/projectList/service.js
@@ -8,7 +8,7 @@
timeout: 60000, // 文件下载可能需要更长时间
})
-console.log('process.env.VUE_ADMIN_BASE_URL', process.env)
+
// 请求拦截 - 添加 token
reportRequest.interceptors.request.use(
diff --git a/screen/src/view/projectProgress/index.vue b/screen/src/view/projectProgress/index.vue
index fa858ab..f955f6f 100644
--- a/screen/src/view/projectProgress/index.vue
+++ b/screen/src/view/projectProgress/index.vue
@@ -507,7 +507,7 @@
});
const contentType = response.headers.get('Content-Type') || '';
- console.log(`URL: ${url}, Content-Type: ${contentType}`);
+
// 判断是否为视频
if (contentType.startsWith('video/')) {
diff --git a/screen/src/view/subentry/index.vue b/screen/src/view/subentry/index.vue
index 4e11dc6..2e2e914 100644
--- a/screen/src/view/subentry/index.vue
+++ b/screen/src/view/subentry/index.vue
@@ -189,7 +189,7 @@
this.loading = true;
try {
const res = await getTrendList(params);
- console.log('11111111111',res)
+
if (res) {
this.processTableData(res || []);
} else {
--
Gitblit v1.7.1