lex-xin 9 meses atrás
pai
commit
ca0b379f7c

+ 1 - 0
src/tenant/music/train-tool/index.module.less

@@ -529,6 +529,7 @@
     }
     .van-search__content {
       background-color: #f6f6f6 !important;
+      margin-bottom: 10px !important;
     }
 
     

+ 15 - 56
src/tenant/music/train-tool/index.tsx

@@ -49,20 +49,6 @@ import 'swiper/css'
 import 'swiper/css/pagination'
 import CourseItem from '../lessonCourseware/component/CourseItem'
 
-enum courseEmnu {
-  PERCUSSION_SINGLE = '打击乐',
-  FLUTE_SINGLE = '长笛',
-  SAX_SINGLE = '萨克斯',
-  CLARINET_SINGLE = '单簧管',
-  TRUMPET_SINGLE = '小号',
-  TROMBONE_SINGLE = '长号',
-  HORN_SINGLE = '圆号',
-  BARITONE_TUBA_SINGLE = '上低音号-大号',
-  MUSIC_THEORY = '乐理',
-  INSTRUMENTAL_ENSEMBLE = '合奏',
-  EUPHONIUM_SINGLE = '上低音号',
-  TUBA_SINGLE = '大号'
-}
 
 export default defineComponent({
   name: 'train-tool',
@@ -173,23 +159,6 @@ export default defineComponent({
       return status
     })
 
-    const courseTypeCodeList = computed(() => {
-      const obj =
-        state.activeTab === 'COURSEWARE' ? searchObj.value[state.activeTab] : []
-      const list = obj.courseTypeList || []
-      const temp = list?.map((item: any) => {
-        return {
-          text: courseEmnu[item],
-          value: item
-        }
-      })
-      temp.unshift({
-        text: '全部教材',
-        value: ''
-      })
-      return temp
-    })
-
     const getDetails = async () => {
       state.loadingAlbum = true
       try {
@@ -797,30 +766,8 @@ export default defineComponent({
                     type="tenant"
                     v-slots={{
                       left: () =>
-                        isSearchStatus.value && (
+                        isSearchStatus.value && state.activeTab !== 'COURSEWARE' && (
                           <DropdownMenu zIndex={2999}>
-                            {state.activeTab === 'COURSEWARE' ? (
-                              <DropdownItem
-                                teleport="body"
-                                onOpen={() => {
-                                  const targetElement: any =
-                                    document.querySelector('.musicList')
-                                  const targetPosition =
-                                    targetElement.getBoundingClientRect().top +
-                                    window.scrollY
-                                  // 设置距离顶部的像素值
-                                  window.scrollTo({
-                                    top: targetPosition - state.heightV + 1,
-                                    behavior: 'smooth'
-                                  })
-                                }}
-                                v-model={params.courseTypeCode}
-                                options={courseTypeCodeList.value}
-                                onUpdate:modelValue={() => {
-                                  onSearch()
-                                }}
-                              />
-                            ) : (
                               <DropdownItem
                                 onOpen={() => {
                                   const targetElement: any =
@@ -1001,7 +948,7 @@ export default defineComponent({
                                   </Button>
                                 </div>
                               </DropdownItem>
-                            )}
+                            
                           </DropdownMenu>
                         )
                     }}
@@ -1137,7 +1084,19 @@ export default defineComponent({
             onCancel={() => {
               state.subjectStatus = false
             }}
-            onConfirm={(val: any) => {
+            onConfirm={(val: any) => {params.keyword = null
+              params.level = ''
+              params.type = ''
+              params.courseTypeCode = ''
+              searchObj.value = {
+                COURSEWARE: {},
+                SUBJECT: {},
+                MUSIC: {},
+                ENSEMBLE: {}
+              }
+              activeTypeParams()
+
+              
               state.teacherSubjectId = val.id
               state.teacherSubjectName = val.name
               params.page = 1