Merge pull request 'fix：价值透析数据修改；' (#369) from yangws into main

Reviewed-on: #369

src/renderer/src/views/classTask/container/classOverview/knowledge.vue

@@ -20,82 +20,58 @@
 <script setup>
 import {ref, watch} from 'vue'
 import overviewStore from '@/store/modules/overview'
-import {listEntpcoursework} from '@/api/education/entpCourseWork'
 
 const useOverview = overviewStore()
 const tableData = ref([])
-//获取题目id
-const ids = ref('')
-//总分
-const allScore = ref(0)
 //用来获取所有知识点
 const konwledge = ref([])
 //所有题目的知识点
 const getKonwledge = () => {
+  const getScoreRate = []
+  // 获取知识点的种数
+  const ledges = []
   useOverview.tableList.forEach(item => {
+    //判断是否存在知识点
     if(item.knowledgePoint){
-      konwledge.value.push({...JSON.parse(item.knowledgePoint),...{scoingRate:Number(item.scoingRate),point:item.point,allPoint:allScore.value}})
+      const title = JSON.parse(item.knowledgePoint)
+      //判断知识点是否重复
+      if(!ledges.includes(title.id)){
+        ledges.push(title.id)
+        konwledge.value.push({title:title.title,allPoint:item.point,id:title.id})
+      }
+      // 判断学生是否答过题
+      if(useOverview.allData[0].hasAnswers.includes(item.studentid))
+          getScoreRate.push({rate:item.scoingRate,id:title.id})
     }
   })
-  tableData.value = getTableList(konwledge.value)
-  tableData.value = tableData.value.map(item => {
-    return{
+  
+  // 看看有几个知识点
+  konwledge.value.forEach(item => {
+    let sunRate = 0
+    let num = 0
+    getScoreRate.forEach(item2 => {
+      if(item.id === item2.id){
+        sunRate += extractedNumber(item2.rate)
+        num ++
+      }
+    })
+    const scoreRate = sunRate / num
+    tableData.value.push({
+      scoingRate:scoreRate.toFixed(2),
       ...item,
-      allPoint: allScore.value
-    }
+      point:(item.allPoint * scoreRate / 100).toFixed(2)
+    })
   })
-  console.log(tableData.value,'tableData.value')
 }
-//获取总分
-const getScore = async () => {
-  const scoreId = useOverview.tableList[0].entpcourseworklist
-  const fixedJsonString = `[${scoreId}]`;
-  const objects = JSON.parse(fixedJsonString);
-  const id = objects.map(obj => obj.id);
-  ids.value = id.join(',')
-  const res = await listEntpcoursework({ids: ids.value, pageSize: 500})
-  if(res.code === 200){
-    allScore.value = res.rows.reduce((acc, cur) => acc + cur.workScore, 0);
-    getKonwledge()
-  }
+// 获取百分比的数字
+const extractedNumber = (score) => {
+  const match = score.match(/\d+/);
+  return match ? parseInt(match[0], 10) : null;
 }
 //组装tableList表格
-const getTableList = (data) => {
-  const result = [];
-  data.forEach(item => {
-    const existingItem = result.find(i => i.id === item.id);
-    if (existingItem) {
-      // 累加point和scoingRate
-      existingItem.pointTotal += parseInt(item.point);
-      existingItem.scoingRateTotal += parseFloat(item.scoingRate);
-      existingItem.count++;
-    } else {
-      // 新的对象
-      result.push({
-        id: item.id,
-        title: item.title,
-        pointTotal: item.point,
-        scoingRateTotal: parseFloat(item.scoingRate),
-        count: 1
-      });
-    }
-  });
 
-  // 计算平均值
-  result.forEach(item => {
-    item.point = Math.round(item.pointTotal / item.count);
-    // item.scoingRate = Math.round((item.scoingRateTotal / item.count) * 100) / 100;
-    item.scoingRate = Math.round((item.point / allScore.value) * 100);
-    delete item.pointTotal;
-    delete item.scoingRateTotal;
-    delete item.count;
-  });
-
-  return result;
-}
 watch(() => useOverview.tableList,() => {
-  console.log(useOverview.tableList,'useOverview.tableList')
-  getScore()
+  getKonwledge()
 })
 </script>