#

src/components/easy2/studyStudent.vue

@@ -15358,10 +15358,21 @@
       :searchTN="worksSName2"
       @setPlname="setPlname"
     ></UpdateMore>
-    <wordCloud
+
+    <!-- <wordCloud
       :dialogVisibleWordCloud.sync="dialogVisibleWordCloud"
       :data="wordCloudData"
-    ></wordCloud>
+    ></wordCloud> -->
+    <el-dialog
+      title="词云"
+      :visible.sync="dialogVisibleWordCloud"
+      width="30%"
+      class="dialog_diy"
+      :before-close="handleClose">
+      <choseWordCloud :cloudData="wordCloudData" :key="wordCloudKey" :dialogVisibleWordCloud="dialogVisibleWordCloud"></choseWordCloud>
+    </el-dialog>
+
+
     <el-dialog
       title="挑人"
       :visible.sync="dialogVisiblePickPeople"
@@ -15545,6 +15556,7 @@ import evaTable from "./commpont/evaTable";
 import { v4 as uuidv4 } from "uuid";
 import statisticalAnalysis from "../components/statisticalAnalysis.vue";
 import choseWorksDetailDialog from "../components/choseWorksDetailDialog.vue";
+import choseWordCloud from '../components/choseWordCloud.vue'
 var OpenCC = require("opencc-js");
 let converter = OpenCC.Converter({
   from: "hk",
@@ -15602,6 +15614,7 @@ const getFile = url => {
 };
 export default {
   components: {
+    choseWordCloud,
     EditorBar,
     Time,
     pdf,
@@ -15634,6 +15647,7 @@ export default {
   },
   data() {
     return {
+      wordCloudKey: 0,
       bg: null,
       drawShow: false,
       dialogVisible: false,
@@ -16914,11 +16928,18 @@ export default {
 
       let target = document.querySelector(`#gj${k}`);
       if (target) {
-        target.scrollIntoView(true);
-        setTimeout(() => {
-          a.scrollTop = a.scrollTop - 150;
+        // target.scrollIntoView(true);
+        // setTimeout(() => {
+        //   a.scrollTop = a.scrollTop - 150;
+        // }, 0);
+        target.scrollIntoView();
+        setTimeout(()=>{
+            let scrollBody = document.querySelector('.body_student').parentElement
+            scrollBody.scrollTop = scrollBody.scrollTop - 100
         }, 0);
+       
       }
+      
       this.navId = "";
       let flag = this.courseType == i;
       let flag2 = this.taskCount == j;
@@ -24167,6 +24188,8 @@ export default {
       this.$forceUpdate();
     },
     openWordCloud(toolindex) {
+      this.wordCloudData = '';
+
       let array = [];
       for (var i = 0; i < this.worksStudent[toolindex].length; i++) {
         let works = JSON.parse(this.worksStudent[toolindex][i].works)[0].answer;
@@ -24181,8 +24204,15 @@ export default {
           }
         }
       }
-      this.wordCloudData = array;
+      let _result = ''
+      array.forEach(e=>{
+        _result +=e.name+','
+      })
+      this.wordCloudData = _result;
+
       this.dialogVisibleWordCloud = true;
+      this.wordCloudKey += 1;
+
     },
     openTips(i) {
       this.tipsIndex = i;
@@ -24749,7 +24779,7 @@ export default {
     },
     getSplitScreenData() {
       // return;
-      if (this.tType != 1) return;
+      // if (this.tType != 1) return; 
       let params = {
         cid: this.id
       };

src/components/easy3/studyStudent.vue

@@ -11973,10 +11973,18 @@
       :searchTN="worksSName2"
       @setPlname="setPlname"
     ></UpdateMore>
-    <wordCloud
+    <!-- <wordCloud
       :dialogVisibleWordCloud.sync="dialogVisibleWordCloud"
       :data="wordCloudData"
-    ></wordCloud>
+    ></wordCloud> -->
+    <el-dialog
+      title="词云"
+      :visible.sync="dialogVisibleWordCloud"
+      width="30%"
+      class="dialog_diy"
+      :before-close="handleClose">
+      <choseWordCloud :cloudData="wordCloudData" :key="wordCloudKey" :dialogVisibleWordCloud="dialogVisibleWordCloud"></choseWordCloud>
+    </el-dialog>
     <el-dialog
       title="挑人"
       :visible.sync="dialogVisiblePickPeople"
@@ -12093,6 +12101,8 @@ import statisticalAnalysis from '../components/statisticalAnalysis.vue'
 import choseWorksDetailDialog from '../components/choseWorksDetailDialog.vue'
 import { v4 as uuidv4 } from "uuid";
 var OpenCC = require("opencc-js");
+import choseWordCloud from '../components/choseWordCloud.vue'
+
 let converter = OpenCC.Converter({
   from: "hk",
   to: "cn"
@@ -12148,6 +12158,7 @@ const getFile = (url) => {
 };
 export default {
   components: {
+    choseWordCloud,
     EditorBar,
     Time,
     pdf,
@@ -12177,6 +12188,7 @@ export default {
   },
   data() {
     return {
+      wordCloudKey: 0,
       bg: null,
       drawShow: false,
       dialogVisible: false,
@@ -12855,10 +12867,16 @@ export default {
 
       let target = document.querySelector(`#gj${k}`);
       if (target) {
-        target.scrollIntoView(true);
-        setTimeout(() => {
-          a.scrollTop = a.scrollTop - 150;
+        // target.scrollIntoView(true);
+        // setTimeout(() => {
+        //   a.scrollTop = a.scrollTop - 150;
+        // }, 0);
+        target.scrollIntoView();
+        setTimeout(()=>{
+            let scrollBody = document.querySelector('.body_student').parentElement
+            scrollBody.scrollTop = scrollBody.scrollTop - 100
         }, 0);
+       
       }
       this.navId = ""
 			let flag = this.courseType == i;
@@ -19844,6 +19862,8 @@ export default {
       this.$forceUpdate();
     },
     openWordCloud(toolindex) {
+      this.wordCloudData = '';
+
       let array = [];
       for (var i = 0; i < this.worksStudent[toolindex].length; i++) {
         let works = JSON.parse(this.worksStudent[toolindex][i].works)[0].answer;
@@ -19858,8 +19878,15 @@ export default {
           }
         }
       }
-      this.wordCloudData = array;
+      let _result = ''
+      array.forEach(e=>{
+        _result +=e.name+','
+      })
+      this.wordCloudData = _result;
+
       this.dialogVisibleWordCloud = true;
+      this.wordCloudKey += 1;
+
     },
     uploadWorks(i) {
       this.$confirm("确定导出作业吗？", "提示", {
@@ -20380,7 +20407,7 @@ export default {
     },
     getSplitScreenData() {
       // return;
-      if (this.tType != 1) return;
+      // if (this.tType != 1) return;
       let params = {
         cid: this.id
       };

src/components/studyStudent.vue

@@ -11914,10 +11914,18 @@
       :searchTN="worksSName2"
       @setPlname="setPlname"
     ></UpdateMore>
-    <wordCloud
+    <!-- <wordCloud
       :dialogVisibleWordCloud.sync="dialogVisibleWordCloud"
       :data="wordCloudData"
-    ></wordCloud>
+    ></wordCloud> -->
+    <el-dialog
+      title="词云"
+      :visible.sync="dialogVisibleWordCloud"
+      width="30%"
+      class="dialog_diy"
+      :before-close="handleClose">
+      <choseWordCloud :cloudData="wordCloudData" :key="wordCloudKey" :dialogVisibleWordCloud="dialogVisibleWordCloud"></choseWordCloud>
+    </el-dialog>
     <el-dialog
       title="挑人"
       :visible.sync="dialogVisiblePickPeople"
@@ -12033,6 +12041,8 @@ import statisticalAnalysis from "./components/statisticalAnalysis.vue";
 import choseWorksDetailDialog from './components/choseWorksDetailDialog.vue';
 import { v4 as uuidv4 } from "uuid";
 var OpenCC = require("opencc-js");
+import choseWordCloud from './components/choseWordCloud.vue'
+
 let converter = OpenCC.Converter({
   from: "hk",
   to: "cn"
@@ -12088,6 +12098,7 @@ const getFile = (url) => {
 };
 export default {
   components: {
+    choseWordCloud,
     EditorBar,
     Time,
     pdf,
@@ -12117,6 +12128,7 @@ export default {
   },
   data() {
     return {
+      wordCloudKey: 0,
       bg: null,
       drawShow: false,
       dialogVisible: false,
@@ -12833,10 +12845,16 @@ export default {
       this.navId = ""
       let target = document.querySelector(`#gj${k}`);
       if (target) {
-        target.scrollIntoView(true);
-        setTimeout(() => {
-          a.scrollTop = a.scrollTop - 150;
+        // target.scrollIntoView(true);
+        // setTimeout(() => {
+        //   a.scrollTop = a.scrollTop - 150;
+        // }, 0);
+        target.scrollIntoView();
+        setTimeout(()=>{
+            let scrollBody = document.querySelector('.body_student').parentElement
+            scrollBody.scrollTop = scrollBody.scrollTop - 100
         }, 0);
+       
       }
 			let flag = this.courseType == i;
 			let flag2 = this.taskCount == j
@@ -19832,6 +19850,8 @@ export default {
       this.$forceUpdate();
     },
     openWordCloud(toolindex) {
+      this.wordCloudData = '';
+      
       let array = [];
       for (var i = 0; i < this.worksStudent[toolindex].length; i++) {
         let works = JSON.parse(this.worksStudent[toolindex][i].works)[0].answer;
@@ -19846,8 +19866,15 @@ export default {
           }
         }
       }
-      this.wordCloudData = array;
+      let _result = ''
+      array.forEach(e=>{
+        _result +=e.name+','
+      })
+      this.wordCloudData = _result;
+      
       this.dialogVisibleWordCloud = true;
+      this.wordCloudKey += 1;
+
     },
     uploadWorks(i) {
       this.$confirm("确定导出作业吗？", "提示", {
@@ -20369,7 +20396,7 @@ export default {
     },
     getSplitScreenData() {
       // return;
-      if (this.tType != 1) return;
+      // if (this.tType != 1) return;
       let params = {
         cid: this.id
       };

src/components/studySutdentClass/studyStudent.vue

@@ -14914,10 +14914,18 @@
       :searchTN="worksSName2"
       @setPlname="setPlname"
     ></UpdateMore>
-    <wordCloud
+    <!-- <wordCloud
       :dialogVisibleWordCloud.sync="dialogVisibleWordCloud"
       :data="wordCloudData"
-    ></wordCloud>
+    ></wordCloud> -->
+    <el-dialog
+      title="词云"
+      :visible.sync="dialogVisibleWordCloud"
+      width="30%"
+      class="dialog_diy"
+      :before-close="handleClose">
+      <choseWordCloud :cloudData="wordCloudData" :key="wordCloudKey" :dialogVisibleWordCloud="dialogVisibleWordCloud"></choseWordCloud>
+    </el-dialog>
     <el-dialog
       title="挑人"
       :visible.sync="dialogVisiblePickPeople"
@@ -15101,7 +15109,7 @@ import { v4 as uuidv4 } from "uuid";
 import markScore from "./commpont/markScore";
 import markDialog from "./commpont/markDialog";
 import evaTable from "./commpont/evaTable";
-
+import choseWordCloud from '../components/choseWordCloud.vue'
 var OpenCC = require("opencc-js");
 let converter = OpenCC.Converter({
   from: "hk",
@@ -15158,6 +15166,7 @@ const getFile = (url) => {
 };
 export default {
   components: {
+    choseWordCloud,
     EditorBar,
     Time,
     pdf,
@@ -15190,6 +15199,7 @@ export default {
   },
   data() {
     return {
+      wordCloudKey: 0,
       bg: null,
       drawShow: false,
       dialogVisible: false,
@@ -16451,10 +16461,16 @@ export default {
 
       let target = document.querySelector(`#gj${k}`);
       if (target) {
-        target.scrollIntoView(true);
-        setTimeout(() => {
-          a.scrollTop = a.scrollTop - 150;
+        // target.scrollIntoView(true);
+        // setTimeout(() => {
+        //   a.scrollTop = a.scrollTop - 150;
+        // }, 0);
+        target.scrollIntoView();
+        setTimeout(()=>{
+            let scrollBody = document.querySelector('.body_student').parentElement
+            scrollBody.scrollTop = scrollBody.scrollTop - 100
         }, 0);
+       
       }
       this.navId = ""
 			let flag = this.courseType == i;
@@ -23587,6 +23603,8 @@ export default {
       this.$forceUpdate();
     },
     openWordCloud(toolindex) {
+      this.wordCloudData = '';
+
       let array = [];
       for (var i = 0; i < this.worksStudent[toolindex].length; i++) {
         let works = JSON.parse(this.worksStudent[toolindex][i].works)[0].answer;
@@ -23601,10 +23619,14 @@ export default {
           }
         }
       }
-      console.log('array',array);
-
-      this.wordCloudData = array;
+      let _result = ''
+      array.forEach(e=>{
+        _result +=e.name+','
+      })
+      this.wordCloudData = _result;
       this.dialogVisibleWordCloud = true;
+      this.wordCloudKey += 1;
+
     },
     uploadWorks(i) {
       this.$confirm("确定导出作业吗？", "提示", {
@@ -24126,7 +24148,7 @@ export default {
     },
     getSplitScreenData() {
       // return;
-      if (this.tType != 1) return;
+      // if (this.tType != 1) return;
       let params = {
         cid: this.id
       };