Startseite Erkunden Hilfe
Anmelden
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

Merge branch 'beta'

SanHQin vor 1 Monat
Ursprung
a2c0919fa8 404adc1adc
Commit
9e1036befc
19 geänderte Dateien mit 78 neuen und 53 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.1f49089c405bb8f719ed9f59102dbb23.css
  3. 0 0
      dist/static/css/app.1f49089c405bb8f719ed9f59102dbb23.css.map
  4. 0 0
      dist/static/css/workPage.a84f497911024c8c5b15207ddf11a7a3.css
  5. 0 0
      dist/static/css/workPage.a84f497911024c8c5b15207ddf11a7a3.css.map
  6. 0 0
      dist/static/js/app.5baa0df200fd6278c1bf.js
  7. 0 0
      dist/static/js/app.5baa0df200fd6278c1bf.js.map
  8. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  9. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  10. 0 0
      dist/static/js/workPage.546692eb5acca5c2bbba.js
  11. 0 0
      dist/static/js/workPage.546692eb5acca5c2bbba.js.map
  12. 0 0
      dist/static/js/workPage.f47a9ac2a33d9cf48512.js
  13. 0 0
      dist/static/js/workPage.f47a9ac2a33d9cf48512.js.map
  14. 1 1
      dist/workPage.html
  15. 35 23
      src/components/pages/pptEasy/addCourse2.vue
  16. 37 25
      src/components/pages/pptEasy/addCourse3.vue
  17. 1 1
      src/components/pages/studentManageNew/component/editInterstcla.vue
  18. 1 1
      src/components/pages/studentManageNew/component/table.vue
  19. 2 1
      src/components/pages/workPage/components/choiceQuestion.vue

+ 1 - 1
dist/index.html
Datei anzeigen 

@@ -37,7 +37,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.23fe87cb6a5987dc6626ea70c761cdab.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.f6b118c3004cb4fe9b9c.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.1f49089c405bb8f719ed9f59102dbb23.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.5baa0df200fd6278c1bf.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.1f49089c405bb8f719ed9f59102dbb23.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.1f49089c405bb8f719ed9f59102dbb23.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/workPage.a84f497911024c8c5b15207ddf11a7a3.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/workPage.a84f497911024c8c5b15207ddf11a7a3.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.5baa0df200fd6278c1bf.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.5baa0df200fd6278c1bf.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/workPage.546692eb5acca5c2bbba.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/workPage.546692eb5acca5c2bbba.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/workPage.f47a9ac2a33d9cf48512.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/workPage.f47a9ac2a33d9cf48512.js.map


+ 1 - 1
dist/workPage.html
Datei anzeigen 

@@ -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.e4f995b0ca977279f09ecbe9e3504805.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.7b2c55096449c94cc8fd.js></script><script type=text/javascript src=./static/js/workPage.546692eb5acca5c2bbba.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.a84f497911024c8c5b15207ddf11a7a3.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.7b2c55096449c94cc8fd.js></script><script type=text/javascript src=./static/js/workPage.f47a9ac2a33d9cf48512.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

+ 35 - 23
src/components/pages/pptEasy/addCourse2.vue
Datei anzeigen 

@@ -1022,6 +1022,7 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      pptIframeUrl: "",
 
       gotype: (window.topU && window.topU.gotype) ? window.topU.gotype : '',
 
       checkAll: false,
 
       userid: this.$route.query.userid,
 
@@ -1195,25 +1196,6 @@ export default {
 
     }
 
   },
 
   computed: {
 
-    // 判断当前页面URL是否包含beta
 
-    isBetaEnv() {
 
-      return window.location.href.includes('beta');
 
-    },
 
-    // 动态生成PPT iframe的URL
 
-    pptIframeUrl() {
 
-
 
-      let ppturl = "https://beta.ppt.cocorobo.cn"
 
-      if (this.isBetaEnv) {
 
-        ppturl = "https://beta.ppt.cocorobo.cn"
 
-      } else if (this.lang.lang == 'com') {
 
-        ppturl = 'https://ppt.cocorobo.com'
 
-      } else if (this.lang.lang == 'hk') {
 
-        ppturl = 'https://ppt.cocorobo.hk'
 
-      } else {
 
-        ppturl = 'https://ppt.cocorobo.cn'
 
-      }
 
-      return `${ppturl}/?mode=editor2&courseid=${this.cid}`;
 
-    },
 
     getListClassC() {
 
       return function(list) {
 
         let _c2 = [];
 
@@ -1632,8 +1614,10 @@ export default {
 
         })
 
       }
 
       // 用_pptData生成json文件，并生成File对象
 
-      const pptJsonStr = JSON.stringify(_pptData2, null, 2);
 
+      const pptJsonStr = JSON.stringify(_pptData, null, 2);
 
+      const pptJsonStr2 = JSON.stringify(_pptData2, null, 2);
 
       const pptJsonFile = new File([pptJsonStr], this.courseName + ".json", { type: "application/json" });
 
+      const pptJsonFile2 = new File([pptJsonStr2], this.courseName + ".json", { type: "application/json" });
 
       // 你可以根据需要将pptJsonFile上传或保存
 
 
       let _url = await this.uploadFile(pptJsonFile);
 
@@ -1696,7 +1680,7 @@ export default {
 
           if(type == 1){
 
             this.steps = 4;
 
           }
 
-          this.uploadFile2(pptJsonFile, this.courseId);
 
+          this.uploadFile2(pptJsonFile2, this.courseId);
 
           this.addOp3(
 
             "1",
 
             "",
 
@@ -1721,14 +1705,23 @@ export default {
 
       if (this.uploadWorkLoading) return;
 
       this.uploadWorkLoading = true;
 
       let _pptData = await this.getPPtJson();
 
-
 
+      const _pptData2 = JSON.parse(JSON.stringify(_pptData))
 
+      if (_pptData2.slides) {
 
+        _pptData2.slides.forEach((slide) => {
 
+          if (slide.elements) {
 
+            slide.elements = slide.elements.filter((element) => element.type !== 'image')
 
+          }
 
+        })
 
+      }
 
       // 用_pptData生成json文件，并生成File对象
 
       const pptJsonStr = JSON.stringify(_pptData, null, 2);
 
+      const pptJsonStr2 = JSON.stringify(_pptData2, null, 2);
 
       const pptJsonFile = new File([pptJsonStr], this.courseName + ".json", { type: "application/json" });
 
+      const pptJsonFile2 = new File([pptJsonStr2], this.courseName + ".json", { type: "application/json" });
 
       // 你可以根据需要将pptJsonFile上传或保存
 
       console.log(_url)
 
       let _url = await this.uploadFile(pptJsonFile);
 
-      this.uploadFile2(pptJsonFile, this.cid);
 
+      this.uploadFile2(pptJsonFile2, this.cid);
 
 
       this.pptCourseJson.pptData = _url;
 
 
@@ -3074,6 +3067,24 @@ export default {
 
       this.isAddOrUpdateLineLoading = false;
 
 
     },
 
+    // 判断当前页面URL是否包含beta
 
+    isBetaEnv() {
 
+      return window.location.href.includes('beta');
 
+    },
 
+    // 动态生成PPT iframe的URL
 
+    setPptIframeUrl() {
 
+      let ppturl = "https://beta.ppt.cocorobo.cn"
 
+      if (this.isBetaEnv) {
 
+        ppturl = "https://beta.ppt.cocorobo.cn"
 
+      } else if (this.lang.lang == 'com') {
 
+        ppturl = 'https://ppt.cocorobo.com'
 
+      } else if (this.lang.lang == 'hk') {
 
+        ppturl = 'https://ppt.cocorobo.hk'
 
+      } else {
 
+        ppturl = 'https://ppt.cocorobo.cn'
 
+      }
 
+      this.pptIframeUrl = `${ppturl}/?mode=editor2&courseid=${this.cid}`;
 
+    },
 
   },
 
   beforeDestroy() {
 
 
@@ -3092,6 +3103,7 @@ export default {
 
     if (this.mergedList.includes(this.org)) {
 
       this.isTeacherSee = true
 
     }
 
+    this.setPptIframeUrl();
 
     // 清空
 
     this.pptCourseJson.toolsList = [];
 
     this.setPPtToolList()

+ 37 - 25
src/components/pages/pptEasy/addCourse3.vue
Datei anzeigen 

@@ -778,7 +778,7 @@
 
             <div v-if="!editingCourseName" @click="editingCourseName = true" class="course-name-text">
 
               {{ courseName || lang.ssUntitledCourse }}
 
             </div>
 
-            <el-input v-else v-model="courseName" @blur="editingCourseName = false"
 
+            <el-input v-else v-model="courseName" @blur="editingCourseName = false; handleUpdateTitle()"
 
               @keyup.enter="editingCourseName = false" class="course-name-input" autofocus></el-input>
 
           </div>
 
 
@@ -977,6 +977,7 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      pptIframeUrl: "",
 
       gotype: (window.topU && window.topU.gotype) ? window.topU.gotype : '',
 
       checkAll: false,
 
       userid: this.$route.query.userid,
 
@@ -1163,25 +1164,6 @@ export default {
 
     }
 
   },
 
   computed: {
 
-    // 判断当前页面URL是否包含beta
 
-    isBetaEnv() {
 
-      return window.location.href.includes('beta');
 
-    },
 
-    // 动态生成PPT iframe的URL
 
-    pptIframeUrl() {
 
-
 
-      let ppturl = "https://beta.ppt.cocorobo.cn"
 
-      if (this.isBetaEnv) {
 
-        ppturl = "https://beta.ppt.cocorobo.cn"
 
-      } else if (this.lang.lang == 'com') {
 
-        ppturl = 'https://ppt.cocorobo.com'
 
-      } else if (this.lang.lang == 'hk') {
 
-        ppturl = 'https://ppt.cocorobo.hk'
 
-      } else {
 
-        ppturl = 'https://ppt.cocorobo.cn'
 
-      }
 
-      return `${ppturl}/?mode=editor3&courseid=${this.cid}`;
 
-    },
 
     getListClassC() {
 
       return function (list) {
 
         let _c2 = [];
 
@@ -1350,7 +1332,7 @@ export default {
 
         visibility: this.isTeacherSee,
 
         aiAssistant: this.aiAssistant
 
       });
 
-      thisisTeacherSee
 
+      // this.TeacherSee
 
       // this.dialogVisiblePublish = false;
 
 
       // 仅保留已存在于 courseTypeId 中的非学科/年级项
 
@@ -1804,10 +1786,19 @@ export default {
 
         this.uploadWorkLoading = true;
 
       }
 
       let _pptData = await this.getPPtJson();
 
-
 
+      const _pptData2 = JSON.parse(JSON.stringify(_pptData))
 
+      if (_pptData2.slides) {
 
+        _pptData2.slides.forEach((slide) => {
 
+          if (slide.elements) {
 
+            slide.elements = slide.elements.filter((element) => element.type !== 'image')
 
+          }
 
+        })
 
+      }
 
       // 用_pptData生成json文件，并生成File对象
 
       const pptJsonStr = JSON.stringify(_pptData, null, 2);
 
+      const pptJsonStr2 = JSON.stringify(_pptData2, null, 2);
 
       const pptJsonFile = new File([pptJsonStr], this.courseName + ".json", { type: "application/json" });
 
+      const pptJsonFile2 = new File([pptJsonStr2], this.courseName + ".json", { type: "application/json" });
 
       // 你可以根据需要将pptJsonFile上传或保存
 
 
       let _url = await this.uploadFile(pptJsonFile);
 
@@ -1874,7 +1865,7 @@ export default {
 
             this.copyCourse(this.cid);
 
           }
 
           this.loadgetCourseDetail();
 
-          this.uploadFile2(pptJsonFile, this.courseId);
 
+          this.uploadFile2(pptJsonFile2, this.courseId);
 
           this.addOp3(
 
             "1",
 
             "",
 
@@ -1910,12 +1901,14 @@ export default {
 
         })
 
       }
 
       // 用_pptData生成json文件，并生成File对象
 
-      const pptJsonStr = JSON.stringify(_pptData2, null, 2);
 
+      const pptJsonStr = JSON.stringify(_pptData, null, 2);
 
+      const pptJsonStr2 = JSON.stringify(_pptData2, null, 2);
 
       const pptJsonFile = new File([pptJsonStr], this.courseName + ".json", { type: "application/json" });
 
+      const pptJsonFile2 = new File([pptJsonStr2], this.courseName + ".json", { type: "application/json" });
 
       // 你可以根据需要将pptJsonFile上传或保存
 
       console.log(_url)
 
       let _url = await this.uploadFile(pptJsonFile);
 
-      this.uploadFile2(pptJsonFile, this.cid);
 
+      this.uploadFile2(pptJsonFile2, this.cid);
 
 
       this.pptCourseJson.pptData = _url;
 
 
@@ -3293,6 +3286,24 @@ export default {
 
       this.dialogVisible7 = false;
 
 
     },
 
+    // 判断当前页面URL是否包含beta
 
+    isBetaEnv() {
 
+      return window.location.href.includes('beta');
 
+    },
 
+    // 动态生成PPT iframe的URL
 
+    setPptIframeUrl() {
 
+      let ppturl = "https://beta.ppt.cocorobo.cn"
 
+      if (this.isBetaEnv) {
 
+        ppturl = "https://beta.ppt.cocorobo.cn"
 
+      } else if (this.lang.lang == 'com') {
 
+        ppturl = 'https://ppt.cocorobo.com'
 
+      } else if (this.lang.lang == 'hk') {
 
+        ppturl = 'https://ppt.cocorobo.hk'
 
+      } else {
 
+        ppturl = 'https://ppt.cocorobo.cn'
 
+      }
 
+      this.pptIframeUrl = `${ppturl}/?mode=editor3&courseid=${this.cid}`;
 
+    },
 
   },
 
   beforeDestroy() {
 
 
@@ -3314,6 +3325,7 @@ export default {
 
     // 清空
 
     this.pptCourseJson.toolsList = [];
 
     this.setPPtToolList()
 
+    this.setPptIframeUrl();
 
     // iframe页面加载完成
 
     this.$refs.pptIframeRef.onload = () => {
 
       console.log("iframe页面加载完成");

+ 1 - 1
src/components/pages/studentManageNew/component/editInterstcla.vue
Datei anzeigen 

@@ -80,7 +80,7 @@ export default {
 
         oid: this.oid,
 
       };
 
       this.ajax
 
-        .get(this.$store.state.api + "updateClass", params)
 
+        .get(this.$store.state.api + "updateClassNew", params)
 
         .then((res) => {
 
           if (res.data[0] && res.data[0][0].classname == 1) {
 
             this.$message({

+ 1 - 1
src/components/pages/studentManageNew/component/table.vue
Datei anzeigen 

@@ -1777,7 +1777,7 @@ export default {
 
         oid: this.oid
 
       };
 
       this.ajax
 
-        .get(this.$store.state.api + "updateClass", params)
 
+        .get(this.$store.state.api + "updateClassNew", params)
 
         .then(res => {
 
           if (res.data[0] && res.data[0][0].classname == 1) {
 
             this.$message({

+ 2 - 1
src/components/pages/workPage/components/choiceQuestion.vue
Datei anzeigen 

@@ -13,7 +13,8 @@
 
     <img class="cq_image" v-if="work.testJson[showIndex] && work.testJson[showIndex].timuList && work.testJson[showIndex].timuList.length>0" :src="work.testJson[showIndex].timuList[0].src" @click="$hevueImgPreview(work.testJson[showIndex].timuList[0].src)">
 
 
     <div class="cq_type" v-if="work.testJson[showIndex]">
 
-      {{ work.testJson[showIndex].type == '1' ? lang.SingleChoice : lang.MultipleChoice }}
 
+      {{lang.ssChoice}}
 
+      <!-- {{ work.testJson[showIndex].type == '1' ? lang.SingleChoice : lang.MultipleChoice }} -->
 
       <!-- <span v-if="work.testJson.length>1">（{{showIndex+1}}/{{work.testJson.length}}）</span> -->
 
 
     </div>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.