合并冲突

This commit is contained in:
lpq
2023-03-04 14:20:16 +08:00
43 changed files with 1126 additions and 899 deletions

View File

@@ -2637,7 +2637,7 @@ export default {
codeUrl =
window.location.protocol +
process.env.VUE_APP_H5 +
"/externalexam?courseId=" +
"/externalexam?type=2&courseId=" +
item.courseId;
} else {
codeUrl =
@@ -2705,7 +2705,7 @@ export default {
item.courseId +
"&evaType=" +
item.evaType +
"&targetId=" +
"&type=2&targetId=" +
item.targetId;
}
@@ -2737,7 +2737,7 @@ export default {
item.id +
"&chapterOrStageId=" +
item.chapterId +
"&infoId=" +
"&type=2&infoId=" +
state.routerId;
}
// 项目
@@ -2745,7 +2745,7 @@ export default {
codeUrl =
window.location.protocol +
process.env.VUE_APP_H5 +
"/projectdetails?projectId=" +
"/projectdetails?type=2&projectId=" +
item.courseId;
}
state.codevisible = true;
@@ -2786,12 +2786,14 @@ export default {
// 共享文档文件下载
const downloadFile = (url) => {
debugger
const urlNew = url.slice(1);
console.log(urlNew);
if (urlNew) {
window.open(process.env.VUE_APP_FILE_PATH + urlNew);
}
url && window.open(url);
console.log(url);
window.open(
window.location.protocol +
process.env.VUE_APP_BOE_API_URL +
process.env.VUE_APP_FILE_PATH +
url
);
// if(url){
// const filename = '操作指南'
// const x = new XMLHttpRequest()