1

1

src/school/ranking-list/index.tsx

@@ -26,7 +26,12 @@ export default defineComponent({
       <>
         <OSticky position="top" background="#F8F8F8" onGetHeight={getHeight}>
           <div class={styles.topWrap}>
-            <OHeader color={'#ffffff'} background={'transparent'} border={false}></OHeader>
+            <OHeader
+              color={'#ffffff'}
+              backIconColor="white"
+              background={'transparent'}
+              border={false}
+            ></OHeader>
             <span class={styles.topTime}>{timers.value}</span>
           </div>
           <Tabs

src/school/ranking-list/modals/rank-item.module.less

@@ -41,6 +41,7 @@
       line-height: 22px;
     }
     .tag {
+      display: inline-block;
       background: #ffe7da;
       border-radius: 4px;
       font-size: 12px;

src/school/ranking-list/modals/rank-item.tsx

@@ -24,7 +24,9 @@ export default defineComponent({
               </div>
               <div>
                 <p class={styles.studentName}>{props.item.nickname}</p>
-                <div class={styles.tag}>{props.item.subjectNames}</div>
+                <div class={styles.tag}>
+                  {props.item.subjectNames ? props.item.subjectNames : '暂无声部'}
+                </div>
               </div>
             </div>
             <div class={styles.wrapRight}>

src/student/ranking-list/components/day-bang.tsx

@@ -50,6 +50,7 @@ export default defineComponent({
     const showContact = ref(false)
     const list = ref([])
     const toTop = ref(props.toHeight)
+    const myInfo = ref({} as any)
     console.log(props.toHeight)
     watch(
       () => props.toHeight,
@@ -74,7 +75,7 @@ export default defineComponent({
           refreshing.value = false
         }
 
-        const res = await request.post('/api-school/student/page', {
+        const res = await request.post('/api-student/student/page', {
           data: { ...forms }
         })
 
@@ -89,6 +90,7 @@ export default defineComponent({
         console.log(showContact.value, ' showContact.value ')
         loading.value = false
         finished.value = true
+        myInfo.value = res.data.extra
         // finished.value = res.data.current >= res.data.pages
       } catch (e: any) {
         // console.log(e, 'e')
@@ -129,7 +131,7 @@ export default defineComponent({
                 ))}
               </List>
             </PullRefresh>
-            <MyRankingItem item={list.value[0]}></MyRankingItem>
+            <MyRankingItem item={myInfo.value}></MyRankingItem>
           </div>
         ) : (
           <OEmpty />

src/student/ranking-list/components/timer-bang.tsx

@@ -47,6 +47,7 @@ export default defineComponent({
     const showContact = ref(false)
     const list = ref([])
     const toTop = ref(props.toHeight)
+    const myInfo = ref({} as any)
     watch(
       () => props.toHeight,
       (val: number) => {
@@ -71,7 +72,7 @@ export default defineComponent({
           refreshing.value = false
         }
 
-        const res = await request.post('/api-school/student/page', {
+        const res = await request.post('/api-student/student/page', {
           data: { ...forms }
         })
 
@@ -86,6 +87,7 @@ export default defineComponent({
         console.log(showContact.value, ' showContact.value ')
         loading.value = false
         finished.value = true
+        myInfo.value = res.data.extra
         // finished.value = res.data.current >= res.data.pages
       } catch (e: any) {
         // console.log(e, 'e')
@@ -128,7 +130,7 @@ export default defineComponent({
                 ))}
               </List>
             </PullRefresh>
-            <MyRankingItem item={list.value[0]}></MyRankingItem>
+            <MyRankingItem item={myInfo.value}></MyRankingItem>
           </div>
         ) : (
           <OEmpty />

src/student/ranking-list/index.tsx

@@ -39,7 +39,12 @@ export default defineComponent({
       <>
         <OSticky position="top" background="#F8F8F8" onGetHeight={getHeight}>
           <div class={styles.topWrap}>
-            <OHeader color={'#ffffff'} background={'transparent'} border={false}></OHeader>
+            <OHeader
+              color={'#ffffff'}
+              backIconColor="white"
+              background={'transparent'}
+              border={false}
+            ></OHeader>
             <span class={styles.topTime} onClick={() => (state.showPopoverTime = true)}>
               {forms.timeName} <Icon name={state.showPopoverTime ? 'arrow-up' : 'arrow-down'} />
             </span>

src/student/ranking-list/modals/my-ranking-item.tsx

@@ -15,14 +15,23 @@ export default defineComponent({
               </div>
               <div>
                 <p class={styles.studentName}>{props.item.nickname}</p>
-                <div class={styles.myTag}>{props.item.subjectNames}</div>
+                <div class={styles.myTag}>
+                  {props.item.subjectNames ? props.item.subjectNames : '暂无声部'}
+                </div>
               </div>
             </div>
             <div class={styles.wrapRight}>
-              <p>
-                <span>我的排名</span>
-                {props.item.ranking ? props.item.ranking : 0}
-              </p>
+              {props.item.ranking <= 50 ? (
+                <p>
+                  <span>我的排名</span>
+                  {props.item.ranking <= 50 ? props.item.ranking : 0}
+                </p>
+              ) : (
+                <p>
+                  {' '}
+                  <span>暂无排名</span>
+                </p>
+              )}
             </div>
           </div>
           <div class={styles.wall}></div>

src/student/ranking-list/modals/rank-item.module.less

@@ -42,6 +42,7 @@
       text-align: center;
     }
     .tag {
+      display: inline-block;
       background: #ffe7da;
       border-radius: 4px;
       font-size: 12px;
@@ -106,6 +107,7 @@
       text-align: center;
     }
     .myTag {
+      display: inline-block;
       background: #ff8057;
       border-radius: 12px;
       font-size: 12px;

src/student/ranking-list/modals/rank-item.tsx

@@ -24,7 +24,9 @@ export default defineComponent({
               </div>
               <div>
                 <p class={styles.studentName}>{props.item.nickname}</p>
-                <div class={styles.tag}>{props.item.subjectNames}</div>
+                <div class={styles.tag}>
+                  {props.item.subjectNames ? props.item.subjectNames : '暂无声部'}
+                </div>
               </div>
             </div>
             <div class={styles.wrapRight}>

src/views/attendance-rule/index.tsx

@@ -5,14 +5,7 @@ import { defineComponent, reactive, onMounted } from 'vue'
 import clockIcon from './images/clock-icon.png'
 import styles from './index.module.less'
 import request from '@/helpers/request'
-import {
-  addFormMinute,
-  addFormMinuteAddS,
-  reduceFormMinute,
-  reduceFormMinuteAddS,
-  addFormMinuteMS,
-  reduceFormMinuteMS
-} from '@/helpers/date'
+import { addFormMinute, reduceFormMinute } from '@/helpers/date'
 export default defineComponent({
   name: 'attendance-rule',
   setup() {
@@ -79,7 +72,8 @@ export default defineComponent({
                   <p>
                     课程<span>开始前{forms[15] ? forms[15] : 0}分钟</span>至课程
                     <span>开始前{forms[16] ? forms[16] : 0}分钟</span>
-                    签到GPS定位点在教学点<span>{forms[10] ? forms[10] : 0}米内</span>
+                    签到 <br />
+                    GPS定位点在教学点<span>{forms[10] ? forms[10] : 0}米内</span>
                   </p>
                   <p>
                     时间段：{reduceFormMinute('12:00:00', forms[15])} ~{' '}
@@ -92,7 +86,9 @@ export default defineComponent({
                   <p>
                     课程<span>开始前{forms[17] ? forms[17] : 0}分钟</span>后至课程
                     <span>开始前</span>
-                    签到GPS定位点在教学点<span>{forms[10] ? forms[10] : 0}米外</span>
+                    签到
+                    <br />
+                    GPS定位点在教学点<span>{forms[10] ? forms[10] : 0}米内</span>
                   </p>
                   <p>时间段：{reduceFormMinute('12:00:00', forms[17])} ~ 12:00:00</p>
                   <p>
@@ -172,14 +168,15 @@ export default defineComponent({
                   <p>
                     课程<span>结束后</span>至课程当天24点前
                   </p>
-                  <p>时间段：13:00:00 ~ 23:59:59</p>
+                  <p>时间段：12:00:00 ~ 23:59:59</p>
                 </div>
 
                 <div class={styles.textWrap}>
                   <h4>正常签退：</h4>
                   <p>
                     课程<span>结束后</span>至课程<span>结束后{forms[28] ? forms[28] : 0}分钟</span>
-                    签退GPS定位点在教学点<span>{forms[10] ? forms[10] : 0}米内</span>
+                    签退 <br />
+                    GPS定位点在教学点<span>{forms[10] ? forms[10] : 0}米内</span>
                   </p>
                   <p>时间段：13:00:00 ~ {addFormMinute('13:00:00', forms[28])}</p>
                 </div>
@@ -205,7 +202,7 @@ export default defineComponent({
                   <h4>异常签退：</h4>
                   <p>
                     课程<span>结束前{forms[29] ? forms[29] : 0}分钟</span>至<span>课程结束前</span>
-                    或GPS定位点在教学点<span> {forms[10] ? forms[10] : 0}米外</span>
+                    <br /> 或GPS定位点在教学点<span> {forms[10] ? forms[10] : 0}米内</span>
                   </p>
                   <p>时间段：{reduceFormMinute('13:00:00', forms[29])} ~ 12:59:59</p>
                   <p>
@@ -245,7 +242,8 @@ export default defineComponent({
                 <div class={styles.textWrap}>
                   <p>
                     <span>
-                      若签到时间在正常范围内 但同时GPS定位在教学点{forms[10] ? forms[10] : 0}
+                      若签到时间在正常范围内
+                      <br /> 但同时GPS定位在教学点{forms[10] ? forms[10] : 0}
                       米外
                     </span>
                   </p>
@@ -260,7 +258,7 @@ export default defineComponent({
                 <div class={styles.textWrap}>
                   <p>
                     <span>
-                      若签退时间在正常范围内 但同时GPS定位在教学点{forms[10] ? forms[10] : 0}
+                      若签退时间在正常范围内 <br /> 但同时GPS定位在教学点{forms[10] ? forms[10] : 0}
                       米外
                     </span>
                   </p>