Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

src/components/pages/components/exportDataDialog.vue

@@ -2402,7 +2402,7 @@ export default {
           realData[5].per += `任务${index + 1}：${e}，`;
         });
         this.claScoFoldLineData.forEach((e, index) => {
-          realData[5].cla += `任务${index + 1}：${e}，`;
+          realData[5].cla += `任务${index + 1}：${e[2]}，`;
         });
 
         // console.log("realData", realData);
@@ -2749,7 +2749,7 @@ export default {
         realData[5].per += `任务${index + 1}：${e}，`;
       });
       this.claScoFoldLineData.forEach((e, index) => {
-        realData[5].cla += `任务${index + 1}：${e}，`;
+        realData[5].cla += `任务${index + 1}：${e[2]}，`;
       });
 
       console.log("realData", realData);
@@ -3011,7 +3011,12 @@ export default {
       // });
       this.initChart(); // 作业提交率折线图
     },
-
+    // 补零寻找四分位数
+    padArrayWithZeros(array, targetLength, direction = 'right') {
+      const zeros = new Array(targetLength).fill(0);
+      const paddedArray = direction === 'right' ? array.concat(zeros) : zeros.concat(array);
+      return paddedArray.slice(0, targetLength);
+    },
     // 计算任务得分
     getFoldLineSCoDataAi(repeatWork) {
       // 作业数据e.sco得分
@@ -3039,7 +3044,7 @@ export default {
 
       this.stageList.forEach((e, index) => {
         repeatWorkCopy[index] = [];
-        scoList[index] = 0;
+        scoList[index] = [index,0];
       });
 
       // 将作业进行阶段分类
@@ -3049,12 +3054,12 @@ export default {
 
       repeatWorkCopy.forEach((e, index) => {
         e.forEach(k => {
-          scoList[index] += k.sco * 1;
+          scoList[index][1] += k.sco * 1;
         });
-        if (scoList[index] == 0) {
-          scoList[index] = 0;
+        if (scoList[index][1] == 0) {
+          scoList[index][1] = 0;
         } else {
-          scoList[index] = (scoList[index] / e.length).toFixed(1);
+          scoList[index][1] = (scoList[index][1] / e.length).toFixed(1);
         }
       });
 
@@ -3088,31 +3093,61 @@ export default {
         }
       });
 
+
+         // 获取任务下的可评分工具数量
+         let toolNum = []
+
+        this.toolPercentage.forEach((e,i) => {
+          toolNum[i] = []
+          e.forEach(k=>{
+            if (this.TeaStuInt.indexOf(k) != -1) {
+              toolNum[i].push(k)
+            }
+          })
+        });
+
       let repeatWorkCopy = []; // 任务分类作业容器
       let scoList = []; //分数每个任务的所有任务分的集合
+      let blockData = []; //盒须图数据
+      this.claScoFoldLineData = []
+      let scoNum = []// 每个任务下的分数集合
 
       this.stageList.forEach((e, index) => {
         repeatWorkCopy[index] = [];
         scoList[index] = 0;
+        blockData[index] = []
+        scoNum[index] = []
+        this.claScoFoldLineData[index] = [0,0,0,0,0]
       });
 
+
       // 将作业进行阶段分类
       repeatWork.forEach(e => {
         repeatWorkCopy[e.task].push(e);
+        scoNum[e.task].push(e.sco * 1);
       });
 
+      console.log('repeatWorkCopy',JSON.parse(JSON.stringify(repeatWorkCopy)));
 
-      // 获取任务下的可评分工具数量
-      let toolNum = []
+      scoNum.forEach((e,i)=>{
+        if (e.length < (toolNum[i].length * this.data12[0].num)) {
+          e = this.padArrayWithZeros(e,(toolNum[i].length * this.data12[0].num))
+        }
+        e = e.sort((a, b) => a - b);
+        console.log('scoNum',e);
+        
+
+        let sco2 = (e.length * 0.25).toFixed(0)
+        let sco3 = (e.length * 0.75).toFixed(0)
+        console.log(sco2,sco3);
+        
+
+        this.claScoFoldLineData[i][0] = e[0]
+        this.claScoFoldLineData[i][1] = e[sco2]
+        this.claScoFoldLineData[i][3] = e[sco3] //
+        this.claScoFoldLineData[i][4] = e[e.length-1]
+      })
 
-      this.toolPercentage.forEach((e,i) => {
-        toolNum[i] = []
-        e.forEach(k=>{
-          if (this.TeaStuInt.indexOf(k) != -1) {
-            toolNum[i].push(k)
-          }
-        })
-      });
 
       repeatWorkCopy.forEach((e, index) => {
         e.forEach(k => {
@@ -3124,20 +3159,29 @@ export default {
           scoList[index] = 0;
         } else {
         
-          //任务平均分 = 任务得分 / 人数 / 评分
-          scoList[index] = (scoList[index] / this.data12[0].num);
+          //所有任务得分 =  任务得分 / 人数
+          scoList[index] = (scoList[index] / (this.data12[0].num * toolNum[index].length).toFixed(1));
         }
       });
+
+      scoList.forEach((e,i)=>{
+        this.claScoFoldLineData[i][2] = e
+      })
+
+      console.log('this.claScoFoldLineData',this.claScoFoldLineData);
+      
     
 
 
-      this.claScoFoldLineData = scoList.map((e,i) => {
-        if (e == 0) {
-          return 0;
-        } else {
-          return (e / toolNum[i].length).toFixed(2);
-        }
-      });
+      // this.claScoFoldLineData = scoList.map((e,i) => {
+      //   if (e == 0) {
+      //     return 0;
+      //   } else {
+      //     return (e / toolNum[i].length).toFixed(2);
+      //   }
+      // });
+
+      
       this.initChart2(); // 班级任务成绩
     },
 
@@ -3345,7 +3389,76 @@ export default {
     // 任务成绩
     initChart2() {
       const chart = echarts.init(this.$refs.cScoEcharts);
-      const option = {
+      let boxData =this.claScoFoldLineData;
+
+      let scatterData = this.scoFoldLineData;
+
+      // console.log('boxData', boxData);
+      // console.log('scatterData', scatterData);
+
+      
+      // const option = {
+      //   title: {
+      //     text: "任务成绩",
+      //     left: "left",
+      //     textStyle: {
+      //       color: "rgba(140, 140, 140, 1)", // 标题颜色
+      //       fontSize: 10, // 标题字体大小
+      //       fontWeight: "bold" // 加粗样式
+      //     }
+      //   },
+      //   tooltip: {
+      //     trigger: "axis"
+      //     // formatter: "{b} : {c}"
+      //   },
+      //   legend: {
+      //     data: ["个人数据", "班级平均值"],
+      //     // align: "right",
+      //     orient: "vertical", // 设置为垂直排列
+      //     right: 10
+      //   },
+      //   xAxis: {
+      //     type: "category",
+      //     data: this.stageList.map(item => item),
+      //     axisTick: {
+      //       alignWithLabel: true // 使刻度线和标签对齐
+      //     }
+      //   },
+      //   yAxis: {
+      //     type: "value",
+      //     axisLabel: {
+      //       formatter: "{value}"
+      //     },
+      //     max: 5
+      //   },
+      //   series: [
+      //     {
+      //       name: "个人数据",
+      //       data: this.scoFoldLineData.map(item => item),
+      //       type: "line",
+      //       symbol: "circle",
+      //       symbolSize: 5,
+      //       lineStyle: {
+      //         opacity: 1 // 设置透明度为1，即不透明
+      //       }
+      //     },
+      //     {
+      //       name: "班级平均值",
+      //       data: this.claScoFoldLineData.map(item => item),
+      //       type: "line",
+      //       symbol: "circle",
+      //       symbolSize: 5,
+      //       lineStyle: {
+      //         opacity: 1 // 设置透明度为1，即不透明
+      //       }
+      //     }
+      //     // {
+      //     //   data: this.scoFoldLineData.map(item => item),
+      //     //   type: "line"
+      //     // }
+      //   ]
+      // };
+      let option = {
         title: {
           text: "任务成绩",
           left: "left",
@@ -3355,56 +3468,61 @@ export default {
             fontWeight: "bold" // 加粗样式
           }
         },
-        tooltip: {
-          trigger: "axis"
-          // formatter: "{b} : {c}"
-        },
         legend: {
-          data: ["个人数据", "班级平均值"],
+          data: ["个人数据", "班级数据"],
           // align: "right",
-          orient: "vertical", // 设置为垂直排列
+          orient:  "vertical", // 设置为垂直排列
           right: 10
         },
-        xAxis: {
-          type: "category",
-          data: this.stageList.map(item => item),
-          axisTick: {
-            alignWithLabel: true // 使刻度线和标签对齐
-          }
-        },
-        yAxis: {
-          type: "value",
-          axisLabel: {
-            formatter: "{value}"
+        tooltip: {
+          trigger: "item",
+          axisPointer: {
+            type: "shadow",
           },
-          max: 5
         },
+        xAxis: [
+          {
+            type: "category",
+            data: this.stageList.map(item => item),
+          },
+          
+        ],
+        yAxis: [
+          {
+            type: "value",
+            max: 5
+          },
+        ],
         series: [
           {
-            name: "个人数据",
-            data: this.scoFoldLineData.map(item => item),
-            type: "line",
-            symbol: "circle",
-            symbolSize: 5,
-            lineStyle: {
-              opacity: 1 // 设置透明度为1，即不透明
-            }
+            name: "班级数据",
+            type: "boxplot",
+            data: boxData,
           },
           {
-            name: "班级平均值",
-            data: this.claScoFoldLineData.map(item => item),
-            type: "line",
-            symbol: "circle",
-            symbolSize: 5,
-            lineStyle: {
-              opacity: 1 // 设置透明度为1，即不透明
-            }
-          }
-          // {
-          //   data: this.scoFoldLineData.map(item => item),
-          //   type: "line"
-          // }
-        ]
+            name: "个人数据",
+            type: "scatter",
+            data: scatterData,
+            itemStyle: {
+              color: function (params) {
+                // 获取当前散点的 X 轴值
+                let xValue = params.value[0];
+                // 获取相应 X 轴位置的盒须图数据的最小值
+                let boxMinValue = boxData[xValue][1];
+                let boxMinValue2 = boxData[xValue][3];
+
+                // 判断散点是否低于盒须图的最小值，低于的话显示红色
+                if (params.value[1] < boxMinValue) {
+                  return "red";
+                } else if( params.value[1] >= boxMinValue2 ){
+                  return "green";
+                }else{
+                  return "yellow";
+                }
+              },
+            },
+          },
+        ],
       };
 
       chart.setOption(option);