|
|
@@ -7330,7 +7330,7 @@ import JSZip from "jszip";
|
|
|
import evaList from "./evaList.vue";
|
|
|
import MindTask from "./jsmind2";
|
|
|
import ConvertApi from 'convertapi-js'
|
|
|
-let convertApi = ConvertApi.auth('secret_p4VftZdurEHwBlKA')
|
|
|
+let convertApi = ConvertApi.auth('secret_U1EO5rhgMCnoBnBT')
|
|
|
|
|
|
var OpenCC = require("opencc-js");
|
|
|
let converter = OpenCC.Converter({
|
|
|
@@ -9767,19 +9767,20 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
|
|
|
// });
|
|
|
// const file = new File([blob], dname, { type: 'application/msword' });
|
|
|
let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
|
|
|
- let params = convertApi.createParams()
|
|
|
- params.add('file', file)
|
|
|
- try {
|
|
|
- let result = await convertApi.convert('docx', 'docx', params)
|
|
|
- file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
|
|
|
- return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
|
|
|
- });
|
|
|
- await this.beforeUploadHtml(file, index, callback)
|
|
|
- } catch (error) {
|
|
|
- console.log('=================','报错')
|
|
|
- await this.beforeUploadHtml(file, index, callback)
|
|
|
- return
|
|
|
- }
|
|
|
+ // let params = convertApi.createParams()
|
|
|
+ // params.add('file', file)
|
|
|
+ // try {
|
|
|
+ // let result = await convertApi.convert('docx', 'docx', params)
|
|
|
+ // file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
|
|
|
+ // return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
|
|
|
+ // });
|
|
|
+ // await this.beforeUploadHtml(file, index, callback)
|
|
|
+ // } catch (error) {
|
|
|
+ // console.log('=================','报错')
|
|
|
+ // await this.beforeUploadHtml(file, index, callback)
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ await this.beforeUploadHtml(file, index, callback)
|
|
|
|
|
|
},
|
|
|
async generateExport(a, html, index) {
|
|
|
@@ -9817,20 +9818,21 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
|
|
|
// 创建文件流
|
|
|
|
|
|
let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
|
|
|
- let params = convertApi.createParams()
|
|
|
- params.add('file', file)
|
|
|
- try {
|
|
|
- let result = await convertApi.convert('docx', 'docx', params)
|
|
|
- file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
|
|
|
- return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
|
|
|
- });
|
|
|
+ // let params = convertApi.createParams()
|
|
|
+ // params.add('file', file)
|
|
|
+ // try {
|
|
|
+ // let result = await convertApi.convert('docx', 'docx', params)
|
|
|
+ // file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
|
|
|
+ // return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
|
|
|
+ // });
|
|
|
|
|
|
- // 执行下载
|
|
|
- saveAs(file, dname);
|
|
|
- } catch (error) {
|
|
|
- saveAs(file, dname);
|
|
|
- // this.$message.error('导出失败')
|
|
|
- }
|
|
|
+ // // 执行下载
|
|
|
+ // saveAs(file, dname);
|
|
|
+ // } catch (error) {
|
|
|
+ // saveAs(file, dname);
|
|
|
+ // // this.$message.error('导出失败')
|
|
|
+ // }
|
|
|
+ saveAs(file, dname);
|
|
|
|
|
|
// return file
|
|
|
},
|
|
|
@@ -9872,16 +9874,18 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
|
|
|
let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
|
|
|
let params = convertApi.createParams()
|
|
|
params.add('file', file)
|
|
|
- try {
|
|
|
- let result = await convertApi.convert('docx', 'docx', params)
|
|
|
- file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
|
|
|
- return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
|
|
|
- });
|
|
|
+ resolve(file); // 通过 Promise 返回 File 对象
|
|
|
|
|
|
- resolve(file); // 通过 Promise 返回 File 对象
|
|
|
- } catch (error) {
|
|
|
- resolve(''); // 通过 Promise 返回 File 对象
|
|
|
- }
|
|
|
+ // try {
|
|
|
+ // let result = await convertApi.convert('docx', 'docx', params)
|
|
|
+ // file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
|
|
|
+ // return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
|
|
|
+ // });
|
|
|
+
|
|
|
+ // resolve(file); // 通过 Promise 返回 File 对象
|
|
|
+ // } catch (error) {
|
|
|
+ // resolve(''); // 通过 Promise 返回 File 对象
|
|
|
+ // }
|
|
|
|
|
|
});
|
|
|
},
|
|
|
@@ -9987,18 +9991,19 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
|
|
|
// });
|
|
|
// const file = new File([blob], dname, { type: 'application/msword' });
|
|
|
let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
|
|
|
- let params = convertApi.createParams()
|
|
|
- params.add('file', file)
|
|
|
- try {
|
|
|
- let result = await convertApi.convert('docx', 'docx', params)
|
|
|
- file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
|
|
|
- return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
|
|
|
- });
|
|
|
- await this.beforeUploadHtml2(file, index, callback)
|
|
|
- } catch (error) {
|
|
|
- await this.beforeUploadHtml2(file, index, callback)
|
|
|
- return;
|
|
|
- }
|
|
|
+ // let params = convertApi.createParams()
|
|
|
+ // params.add('file', file)
|
|
|
+ // try {
|
|
|
+ // let result = await convertApi.convert('docx', 'docx', params)
|
|
|
+ // file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
|
|
|
+ // return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
|
|
|
+ // });
|
|
|
+ // await this.beforeUploadHtml2(file, index, callback)
|
|
|
+ // } catch (error) {
|
|
|
+ // await this.beforeUploadHtml2(file, index, callback)
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ await this.beforeUploadHtml2(file, index, callback)
|
|
|
},
|
|
|
beforeUploadHtml2(event, index, callback) {
|
|
|
var file = event;
|
|
|
@@ -10841,6 +10846,8 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
|
|
|
file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
|
|
|
return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
|
|
|
});
|
|
|
+ console.log(result)
|
|
|
+ console.log(file)
|
|
|
} catch (error) {
|
|
|
cfindex2++;
|
|
|
if(type == 14){
|
|
|
@@ -10888,8 +10895,7 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
|
|
|
return; // 直接返回，不继续执行后续代码
|
|
|
}
|
|
|
|
|
|
- console.log(result)
|
|
|
- console.log(file)
|
|
|
+
|
|
|
// return;
|
|
|
}
|
|
|
|
