作业集

src/components/pages/components/exportDataDialog.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="pbl">
     <div ref="reportPdf" v-loading="loading">
+      <!-- 封面 -->
       <div
         class="coverPage"
         :style="{
@@ -60,13 +61,14 @@
         </div>
         <div class="coverPageFrom">
           <img
-            style="z-index: 10;width: 90%;"
+            style="z-index: 10;width: 90%;transform: translate(0px, -45px);"
             src="../../../assets/icon/exportPdfworks/ropt.svg"
             alt=""
           />
         </div>
       </div>
 
+      <!-- 内容 -->
       <div
         class="coverPageCon"
         v-if="claV"
@@ -342,7 +344,6 @@ export default {
       // 师生在线互动次数结束
 
       // 生生互动主动开始
-      stuInterAllWork: [],
       stuInterAllLike: [],
       claAtuInterAllLike: [],
 
@@ -1267,7 +1268,6 @@ export default {
 
       this.interactWork = []; //每个工具下提交的作业
 
-      this.stuInterAllWork = []; // 生生互动阶段作业分类
       this.stuInterAllLike = []; // 生生互动阶段点赞评论分类
 
       this.bdStuInterAllWork = []; // 生生互动阶段被动作业分类
@@ -1369,7 +1369,6 @@ export default {
 
           this.interactWork[iInd] = []; //每个工具下提交的作业
 
-          this.stuInterAllWork[iInd] = []; // 生生互动阶段作业分类
           this.stuInterAllLike[iInd] = []; // 生生互动阶段点赞评论分类
 
           this.bdStuInterAllWork[iInd] = []; // 生生互动阶段被动作业分类
@@ -1438,8 +1437,8 @@ export default {
       this.getClaTeaStuHdAi(this.data5);
 
       // 生生互动主动
-      this.getStuInterAllWorkAi(this.data6, this.data7);
-      this.getClaStuInterAllWorkAi(this.data6, this.data11);
+      this.getStuInterAllWorkAi(this.data13, this.data7);
+      this.getClaStuInterAllWorkAi(this.data13, this.data11);
 
       // // 生生互动被动
       this.getBdStuInterAllWorkAi(this.data6, this.data8);
@@ -1471,7 +1470,6 @@ export default {
         //每个工具下提交的作业
         this.interactWork[eInd] = [];
 
-        this.stuInterAllWork[eInd] = []; // 生生互动阶段作业分类
         this.stuInterAllLike[eInd] = []; // 生生互动阶段点赞评论分类
 
         this.bdStuInterAllWork[eInd] = []; // 生生互动阶段被动作业分类
@@ -1540,7 +1538,7 @@ export default {
       this.getClaTeaStuHdAi(this.data5);
 
       // 生生互动主动
-      this.getStuInterAllWork(this.data6, this.data7);
+      this.getStuInterAllWork(this.data13, this.data7);
       this.getClaStuInterAllWork(this.data13, this.data11);
 
       // 生生互动被动
@@ -1577,14 +1575,18 @@ export default {
 
     // 生生互动主动 阶段模式
     getStuInterAllWork(val, likeData) {
-      this.stuInterAllWork.forEach((e, index) => {
+      let hd = []; //分数每个任务的所有任务分的集合
+      this.stageList.forEach((e, index) => {
+        hd[index] = [];
+      });
+      hd.forEach((e, index) => {
         val.forEach(k => {
           if (k.stage == index) {
             e.push(k.id);
           }
         });
       });
-      this.stuInterAllWork.forEach((e, index) => {
+      hd.forEach((e, index) => {
         likeData.forEach(k => {
           if (e.indexOf(k.workId) != -1) {
             this.stuInterAllLike[index].push(k);
@@ -1975,14 +1977,18 @@ export default {
 
     // 生生互动主动
     getStuInterAllWorkAi(val, likeData) {
-      this.stuInterAllWork.forEach((e, index) => {
+      let hd = []; //分数每个任务的所有任务分的集合
+      this.stageList.forEach((e, index) => {
+        hd[index] = [];
+      });
+      hd.forEach((e, index) => {
         val.forEach(k => {
           if (k.task == index) {
             e.push(k.id);
           }
         });
       });
-      this.stuInterAllWork.forEach((e, index) => {
+      hd.forEach((e, index) => {
         likeData.forEach(k => {
           if (e.indexOf(k.workId) != -1) {
             this.stuInterAllLike[index].push(k);
@@ -2051,7 +2057,6 @@ export default {
           }))
         },
         tooltip: {
-          trigger: "axis"
           // formatter: "{b} : {c}"
         },
         radius: "80%",
@@ -2657,8 +2662,8 @@ export default {
   box-sizing: border-box;
   margin: auto;
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  padding: 20px;
-  padding-top: 10px;
+  /* padding: 20px; */
+  /* padding-top: 10px; */
   overflow: auto;
   border-radius: 10px;
 }

src/components/pages/components/worksDetail2.vue

@@ -1557,7 +1557,6 @@
     </el-dialog>
 
     <el-dialog
-      title="文件预览"
       :visible.sync="worksDialog"
       :before-close="handleClose"
       class="worksDialogCSSExp"
@@ -4637,10 +4636,11 @@ export default {
 }
 
 .worksDialogCSSExp >>> .el-dialog__body {
-  width: 635px !important;
+  /* width: 100% !important; */
+  padding: 0 !important;
 }
 .worksDialogCSSExp >>> .el-dialog {
-  width: 676px !important;
+  width: 594pt !important;
 }
 
 .worksDialogCSS >>> .el-dialog__header {

src/components/pages/works.vue

@@ -311,11 +311,6 @@
          @StuCancel="StuCancel"
         :dialogVisibleS.sync="dialogVisibleS"
       ></StudentWorksDetail>
-      <!-- <div class="cancelbox" v-if="dialogVisibleS">
-        <el-button @click="StuCancel" type="primary" size="small"
-          >返回</el-button
-        >
-      </div> -->
     </div>
 
     <WorkDate