From c3bb35b20d6e076f73a1cad50fd6b9b94ca399a7 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期一, 06 一月 2025 16:15:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/coalMine/cPeopleManage/index.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/coalMine/cPeopleManage/index.vue b/src/views/coalMine/cPeopleManage/index.vue
index 1b91ecc..757b18b 100644
--- a/src/views/coalMine/cPeopleManage/index.vue
+++ b/src/views/coalMine/cPeopleManage/index.vue
@@ -62,7 +62,8 @@
</el-table-column>
<el-table-column label="证件照片" align="center" prop="photoPath">
<template #default="scope">
- <el-button type="text" @click="viewFile(scope.row.photoAttachment)">预览</el-button>
+ <el-button type="text" v-if="scope.row.photoAttachment && scope.row.photoAttachment.fileUrl !==''" @click="viewFile(scope.row.photoAttachment)">预览</el-button>
+ <span type="text" v-else>暂无</span>
</template>
</el-table-column>
<!-- <el-table-column label="个人履历" align="center">-->
@@ -230,7 +231,7 @@
},
viewFile(file){
const t = this
- axios.get(process.env.VUE_APP_BASE_API + file.fileUrl,{headers:{'Content-Type': 'application/json','Authorization': "Bearer " + getToken()},responseType: 'blob'}).then(res=>{
+ axios.get(process.env.VUE_APP_BASE_API + file.fileUrl,{headers:{'Content-Type': 'application/json','Authorization': "Bearer " + getToken()},responseType: 'blob',timeout: 3000}).then(res=>{
if (res && res.data) {
const link = document.createElement('a')
let blob = new Blob([res.data],{type: res.data.type})
--
Gitblit v1.9.2