fix: 智能填报的分数范围修改

src/pages-sub/home/components/ProgressBar.vue

@@ -4,17 +4,11 @@
   </view>
 </template>
 
-<script>
+<script lang="ts" setup>
-import { defineComponent } from 'vue'
+const props = defineProps({
-
+  progress: {
-export default defineComponent({
+    type: [Number, String],
-  name: 'ProgressBar',
+    default: 0,
-  props: {
-    progress: {
-      type: Number | String,
-      required: true,
-      default: 0,
-    },
   },
 })
 </script>

src/pages-sub/home/major/components/MajorUniversity.vue

@@ -92,8 +92,8 @@ watch(
           ssdmList: { ssmc: string; code: string; count: number }[]
         }
         provinceList.value = result.ssdmList.filter((item) => {
-          provinceTotal.value += item.count
           if (item.code) {
+            provinceTotal.value += item.count
             return item
           }
         })

src/pages-sub/home/wishesList/composable/useWishesList.ts

@@ -66,10 +66,11 @@ export const countModel = (list: any[]) => {
   return { tModel }
 }
 
-export const useScore = (provinceCode, batchName, requireSubject) => {
+export const useScore = (provinceCode, batchName, requireSubject, expectedScore) => {
   const score = ref(0)
   const minScore = ref(0)
   const maxScore = ref(0)
+  const sliderValue = ref([0, 0])
   const _requireSubject = requireSubject.length > 0 ? requireSubject[0].name : ''
   getBatchDynamicData({ LocationCode: provinceCode, Course: _requireSubject }).then((resp) => {
     if (resp.code === 200) {
@@ -81,7 +82,14 @@ export const useScore = (provinceCode, batchName, requireSubject) => {
 
       minScore.value = _result.minScore
       maxScore.value = _result.maxScore
+      if (maxScore.value !== 0) {
+        sliderValue.value[0] =
+          expectedScore < minScore.value + 40 ? minScore.value : expectedScore - 40
+
+        sliderValue.value[1] =
+          expectedScore > maxScore.value - 40 ? maxScore.value : expectedScore + 40
+      }
     }
   })
-  return { score, minScore, maxScore }
+  return { score, minScore, maxScore, sliderValue }
 }

src/pages-sub/home/wishesList/index.vue

@@ -293,34 +293,16 @@ const handleRegionName = (val: string[]) => {
   province.value = val
 }
 
-const sliderValue = ref([0, 0])
 const handleSliderChange = (val) => {
   collegeSearch.value.tModelValue = '-1'
   paging.value.reload()
 }
 
-const { score, minScore, maxScore } = useScore(
+const { score, minScore, maxScore, sliderValue } = useScore(
   userStore.userInfo.estimatedAchievement.provinceCode,
   userStore.userInfo.batchName,
   userStore.userInfo.estimatedAchievement.requireSubject,
-)
+  +userStore.userInfo.estimatedAchievement.expectedScore,
-
-watch(
-  () => maxScore.value,
-  () => {
-    if (maxScore.value !== 0) {
-      sliderValue.value[0] =
-        +userStore.userInfo.estimatedAchievement.expectedScore < minScore.value + 40
-          ? minScore.value
-          : +userStore.userInfo.estimatedAchievement.expectedScore - 40
-
-      sliderValue.value[1] =
-        +userStore.userInfo.estimatedAchievement.expectedScore > maxScore.value - 40
-          ? maxScore.value
-          : +userStore.userInfo.estimatedAchievement.expectedScore + 40
-    }
-  },
-  { immediate: true },
 )
 
 const isEdit = ref(false)