11wqe1 2 mēneši atpakaļ
vecāks
revīzija
24e80c1f50

+ 1 - 1
src/components/components/choseWorksDetailDialog.vue

@@ -266,7 +266,7 @@
                   </div>
                 </div>
                 <div v-if="[7,1,3].includes(toolType)" class="s_b_m_b_i_m_evaluation">
-                  {{ testData }}
+                  <!-- {{ testData }} -->
                   <!-- <img src="" alt=""> -->
                     <!-- <div class="cont" v-if="testData && testData.tableJson && testData.tableJson.text" v-html="testData.tableJson.text"></div>                 -->
                 </div>

+ 14 - 4
src/components/easy2/studyStudent.vue

@@ -24805,10 +24805,14 @@ export default {
 						if(this.$refs.statisticalAnalysisRef.show){
 							this.$refs.statisticalAnalysisRef.close();
 						}
-          } else if (behavior.code === 0) {
+          }
+           if (behavior.code === 0) {
             //开启内容列表弹窗
             this.checkFileFull1(behavior.form.t, behavior.form.f);
-          } else if (behavior.code === 1) {
+            }else{
+              this.fullDialogVisible = false;         
+            }
+           if (behavior.code === 1) {
             //关于选择题的作业详细的操作
             // toolIndex:toolIndex,courseType:this.courseType,taskCount:this.taskCount,type:0
             if(this.courseType!==behavior.form.courseType || this.taskCount!==behavior.form.taskCount){
@@ -24823,7 +24827,10 @@ export default {
 								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,lookWorks:behavior.form.lookWorks})
               }
             });
-          }else if(behavior.code === 2){
+          }else{
+            this.$refs.choseWorksDetailDialogRef.close()
+          }
+           if(behavior.code === 2){
 						if(this.$refs.statisticalAnalysisRef.show){
 							this.$refs.statisticalAnalysisRef.splitScreenFn({type:behavior.form.type})
 						}else{
@@ -24833,7 +24840,9 @@ export default {
       				  toolIndex: behavior.form.toolIndex
       				});
 						}
-					}
+					}else{
+            this.$refs.statisticalAnalysisRef.close();
+          }
           if(behavior.form.taskCount!=="" && behavior.form.courseType !==""){
             if(this.courseType !=behavior.form.courseType){
               this.courseType = behavior.form.courseType;
@@ -24854,6 +24863,7 @@ export default {
             if(behavior.form.navId){
               this.navId = behavior.form.navId
             }
+            this.getCourseDetail()
 
             this.setContent2(false)
           }

+ 15 - 5
src/components/easy3/studyStudent.vue

@@ -20431,17 +20431,21 @@ export default {
         if (behavior) {
           if (behavior.code === 99) {
             //初始化
-            this.fullDialogVisible = false;
+            this.fullDialogVisible = false;             
 						if(this.$refs.choseWorksDetailDialogRef.show){
 							this.$refs.choseWorksDetailDialogRef.close();
 						}
 						if(this.$refs.statisticalAnalysisRef.show){
 							this.$refs.statisticalAnalysisRef.close();
 						}
-          } else if (behavior.code === 0) {
+          }
+           if (behavior.code === 0) {
             //开启内容列表弹窗
             this.checkFileFull1(behavior.form.t, behavior.form.f);
-          } else if (behavior.code === 1) {
+            }else{
+              this.fullDialogVisible = false;         
+            }
+           if (behavior.code === 1) {
             //关于选择题的作业详细的操作
             // toolIndex:toolIndex,courseType:this.courseType,taskCount:this.taskCount,type:0
             if(this.courseType!==behavior.form.courseType || this.taskCount!==behavior.form.taskCount){
@@ -20456,7 +20460,10 @@ export default {
 								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,lookWorks:behavior.form.lookWorks})
               }
             });
-          }else if(behavior.code === 2){
+          }else{
+            this.$refs.choseWorksDetailDialogRef.close()
+          }
+           if(behavior.code === 2){
 						if(this.$refs.statisticalAnalysisRef.show){
 							this.$refs.statisticalAnalysisRef.splitScreenFn({type:behavior.form.type})
 						}else{
@@ -20466,7 +20473,9 @@ export default {
       				  toolIndex: behavior.form.toolIndex
       				});
 						}
-					}
+					}else{
+            this.$refs.statisticalAnalysisRef.close();
+          }
           if(behavior.form.taskCount!=="" && behavior.form.courseType !==""){
             if(this.courseType !=behavior.form.courseType){
               this.courseType = behavior.form.courseType;
@@ -20487,6 +20496,7 @@ export default {
             if(behavior.form.navId){
               this.navId = behavior.form.navId
             }
+            this.getCourseDetail()
 
             this.setContent2(false)
           }

+ 18 - 11
src/components/studyStudent.vue

@@ -16640,9 +16640,7 @@ export default {
               });
               this.fileC[i] = c.filter((el) => {
                 return el.type == 12;
-              });
-              console.log('this.fileC[i]',this.fileC[i]);
-              
+              });              
               if (this.tType == 2) {
                 if (this.fileC[i].length) {
                   let yym1 =  this.fileC[i].filter(e=>{
@@ -16779,7 +16777,6 @@ export default {
               this.isClickNav = "";
               this.showType = "";
             }
-            console.log('_chapterData',_chapterData);
 
             if (this.tType == 2) {
               _chapterData.forEach((e,i)=>{
@@ -16847,7 +16844,6 @@ export default {
               this.fileC[i] = c.filter((el) => {
                 return el.type == 12;
               });
-              console.log('this.fileC[i]',this.fileC[i]);
 
               if (this.tType == 2) {
                 if (this.fileC[i].length) {
@@ -20416,7 +20412,7 @@ export default {
           console.log("获取分屏数出错:", e);
         });
     },
-		doSplitScreenBehavior() {
+    doSplitScreenBehavior() {
       if (
         this.splitScreenData.isOpen &&
         this.splitScreenData.uid != this.splitScreenData.myUid
@@ -20425,17 +20421,21 @@ export default {
         if (behavior) {
           if (behavior.code === 99) {
             //初始化
-            this.fullDialogVisible = false;
+            this.fullDialogVisible = false;             
 						if(this.$refs.choseWorksDetailDialogRef.show){
 							this.$refs.choseWorksDetailDialogRef.close();
 						}
 						if(this.$refs.statisticalAnalysisRef.show){
 							this.$refs.statisticalAnalysisRef.close();
 						}
-          } else if (behavior.code === 0) {
+          }
+           if (behavior.code === 0) {
             //开启内容列表弹窗
             this.checkFileFull1(behavior.form.t, behavior.form.f);
-          } else if (behavior.code === 1) {
+            }else{
+              this.fullDialogVisible = false;         
+            }
+           if (behavior.code === 1) {
             //关于选择题的作业详细的操作
             // toolIndex:toolIndex,courseType:this.courseType,taskCount:this.taskCount,type:0
             if(this.courseType!==behavior.form.courseType || this.taskCount!==behavior.form.taskCount){
@@ -20450,7 +20450,10 @@ export default {
 								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,lookWorks:behavior.form.lookWorks})
               }
             });
-          }else if(behavior.code === 2){
+          }else{
+            this.$refs.choseWorksDetailDialogRef.close()
+          }
+           if(behavior.code === 2){
 						if(this.$refs.statisticalAnalysisRef.show){
 							this.$refs.statisticalAnalysisRef.splitScreenFn({type:behavior.form.type})
 						}else{
@@ -20460,7 +20463,9 @@ export default {
       				  toolIndex: behavior.form.toolIndex
       				});
 						}
-					}
+					}else{
+            this.$refs.statisticalAnalysisRef.close();
+          }
           if(behavior.form.taskCount!=="" && behavior.form.courseType !==""){
             if(this.courseType !=behavior.form.courseType){
               this.courseType = behavior.form.courseType;
@@ -20482,6 +20487,8 @@ export default {
               this.navId = behavior.form.navId
             }
 
+            this.getCourseDetail()
+
             this.setContent2(false)
           }
         } else {

+ 38 - 5
src/components/studySutdentClass/studyStudent.vue

@@ -24168,17 +24168,21 @@ export default {
         if (behavior) {
           if (behavior.code === 99) {
             //初始化
-            this.fullDialogVisible = false;
+            this.fullDialogVisible = false;             
 						if(this.$refs.choseWorksDetailDialogRef.show){
 							this.$refs.choseWorksDetailDialogRef.close();
 						}
 						if(this.$refs.statisticalAnalysisRef.show){
 							this.$refs.statisticalAnalysisRef.close();
 						}
-          } else if (behavior.code === 0) {
+          }
+           if (behavior.code === 0) {
             //开启内容列表弹窗
             this.checkFileFull1(behavior.form.t, behavior.form.f);
-          } else if (behavior.code === 1) {
+            }else{
+              this.fullDialogVisible = false;         
+            }
+           if (behavior.code === 1) {
             //关于选择题的作业详细的操作
             // toolIndex:toolIndex,courseType:this.courseType,taskCount:this.taskCount,type:0
             if(this.courseType!==behavior.form.courseType || this.taskCount!==behavior.form.taskCount){
@@ -24193,7 +24197,10 @@ export default {
 								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,lookWorks:behavior.form.lookWorks})
               }
             });
-          }else if(behavior.code === 2){
+          }else{
+            this.$refs.choseWorksDetailDialogRef.close()
+          }
+           if(behavior.code === 2){
 						if(this.$refs.statisticalAnalysisRef.show){
 							this.$refs.statisticalAnalysisRef.splitScreenFn({type:behavior.form.type})
 						}else{
@@ -24203,7 +24210,33 @@ export default {
       				  toolIndex: behavior.form.toolIndex
       				});
 						}
-					}
+					}else{
+            this.$refs.statisticalAnalysisRef.close();
+          }
+          if(behavior.form.taskCount!=="" && behavior.form.courseType !==""){
+            if(this.courseType !=behavior.form.courseType){
+              this.courseType = behavior.form.courseType;
+            }
+            if(this.taskCount !=behavior.form.taskCount){
+              this.taskCount = behavior.form.taskCount;
+            }
+
+              var a = document.scrollingElement;
+                let target = document.querySelector(`#gj${behavior.form.toolType}`);
+                if (target) {
+                  target.scrollIntoView(true);
+                  setTimeout(() => {
+                    a.scrollTop = 0
+                  }, 0);
+                }
+
+            if(behavior.form.navId){
+              this.navId = behavior.form.navId
+            }
+            this.getCourseDetail()
+
+            this.setContent2(false)
+          }
         } else {
         }
       }