From 9ae7169f6c54a10a1f74ea7ad447d67b43ee2992 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Thu, 12 Jan 2023 11:53:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=A9=BA=E5=AD=90=E6=AE=B5=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E5=90=8E=E6=98=BE=E7=A4=BA=E7=BD=91=E5=9D=80?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/FJUpload.vue    | 6 +++++-
 src/views/research/ResearchManage.vue | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/common/FJUpload.vue b/src/components/common/FJUpload.vue
index d5d3c265..a9f9bffc 100644
--- a/src/components/common/FJUpload.vue
+++ b/src/components/common/FJUpload.vue
@@ -20,7 +20,11 @@
         <div class="file_detail">
           <div class="file_name">
             <span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">
-              {{ item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name }}
+              {{ 
+                item.name.indexOf('http')!==-1?
+                item.name.slice(item.name.lastIndexOf('/') + 1)
+                :item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name 
+              }}
             </span>
           </div>
           <!--          <div class="file_size">-->
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 20ead7d9..4ba0c4f6 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -599,6 +599,7 @@ export default {
     const handleNext = async() => {
       if (!state.assessmentId) {
         if (!state.assessmentName) {
+          message.destroy();
           message.error("请输入评估名称");
           return false;
         }
@@ -620,6 +621,11 @@ export default {
         router.push("/researchadd");
         handleCancel();
       } else {
+        if (!state.assessmentName) {
+          message.destroy();
+          message.error("请输入评估名称");
+          return false;
+        }
         editAssessmentName({
           assessmentId: state.assessmentId,
           assessmentName: state.assessmentName,