From f751b60d5593981aeba16bb32d2bfea8bcdd07b9 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 12 Jan 2023 15:02:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E8=AF=BE=E7=A8=8B=E9=99=84=E4=BB=B6=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 8b39129..789b1c3 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -96,8 +96,8 @@
 								<div v-for="(el, index) in formateArr(data.planDto?.attach)" :key="index" class="enclosure"
 									:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
 									<div class="enclosureL">
-										<FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg>
-										<div style="margin-left: 20px">{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}</div>
+										<FileTypeImg :v-model="el.name? el.name : el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg>
+										<div style="margin-left: 20px">{{ el.name? el.name : el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}</div>
 									</div>
 									<div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" >
 										<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">
@@ -108,7 +108,7 @@
 										</div>
 										<div v-else class="download">
 											<img style="width: 16px; height: 15px" src="../../assets/image/download.png" />
-											<div style="margin-left: 5px" @click="download(el)">
+											<div style="margin-left: 5px" @click="download(el.name? el.response.data : el)">
 												下载
 											</div>
 										</div>
@@ -239,9 +239,14 @@ const downloads = (url) => {
 };
 
 function formateArr(strs) {
-	let arrs = strs.split(',')
-	console.log('112233', arrs)
-	return arrs
+	let newArr = [];
+	try{
+		newArr = JSON.parse(strs)
+	} catch {
+		newArr = strs.split(',')
+	}
+	console.log('112233', newArr)
+	return newArr
 }
 
 let timer = null;