Merge branch 'iteration-20241126' into dev

src/teacher/statistics/home-statistics-detail/echats/index.tsx

@@ -5,6 +5,7 @@ import {
   PropType,
   reactive,
   ref,
+  shallowReactive,
   watch
 } from 'vue'
 import styles from './index.module.less'
@@ -199,6 +200,10 @@ export default defineComponent({
       endTime: new Date(timeRange?.endTime || ''),
       endTimeStr: timeRange?.endTime || ''
     })
+    const showTimeRange = shallowReactive({
+      startTime: timeRange?.startTime || '',
+      endTime: timeRange?.endTime || ''
+    })
     let myChart: echarts.ECharts
 
     const _initData = () => {
@@ -286,7 +291,9 @@ export default defineComponent({
               ]}
               onClick={() => (searchStatus.value = true)}
             >
-              <span>本月</span>
+              <span>
+                {showTimeRange.startTime}~{showTimeRange.endTime}
+              </span>
               <img src={searchStatus.value ? iconArrow11 : iconArrow1} />
             </div>
           </div>
@@ -404,6 +411,9 @@ export default defineComponent({
                     startTime: forms.startTimeStr,
                     endTime: forms.endTimeStr
                   })
+                  // 显示的时间
+                  showTimeRange.startTime = forms.startTimeStr
+                  showTimeRange.endTime = forms.endTimeStr
                   searchStatus.value = false
                 }}
               >
@@ -436,6 +446,7 @@ export default defineComponent({
               forms.endTimeMaxDate = dayjs(val || new Date())
                 .add(1, 'year')
                 .toDate()
+              currentType.value = '' as any
             }}
           />
         </Popup>
@@ -458,6 +469,7 @@ export default defineComponent({
               forms.endTime = val
               forms.endTimeStatus = false
               forms.endTimeStr = dayjs(val).format('YYYY-MM-DD')
+              currentType.value = '' as any
             }}
           />
         </Popup>

src/teacher/statistics/practice-statistics-detail/index.tsx

@@ -239,7 +239,7 @@ export default defineComponent({
 
     const getSubjectList = async () => {
       const { data } = await request.get(
-        `api-teacher/subject/subSubjectSelect?type=MUSIC`
+        `/api-teacher/subject/subSubjectSelect?type=MUSIC`
       )
       if (Array.isArray(data)) {
         forms.subjectList = data
@@ -665,6 +665,7 @@ export default defineComponent({
               forms.endTimeMaxDate = dayjs(val || new Date())
                 .add(1, 'year')
                 .toDate()
+              searchObj.type = '' as any
             }}
           />
         </Popup>
@@ -686,6 +687,7 @@ export default defineComponent({
               forms.endTime = val
               forms.endTimeStatus = false
               forms.endTimeStr = dayjs(val).format('YYYY-MM-DD')
+              searchObj.type = '' as any
             }}
           />
         </Popup>