Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

zengyicheng 1 year ago
parent
5ec90312dd 5fed9282fa
commit
6bc0d96c79
14 changed files with 90 additions and 26 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.08e5b1df57d4490af5a15a7c6075924e.css
  3. 0 0
      dist/static/css/app.08e5b1df57d4490af5a15a7c6075924e.css.map
  4. 0 0
      dist/static/css/app.a92d1e47d67e76053f5dc510adb006d4.css.map
  5. 0 0
      dist/static/js/app.69b002b8c1478a87765b.js
  6. 0 0
      dist/static/js/app.69b002b8c1478a87765b.js.map
  7. 0 0
      dist/static/js/app.a424531df805e70dd514.js
  8. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  9. 12 1
      src/components/pages/addCourse.vue
  10. 1 0
      src/components/pages/course.vue
  11. 28 12
      src/components/pages/easy/addCourse.vue
  12. 1 0
      src/components/pages/scourse.vue
  13. 18 0
      src/components/pages/student/addCourse.vue
  14. 29 12
      src/components/pages/task/addCourse.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.a92d1e47d67e76053f5dc510adb006d4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.a424531df805e70dd514.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.08e5b1df57d4490af5a15a7c6075924e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.69b002b8c1478a87765b.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


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


+ 12 - 1
src/components/pages/addCourse.vue
View File 

@@ -2485,7 +2485,7 @@
 
                             <div class="tool">
 
                               <div
 
                                 class="whiteBIcon"
 
-                                @click="addTools(57, itemTaskIndex, toolIndex)"
 
+                                @click="openTools(itemTaskIndex, 57, toolIndex)"
 
                               >
 
                                 <img
 
                                   src="../../assets/icon/fourthToolList/cocopi.png"
 
@@ -7968,6 +7968,17 @@ export default {
 
           },
 
           "*"
 
         );
 
+      } else if (i == 57) {
 
+        window.parent.postMessage(
 
+          {
 
+            tools: "57y",
 
+            cid: this.cid,
 
+            stage: this.unitIndex,
 
+            task: itemTaskIndex,
 
+            tool: toolIndex,
 
+          },
 
+          "*"
 
+        );
 
       }
 
     },
 
     chapAddTools(i) {

+ 1 - 0
src/components/pages/course.vue
View File 

@@ -1172,6 +1172,7 @@ export default {
 
           } else {
 
             this.groupA = "0";
 
           }
 
+          this.$message.success("复制成功")
 
           this.clear();
 
         })
 
         .catch((err) => {

+ 28 - 12
src/components/pages/easy/addCourse.vue
View File 

@@ -267,7 +267,7 @@
 
             <div class="whiteBg" style="border-radius: 0; margin-top: 15px">
 
               <div class="right_title">
 
                 <span>上传课程内容</span>
 
-                <el-button type="primary" @click="pasteTask" size="small"
 
+                <el-button type="primary" @click="pasteTask" size="mini" style="margin-left:10px"
 
                   >智能粘贴</el-button
 
                 >
 
               </div>
 
@@ -1742,9 +1742,7 @@
 
                                 <div class="tool">
 
                                   <div
 
                                     class="whiteBIcon"
 
-                                    @click="
 
-                                      addTools(57, itemTaskIndex, toolIndex)
 
-                                    "
 
+                                    @click="openTools(itemTaskIndex, 57, toolIndex)"
 
                                   >
 
                                     <img
 
                                       src="../../../assets/icon/fourthToolList/cocopi.png"
 
@@ -4187,7 +4185,7 @@
 
                             <div class="tool">
 
                               <div
 
                                 class="whiteBIcon"
 
-                                @click="addTools(57, itemTaskIndex, toolIndex)"
 
+                                @click="openTools(itemTaskIndex, 57, toolIndex)"
 
                               >
 
                                 <img
 
                                   src="../../../assets/icon/fourthToolList/cocopi.png"
 
@@ -8716,12 +8714,12 @@ export default {
 
         .post(this.$store.state.api + "addWorkNew2T", params)
 
         .then((res) => {
 
           console.log(this.steps);
 
-          if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
 
+          // if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
 
             this.$message({
 
               message: "新增成功",
 
               type: "success",
 
             });
 
-          }
 
+          // }
 
           this.number = res.data.ordernumber;
 
           this.courseId = res.data.courseId;
 
           this.cid = res.data.courseId;
 
@@ -8862,7 +8860,7 @@ export default {
 
       this.ajax
 
         .post(this.$store.state.api + "updateWorkNew2", params)
 
         .then((res) => {
 
-          if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
 
+          // if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
 
             if (this.cidType == 1) {
 
               this.$message({
 
                 message: "修改成功",
 
@@ -8874,7 +8872,7 @@ export default {
 
                 type: "success",
 
               });
 
             }
 
-          }
 
+          // }
 
           this.number = this.nbOrder;
 
           this.courseId = this.cid;
 
           this.steps = 4;
 
@@ -9509,7 +9507,7 @@ export default {
 
       } else if (i == 3) {
 
         if (!this.cid) {
 
           this.$message.error(
 
-            "如果您需要在内容中添加模板，请在修改模式下进行添加。"
 
+            "极简模式添加时不能添加模板，请添加课程后在修改添加模板"
 
           );
 
           return;
 
         }
 
@@ -9526,7 +9524,7 @@ export default {
 
       } else if (i == 1) {
 
         if (!this.cid) {
 
           this.$message.error(
 
-            "如果您需要在内容中添加模板，请在修改模式下进行添加。"
 
+            "极简模式添加时不能添加模板，请添加课程后在修改添加模板"
 
           );
 
           return;
 
         }
 
@@ -9540,6 +9538,23 @@ export default {
 
           },
 
           "*"
 
         );
 
+      } else if (i == 57) {
 
+        if (!this.cid) {
 
+          this.$message.error(
 
+            "极简模式添加时不能添加模板，请添加课程后在修改添加模板"
 
+          );
 
+          return;
 
+        }
 
+        window.parent.postMessage(
 
+          {
 
+            tools: "57y",
 
+            cid: this.cid,
 
+            stage: this.unitIndex,
 
+            task: itemTaskIndex,
 
+            tool: toolIndex,
 
+          },
 
+          "*"
 
+        );
 
       }
 
     },
 
     chapAddTools(i) {
 
@@ -12034,7 +12049,8 @@ export default {
 
   color: #0f7eff;
 
   margin: 0 auto;
 
   display: flex;
 
-  justify-content: space-between;
 
+  /* justify-content: space-between; */
 
+  align-items: flex-end;
 
 }
 
 
 .people {

+ 1 - 0
src/components/pages/scourse.vue
View File 

@@ -673,6 +673,7 @@ export default {
 
           } else {
 
             this.groupA = "0";
 
           }
 
+          this.$message.success("复制成功")
 
           this.clear()
 
         })
 
         .catch((err) => {

+ 18 - 0
src/components/pages/student/addCourse.vue
View File 

@@ -7038,9 +7038,27 @@ export default {
 
         .get(this.$store.state.api + "getCourseTemplateTs", params)
 
         .then((res) => {
 
           this.templateArray = res.data[0];
 
+          this.getTemplateOrg();
 
+          this.$forceUpdate();
 
         })
 
         .catch((err) => {});
 
     },
 
+    getTemplateOrg() {
 
+      let params = {
 
+        oid: this.org,
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCourseTemplateTs", params)
 
+        .then((res) => {
 
+          if (res.data[0].length) {
 
+            let ta = res.data[0]
 
+            let newArr2 = this.templateArray.filter(x => !ta.some(y => y.id === x.id));
 
+            this.templateArray = [...newArr2, ...this.templateArray];
 
+          }
 
+          this.$forceUpdate();
 
+        })
 
+        .catch((err) => { });
 
+    },
 
     clearChoose() {
 
       this.clearArray.splice(this.templateC.id, 1);
 
       this.dialogVisible2 = false;

+ 29 - 12
src/components/pages/task/addCourse.vue
View File 

@@ -267,7 +267,7 @@
 
             <div class="whiteBg" style="border-radius: 0; margin-top: 15px">
 
               <div class="right_title">
 
                 <span>上传课程内容</span>
 
-                <el-button type="primary" @click="pasteTask" size="small"
 
+                <el-button type="primary" @click="pasteTask" size="mini" style="margin-left:10px"
 
                   >智能粘贴</el-button
 
                 >
 
               </div>
 
@@ -1765,9 +1765,7 @@
 
                                 <div class="tool">
 
                                   <div
 
                                     class="whiteBIcon"
 
-                                    @click="
 
-                                      addTools(57, itemTaskIndex, toolIndex)
 
-                                    "
 
+                                    @click="openTools(itemTaskIndex, 57, toolIndex)"
 
                                   >
 
                                     <img
 
                                       src="../../../assets/icon/fourthToolList/cocopi.png"
 
@@ -4198,7 +4196,7 @@
 
                             <div class="tool">
 
                               <div
 
                                 class="whiteBIcon"
 
-                                @click="addTools(57, itemTaskIndex, toolIndex)"
 
+                                @click="openTools(itemTaskIndex, 57, toolIndex)"
 
                               >
 
                                 <img
 
                                   src="../../../assets/icon/fourthToolList/cocopi.png"
 
@@ -8712,17 +8710,18 @@ export default {
 
         .post(this.$store.state.api + "addWorkNew2E", params)
 
         .then((res) => {
 
           console.log(this.steps);
 
-          if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
 
+          // if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
 
             this.$message({
 
               message: "新增成功",
 
               type: "success",
 
             });
 
-          }
 
+          // }
 
           this.number = res.data.ordernumber;
 
           this.courseId = res.data.courseId;
 
           this.cid = res.data.courseId;
 
           this.courseUserid = this.userid;
 
           this.islogin = true;
 
+          this.steps = 4;
 
         })
 
         .catch((err) => {
 
           this.$message.error("网络不佳");
 
@@ -8858,7 +8857,7 @@ export default {
 
       this.ajax
 
         .post(this.$store.state.api + "updateWorkNew2", params)
 
         .then((res) => {
 
-          if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
 
+          // if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
 
             if (this.cidType == 1) {
 
               this.$message({
 
                 message: "修改成功",
 
@@ -8870,7 +8869,7 @@ export default {
 
                 type: "success",
 
               });
 
             }
 
-          }
 
+          // }
 
           this.number = this.nbOrder;
 
           this.courseId = this.cid;
 
           this.steps = 4;
 
@@ -9505,7 +9504,7 @@ export default {
 
       } else if (i == 3) {
 
         if (!this.cid) {
 
           this.$message.error(
 
-            "如果您需要在内容中添加模板，请在修改模式下进行添加。"
 
+            "任务模式添加时不能添加模板，请添加课程后在修改添加模板"
 
           );
 
           return;
 
         }
 
@@ -9522,7 +9521,7 @@ export default {
 
       } else if (i == 1) {
 
         if (!this.cid) {
 
           this.$message.error(
 
-            "如果您需要在内容中添加模板，请在修改模式下进行添加。"
 
+            "任务模式添加时不能添加模板，请添加课程后在修改添加模板"
 
           );
 
           return;
 
         }
 
@@ -9536,6 +9535,23 @@ export default {
 
           },
 
           "*"
 
         );
 
+      } else if (i == 57) {
 
+        if (!this.cid) {
 
+          this.$message.error(
 
+            "任务模式添加时不能添加模板，请添加课程后在修改添加模板"
 
+          );
 
+          return;
 
+        }
 
+        window.parent.postMessage(
 
+          {
 
+            tools: "57y",
 
+            cid: this.cid,
 
+            stage: this.unitIndex,
 
+            task: itemTaskIndex,
 
+            tool: toolIndex,
 
+          },
 
+          "*"
 
+        );
 
       }
 
     },
 
     chapAddTools(i) {
 
@@ -12003,7 +12019,8 @@ export default {
 
   color: #0f7eff;
 
   margin: 0 auto;
 
   display: flex;
 
-  justify-content: space-between;
 
+  /* justify-content: space-between; */
 
+  align-items: flex-end;
 
 }
 
 
 .people {

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