Merge remote-tracking branch 'origin/master'

src/view/gameTask/scriptList.vue

@@ -23,7 +23,7 @@
                 <el-table-column align="left" label="脚本名称" min-width="60" prop="name" sortable="custom" />
                 <el-table-column align="left" label="负责人" min-width="60" prop="responsible_person" sortable="custom" />
                 <el-table-column align="left" label="下载链接" min-width="80" prop="url" />
-                <el-table-column align="left" label="版本号" min-width="60" prop="version" />
+                <el-table-column align="left" label="版本号" min-width="60" prop="version" sortable="custom" />
                 <el-table-column align="left" label="md5值" min-width="60" prop="md5_string" />
                 <el-table-column align="left" label="状态" min-width="60">
                     <template #default="scope">

src/view/gameTask/uploadView.vue

@@ -350,12 +350,15 @@ const submitUpload = async () => {
         getTableData()
         closeDialog()
       } else {
+        fullscreenLoading = false;
         ElMessage.error("上传失败");
+        fileList.data = []
         getTableData()
         closeDialog()
       }
     } else {
       // console.log('error submit!!');
+      fileList.data = []
       return false;
     }
   });