林旭祥 6 månader sedan
förälder
incheckning
ad1096ea54
1 ändrade filer med 35 tillägg och 27 borttagningar
  1. 35 27
      src/views/analysis/detail.vue

+ 35 - 27
src/views/analysis/detail.vue

@@ -30,12 +30,12 @@
               src="@/assets/images/analysis/run1000.png" />
             <img v-if="query.exam_name == 'basketball' ||
               query.exam_name == 'basketballv1'
-              " src="@/assets/images/analysis/basketball.png" />
+            " src="@/assets/images/analysis/basketball.png" />
             <img v-if="query.exam_name == 'football' || query.exam_name == 'footballv1'
-              " src="@/assets/images/analysis/football.png" />
+            " src="@/assets/images/analysis/football.png" />
             <img v-if="query.exam_name == 'badminton' ||
               query.exam_name == 'badmintonv1'
-              " src="@/assets/images/analysis/badminton.png" />
+            " src="@/assets/images/analysis/badminton.png" />
             <img v-if="query.exam_name == 'pingpong'" src="@/assets/images/analysis/pingpong.png" />
             <img v-if="query.exam_name == 'volleyball'" src="@/assets/images/analysis/volleyball.png" />
             <img v-if="query.exam_name == 'solidball'" src="@/assets/images/analysis/solidBall.png" />
@@ -83,12 +83,12 @@
             width:
               (details.std.scores[1] - details.std.scores[0]) * 100 + '%',
           }">及格</span><span class="c" :style="{
-  width:
-    (details.std.scores[2] - details.std.scores[1]) * 100 + '%',
-}">良好</span><span class="d" :style="{
-  width:
-    (details.std.scores[3] - details.std.scores[2]) * 100 + '%',
-}">优秀</span>
+            width:
+              (details.std.scores[2] - details.std.scores[1]) * 100 + '%',
+          }">良好</span><span class="d" :style="{
+            width:
+              (details.std.scores[3] - details.std.scores[2]) * 100 + '%',
+          }">优秀</span>
         </div>
         <div class="drawingItem" v-else>
           <span class="a">不及格</span><span class="b">及格</span><span class="c">良好</span><span class="d">优秀</span>
@@ -150,30 +150,30 @@
     <div class="main-c" v-if="JSON.stringify(details) != '{}'">
       <!--立定跳远-->
       <Jump :detailsData="details" v-if="JSON.stringify(details) != '{}' && ['jump'].includes(query.exam_name)
-        " />
+      " />
       <!--实心球-->
       <SolidBall :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
         ['solidball'].includes(query.exam_name)
-        " />
+      " />
       <!--脚环跑步-->
       <Runa :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
         ['runa800', 'runa1000'].includes(query.exam_name)
-        " />
+      " />
       <!--跑步-->
       <Run :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
         ['run50', 'run60', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8'].includes(query.exam_name)
-        " />
+      " />
       <!--仰卧起坐-->
       <SitUp :detailsData="details" v-if="JSON.stringify(details) != '{}' && ['situp'].includes(query.exam_name)
-        " />
+      " />
       <!--引体向上-->
       <PullUp :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
         ['pullup'].includes(query.exam_name)
-        " />
+      " />
       <!--跳绳类-->
       <RopeSkipping :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
         ['jumprope', 'skiprope'].includes(query.exam_name)
-        " />
+      " />
       <!--球类-->
       <Balls :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
         [
@@ -186,21 +186,21 @@
           'badminton',
           'pingpong',
         ].includes(query.exam_name)
-        " />
+      " />
       <!--斜身引体-->
       <SidePullUp :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
         ['sidepullup'].includes(query.exam_name)
-        " />
+      " />
       <!--三级蛙跳-->
       <TriJump :detailsData="details" v-if="JSON.stringify(details) != '{}' && ['trijump'].includes(query.exam_name)
-        " />
+      " />
       <!--铅球-->
       <ShotPut :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
         ['shotput'].includes(query.exam_name)
-        " />
+      " />
       <!--急行跳远-->
       <LongJump :detailsData="details" v-if="JSON.stringify(details) != '{}' && ['longjump'].includes(query.exam_name)
-        " />
+      " />
       <div class="tip">
         <!-- 温馨提示:<br />
         因为光线或人员遮挡等环境问题,导致测试数据偶尔有偏差,最终解释权归卓浦士科技所有。<br />客服热线:<a
@@ -275,6 +275,19 @@ const getTrainExamDetails = () => {
  * 重组详情
 */
 const getDetails = () => {
+  let myList: any = [];
+  dataDictionary.gradeLists.forEach((item: any) => {
+    item.child.forEach((items: any) => {
+      let myIndex = myList.findIndex((itemss: any) => {
+        return itemss.value == items.value;
+      });
+      if (myIndex == -1) {
+        myList.push(items)
+      }
+    })
+  })
+  console.log("myList",myList)
+  gradeType.value = myList;
   let obj = gradeType.value.find((item: any) => {
     return item.value == details.value.grade;
   });
@@ -316,12 +329,6 @@ const getDetails = () => {
 };
 
 onBeforeMount(() => {
-  const myInfo: any = localStorage.getItem("userInfo");
-  const userinfo = JSON.parse(myInfo)
-  let obj: any = dataDictionary.gradeLists.find((item) => {
-    return item.value == userinfo.category;
-  })
-  gradeType.value = obj.child || [];
   query.value = route.query;
   if (query.value.test_key) {
     //测试
@@ -343,6 +350,7 @@ onMounted(() => {
     font-size: calc(1280px / 106);
   }
 }
+
 .main {
   background: #efefef;
   height: 100vh;