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

Merge branch 'beta' into HK

lsc vor 1 Jahr
Ursprung
4505182ebf 1a0a9631bc
Commit
401afb7490
12 geänderte Dateien mit 46 neuen und 19243 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 8 0
      dist/index.html
  2. 0 0
      dist/static/js/manifest.0ad6c5648a38a6d1fa8f.js.map
  3. 0 0
      dist/static/js/vendor.d5f0d79dbb0d92c052d4.js
  4. 0 0
      dist/static/js/vendor.d5f0d79dbb0d92c052d4.js.map
  5. 1 19236
      package-lock.json
  6. 1 1
      src/components/pages/aiAddCourse/addCourse.vue
  7. 6 1
      src/components/pages/easy/addCourse.vue
  8. 6 1
      src/components/pages/newCourse/addCourse.vue
  9. 6 1
      src/components/pages/student/addCourse.vue
  10. 6 1
      src/components/pages/synergyCourse/addCourse.vue
  11. 6 1
      src/components/pages/task/addCourse.vue
  12. 6 1
      src/components/pages/trainCourse/addCourse.vue

+ 8 - 0
dist/index.html
Datei anzeigen 

@@ -32,7 +32,15 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.0149c828b06aa7ec3c1401aa9f6ee726.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.0ad6c5648a38a6d1fa8f.js></script><script type=text/javascript src=./static/js/vendor.d5f0d79dbb0d92c052d4.js></script><script type=text/javascript src=./static/js/app.180733f50508364505bc.js></script></body></html><script>function stopSafari() {
 
+=======
 
+<<<<<<< HEAD
 
+    }</style><link href=./static/css/app.ae42e894bd9dc960fd7c14c14b183ff2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.b8ca4864f3f84bfe39d6.js></script><script type=text/javascript src=./static/js/app.944e1e997768903315b3.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.ac9cc624e725fbc8a3aec71c48baf3d0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.d5f0d79dbb0d92c052d4.js></script><script type=text/javascript src=./static/js/app.1a546da32a74eafae154.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> f17e7ca1fc7f442e78e18c9d5d85fe68297996c2
 
+>>>>>>> beta
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 19236
package-lock.json


+ 1 - 1
src/components/pages/aiAddCourse/addCourse.vue
Datei anzeigen 

@@ -5549,7 +5549,7 @@ export default {
 
       imageloading2: false,
 
       searchImageValue: "",
 
       ppage: 1,
 
-      toolsData: toolsData,
 
+      toolsData: converter(toolsData),
 
       oldIndex: 0,
 
       dragType: "",
 
       oldUnitIndex: 0,

+ 6 - 1
src/components/pages/easy/addCourse.vue
Datei anzeigen 

@@ -4658,6 +4658,11 @@ import sourceDialog from "../teacherSource/dialog.vue";
 
 import interVideo from "../interVideo/index.vue";
 
 import englishRight from "./commpont/englishRight.vue";
 
 import EnglishVoice from '../EnglishVoice/index.vue'
 
+var OpenCC = require("opencc-js");
 
+let converter = OpenCC.Converter({
 
+		from:'hk',
 
+		to:'cn'
 
+})
 
 
 export default {
 
   components: {
 
@@ -4894,7 +4899,7 @@ export default {
 
       ppage: 1,
 
       imageList: [],
 
       heightPx: '100%',
 
-      toolsData: toolsData,
 
+      toolsData: converter(toolsData),
 
       oldIndex: 0,
 
       oldData: null,
 
       newIndex: "",

+ 6 - 1
src/components/pages/newCourse/addCourse.vue
Datei anzeigen 

@@ -7375,6 +7375,11 @@ import interVideo from "../interVideo/index.vue";
 
 import englishRight from "../components/englishRight.vue";
 
 import evaBox from "../evaBox/index.vue";
 
 import EnglishVoice from "../EnglishVoice/index.vue";
 
+var OpenCC = require("opencc-js");
 
+let converter = OpenCC.Converter({
 
+		from:'hk',
 
+		to:'cn'
 
+})
 
 
 export default {
 
   components: {
 
@@ -7625,7 +7630,7 @@ export default {
 
       imageloading: false,
 
       searchImageValue: "",
 
       ppage: 1,
 
-      toolsData: toolsData,
 
+      toolsData: converter(toolsData),
 
       oldIndex: 0,
 
       dragType: "",
 
       oldUnitIndex: 0,

+ 6 - 1
src/components/pages/student/addCourse.vue
Datei anzeigen 

@@ -2387,6 +2387,11 @@ import * as imageConversion from "image-conversion";
 
 import courseDetailVue from "../courseDetail.vue";
 
 import sourceDialog from "../teacherSource/dialog.vue";
 
 import { tools as toolsData } from "../../../common/tools.js";
 
+var OpenCC = require("opencc-js");
 
+let converter = OpenCC.Converter({
 
+		from:'hk',
 
+		to:'cn'
 
+})
 
 
 export default {
 
   components: {
 
@@ -2701,7 +2706,7 @@ export default {
 
       newIndex: "",
 
       checkUnitIndex: 0,
 
       isdrag: '',
 
-      toolsData: toolsData,
 
+      toolsData: converter(toolsData),
 
     };
 
   },
 
   directives: {

+ 6 - 1
src/components/pages/synergyCourse/addCourse.vue
Datei anzeigen 

@@ -2706,6 +2706,11 @@ import weilaiData from "../components/weilai.js";
 
 import sourceDialog from "../teacherSource/dialog.vue";
 
 import interVideo from "../interVideo/index.vue";
 
 import groupBox from "./group/group.vue"
 
+var OpenCC = require("opencc-js");
 
+let converter = OpenCC.Converter({
 
+		from:'hk',
 
+		to:'cn'
 
+})
 
 
 export default {
 
   components: {
 
@@ -2940,7 +2945,7 @@ export default {
 
       ppage: 1,
 
       imageList: [],
 
       heightPx: '100%',
 
-      toolsData: toolsData,
 
+      toolsData: converter(toolsData),
 
       pageSize: 20,
 
       total: 0,
 
       page: 0,

+ 6 - 1
src/components/pages/task/addCourse.vue
Datei anzeigen 

@@ -8226,6 +8226,11 @@ import weilaiData from "../components/weilai.js";
 
 import sourceDialog from "../teacherSource/dialog.vue";
 
 import interVideo from "../interVideo/index.vue";
 
 import englishRight from "./commpont/englishRight.vue";
 
+var OpenCC = require("opencc-js");
 
+let converter = OpenCC.Converter({
 
+		from:'hk',
 
+		to:'cn'
 
+})
 
 
 export default {
 
   components: {
 
@@ -8460,7 +8465,7 @@ export default {
 
       ppage: 1,
 
       imageList: [],
 
       heightPx: "100%",
 
-      toolsData: toolsData,
 
+      toolsData: converter(toolsData),
 
       oldIndex: 0,
 
       oldData: null,
 
       newIndex: "",

+ 6 - 1
src/components/pages/trainCourse/addCourse.vue
Datei anzeigen 

@@ -3911,6 +3911,11 @@ import weilaiData from "../components/weilai.js";
 
 import sourceDialog from "../teacherSource/dialog.vue";
 
 import interVideo from "../interVideo/index.vue";
 
 import englishRight from "../components/englishRight.vue";
 
+var OpenCC = require("opencc-js");
 
+let converter = OpenCC.Converter({
 
+		from:'hk',
 
+		to:'cn'
 
+})
 
 
 export default {
 
   components: {
 
@@ -4152,7 +4157,7 @@ export default {
 
       imageloading: false,
 
       searchImageValue: "",
 
       ppage: 1,
 
-      toolsData: toolsData,
 
+      toolsData: converter(toolsData),
 
       oldIndex: 0,
 
       dragType:'',
 
       oldUnitIndex: 0,

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