소스 검색

feat(认知任务): 优化

JutarryWu 6 달 전
부모
커밋
c8abfa1e50

+ 23 - 8
src/pages/cognitiveTasks/BreadthTraining/index.vue

@@ -78,14 +78,29 @@ function generateBaseData() {
   const baseDataList = [
     // { count: 5, score: 10, extraScore: 0 }, { count: 5, score: 10, extraScore: 0 }, ...
     // { count: 5, score: 10, extraScore: 0 }, { count: 5, score: 10, extraScore: 0 }, ...
-    ...Array.from({ length: 10 }).fill({ count: 5, score: 10, extraScore: 0 }),
-    ...Array.from({ length: 10 }).fill({ count: 6, score: 20, extraScore: 0 }),
-    ...Array.from({ length: 10 }).fill({ count: 7, score: 30, extraScore: 0 }),
-    ...Array.from({ length: 10 }).fill({ count: 8, score: 40, extraScore: 0 }),
-    ...Array.from({ length: 10 }).fill({ count: 9, score: 50, extraScore: 0 }),
-    ...Array.from({ length: 10 }).fill({ count: 10, score: 60, extraScore: 0 }),
-    ...Array.from({ length: 10 }).fill({ count: 11, score: 70, extraScore: 0 }),
-    ...Array.from({ length: 10 }).fill({ count: 12, score: 80, extraScore: 0 }),
+    ...Array.from({ length: 5 }).fill([2, 4, 5, 9, 7]),
+    ...Array.from({ length: 5 }).fill([3, 8, 5, 6, 7]),
+
+    ...Array.from({ length: 5 }).fill([1, 9, 6, 7, 8]),
+    ...Array.from({ length: 5 }).fill([4, 5, 6, 2, 3]),
+
+    ...Array.from({ length: 5 }).fill([11, 10, 7, 8, 9]),
+    ...Array.from({ length: 5 }).fill([5, 6, 7, 4, 8]),
+
+    ...Array.from({ length: 5 }).fill([6, 7, 8, 9, 5]),
+    ...Array.from({ length: 5 }).fill([7, 8, 9, 10, 11]),
+
+    ...Array.from({ length: 5 }).fill([7, 8, 9, 5, 6]),
+    ...Array.from({ length: 5 }).fill([8, 9, 10, 11, 12]),
+
+    ...Array.from({ length: 5 }).fill([8, 9, 10, 11, 12]),
+    ...Array.from({ length: 5 }).fill([6, 7, 8, 9, 10]),
+
+    ...Array.from({ length: 5 }).fill([10, 11, 12, 13, 14]),
+    ...Array.from({ length: 5 }).fill([8, 9, 10, 11, 13]),
+
+    ...Array.from({ length: 5 }).fill([12, 13, 14, 15, 16]),
+    ...Array.from({ length: 5 }).fill([8, 10, 11, 12, 13]),
   ]
 
   mainData.dataList = baseDataList.map((item: IMainChildData, index) => {

+ 3 - 0
src/pages/cognitiveTasks/cocos/index.vue

@@ -17,6 +17,9 @@ onMounted(() => {
 
 <template>
   <section class="app-container">
+    <div v-if="false" class="absolute top-[12px] right-[12px] z-[999] cursor-pointer">
+      <van-icon name="arrow-up" class="text-[24px] text-[#fff]" />
+    </div>
     <iframe
       :src="src"
       width="100%"

+ 3 - 1
src/pages/cognitiveTasks/main/index.vue

@@ -25,7 +25,9 @@ const urlList = [
 
 function startTest() {
   // console.log(urlList[Number(taskId.value) - 1])
-  router.push(urlList[Number(taskId.value) - 1])
+  router.push({
+    path: urlList[Number(taskId.value) - 1],
+  })
 }
 
 async function exec() {

+ 5 - 5
src/pages/cognitiveTasks/spatialOrientationAbility/index.vue

@@ -115,8 +115,8 @@ function generateNonOverlappingPoints(centerX: number, centerY: number, radius:
   }
   return points.map((item) => {
     return {
-      xAxis: item.xAxis + 16,
-      yAxis: item.yAxis + 16,
+      xAxis: item.xAxis + 8,
+      yAxis: item.yAxis + 8,
     }
   })
 }
@@ -164,7 +164,7 @@ function getAngle({ x: x1, y: y1 }, { x: x2, y: y2 }) {
 // 以下生成随机位置显示图例方法
 function initImgData(level: number, num: number) {
   // 随机生成6个物品的位置
-  const items = generateNonOverlappingPoints(165, 176, 165, num - 1)
+  const items = generateNonOverlappingPoints(160, 170, 160, num - 1)
   arrDataDemo = shuffle(arrDataDemo)
   const tempItems: IData[] = arrDataDemo.slice(0, num)
   const extraInfo = {
@@ -333,10 +333,10 @@ onMounted(() => {
       <div
         v-for="(arr, index) in showDataArr[currentIndex]"
         :key="index"
-        class="item flex-column absolute translate-[-50%] text-[16px] text-black"
+        class="item flex-column absolute translate-[-50%] text-[15px] text-black items-center"
         :style="{ top: `${arr.yAxis}px`, left: `${arr.xAxis}px` }"
       >
-        <img :src="arr.imgUrl" alt="" class="h-[28px] w-[28px]">
+        <img :src="arr.imgUrl" alt="" class="h-[24px] w-[24px]">
         <span>{{ arr.name }}</span>
       </div>
     </div>