首页 发现 帮助
登录
CocoRoboLabs
/
pbl-teacher-table
3
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

update

lsc 1 年之前
父节点
f7a098112d
当前提交
164e974bb3
共有 15 个文件被更改，包括 105 次插入 和 26 次删除
分列视图 显示文件统计
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.307ff4d5c368c94b27a72be87657ba29.css
  3. 0 0
      dist/static/css/app.307ff4d5c368c94b27a72be87657ba29.css.map
  4. 0 0
      dist/static/css/app.8cb575f9932e2bdc9973dd3379da3fe1.css.map
  5. 0 0
      dist/static/js/app.40828cd02991e1d54cf5.js
  6. 0 0
      dist/static/js/app.40828cd02991e1d54cf5.js.map
  7. 0 0
      dist/static/js/app.4372b06e4a82152c2175.js
  8. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  9. 10 0
      src/assets/css/button.css
  10. 二进制
      src/assets/icon/new/course_icon_tool.png
  11. 23 7
      src/components/pages/addCourse.vue
  12. 6 3
      src/components/pages/easy/addCourse.vue
  13. 53 9
      src/components/pages/synergyCourse/course.vue
  14. 6 3
      src/components/pages/synergyCourse/group/group.vue
  15. 6 3
      src/components/pages/task/addCourse.vue

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

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.8cb575f9932e2bdc9973dd3379da3fe1.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.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.4372b06e4a82152c2175.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.307ff4d5c368c94b27a72be87657ba29.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.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.40828cd02991e1d54cf5.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.307ff4d5c368c94b27a72be87657ba29.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.307ff4d5c368c94b27a72be87657ba29.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.8cb575f9932e2bdc9973dd3379da3fe1.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.40828cd02991e1d54cf5.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.40828cd02991e1d54cf5.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.4372b06e4a82152c2175.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 10 - 0
src/assets/css/button.css
查看文件 

@@ -118,6 +118,8 @@
 
 }
 
 
 .pub_btn_add_img2::before,
 
+.pub_btn_eval_img::before,
 
+.pub_btn_tool_img::before,
 
 .pub_btn_add_task_img::before,
 
 .pub_btn_finish_img::before,
 
 .pub_btn_last_img::before,
 
@@ -177,6 +179,14 @@
 
   background-image: url(../icon/new/icon_addTask.png);
 
 }
 
 
+.pub_btn_tool_img::before {
 
+  background-image: url(../icon/new/course_icon_tool.png);
 
+}
 
+
 
+.pub_btn_eval_img::before {
 
+  background-image: url(../icon/new/icon_setting.png);
 
+}
 
+
 
 .r_pub_button_retrun {
 
   color: #0061FF;
 
   font-size: 14px;

二进制
src/assets/icon/new/course_icon_tool.png
查看文件


+ 23 - 7
src/components/pages/addCourse.vue
查看文件 

@@ -730,7 +730,7 @@
 
                               itemTask.chapterData.length == 0
 
                               "><img src="../../assets/icon/new/c_none.png" alt /><span>请添加学习内容</span></div>
 
                             <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
-                              <div @dragstart="dragStart(item1, index1, index)" @dragover.prevent="dragOver(index1)"
 
+                              <div @dragstart="dragStart(item1, index1, itemTaskIndex)" @dragover.prevent="dragOver(index1)"
 
                                 @dragend="dragEnd()" draggable class="chapter_upload"
 
                                 v-for="(item1, index1) in itemTask.chapterData" :key="item1.id" @click="
 
                                   getChapterData(
 
@@ -2123,12 +2123,15 @@
 
                                   v-model="itemTool.toolDetail"></textarea>
 
                               </div>
 
                             </div>
 
-                            <div class="addToolFun2" @click="addToolFun(itemTaskIndex)">
 
+                            <!-- <div class="addToolFun2" @click="addToolFun(itemTaskIndex)">
 
                               <div class="addToolImg">
 
                                 <img src="../../assets/icon/add.png" alt />
 
                               </div>
 
                               <div>添加工具</div>
 
-                            </div>
 
+                            </div> -->
 
+                            <button class="c_pub_button_add pub_btn_tool_img" @click="addToolFun(itemTaskIndex)" style="margin: 0 auto 0">
 
+                              添加工具
 
+                            </button>
 
                           </div>
 
                         </div>
 
                         <div v-else-if="unitJson[unitIndex].easy == 2 ||
 
@@ -2305,12 +2308,15 @@
 
                                 </div>
 
                               </div>
 
                             </div>
 
-                            <div class="addToolFun" style="margin-bottom: 20px" @click="addToolFun(itemTaskIndex)">
 
+                            <!-- <div class="addToolFun" style="margin-bottom: 20px" @click="addToolFun(itemTaskIndex)">
 
                               <div class="addToolImg">
 
                                 <img src="../../assets/icon/add.png" alt />
 
                               </div>
 
                               <div>添加工具</div>
 
-                            </div>
 
+                            </div> -->
 
+                            <button class="c_pub_button_add pub_btn_tool_img" @click="addToolFun(itemTaskIndex)" style="margin: 35px auto 20px">
 
+                              添加工具
 
+                            </button>
 
                           </div>
 
                         </div>
 
                         <div v-else-if="unitJson[unitIndex].easy == 1 ||
 
@@ -2383,13 +2389,16 @@
 
                                   </div>
 
                                 </div>
 
                               </div>
 
-                              <div class="addToolFun" @click="addEList(unitIndex, itemTaskIndex)"
 
+                              <!-- <div class="addToolFun" @click="addEList(unitIndex, itemTaskIndex)"
 
                                 style="margin: 35px 35px 0 0">
 
                                 <div class="addToolImg">
 
                                   <img src="../../assets/icon/add.png" alt />
 
                                 </div>
 
                                 <div>添加</div>
 
-                              </div>
 
+                              </div> -->
 
+                              <button class="c_pub_button_add pub_btn_eval_img" @click="addEList(unitIndex, itemTaskIndex)" style="margin: 20px 35px 0 0">
 
+                                  添加
 
+                              </button>
 
                             </div>
 
                             <div v-if="evalua" style="
 
                           border: 1px solid #e5e5e5;
 
@@ -8315,6 +8324,9 @@ export default {
 
       this.selectEva();
 
       if (this.evalua != id && type == 2) {
 
         this.$message.success("导入成功");
 
+        setTimeout(() => {
 
+          this.checkEva(id)
 
+        }, 100);
 
       }
 
       this.evalua = id;
 
       this.checkId = id;
 
@@ -9033,6 +9045,8 @@ export default {
 
       }
 
     },
 
     dragStart(val, i, j) {
 
+      console.log(this.taskCount);
 
+
 
       this.taskCount = j
 
       this.oldIndex = i;
 
       this.oldData = val;
 
@@ -9041,6 +9055,8 @@ export default {
 
       this.newIndex = i;
 
     },
 
     dragEnd() {
 
+      console.log(this.taskCount);
 
+
 
       let newItems = [...this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].chapterData];
 
       // 删除老的节点
 
       newItems.splice(this.oldIndex, 1);

+ 6 - 3
src/components/pages/easy/addCourse.vue
查看文件 

@@ -255,7 +255,7 @@
 
                             item.taskJson[0].chapterData.length == 0
 
                             "><img src="../../../assets/icon/new/c_none.png" alt /><span>请添加学习内容</span></div>
 
                           <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
-                            <div @dragstart="dragStart(item1, index1, index)" @dragover.prevent="dragOver(index1)"
 
+                            <div @dragstart="dragStart(item1, index1, 0)" @dragover.prevent="dragOver(index1)"
 
                               @dragend="dragEnd()" draggable class="chapter_upload" v-for="(item1, index1) in item.taskJson[0]
 
                                 .chapterData" :key="item1.id" @click="
 
     getChapterData(
 
@@ -1639,12 +1639,15 @@
 
                                 " v-model="itemTool.toolDetail"></textarea>
 
                             </div>
 
                           </div>
 
-                          <div class="addToolFun2" @click="addToolFun(itemTaskIndex)">
 
+                          <!-- <div class="addToolFun2" @click="addToolFun(itemTaskIndex)">
 
                             <div class="addToolImg">
 
                               <img src="../../../assets/icon/add.png" alt />
 
                             </div>
 
                             <div>添加工具</div>
 
-                          </div>
 
+                          </div> -->
 
+                          <button class="c_pub_button_add pub_btn_tool_img" @click="addToolFun(itemTaskIndex)" style="margin: 0 auto 0">
 
+                            添加工具
 
+                          </button>
 
                         </div>
 
                       </div>
 
                     </div>

+ 53 - 9
src/components/pages/synergyCourse/course.vue
查看文件 

@@ -510,14 +510,57 @@ export default {
 
         return "";
 
       }
 
     },
 
-    open(cid){
 
-      window.parent.postMessage(
 
-        { 
-          tools: "opencCscl",
 
-          cid: cid,
 
-        }, 
-        "*"
 
-      );
 
+    open(cid) {
 
+      let params = {
 
+        cid: cid,
 
+        classid: '1',
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCourseGroup", params)
 
+        .then((res) => {
 
+          if (res.data && res.data[1].length) {
 
+            let groupPerson = res.data[1]
 
+            let groupCid = ''
 
+            for(var i = 0; i <groupPerson.length;i++){
 
+              if(groupPerson[i].userid == this.userid){
 
+                groupCid = groupPerson[i].groupCid
 
+                break;
 
+              }
 
+            }
 
+            if(groupCid){
 
+              window.parent.postMessage(
 
+                { 
+                  tools: "opencCscl",
 
+                  cid: cid,
 
+                  gid: groupCid,
 
+                }, 
+                "*"
 
+              );
 
+            } else {
 
+              window.parent.postMessage(
 
+                { 
+                  tools: "opencCscl",
 
+                  cid: cid,
 
+                  gid: '',
 
+                }, 
+                "*"
 
+              );
 
+            }
 
+          } else {
 
+            window.parent.postMessage(
 
+              { 
+                tools: "opencCscl",
 
+                cid: cid,
 
+                gid: '',
 
+              }, 
+              "*"
 
+            );
 
+          }
 
+        })
 
+        .catch((err) => {
 
+          this.$message.error("网络不佳");
 
+          console.error(err);
 
+        });
 
     },
 
     jump(cid) {
 
       // window.open(
 
@@ -1891,4 +1934,5 @@ export default {
 
 
 .buttonBox>div:hover {
 
   background: #f6f8ff;
 
-}</style>
 
+}
 
+</style>

+ 6 - 3
src/components/pages/synergyCourse/group/group.vue
查看文件 

@@ -162,7 +162,7 @@
 
                                         移除组员
 
                                     </div>
 
                                     <div @click="selectGroup(g.id)"
 
-                                        v-else-if="groupStudentUid && groupStudentUid[g.id].indexOf(userid) == -1">
 
+                                        v-else-if="groupStudentUid && groupStudentUid[g.id].indexOf(userid) == -1 && courseDetail.userid !== userid">
 
                                         加入分组
 
                                     </div>
 
                                     <div @click="
 
@@ -486,8 +486,11 @@ export default {
 
             if (_user.indexOf(this.userid) == -1) {
 
                 _user.push(this.userid);
 
             }
 
-            if(_user.indexOf(this.courseDetail.userid) == -1){
 
-                _user.push(this.courseDetail.userid);
 
+            // if(_user.indexOf(this.courseDetail.userid) == -1){
 
+            //     _user.push(this.courseDetail.userid);
 
+            // }
 
+            if(_user.indexOf(this.courseDetail.userid) !== -1){
 
+                _user.splice(_user.indexOf(this.courseDetail.userid), 1);
 
             }
 
             let params = {
 
                 uid: _user.join(","),

+ 6 - 3
src/components/pages/task/addCourse.vue
查看文件 

@@ -313,7 +313,7 @@
 
                             itemTask.chapterData.length == 0
 
                             "><img src="../../../assets/icon/new/c_none.png" alt /><span>请添加学习内容</span></div>
 
                           <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
 
-                            <div @dragstart="dragStart(item1, index1, index)" @dragover.prevent="dragOver(index1)"
 
+                            <div @dragstart="dragStart(item1, index1, itemTaskIndex)" @dragover.prevent="dragOver(index1)"
 
                               @dragend="dragEnd()" draggable class="chapter_upload"
 
                               v-for="(item1, index1) in itemTask.chapterData" :key="item1.id" @click="
 
                                 getChapterData(
 
@@ -1982,12 +1982,15 @@
 
                                 " v-model="itemTool.toolDetail"></textarea>
 
                             </div>
 
                           </div>
 
-                          <div class="addToolFun2" @click="addToolFun(itemTaskIndex)">
 
+                          <!-- <div class="addToolFun2" @click="addToolFun(itemTaskIndex)">
 
                             <div class="addToolImg">
 
                               <img src="../../../assets/icon/add.png" alt />
 
                             </div>
 
                             <div>添加工具</div>
 
-                          </div>
 
+                          </div> -->
 
+                          <button class="c_pub_button_add pub_btn_tool_img" @click="addToolFun(itemTaskIndex)" style="margin: 0 auto 0">
 
+                            添加工具
 
+                          </button>
 
                         </div>
 
                       </div>
 
                     </div>

部分文件因为文件数量过多而无法显示