feat: 智能填报筛选数据显示修复
parent
5c4cebf1f5
commit
ea65e642ad
|
|
@ -65,7 +65,11 @@ const handleChange = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const navigatorTo = () => {
|
const navigatorTo = () => {
|
||||||
if (userStore.userInfo.estimatedAchievement.expectedScore === '') {
|
if (
|
||||||
|
Object.prototype.toString.call(userStore.userInfo.estimatedAchievement.expectedScore) ===
|
||||||
|
'[object Null]' ||
|
||||||
|
userStore.userInfo.estimatedAchievement.expectedScore === ''
|
||||||
|
) {
|
||||||
handleChange()
|
handleChange()
|
||||||
} else {
|
} else {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
|
@ -75,7 +79,11 @@ const navigatorTo = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const navigatorToAi = () => {
|
const navigatorToAi = () => {
|
||||||
if (userStore.userInfo.estimatedAchievement.expectedScore === '') {
|
if (
|
||||||
|
Object.prototype.toString.call(userStore.userInfo.estimatedAchievement.expectedScore) ===
|
||||||
|
'[object Null]' ||
|
||||||
|
userStore.userInfo.estimatedAchievement.expectedScore === ''
|
||||||
|
) {
|
||||||
handleChange()
|
handleChange()
|
||||||
} else {
|
} else {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
<view class="custom-picker">
|
<view class="custom-picker">
|
||||||
<view class="picker-mask" @touchmove.stop.prevent></view>
|
<view class="picker-mask" @touchmove.stop.prevent></view>
|
||||||
<picker-view
|
<picker-view
|
||||||
|
:immediate-change="true"
|
||||||
:value="currentIndex"
|
:value="currentIndex"
|
||||||
:indicator-style="indicatorStyle"
|
:indicator-style="indicatorStyle"
|
||||||
:style="{
|
:style="{
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
<view class="picker-mask" @touchmove.stop.prevent></view>
|
<view class="picker-mask" @touchmove.stop.prevent></view>
|
||||||
<picker-view
|
<picker-view
|
||||||
v-if="visible"
|
v-if="visible"
|
||||||
|
:immediate-change="true"
|
||||||
:value="currentIndex"
|
:value="currentIndex"
|
||||||
:indicator-style="indicatorStyle"
|
:indicator-style="indicatorStyle"
|
||||||
:indicator-class="'picker-item-selected'"
|
:indicator-class="'picker-item-selected'"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed, watch, provide, reactive, onMounted, nextTick } from 'vue'
|
import { ref, computed, watch, provide, onMounted, nextTick } from 'vue'
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
value: {
|
value: {
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,9 @@
|
||||||
<slot class="w-full"></slot>
|
<slot class="w-full"></slot>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="text-center p-[32rpx]" v-show="data.length === 0">暂无数据</view>
|
<view class="text-center p-[32rpx] text-[28rpx] text-[#aaa]" v-show="data.length === 0">
|
||||||
|
暂无数据
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -196,11 +196,18 @@ const queryList = (page: number, pageSize: number) => {
|
||||||
majors: collegeSearch.value.majors,
|
majors: collegeSearch.value.majors,
|
||||||
keyword: searchValue.value,
|
keyword: searchValue.value,
|
||||||
type: collegeSearch.value.tModelValue === '-1' ? null : +collegeSearch.value.tModelValue,
|
type: collegeSearch.value.tModelValue === '-1' ? null : +collegeSearch.value.tModelValue,
|
||||||
|
utype: collegeSearch.value.utype,
|
||||||
}).then((resp) => {
|
}).then((resp) => {
|
||||||
if (resp.code === 200) {
|
if (resp.code === 200) {
|
||||||
paging.value.complete((resp.result as { rows: any[] }).rows)
|
paging.value.complete((resp.result as { rows: any[] }).rows)
|
||||||
total.value = (resp.result as { totalRows: number }).totalRows
|
total.value = (resp.result as { totalRows: number }).totalRows
|
||||||
typeModelList.value = coverTypeModel((resp.result as { tModel: any }).tModel, total.value)
|
typeModelList.value = coverTypeModel((resp.result as { tModel: any }).tModel, total.value)
|
||||||
|
let _tem = typeModelList.value.filter(
|
||||||
|
(item) => item.value === collegeSearch.value.tModelValue,
|
||||||
|
)
|
||||||
|
if (_tem.length > 0) {
|
||||||
|
collegeSearch.value.tModel = _tem[0].name
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -218,6 +225,7 @@ const collegeSearch = ref({
|
||||||
feature: [],
|
feature: [],
|
||||||
majors: [],
|
majors: [],
|
||||||
tModel: '',
|
tModel: '',
|
||||||
|
utype: [],
|
||||||
tModelValue: '-1',
|
tModelValue: '-1',
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
@ -231,6 +239,7 @@ const handleConfirm = () => {
|
||||||
collegeSearch.value.feature = _cur.chooseCollegeFeature
|
collegeSearch.value.feature = _cur.chooseCollegeFeature
|
||||||
collegeSearch.value.nature = _cur.chooseNature
|
collegeSearch.value.nature = _cur.chooseNature
|
||||||
collegeSearch.value.majors = _cur.chooseMajors
|
collegeSearch.value.majors = _cur.chooseMajors
|
||||||
|
collegeSearch.value.utype = _cur.chooseUniType
|
||||||
}
|
}
|
||||||
paging.value.reload()
|
paging.value.reload()
|
||||||
}
|
}
|
||||||
|
|
@ -262,6 +271,7 @@ const sliderValue = ref([
|
||||||
+userStore.userInfo.estimatedAchievement.expectedScore,
|
+userStore.userInfo.estimatedAchievement.expectedScore,
|
||||||
])
|
])
|
||||||
const handleSliderChange = (val) => {
|
const handleSliderChange = (val) => {
|
||||||
|
collegeSearch.value.tModelValue = '-1'
|
||||||
paging.value.reload()
|
paging.value.reload()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ const editWishList = (_wishList: any[]) => {
|
||||||
unCode: item.unCode,
|
unCode: item.unCode,
|
||||||
type: item.type,
|
type: item.type,
|
||||||
sort: index + 1,
|
sort: index + 1,
|
||||||
|
percentAge: item.percentAge,
|
||||||
vItems: item.vItems.map((vItem, vIndex) => {
|
vItems: item.vItems.map((vItem, vIndex) => {
|
||||||
return {
|
return {
|
||||||
sort: vIndex + 1,
|
sort: vIndex + 1,
|
||||||
|
|
@ -76,6 +77,7 @@ const addWishList = () => {
|
||||||
unCode: item.unCode || item.collegeCode,
|
unCode: item.unCode || item.collegeCode,
|
||||||
type: item.type,
|
type: item.type,
|
||||||
sort: index + 1,
|
sort: index + 1,
|
||||||
|
percentAge: item.percentAge,
|
||||||
vItems: item.vItems.map((vItem, vIndex) => {
|
vItems: item.vItems.map((vItem, vIndex) => {
|
||||||
return {
|
return {
|
||||||
sort: vIndex + 1,
|
sort: vIndex + 1,
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
mode="scaleToFill"
|
mode="scaleToFill"
|
||||||
class="w-[240rpx] h-[240rpx]"
|
class="w-[240rpx] h-[240rpx]"
|
||||||
/>
|
/>
|
||||||
<text>暂无数据</text>
|
<text class="text-[28rpx] text-[#aaa]">没有数据哦~</text>
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
mode="scaleToFill"
|
mode="scaleToFill"
|
||||||
class="w-[240rpx] h-[240rpx]"
|
class="w-[240rpx] h-[240rpx]"
|
||||||
/>
|
/>
|
||||||
<text>暂无数据</text>
|
<text class="text-[28rpx] text-[#aaa]">没有数据哦~</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
mode="scaleToFill"
|
mode="scaleToFill"
|
||||||
class="w-[240rpx] h-[240rpx]"
|
class="w-[240rpx] h-[240rpx]"
|
||||||
/>
|
/>
|
||||||
<text>暂无数据</text>
|
<text class="text-[28rpx] text-[#aaa]">没有数据哦~</text>
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -253,6 +253,7 @@ export interface AutoFillParams {
|
||||||
location?: null | string
|
location?: null | string
|
||||||
majors?: string[] | null
|
majors?: string[] | null
|
||||||
nature?: string[] | null
|
nature?: string[] | null
|
||||||
|
utype?: string[] | null
|
||||||
ownership?: string[] | null
|
ownership?: string[] | null
|
||||||
p?: number | null
|
p?: number | null
|
||||||
pageIndex?: number
|
pageIndex?: number
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue