林旭祥 1 week ago
parent
commit
d779141a10

+ 18 - 2
src/assets/styles/index.scss

@@ -223,10 +223,18 @@ i,em{
   }
   }
 }
 }
 
 
-.run50x8 {
+.run60 {
   .el-loading-spinner {
   .el-loading-spinner {
     &::before {
     &::before {
-      background-image: url('../static/images/train/run50x8.png');
+      background-image: url('../static/images/train/run60.png');
+    }
+  }
+}
+
+.run70 {
+  .el-loading-spinner {
+    &::before {
+      background-image: url('../static/images/train/run70.png');
     }
     }
   }
   }
 }
 }
@@ -271,6 +279,14 @@ i,em{
   }
   }
 }
 }
 
 
+.run50x8 {
+  .el-loading-spinner {
+    &::before {
+      background-image: url('../static/images/train/run50x8.png');
+    }
+  }
+}
+
 .shotput {
 .shotput {
   .el-loading-spinner {
   .el-loading-spinner {
     &::before {
     &::before {

+ 1 - 1
src/components/OptionWindow/index.vue

@@ -393,7 +393,7 @@ const confirm = () => {
   if (chooseArea.value.length > 1) {
   if (chooseArea.value.length > 1) {
     //多区域
     //多区域
     router.push({ path: '/train/multiple', query: optionForm.value });
     router.push({ path: '/train/multiple', query: optionForm.value });
-  } else if (['run50', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run10x4', 'run50x8'].includes(project.value.key)) {
+  } else if (['run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run10x4', 'run50x8'].includes(project.value.key)) {
     //跑步项目
     //跑步项目
     router.push({ path: '/train/run', query: optionForm.value });
     router.push({ path: '/train/run', query: optionForm.value });
   } else if (['skiprope', 'heartbeat'].includes(project.value.key)) {
   } else if (['skiprope', 'heartbeat'].includes(project.value.key)) {

+ 1 - 1
src/components/ReportList/index.vue

@@ -86,7 +86,7 @@ const getReportList = () => {
         }
         }
         let result = null;
         let result = null;
         if (item.result.toString().indexOf(".") != -1) {
         if (item.result.toString().indexOf(".") != -1) {
-          if (['jump', 'longjump', 'run50', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1', 'footballv1'].includes(type)) {
+          if (['jump', 'longjump', 'run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1', 'footballv1'].includes(type)) {
             result = item.result.toFixed(2)
             result = item.result.toFixed(2)
           } else {
           } else {
             result = item.result.toFixed(1);
             result = item.result.toFixed(1);

+ 2 - 0
src/utils/dataDictionary.ts

@@ -56,6 +56,7 @@ let data = {
     shotput: '米',
     shotput: '米',
     trijump: '米',
     trijump: '米',
     run50: '秒',
     run50: '秒',
+    run60: '秒',
     run70: '秒',
     run70: '秒',
     run100: '秒',
     run100: '秒',
     run200: '秒',
     run200: '秒',
@@ -98,6 +99,7 @@ let data = {
     solidball: 'distance',
     solidball: 'distance',
     shotput: 'distance',
     shotput: 'distance',
     run50: 'times',
     run50: 'times',
+    run60: 'times',
     run70: 'times',
     run70: 'times',
     run100: 'times',
     run100: 'times',
     run200: 'times',
     run200: 'times',

+ 2 - 2
src/views/analysis/detail.vue

@@ -324,7 +324,7 @@ const getDetails = () => {
       details.value.result :
       details.value.result :
       Number(details.value.result).toFixed(2);
       Number(details.value.result).toFixed(2);
     details.value.result = proxy?.runTime(myTime)
     details.value.result = proxy?.runTime(myTime)
-  } else if (['run50', 'run70', 'run100', 'run200', 'run400', 'run15x4'].includes(query.value.exam_name)) {
+  } else if (['run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run15x4'].includes(query.value.exam_name)) {
     details.value.result =
     details.value.result =
       String(details.value.result).indexOf(".") == -1 ?
       String(details.value.result).indexOf(".") == -1 ?
         details.value.result :
         details.value.result :
@@ -339,7 +339,7 @@ const getDetails = () => {
   }
   }
 
 
   if (
   if (
-    ['runa800', 'runa1000', 'run50', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4']
+    ['runa800', 'runa1000', 'run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4']
       .includes(query.value.exam_name) &&
       .includes(query.value.exam_name) &&
     details.value.result == 0
     details.value.result == 0
   ) {
   ) {

+ 1 - 0
src/views/analysis/index.vue

@@ -117,6 +117,7 @@ const getReportList = () => {
               'jump',
               'jump',
               'longjump',
               'longjump',
               'run50',
               'run50',
+              'run60',
               'run70',
               'run70',
               'run100',
               'run100',
               'run200',
               'run200',

+ 3 - 3
src/views/ranking/index.vue

@@ -445,7 +445,7 @@ const getGoodStudent = () => {
         }
         }
         let result = null;
         let result = null;
         if (item.result.toString().indexOf(".") != -1) {
         if (item.result.toString().indexOf(".") != -1) {
-          if (['jump', 'longjump', 'run50', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1', 'basketballv1'].includes(projectObj.value.exam_name)) {
+          if (['jump', 'longjump', 'run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1', 'basketballv1'].includes(projectObj.value.exam_name)) {
             result = item.result.toFixed(2)
             result = item.result.toFixed(2)
           } else {
           } else {
             result = item.result.toFixed(1);
             result = item.result.toFixed(1);
@@ -495,7 +495,7 @@ const getStudentList = () => {
           }
           }
           let result = null;
           let result = null;
           if (item.result.toString().indexOf(".") != -1) {
           if (item.result.toString().indexOf(".") != -1) {
-            if (['jump', 'longjump', 'run50', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1'].includes(projectObj.value.exam_name)) {
+            if (['jump', 'longjump', 'run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1'].includes(projectObj.value.exam_name)) {
               result = item.result.toFixed(2)
               result = item.result.toFixed(2)
             } else {
             } else {
               result = item.result.toFixed(1);
               result = item.result.toFixed(1);
@@ -555,7 +555,7 @@ const getGradeList = async (grade: any) => {
           }
           }
           let result = null;
           let result = null;
           if (item.result.toString().indexOf(".") != -1) {
           if (item.result.toString().indexOf(".") != -1) {
-            if (['jump', 'longjump', 'run50', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1', 'basketballv1'].includes(projectObj.value.exam_name)) {
+            if (['jump', 'longjump', 'run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1', 'basketballv1'].includes(projectObj.value.exam_name)) {
               result = item.result.toFixed(2)
               result = item.result.toFixed(2)
             } else {
             } else {
               result = item.result.toFixed(1);
               result = item.result.toFixed(1);