修改问题

src/school/attendance-rules/component/sigin-in-rule.tsx

@@ -303,7 +303,7 @@ export default defineComponent({
                     以<span>12:00:00</span>开始的课程为例,在
                     <span>
                       {addFormMinuteAddS('12:00:00', 0)} ~{' '}
-                      {addFormMinute('12:00:00', forms['late_sign_in'])}
+                      {addFormMinute('12:00:00', forms['absence_sign_in'])}
                     </span>
                     时间范围内签到属于<span>迟到</span>
                   </div>

src/school/orchestra/compontent/plan.tsx

@@ -116,12 +116,12 @@ export default defineComponent({
                   trackColor="#ECECEC"
                   showPivot={false}
                   style={{
-                    borderRadius: '12px'
+                    borderRadius: '10px'
                   }}
                   percentage={
                     item.endCourseNum ? (item.coursewareNum / item.endCourseNum) * 100 : 0
                   }
-                  strokeWidth={12}
+                  strokeWidth={8}
                 />
               </div>
             ))}

src/school/orchestra/orchestra-detail.tsx

@@ -3,6 +3,7 @@ import OSticky from '@/components/o-sticky'
 import request from '@/helpers/request'
 import { Sticky, Tab, Tabs } from 'vant'
 import { defineComponent, onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
 import Information from './compontent/information'
 import Photo from './compontent/photo'
 import Plan from './compontent/plan'
@@ -11,9 +12,9 @@ import styles from './orchestra-detail.module.less'
 export default defineComponent({
   name: 'orchestra-detail',
   setup() {
+    const route = useRoute()
     const tabs = sessionStorage.getItem('orchestra-detail-tab')
-    // console.log(tabs, 'tabs')
-    const tabValue = ref(tabs || 'information')
+    const tabValue = ref(tabs || route.query.tabs || 'information')
     sessionStorage.removeItem('orchestra-detail-tab')
     const tabHeight = ref('auto')
     const termTimes = ref({

src/school/ranking-list/index.tsx

@@ -90,8 +90,23 @@ export default defineComponent({
             state.startTime = ''
             state.endTime = ''
             if (!dayjs(item[0]).isBetween(dayjs(state.startTime), dayjs(state.endTime))) {
-              state.startTime = dayjs(item[0]).day(1).format('YYYY-MM-DD')
-              state.endTime = dayjs(item[0]).day(7).format('YYYY-MM-DD')
+              const week = dayjs(item[0]).day()
+              if (week === 0) {
+                // 星期天
+                state.startTime = dayjs(item[0]).subtract(6, 'day').format('YYYY-MM-DD')
+                state.endTime = dayjs(item[0]).format('YYYY-MM-DD')
+              } else if (week === 1) {
+                // 星期一
+                state.startTime = dayjs(item[0]).format('YYYY-MM-DD')
+                state.endTime = dayjs(item[0]).add(6, 'day').format('YYYY-MM-DD')
+              } else {
+                state.startTime = dayjs(item[0])
+                  .subtract(week - 1, 'day')
+                  .format('YYYY-MM-DD')
+                state.endTime = dayjs(item[0])
+                  .add(7 - week, 'day')
+                  .format('YYYY-MM-DD')
+              }
             }
             state.showPopoverTime = false
           }}

src/student/ranking-list/index.tsx

@@ -78,8 +78,26 @@ export default defineComponent({
             forms.practiceMonth = ''
             forms.endTime = ''
             if (!dayjs(item[0]).isBetween(dayjs(forms.practiceMonth), dayjs(forms.endTime))) {
-              forms.practiceMonth = dayjs(item[0]).day(1).format('YYYYMMDD')
-              forms.endTime = dayjs(item[0]).day(7).format('YYYY-MM-DD')
+              // forms.practiceMonth = dayjs(item[0]).day(1).format('YYYYMMDD')
+              // forms.endTime = dayjs(item[0]).day(7).format('YYYY-MM-DD')
+
+              const week = dayjs(item[0]).day()
+              if (week === 0) {
+                // 星期天
+                forms.practiceMonth = dayjs(item[0]).subtract(6, 'day').format('YYYYMMDD')
+                forms.endTime = dayjs(item[0]).format('YYYY-MM-DD')
+              } else if (week === 1) {
+                // 星期一
+                forms.practiceMonth = dayjs(item[0]).format('YYYYMMDD')
+                forms.endTime = dayjs(item[0]).add(6, 'day').format('YYYY-MM-DD')
+              } else {
+                forms.practiceMonth = dayjs(item[0])
+                  .subtract(week - 1, 'day')
+                  .format('YYYYMMDD')
+                forms.endTime = dayjs(item[0])
+                  .add(7 - week, 'day')
+                  .format('YYYY-MM-DD')
+              }
             }
             state.showPopoverTime = false
           }}

src/views/attendance-rule/index.tsx

@@ -120,7 +120,7 @@ export default defineComponent({
                   <p>
                     课程
                     <span>
-                      开始前{forms['abnormal_sign_in'] ? forms['abnormal_sign_in'] : 0}分钟
+                      开始前{forms['normal_sign_in_end'] ? forms['normal_sign_in_end'] : 0}分钟
                     </span>
                     后至课程
                     <span>开始前</span>
@@ -146,10 +146,11 @@ export default defineComponent({
                 <div class={styles.textWrap}>
                   <h4>迟到：</h4>
                   <p>
-                    课程<span>开始后{forms['late_sign_in'] ? forms['late_sign_in'] : 0}分钟</span>
+                    课程
+                    <span>开始后{forms['absence_sign_in'] ? forms['absence_sign_in'] : 0}分钟</span>
                     内签到
                   </p>
-                  <p>时间段：12:00:00 ~ {addFormMinute('12:00:00', forms['late_sign_in'])}</p>
+                  <p>时间段：12:00:00 ~ {addFormMinute('12:00:00', forms['absence_sign_in'])}</p>
                   <p>
                     扣除训练补助：
                     <span>

src/views/courseware-record/index.tsx

@@ -88,7 +88,7 @@ export default defineComponent({
     onMounted(() => {
       getList()
       getOrchestraList()
-      getSubjects()
+      // getSubjects()
     })
 
     const onBack = () => {
@@ -127,22 +127,22 @@ export default defineComponent({
       }
     }
 
-    const getSubjects = async () => {
-      try {
-        const res = await request.post(`${platformApi.value}/subjectBasicConfig/page`, {
-          data: { page: 1, rows: 9999 }
-        })
-        state.subjects = res.data.rows.map((item) => {
-          return {
-            name: item.courseTypeName,
-            value: item.courseType as string
-          }
-        })
-      } catch (e: any) {
-        const message = e.message
-        showToast(message)
-      }
-    }
+    // const getSubjects = async () => {
+    //   try {
+    //     const res = await request.post(`${platformApi.value}/subjectBasicConfig/page`, {
+    //       data: { page: 1, rows: 9999 }
+    //     })
+    //     state.subjects = res.data.rows.map((item) => {
+    //       return {
+    //         name: item.courseTypeName,
+    //         value: item.courseType as string
+    //       }
+    //     })
+    //   } catch (e: any) {
+    //     const message = e.message
+    //     showToast(message)
+    //   }
+    // }
     const onRefresh = () => {
       finished.value = false
       // 重新加载数据
@@ -164,7 +164,7 @@ export default defineComponent({
 
     const formatTime2Mins = (second: number) => {
       if (second) {
-        const first = Math.floor(1098 / 60)
+        const first = Math.floor(second / 60)
         const last = second % 60
         return (first >= 10 ? first : '0' + first) + ':' + (last >= 10 ? last : '0' + last)
       } else {
@@ -450,9 +450,33 @@ export default defineComponent({
           onSelect={(item: any) => {
             forms.startTime = ''
             forms.endTime = ''
+            // console.log(
+            //   item,
+            //   dayjs(item[0]).format('YYYY-MM-DD'),
+            //   'item',
+            //   dayjs(item[0]).day(0).format('YYYY-MM-DD'),
+            //   dayjs(item[0]).day(),
+            //   dayjs(item[0]).subtract(6, 'day').format('YYYY-MM-DD')
+            // )
+
             if (!dayjs(item[0]).isBetween(dayjs(forms.startTime), dayjs(forms.endTime))) {
-              forms.startTime = dayjs(item[0]).day(1).format('YYYY-MM-DD')
-              forms.endTime = dayjs(item[0]).day(7).format('YYYY-MM-DD')
+              const week = dayjs(item[0]).day()
+              if (week === 0) {
+                // 星期天
+                forms.startTime = dayjs(item[0]).subtract(6, 'day').format('YYYY-MM-DD')
+                forms.endTime = dayjs(item[0]).format('YYYY-MM-DD')
+              } else if (week === 1) {
+                // 星期一
+                forms.startTime = dayjs(item[0]).format('YYYY-MM-DD')
+                forms.endTime = dayjs(item[0]).add(6, 'day').format('YYYY-MM-DD')
+              } else {
+                forms.startTime = dayjs(item[0])
+                  .subtract(week - 1, 'day')
+                  .format('YYYY-MM-DD')
+                forms.endTime = dayjs(item[0])
+                  .add(7 - week, 'day')
+                  .format('YYYY-MM-DD')
+              }
             }
             state.showPopoverTime = false
           }}

src/views/exercise-record/index.tsx

@@ -409,8 +409,26 @@ export default defineComponent({
             forms.startTime = ''
             forms.endTime = ''
             if (!dayjs(item[0]).isBetween(dayjs(forms.startTime), dayjs(forms.endTime))) {
-              forms.startTime = dayjs(item[0]).day(1).format('YYYY-MM-DD')
-              forms.endTime = dayjs(item[0]).day(7).format('YYYY-MM-DD')
+              // forms.startTime = dayjs(item[0]).day(1).format('YYYY-MM-DD')
+              // forms.endTime = dayjs(item[0]).day(7).format('YYYY-MM-DD')
+
+              const week = dayjs(item[0]).day()
+              if (week === 0) {
+                // 星期天
+                forms.startTime = dayjs(item[0]).subtract(6, 'day').format('YYYY-MM-DD')
+                forms.endTime = dayjs(item[0]).format('YYYY-MM-DD')
+              } else if (week === 1) {
+                // 星期一
+                forms.startTime = dayjs(item[0]).format('YYYY-MM-DD')
+                forms.endTime = dayjs(item[0]).add(6, 'day').format('YYYY-MM-DD')
+              } else {
+                forms.startTime = dayjs(item[0])
+                  .subtract(week - 1, 'day')
+                  .format('YYYY-MM-DD')
+                forms.endTime = dayjs(item[0])
+                  .add(7 - week, 'day')
+                  .format('YYYY-MM-DD')
+              }
             }
             state.showPopoverTime = false
           }}

src/views/exercise-record/modals/student-item.tsx

@@ -93,7 +93,7 @@ export default defineComponent({
                     {props.item.nickname}
                   </p>
                   <p class={styles.bottomText}>
-                    {props.item.subjectNames ? props.item.subjectNames : '暂无声部'}
+                    {props.item.subjectName ? props.item.subjectName : '暂无声部'}
                   </p>
                 </div>
                 <div class={styles.userItem}>