解决冲突

src/components/file/list.vue

@@ -24,8 +24,8 @@
                 >
                     <icon name="el-icon-CircleCloseFilled" :size="20" />
                 </a>
-            </template>
 
+            </template>
             <div
                 class="item flex end v-center column text-center"
                 :title="item.fileName"
@@ -33,7 +33,8 @@
                 v-else
             >
                 <icon :name="getIconName(item.fileName)" :size="40" />
-                <span class="filename">{{ item.fileName }}</span>
+
+                <span class="filename"> {{ item.fileName }}</span>
                 <a
                     class="remove-btn"
                     @click.stop="remove(index)"
@@ -41,6 +42,7 @@
                 >
                     <icon name="el-icon-CircleCloseFilled" :size="16" />
                 </a>
+
             </div>
         </div>
     </div>
@@ -349,7 +351,7 @@ function rotateRight() {
     margin: 2px;
     .item {
         width: 80px;
-        height: 80px;
+        height: 120px;
         margin-bottom: 12px;
         border-radius: 2px;
         color: var(--primary-color);

src/components/file/upload.vue

@@ -4,6 +4,7 @@
             :action="`${BASE_PATH}/file/upload`"
             :headers="{ Authorization: getToken() }"
             multiple
+            :timeout="60000"
             :drag="uploadDrag"
             :before-upload="beforeUpload"
             @progress="uploadProgress"