diff --git a/src/pages-sub/components/interval/NumberInterval.vue b/src/pages-sub/components/interval/NumberInterval.vue new file mode 100644 index 0000000..7589866 --- /dev/null +++ b/src/pages-sub/components/interval/NumberInterval.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/pages-sub/components/Slider.vue b/src/pages-sub/components/interval/Slider.vue similarity index 100% rename from src/pages-sub/components/Slider.vue rename to src/pages-sub/components/interval/Slider.vue diff --git a/src/pages-sub/home/college/components/EnrollmentMark.vue b/src/pages-sub/home/college/components/EnrollmentMark.vue index 91d32e9..24f8bde 100644 --- a/src/pages-sub/home/college/components/EnrollmentMark.vue +++ b/src/pages-sub/home/college/components/EnrollmentMark.vue @@ -109,7 +109,7 @@ const getPlanProListData = async (newVal) => { tableData.value = _res.newZsplanfusions.map((item) => { let _item = item _item.score = `最高分:${item.score_max !== '0' ? item.score_max : '--'} \n 最低分:${item.score_min !== '0' ? item.score_min : '--'} \n 平均分:${item.score_average !== '0' ? item.score_average : '--'}` - _item.subjectAndCollege = ` 院校/批次:${item.subject_name} \n 专业:${item.second_subject}` + _item.subjectAndCollege = ` 院校/批次:${item.subject_name} \n 选科:${item.second_subject}` return _item }) diff --git a/src/pages-sub/home/wishesList/components/FilterMajorList.vue b/src/pages-sub/home/wishesList/components/FilterMajorList.vue index 0f5c62e..6ed745a 100644 --- a/src/pages-sub/home/wishesList/components/FilterMajorList.vue +++ b/src/pages-sub/home/wishesList/components/FilterMajorList.vue @@ -64,6 +64,13 @@ const handleRemove = (item, index) => { menus.value[item.groupIndex].items[item.majorIndex].childMajors[item.cIndex].check = 1 } +const handleClear = () => { + filterParams.value.forEach((item) => { + menus.value[item.groupIndex].items[item.majorIndex].childMajors[item.cIndex].check = 1 + }) + filterParams.value = [] +} + const menus = ref([]) const currentMenuObj = ref(null) @@ -164,7 +171,7 @@ watch( const getSearchParam = () => { return filterParams.value } -defineExpose({ getSearchParam }) +defineExpose({ getSearchParam, handleClear })