Merge branch 'master' of http://10.8.230.114:3000/wangbin/log-server-web

src/view/gameTask/uploadView.vue

@@ -255,7 +255,7 @@ const headers = ref({
   // token: getStore('zxdAdmintoken'),
   "content-type": "multipart/form-data"
 })
-const message = ref('请上传dll文件')
+const message = ref('请上传dll/exe文件')
 
 //校验规则
 const rules = ref({
@@ -284,14 +284,14 @@ const handleChange: UploadProps['onChange'] = (file, fileList) => {
 
   let extension = file.name.substring(file.name.lastIndexOf('.') + 1);
   console.log(extension)
-  if (extension !== 'dll') {
+  if (extension !== 'dll' && extension !== 'exe') {
     // this.$message.warning('只能上传后缀是.zip/.rar/.apk的文件'); //控制文件类型
     ElMessage.error('文件类型不对'); //控制文件类型
     upload.value!.clearFiles()
     return false
   }
-  else if (Number(file.size) / 1024 / 1024 > 2) {
-    ElMessage.error('Avatar picture size can not exceed 2MB!')
+  else if (Number(file.size) / 1024 / 1024 > 20) {
+    ElMessage.error('Avatar file size can not exceed 20MB!')
     upload.value!.clearFiles()
     return false
   }