feat:合并

src/App.vue

@@ -44,7 +44,7 @@ export default defineComponent({
 		const store = useStore();
 		const isLogin = ref(false);
 		// console.log("router", router.getRoutes(), route);
-		console.log("版本2.0.4------------");
+		console.log("版本2.0.5------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

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">-->

src/views/courselibrary/CoursewareManage.vue

@@ -1659,7 +1659,7 @@
       :footer="null"
       :closable="false"
       wrapClassName="modalStyle stusmanageModal"
-      width="80%"
+      width="90%"
       @cancel="sm_exit"
     >
       <div class="modalHeader">
@@ -7786,7 +7786,7 @@ export default defineComponent({
 
 .stusmanageModal {
   .ant-modal {
-    max-width: 1700px;
+    max-width: 1800px;
     .ant-modal-content {
       // width:1358px !important;
       .ant-modal-body {

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,