Merge branch 'gyj' into dev

This commit is contained in:
gyj
2023-11-30 18:40:27 +08:00
@@ -138,13 +138,24 @@ export default {
this.$emit("cancelCompreess"); this.$emit("cancelCompreess");
this.upload.isUploading = false; this.upload.isUploading = false;
this.$refs.uploadZipBatch.clearFiles(); this.$refs.uploadZipBatch.clearFiles();
this.$alert( if(response.code ==200){
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg + response.msg +
"</div>", "</div>",
"导入结果", "导入结果",
{ dangerouslyUseHTMLString: true } { dangerouslyUseHTMLString: true }
); )
}else{
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
"导入压缩失败" +
"</div>",
"导入结果",
{ dangerouslyUseHTMLString: true }
)
}
this.getcaseApply(this.queryParams); this.getcaseApply(this.queryParams);
}, },
}, },