#

src/components/components/choseWorksDetailDialog.vue

@@ -511,6 +511,7 @@ export default {
       data: null,
       testJson: null,
       testJsonCopy: null,
+      screenCopy:'',
       testData: null,
       toolIndex: null,
       worksStudent: [],
@@ -807,11 +808,11 @@ export default {
       this.dialogVisibleWordCloud = true
     },
     StudentWork(val){
-      console.log('val',val);
+      console.log('splitScreenFn',val);
 
       // console.log('val',JSON.parse(val));
       console.log('toolType',this.toolType);
-      // console.log('this.testData',this.testData);
+      console.log('this.worksStudent',this.worksStudent);
 
       
 
@@ -831,15 +832,16 @@ export default {
       console.log('this.testJson',JSON.parse(JSON.stringify(this.testJsonCopy)));
       
       this.showType = 0;
-			// this.$emit("changeSplitScreenBehavior",{code: 1,
-      //   form: {
-      //     toolIndex: this.toolIndex,
-      //     courseType: this.courseType,
-      //     taskCount: this.taskCount,
-      //     type: this.showType,
-			// 		showStatisticsType:this.showStatisticsType，
-			// 		lookWorks:val.id
-      //   }})
+			this.$emit("changeSplitScreenBehavior",{code: 1,
+        form: {
+          toolType:this.toolType,
+          toolIndex: this.toolIndex,
+          courseType: this.courseType,
+          taskCount: this.taskCount,
+          type: this.showType,
+					showStatisticsType:this.showStatisticsType,
+					lookWorks:val.wid
+        }})
     },
     setData() {      
       if (this.show && this.toolIndex !== null) {
@@ -887,6 +889,7 @@ export default {
       this.showType = type;
 			this.$emit("changeSplitScreenBehavior",{code: 1,
         form: {
+          toolType:this.toolType,
           toolIndex: this.toolIndex,
           courseType: this.courseType,
           taskCount: this.taskCount,
@@ -910,6 +913,7 @@ export default {
 			this.showStatisticsType = type;
 			this.$emit("changeSplitScreenBehavior",{code: 1,
         form: {
+          toolType:this.toolType,
           toolIndex: this.toolIndex,
           courseType: this.courseType,
           taskCount: this.taskCount,
@@ -927,8 +931,12 @@ export default {
 			if(data.toolType!==undefined){
 				this.toolType = data.toolType;
 			}
-			if(data.lookWorks!==undefined){
-				// this.StudentWork(item)
+
+			if(data.lookWorks !== undefined){
+        let work = this.worksStudent.find(e=>e.wid==data.lookWorks);
+        if(work){
+          this.StudentWork(work)
+        }     
 			}
 		}
   }

src/components/easy2/studyStudent.vue

@@ -13180,7 +13180,6 @@
       </div>
     </el-dialog>
     <el-dialog
-      title="查看文档"
       :visible.sync="fullDialogVisible"
       :append-to-body="true"
       width="100%"
@@ -13189,7 +13188,7 @@
       class="dialog_diy full_diy"
       :class="{ full_diy2: fulltype == 3 }"
     >
-      <div slot="title" class="header-title">
+      <div slot="title" v-if="!splitScreenData.isOpen || (splitScreenData.isOpen && splitScreenData.uid == splitScreenData.myUid)"  class="header-title">
         <div style="color: #fff">查看文档</div>
         <div
           @click="
@@ -16902,7 +16901,17 @@ export default {
           );
         }
       }
-
+      // this.changeSplitScreenBehavior({
+      //   code: 1,
+      //   form: {
+			// 		toolType:tooc,
+      //     toolIndex: toolIndex,
+      //     courseType: this.courseType,
+      //     taskCount: this.taskCount,
+      //     type: 2
+      //   }
+      // });
+      
       // var b = this.$refs["bz" + k][0];
       // a.scrollTop = b.offsetTop;
     },
@@ -21634,8 +21643,8 @@ export default {
           } else {
             this.getCourseState(1);
           }
-
-					if ((this.IsFollow && this.tType == 2) || (this.splitScreenData.isOpen && this.splitScreenData.uid != this.splitScreenData.myUid)) {
+          //  || (this.splitScreenData.isOpen && this.splitScreenData.uid != this.splitScreenData.myUid)
+					if ((this.IsFollow && this.tType == 2)) {
             this.setContent2(false);
             let _followC = res.data[0][0].followC.split("-");
             if (
@@ -24520,7 +24529,7 @@ export default {
           toolIndex: toolIndex,
           courseType: this.courseType,
           taskCount: this.taskCount,
-          type: 0
+          type: 2
         }
       });
     },
@@ -24671,9 +24680,9 @@ export default {
             this.$nextTick(() => {
 							if (this.$refs.choseWorksDetailDialogRef.show) {
                 //已经打开了
-								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
+								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType,lookWorks:behavior.form.lookWorks})
               } else {
-								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,})
+								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,lookWorks:behavior.form.lookWorks})
               }
             });
           }else if(behavior.code === 2){
@@ -24688,7 +24697,7 @@ export default {
 						}
 					}
         } else {
-        }
+        } 
       }
     },
     updateSplitScreenData(empty = 0) {
@@ -24755,7 +24764,17 @@ export default {
         this.splitScreenData.isOpen &&
         this.splitScreenData.uid == this.splitScreenData.myUid
       ) {
-        this.splitScreenData.behavior = newValue;
+        let _behavior = newValue;
+        if(_behavior.form){
+          _behavior.form.taskCount = this.taskCount;
+          _behavior.form.courseType = this.courseType
+        }else{
+          _behavior.form = {
+            taskCount:this.taskCount,
+            courseType:this.courseType
+          }
+        }
+        this.splitScreenData.behavior = _behavior;
         this.updateSplitScreenData(0);
       }
     },