日常开发

src/components/ReportList/index.vue

@@ -130,7 +130,7 @@ const getScroll = (event?: any) => {
   let scrollTop = obj.scrollTop;
   let clientHeight = obj.clientHeight;
   //提前100高度加载数据
-  if (scrollTop + clientHeight + 100 >= scrollHeight) {
+  if (scrollTop + clientHeight + 150 >= scrollHeight) {
     console.log('到底了!')
     //继续加载下一页
     if (debounceTime.value) {

src/views/analysis/components/run.vue

@@ -6,7 +6,7 @@
         <div class="item" v-if="details.image_url">
           <div class="item-title">冲线截图 </div>
           <div class="item-con">
-            <img class="bigImg" src="details.image_url" />
+            <img class="bigImg" :src="details.image_url" />
           </div>
         </div>
       </div>

src/views/analysis/components/triJump.vue

@@ -376,5 +376,5 @@ onBeforeMount(() => {
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
 </style>

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">
       <!--立定跳远-->
       <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
@@ -225,6 +225,7 @@ import RopeSkipping from "./components/ropeSkipping.vue";
 import SidePullUp from "./components/sidePullUp.vue";
 import TriJump from "./components/triJump.vue";
 import ShotPut from "./components/shotPut.vue";
+const route = useRoute();
 const dic: any = dataDictionary;
 const { proxy } = getCurrentInstance() as any;
 const data = reactive<any>({
@@ -239,14 +240,14 @@ const { query, details, gradeType } = toRefs(data);
 */
 const getDetails = () => {
   let params = {
-    test_key: query.value.test_key,
-    stu_key: query.value.stu_key,
     exam_name: query.value.exam_name,
+    student_id: query.value.student_id,
+    result_id: query.value.result_id
   };
-  proxy?.$http.analysis.examDetails(params)
+  proxy?.$http.common.reportDetails(params)
     .then((res: any) => {
       //console.log(res);
-      details.value = res.data;
+      details.value = res.data || {};
       let obj = gradeType.value.find((item: any) => {
         return item.value == details.value.grade;
       });
@@ -281,6 +282,8 @@ onBeforeMount(() => {
     return item.value == userinfo.category;
   })
   gradeType.value = obj.child || [];
+  query.value = route.query;
+
 })
 
 onMounted(() => {

src/views/analysis/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="reportList">
-    <div class="title">测试记录</div>
+    <div class="title">{{ dic.project[parameter.project] || "" }}测试记录</div>
     <ul :ref="reportScrollRef" @scroll="getScroll($event)">
       <li v-for="(item, index) in reportList" :key="index" @click="openReport(item)">
         <div class="left">
@@ -31,7 +31,6 @@ const router = useRouter();
 const route = useRoute();
 const dic: any = dataDictionary;
 const { proxy } = getCurrentInstance() as any;
-const reportWindowRef = ref();
 const reportScrollRef = ref();
 
 const data = reactive<any>({
@@ -39,7 +38,7 @@ const data = reactive<any>({
   reportList: [],//测试列表
   studentPage: {
     current: 1,
-    size: 10,
+    size: 20,
     pages: 1,
   }, //学生分页
   debounceTime: '', //防抖状态
@@ -99,9 +98,9 @@ const getPages = (data: any) => {
 */
 const openReport = (data: any) => {
   let params = {
-    test_key: data.test_key,
-    stu_key: data.stu_key,
     exam_name: data.exam_name,
+    student_id: data.student_id,
+    result_id: data.result_id,
   }
   router.push({
     path: '/analysis/detail', query: params
@@ -120,7 +119,7 @@ const getScroll = (event?: any) => {
   let scrollTop = obj.scrollTop;
   let clientHeight = obj.clientHeight;
   //提前100高度加载数据
-  if (scrollTop + clientHeight + 100 >= scrollHeight) {
+  if (scrollTop + clientHeight + 150 >= scrollHeight) {
     console.log('到底了!')
     //继续加载下一页
     if (debounceTime.value) {
@@ -154,6 +153,19 @@ onMounted(() => {
 })
 </script>
 <style lang="scss" scoped>
+html {
+  font-size: calc(100vw / 106);
+}
+
+ul,
+ol {
+  margin: 0;
+  padding: 0;
+}
+
+ul li {
+  list-style: none;
+}
 .reportList {
   display: flex;
   flex-direction: column;
@@ -165,7 +177,7 @@ onMounted(() => {
     width: 100%;
     text-align: center;
     color: #1A293A;
-    font-size: 1.65rem;
+    font-size: 3.5vh;
     background: radial-gradient(120% 126% at 5% 93%, #8EFFA9 0%, #07FFE7 100%);
   }
 
@@ -175,7 +187,7 @@ onMounted(() => {
 
     li {
       border-bottom: 1px solid #48677E;
-      padding: 8px 30px;
+      padding: 8px 25px;
       display: flex;
       justify-content: space-between;
       align-items: center;

src/views/ranking/index.vue

@@ -594,7 +594,7 @@ const getScroll = (event?: any, grade?: any) => {
   let scrollTop = obj.scrollTop;
   let clientHeight = obj.clientHeight;
   //提前100高度加载数据
-  if (scrollTop + clientHeight + 100 >= scrollHeight) {
+  if (scrollTop + clientHeight + 150 >= scrollHeight) {
     console.log('到底了!')
     //继续加载下一页
     if (debounceTime.value) {