Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/project/ProjectOnlineManage.vue

@@ -498,7 +498,7 @@ export default {
         window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.stageId}&type=${1}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}`)
       }else if(props.datasource.type==11){
         {/* 评估导出 */}
-        window.open(`${process.env.VUE_APP_BASE_API}admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }else{
         window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }

src/views/learningpath/LevelAdd.vue

@@ -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;
@@ -2787,8 +2787,15 @@ export default {
     // 共享文档文件下载
     const downloadFile = (url) => {
       console.log(url);
-      if (url) {
-        window.open(url);
+      let urlNew = url.slice(1);
+      console.log(urlNew);
+      if (urlNew) {
+        window.open(
+          window.location.protocol +
+            process.env.VUE_APP_BOE_API_URL +
+            process.env.VUE_APP_FILE_PATH +
+            urlNew
+        );
       }
       // if(url){
       //   const filename = '操作指南'

src/views/projectcenter/TaskPage.vue

@@ -3925,7 +3925,7 @@ export default {
     };
     //创建小组
     const createGroup = async () => {
-      debugger
+      debugger;
       console.log("state.groupPageList" + state.groupPageList);
       const id = state.groupInfo.id;
       const d = state.groupPageList
@@ -4513,7 +4513,7 @@ export default {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/faceteach?type=2&courseId=" +
+          "/faceteach?type=1&courseId=" +
           item.courseId +
           "&id=" +
           item.id;
@@ -4540,7 +4540,7 @@ export default {
           codeUrl =
             window.location.protocol +
             process.env.VUE_APP_H5 +
-            "/externalexam?courseId=" +
+            "/externalexam?type=1&courseId=" +
             item.courseId;
         } else {
           codeUrl =
@@ -4607,7 +4607,7 @@ export default {
           process.env.VUE_APP_H5 +
           "/evaluation?courseId=" +
           item.courseId +
-          "&evaType=" +
+          "&type=1&evaType=" +
           item.evaType +
           "&targetId=" +
           item.targetId;
@@ -4638,7 +4638,7 @@ export default {
           process.env.VUE_APP_H5 +
           "/ballotpage?courseId=" +
           item.courseId +
-          "&btype=2&id=" +
+          "&type=1&btype=2&id=" +
           item.id +
           "&chapterOrStageId=" +
           item.stageId +
@@ -4663,7 +4663,7 @@ export default {
         url:
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/projectdetails?projectId=" +
+          "/projectdetails?type=1&projectId=" +
           state.projectId,
       };
       state.codeInfo = obj;
@@ -4678,7 +4678,17 @@ export default {
     }
     // 共享文档文件下载
     const downloadFile = (url) => {
-      url && window.open(url);
+      console.log(url);
+      let urlNew = url.slice(1);
+      if (urlNew) {
+        window.open(
+          window.location.protocol +
+            process.env.VUE_APP_BOE_API_URL +
+            process.env.VUE_APP_FILE_PATH +
+            urlNew
+        );
+      }
+      // url && window.open(url);
     };
     function stageChange(item, index) {
       state.choosedStageName = item.name;