update

src/components/pages/pptEasy/addCourse3.vue

@@ -1369,7 +1369,7 @@ export default {
     generateFromAI() {
       console.log('自AI生成');
       if(!this.courseName){
-        this.$message.error(this.lang.ssFillCourseName);
+        this.$message.error(this.lang.ssFillCourseName2);
         return;
       }
       if(this.avatar_loading){
@@ -1498,14 +1498,14 @@ export default {
       // this.isTeacherSee = true
       if (this.cid == "" || this.cid == undefined) {
         if (this.courseName == "") {
-          this.$message.error(this.lang.ssFillCourseName);
+          this.$message.error(this.lang.ssFillCourseName2);
           return;
         } else {
           this.addWork();
         }
       } else {
         if (this.courseName == "") {
-          this.$message.error(this.lang.ssFillCourseName);
+          this.$message.error(this.lang.ssFillCourseName2);
           return;
         } else {
           console.log("修改课程");
@@ -1542,14 +1542,14 @@ export default {
     save(type = 1) {
       if (this.cid == "" || this.cid == undefined) {
         if (this.courseName == "") {
-          this.$message.error(this.lang.ssFillCourseName);
+          this.$message.error(this.lang.ssFillCourseName2);
           return;
         } else {
           this.addWork(2, type);
         }
       } else {
         if (this.courseName == "") {
-          this.$message.error(this.lang.ssFillCourseName);
+          this.$message.error(this.lang.ssFillCourseName2);
           return;
         } else {
           this.updateWork(2, type);
@@ -1624,14 +1624,14 @@ export default {
           console.log("保存已编辑内容");
           if (this.cid == "" || this.cid == undefined) {
             if (this.courseName == "") {
-              this.$message.error(this.lang.ssFillCourseName);
+              this.$message.error(this.lang.ssFillCourseName2);
               return;
             } else {
               this.addWork();
             }
           } else {
             if (this.courseName == "") {
-              this.$message.error(this.lang.ssFillCourseName);
+              this.$message.error(this.lang.ssFillCourseName2);
               return;
             } else {
               this.updateWork();
@@ -1678,6 +1678,30 @@ export default {
         checkLoaded(resolve);
       });
     },
+    //获取ppt的数据
+    async getPPtimgExporting() {
+      const checkLoaded = async (resolve) => {
+        console.log("获取ppt数据")
+        let _pptIframe = this.$refs.pptIframeRef;
+        if (
+          _pptIframe &&
+          _pptIframe.contentWindow &&
+          _pptIframe.contentWindow.window &&
+          typeof _pptIframe.contentWindow.window.exportJSON === "function"
+        ) {
+          let _data = _pptIframe.contentWindow.window.imgExporting();
+          resolve(_data);
+        } else {
+          // 递归等待1000ms后重试
+          setTimeout(() => {
+            checkLoaded(resolve);
+          }, 1000);
+        }
+      };
+      return new Promise((resolve) => {
+        checkLoaded(resolve);
+      });
+    },
     //上传文件
     uploadFile(file) {
       return new Promise((resolve) => {
@@ -1786,6 +1810,11 @@ export default {
         this.uploadWorkLoading = true;
       }
       let _pptData = await this.getPPtJson();
+      let imgExporting = await this.getPPTimgExporting()
+      if (type == 1 && imgExporting) {
+        this.$message.info(this.lang.ssPptLoad)
+        return
+      }
       const _pptData2 = JSON.parse(JSON.stringify(_pptData))
       const pptContent = []
       if (_pptData2.slides) {
@@ -1899,6 +1928,11 @@ export default {
         this.uploadWorkLoading = true;
       }
       let _pptData = await this.getPPtJson();
+      let imgExporting = await this.getPPTimgExporting()
+      if (type == 1 && imgExporting) {
+        this.$message.info(this.lang.ssPptLoad)
+        return
+      }
       const _pptData2 = JSON.parse(JSON.stringify(_pptData))
       const pptContent = []
       if (_pptData2.slides) {
@@ -2673,6 +2707,19 @@ export default {
       this.addContent(cocoroboItem)
       this.setPPtToolList();
     },
+    setUrl() {
+      let url = 'https://beta.pbl.cocorobo.cn'
+      if (this.lang.lang === 'cn') {
+        url = 'https://pbl.cocorobo.cn'
+      }
+      else if (this.lang.lang === 'hk') {
+        url = 'https://pbl.cocorobo.hk'
+      }
+      else if (this.lang.lang === 'en') {
+        url = 'https://pbl.cocorobo.com'
+      }
+      return url
+    },
     addTest() {
       // var aj = this.testJson.testJson;
       // var b = 1;
@@ -2765,7 +2812,8 @@ export default {
 
       this.dialogVisibleChoice = false;
       this.getWorkPageId(_data.id, 45, testJson).then(res => {
-        let url = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/workPage.html#/setWorkPage?id=${res}&type=${_data.tool}`
+        let baseUrl = setUrl()
+        let url = `${baseUrl}/pbl-teacher-table/dist/workPage.html#/setWorkPage?id=${res}&type=${_data.tool}`
         this.pptCourseJson.toolsList.find(i => i.id === _data.id).url = url;
         this.setPPtToolList();
         _data.url = url
@@ -3021,7 +3069,8 @@ export default {
 
       this.dialogVisible8 = false;
       this.getWorkPageId(_data.id, 15, { answerQ: this.answerQ }).then(res => {
-        let url = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/workPage.html#/setWorkPage?id=${res}&type=${_data.tool}`;
+        let baseUrl = setUrl()
+        let url = `${baseUrl}/pbl-teacher-table/dist/workPage.html#/setWorkPage?id=${res}&type=${_data.tool}`;
         this.pptCourseJson.toolsList.find(i => i.id === _data.id).url = url;
         this.setPPtToolList();
         _data.url = url

src/lang/cn.json

@@ -1042,6 +1042,7 @@
   "ssWaitTaskSave":"请等待任务*回答完毕后再保存",
   "ssWaitTaskCont":"请等待任务*回答完毕后再继续",
   "ssFillCourseName":"请补充填写课程名称",
+  "ssFillCourseName2":"请输入课程名称",
   "ssClickConfirmUpload":"点击确认上传按钮",
   "ssGenOutTaskDesc":"生成大纲任务*描述还未生成完，请前往查看，回答完毕后再次操作。",
   "ssCpoteNotGen":"概念群还未生成完，请前往查看，回答完毕后再次操作。",
@@ -1917,6 +1918,7 @@
   "ssTotalPrefix":"共",
   "ssBasicInfo":"基础信息",
   "ssPptLoad":"ppt正在加载中，请稍等",
+  "ssPptLoad2":"ppt正在上传图片中，请稍等",
   "ssUploadPptFail":"上传失败ppt数据失败",
   "ssCopyToolSucc":"复制工具成功",
   "ssAddH5":"添加H5页面",

src/lang/en.json

@@ -1037,6 +1037,7 @@
   "ssWaitTaskSave":"Please wait for task * to finish answering before saving",
   "ssWaitTaskCont":"Please wait for task * to finish answering before continuing",
   "ssFillCourseName":"Please enter a course name to continue.",
+  "ssFillCourseName2":"Please enter course name",
   "ssClickConfirmUpload":"Click confirm upload button",
   "ssGenOutTaskDesc":"Outline task * description is not yet complete, please check and try again after answering.",
   "ssCpoteNotGen":"Conceptual group is not yet complete, please check and try again after answering.",
@@ -1916,12 +1917,13 @@
   "ssTotalPrefix":"Total ",
   "ssBasicInfo":"Basic Information",
   "ssPptLoad":"PPT is loading, please wait",
+  "ssPptLoad2":"PPT is uploading images, please wait",
   "ssUploadPptFail":"Failed to upload PPT data",
   "ssCopyToolSucc":"Tool copied successfully",
   "ssAddH5":"Add Web Page",
   "ssUploading":"Uploading...",
   "ssCompleted":"Complete",
-  "ssBilibiliVideo":"Bilibili Video",
+  "ssBilibiliVideo":"Youtube Video",
   "ssQAQuestion":"QA Question",
   "ssQAQuestionTool":"QA Question Tool",
   "ssBilibiliVideoSearch":"Search YouTube Videos",

src/lang/hk.json

@@ -1040,6 +1040,7 @@
   "ssWaitTaskSave":"請等待任務*回答完畢後再保存",
   "ssWaitTaskCont":"請等待任務*回答完畢後再繼續",
   "ssFillCourseName":"請補充填寫課程名稱",
+  "ssFillCourseName2":"請輸入課程名稱",
   "ssClickConfirmUpload":"點擊確認上傳按鈕",
   "ssGenOutTaskDesc":"生成大綱任務*描述還未生成完，請前往查看，回答完畢後再次操作。",
   "ssCpoteNotGen":"概念群還未生成完，請前往查看，回答完畢後再次操作。",
@@ -1916,15 +1917,16 @@
   "ssTotalPrefix":"共",
   "ssBasicInfo":"基礎信息",
   "ssPptLoad":"ppt正在加載中，請稍等",
+  "ssPptLoad2":"PPT正在上傳圖片，請稍候",
   "ssUploadPptFail":"上傳失敗ppt數據失敗",
   "ssCopyToolSucc":"複製工具成功",
   "ssAddH5":"添加H5頁面",
   "ssUploading":"上傳中",
   "ssCompleted":"已完成",
-  "ssBilibiliVideo":"Bilibili視頻",
+  "ssBilibiliVideo":"Youtube視頻",
   "ssQAQuestion":"問答題",
   "ssQAQuestionTool":"問答題工具",
-  "ssBilibiliVideoSearch":"Bilibili視頻檢索",
+  "ssBilibiliVideoSearch":"Youtube視頻檢索",
   "ssBiliLoading":"正在檢索中，請稍等...",
   "ssBiliSearchKey":"搜索視頻關鍵字（如需搜索多個可,隔開）",
   "ssBiSort":"綜合排序",