11wqe1 2 months ago
parent
commit
5eec0db0be

+ 22 - 11
src/components/components/choseWorksDetailDialog.vue

@@ -310,7 +310,7 @@
               </div>
               </div>
 							<div v-if="toolType == 15">
-                <choseWordCloud :data="wordCloudData" :dialogVisibleWordCloud="dialogVisibleWordCloud"></choseWordCloud>
+                <choseWordCloud :data="cy" :dialogVisibleWordCloud="dialogVisibleWordCloud"></choseWordCloud>
               </div>
 
 
@@ -735,7 +735,18 @@ export default {
 				}
 				return _result;
 			}
-		}
+		},
+    cy(){
+      let _result = []
+      if(this.toolType===15){
+        let array = this.worksStudent.map(e=>{
+        return {name: JSON.parse(e.works)[0].answer}
+      });
+      _result = array;
+      }
+
+      return _result;
+    }
   },
   watch: {
     worksStudentData: {
@@ -785,10 +796,10 @@ export default {
     },
     openWordCloud() {
 
-      let array = this.worksStudent.map(e=>{
-        return {name: JSON.parse(e.works)[0].answer}
-      });
-      console.log('array',array);
+      // let array = this.worksStudent.map(e=>{
+      //   return {name: JSON.parse(e.works)[0].answer}
+      // });
+      // console.log('array',array);
       
       // for (var i = 0; i < this.worksStudent.length; i++) {
       //   let works = JSON.parse(this.worksStudent[i].works)[0].answer;
@@ -804,15 +815,15 @@ export default {
       //   }
       // }
 
-      this.wordCloudData = array;
+      // this.wordCloudData = array;
       this.dialogVisibleWordCloud = true
     },
     StudentWork(val){
-      console.log('splitScreenFn',val);
+      // console.log('splitScreenFn',val);
 
       // console.log('val',JSON.parse(val));
-      console.log('toolType',this.toolType);
-      console.log('this.worksStudent',this.worksStudent);
+      // console.log('toolType',this.toolType);
+      // console.log('this.worksStudent',this.worksStudent);
 
       
 
@@ -829,7 +840,7 @@ export default {
         this.testJsonCopy=JSON.parse(val.works)[0]
       }
 
-      console.log('this.testJson',JSON.parse(JSON.stringify(this.testJsonCopy)));
+      // console.log('this.testJson',JSON.parse(JSON.stringify(this.testJsonCopy)));
       
       this.showType = 0;
 			this.$emit("changeSplitScreenBehavior",{code: 1,

+ 9 - 3
src/components/easy2/studyStudent.vue

@@ -13185,10 +13185,9 @@
       width="100%"
       :before-close="handleClose"
       :show-close="false"
-      class="dialog_diy full_diy"
-      :class="{ full_diy2: fulltype == 3 }"
+      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && splitScreenData.uid != splitScreenData.myUid) ? 'dialog_diyCopy' : ''] "
     >
-      <div slot="title" v-if="!splitScreenData.isOpen || (splitScreenData.isOpen && splitScreenData.uid == splitScreenData.myUid)"  class="header-title">
+      <div slot="title" class="header-title">
         <div style="color: #fff">查看文档</div>
         <div
           @click="
@@ -26147,6 +26146,13 @@ export default {
 .binfo_input:focus-visible {
   border: 1px solid rgba(61, 103, 188);
 }
+.dialog_diyCopy >>> .el-dialog__header {
+  display: none !important;
+}
+.dialog_diyCopy >>> .el-dialog__body {
+  padding: 0 !important;
+  height: 100% !important;
+}
 
 .dialog_diy >>> .el-dialog__header,
 .dialog_diy1 >>> .el-dialog__header {

+ 9 - 3
src/components/easy3/studyStudent.vue

@@ -10010,8 +10010,8 @@
       width="100%"
       :before-close="handleClose"
       :show-close="false"
-      class="dialog_diy full_diy"
-      :class="{ full_diy2: fulltype == 3 }"
+      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && splitScreenData.uid != splitScreenData.myUid) ? 'dialog_diyCopy' : ''] "
+
     >
       <div slot="title" class="header-title">
         <div style="color: #fff">查看文档</div>
@@ -25059,7 +25059,13 @@ ol {
 .show_taskD.show > img {
   transform: rotate(0deg);
 }
-
+.dialog_diyCopy >>> .el-dialog__header {
+  display: none !important;
+}
+.dialog_diyCopy >>> .el-dialog__body {
+  padding: 0 !important;
+  height: 100% !important;
+}
 .correctCss{
   position: absolute;
   bottom: -70px;

+ 9 - 2
src/components/studyStudent.vue

@@ -9955,8 +9955,8 @@
       width="100%"
       :before-close="handleClose"
       :show-close="false"
-      class="dialog_diy full_diy"
-      :class="{ full_diy2: fulltype == 3 }"
+      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && splitScreenData.uid != splitScreenData.myUid) ? 'dialog_diyCopy' : ''] "
+
     >
       <div slot="title" class="header-title">
         <div style="color: #fff">查看文档</div>
@@ -25071,4 +25071,11 @@ ol {
   background: #409eff;
   color: #fff;
 }
+.dialog_diyCopy >>> .el-dialog__header {
+  display: none !important;
+}
+.dialog_diyCopy >>> .el-dialog__body {
+  padding: 0 !important;
+  height: 100% !important;
+}
 </style>

+ 9 - 2
src/components/studySutdentClass/studyStudent.vue

@@ -12951,8 +12951,8 @@
       width="100%"
       :before-close="handleClose"
       :show-close="false"
-      class="dialog_diy full_diy"
-      :class="{ full_diy2: fulltype == 3 }"
+      :class="['dialog_diy','full_diy', fulltype == 3 ? 'full_diy2' : '', (splitScreenData.isOpen && splitScreenData.uid != splitScreenData.myUid) ? 'dialog_diyCopy' : ''] "
+
     >
       <div slot="title" class="header-title">
         <div style="color: #fff">查看文档</div>
@@ -28805,4 +28805,11 @@ ol {
   color: #fff;
   cursor: pointer;
 }
+.dialog_diyCopy >>> .el-dialog__header {
+  display: none !important;
+}
+.dialog_diyCopy >>> .el-dialog__body {
+  padding: 0 !important;
+  height: 100% !important;
+}
 </style>