首頁 探索 說明
登入
CocoRoboLabs
/
pbl-teacher-table
3
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'beta'

SanHQin 5 天之前
父節點
9460503042 f489c440de
當前提交
50193bebfb
共有 16 個文件被更改，包括 63 次插入 和 5 次删除
統一視圖 顯示文件統計
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.bb577bf4745e294faa903017bf96afa2.css
  3. 0 0
      dist/static/css/app.bb577bf4745e294faa903017bf96afa2.css.map
  4. 0 0
      dist/static/js/app.0ef310e453fb1ea37c83.js
  5. 0 0
      dist/static/js/app.0ef310e453fb1ea37c83.js.map
  6. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  7. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  8. 0 0
      dist/static/js/workPage.1de6b1fc97490321f8ed.js
  9. 0 0
      dist/static/js/workPage.1de6b1fc97490321f8ed.js.map
  10. 0 0
      dist/static/js/workPage.46f3ff329154715f71df.js
  11. 0 0
      dist/static/js/workPage.46f3ff329154715f71df.js.map
  12. 1 1
      dist/workPage.html
  13. 46 0
      src/components/pages/pptEasy/addCourse3.vue
  14. 5 1
      src/lang/cn.json
  15. 5 1
      src/lang/en.json
  16. 5 1
      src/lang/hk.json

+ 1 - 1
dist/index.html
查看文件 

@@ -37,7 +37,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.50374321fd66258d6f7fd295ee8ea34a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.3d0b2da58464181f1b66.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.bb577bf4745e294faa903017bf96afa2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.0ef310e453fb1ea37c83.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.bb577bf4745e294faa903017bf96afa2.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.bb577bf4745e294faa903017bf96afa2.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0ef310e453fb1ea37c83.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0ef310e453fb1ea37c83.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.1de6b1fc97490321f8ed.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.1de6b1fc97490321f8ed.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.46f3ff329154715f71df.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/workPage.46f3ff329154715f71df.js.map


+ 1 - 1
dist/workPage.html
查看文件 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.dceabcb058ed06914fde43af1b3e6067.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.e1fc95e471d70a1519e8.js></script><script type=text/javascript src=./static/js/workPage.1de6b1fc97490321f8ed.js></script></body></html><script>function stopSafari() {
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.dceabcb058ed06914fde43af1b3e6067.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.e1fc95e471d70a1519e8.js></script><script type=text/javascript src=./static/js/workPage.46f3ff329154715f71df.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

+ 46 - 0
src/components/pages/pptEasy/addCourse3.vue
查看文件 

@@ -1738,6 +1738,23 @@ export default {
 
       this.toastMessage = message;
 
       this.toastMessage = message;
 
       this.toastVisible = true;
 
       this.toastVisible = true;
 
     },
 
     },
 
+    showToolsConfirmDialog() {
 
+      return new Promise((resolve) => {
 
+        this.confirmTitle = this.lang.ssUnconfirmedToolPage;
 
+        this.confirmMessage = this.lang.ssUnconfirmedToolPageTip;
 
+        this.confirmConfirmText = this.lang.ssIgnoreAndPublish;
 
+        this.confirmCancelText = this.lang.ssReturnModify;
 
+        this.confirmCallback = () => {
 
+          resolve(true);
 
+        };
 
+        this.confirmVisible = true;
 
+        const originalCancel = this.handleCancel;
 
+        this.handleCancel = () => {
 
+          this.handleCancel = originalCancel;
 
+          resolve(false);
 
+        };
 
+      });
 
+    },
 
     updateInputWidth() {
 
     updateInputWidth() {
 
       // 创建一个隐藏的span元素来计算文字宽度
 
       // 创建一个隐藏的span元素来计算文字宽度
 
       const span = document.createElement('span');
 
       const span = document.createElement('span');
 
@@ -1933,6 +1950,8 @@ export default {
 
       }
 
       }
 
       const _pptData2 = JSON.parse(JSON.stringify(_pptData))
 
       const _pptData2 = JSON.parse(JSON.stringify(_pptData))
 
       const pptContent = []
 
       const pptContent = []
 
+      let toolsArrayCont = []
 
+      let istoolsArray = false
 
       if (_pptData2.slides) {
 
       if (_pptData2.slides) {
 
         _pptData2.slides.forEach((slide, index) => {
 
         _pptData2.slides.forEach((slide, index) => {
 
           let slideContent = ''
 
           let slideContent = ''
 
@@ -1947,6 +1966,19 @@ export default {
 
           }
 
           }
 
           pptContent.push(`第${index + 1}页: ${slideContent || '内容为空'}`)
 
           pptContent.push(`第${index + 1}页: ${slideContent || '内容为空'}`)
 
         })
 
         })
 
+        toolsArrayCont = _pptData2.slides.some(slide => slide.toolsArray && slide.toolsArray.length > 0)
 
+        if (toolsArrayCont) {
 
+          // 有内容就弹出弹窗
 
+          istoolsArray = true
 
+        }
 
+      }
 
+
 
+      if(istoolsArray && type == 1){
 
+        const confirmed = await this.showToolsConfirmDialog();
 
+        if (!confirmed) {
 
+          this.uploadWorkLoading = false;
 
+          return;
 
+        }
 
       }
 
       }
 
       const contentDescription = pptContent.join('\n')
 
       const contentDescription = pptContent.join('\n')
 
       // 用_pptData生成json文件，并生成File对象
 
       // 用_pptData生成json文件，并生成File对象
 
@@ -2053,6 +2085,8 @@ export default {
 
       }
 
       }
 
       const _pptData2 = JSON.parse(JSON.stringify(_pptData))
 
       const _pptData2 = JSON.parse(JSON.stringify(_pptData))
 
       const pptContent = []
 
       const pptContent = []
 
+      let toolsArrayCont = []
 
+      let istoolsArray = false
 
       if (_pptData2.slides) {
 
       if (_pptData2.slides) {
 
         _pptData2.slides.forEach((slide, index) => {
 
         _pptData2.slides.forEach((slide, index) => {
 
           let slideContent = ''
 
           let slideContent = ''
 
@@ -2067,6 +2101,18 @@ export default {
 
           }
 
           }
 
           pptContent.push(`第${index + 1}页: ${slideContent || '内容为空'}`)
 
           pptContent.push(`第${index + 1}页: ${slideContent || '内容为空'}`)
 
         })
 
         })
 
+        toolsArrayCont = _pptData2.slides.some(slide => slide.toolsArray && slide.toolsArray.length > 0)
 
+        if (toolsArrayCont) {
 
+          // 有内容就弹出弹窗
 
+          istoolsArray = true
 
+        }
 
+      }
 
+      if(istoolsArray && type == 1){
 
+        const confirmed = await this.showToolsConfirmDialog();
 
+        if (!confirmed) {
 
+          this.uploadWorkLoading = false;
 
+          return;
 
+        }
 
       }
 
       }
 
       const contentDescription = pptContent.join('\n')
 
       const contentDescription = pptContent.join('\n')
 
       // 用_pptData生成json文件，并生成File对象
 
       // 用_pptData生成json文件，并生成File对象

+ 5 - 1
src/lang/cn.json
查看文件 

@@ -2058,5 +2058,9 @@
 
   "ssSyncImportClassInfo":"提示：如需同步导入班级信息，请于模板中的班级列，输入当前年级+班级名称作为学生班级（如六年级01班，兴趣班不支持新建学生）。",
 
   "ssSyncImportClassInfo":"提示：如需同步导入班级信息，请于模板中的班级列，输入当前年级+班级名称作为学生班级（如六年级01班，兴趣班不支持新建学生）。",
 
   "ssNoSettingAnswer":"未设置正确答案",
 
   "ssNoSettingAnswer":"未设置正确答案",
 
   "allGrades": "全部年级",
 
   "allGrades": "全部年级",
 
-  "ssVoteTopic": "投票主题"
 
+  "ssVoteTopic": "投票主题",
 
+  "ssUnconfirmedToolPage": "存在未确认的工具页",
 
+  "ssUnconfirmedToolPageTip": "存在未确认的工具页，请完成后发布课程。",
 
+  "ssIgnoreAndPublish": "忽略并发布",
 
+  "ssReturnModify": "返回修改"
 
 }
 
 }

+ 5 - 1
src/lang/en.json
查看文件 

@@ -2057,5 +2057,9 @@
 
   "ssNoSettingAnswer":"No correct answer set",
 
   "ssNoSettingAnswer":"No correct answer set",
 
   "ssSyncImportClassInfo":"Tip: For importing class information, please enter the grade + class name in the [Class] column as the student class (e.g., 6th grade 01 class, interest classes do not support importing students).",
 
   "ssSyncImportClassInfo":"Tip: For importing class information, please enter the grade + class name in the [Class] column as the student class (e.g., 6th grade 01 class, interest classes do not support importing students).",
 
   "allGrades": "All Grades",
 
   "allGrades": "All Grades",
 
-  "ssVoteTopic": "Voting Theme"
 
+  "ssVoteTopic": "Voting Theme",
 
+  "ssUnconfirmedToolPage": "Unconfirmed Tool Page",
 
+  "ssUnconfirmedToolPageTip": "Unconfirmed tool page, please publish the course after completion.",
 
+  "ssIgnoreAndPublish": "Ignore and publish",
 
+  "ssReturnModify": "Return to modify"
 
 }
 
 }

+ 5 - 1
src/lang/hk.json
查看文件 

@@ -2058,5 +2058,9 @@
 
   "ssNoSettingAnswer":"未設置正確答案",
 
   "ssNoSettingAnswer":"未設置正確答案",
 
   "ssSyncImportClassInfo":"提示：如需同步導入班級信息，請於模板中的班級列，輸入當前年級+班級名稱作為學生班級（如六年級01班，興趣班不支持導入學生）。",
 
   "ssSyncImportClassInfo":"提示：如需同步導入班級信息，請於模板中的班級列，輸入當前年級+班級名稱作為學生班級（如六年級01班，興趣班不支持導入學生）。",
 
   "allGrades": "全部年級",
 
   "allGrades": "全部年級",
 
-  "ssVoteTopic": "投票主題"
 
+  "ssVoteTopic": "投票主題",
 
+  "ssUnconfirmedToolPage": "存在未確認的工具頁", 
+  "ssUnconfirmedToolPageTip": "存在未確認的工具頁，請完成後發布課程。",
 
+  "ssIgnoreAndPublish": "忽略並發布",
 
+  "ssReturnModify": "返回修改"
 
 }
 
 }

Some files were not shown because too many files changed in this diff