xjs
/
volunteer-secondary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 样式更新

master
xjs 2025-12-01 17:02:36 +08:00
parent 3288a7978d
commit f15cb1adba
24 changed files with 243 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/chart-sub/evaluate/academicReport/capabilityReport.vue
View File

@ -69,17 +69,17 @@ onLoad((options) => {
pageType.value = +options.type pageType.value = +options.type
pageId.value = options.id pageId.value = options.id
// getAbilityDimension({ ScaleId: pageId.value }).then((resp) => { getAbilityDimension({ ScaleId: pageId.value }).then((resp) => {
// if (resp.code === 200) { if (resp.code === 200) {
// studyRecord.value = resp.result as { studyRecord.value = resp.result as {
// description: string description: string
// title: string title: string
// linChart: any[] linChart: any[]
// reportItems: any[] reportItems: any[]
// hTag: string hTag: string
// } }
// } }
// }) })
}) })
</script> </script>

22
src/chart-sub/evaluate/academicReport/characterReport.vue
View File

@ -85,17 +85,17 @@ onLoad((options) => {
pageType.value = +options.type pageType.value = +options.type
pageId.value = options.id pageId.value = options.id
// getMBTIDimension({ ScaleId: pageId.value }).then((resp) => { getMBTIDimension({ ScaleId: pageId.value }).then((resp) => {
// if (resp.code === 200) { if (resp.code === 200) {
// studyRecord.value = resp.result as { studyRecord.value = resp.result as {
// description: string description: string
// title: string title: string
// linChart: any linChart: any
// reportItem: { mainDomain: string; major: string; occupation: string } reportItem: { mainDomain: string; major: string; occupation: string }
// hTag: string hTag: string
// } }
// } }
// }) })
}) })
</script> </script>

2
src/chart-sub/evaluate/academicReport/interestReport.vue
View File

@ -2,7 +2,7 @@
<view class="flex flex-col h-screen relative custom-bg"> <view class="flex flex-col h-screen relative custom-bg">
<Navbar safeAreaInsetTop :bordered="false" leftArrow @clickLeft="handleBack" bg-color="transparent"> <Navbar safeAreaInsetTop :bordered="false" leftArrow @clickLeft="handleBack" bg-color="transparent">
<template #title> <template #title>
<text class="text-[#1F2329] text-[36rpx] font-medium text-[#fff]">性格测评报告</text> <text class="text-[#1F2329] text-[36rpx] font-medium text-[#fff]">兴趣测评报告</text>
</template> </template>
</Navbar> </Navbar>
<view class="flex-1 overflow-auto relative mt-[40rpx]"> <view class="flex-1 overflow-auto relative mt-[40rpx]">

22
src/chart-sub/evaluate/academicReport/opinionAboutReport.vue
View File

@ -79,17 +79,17 @@ onLoad((options) => {
pageType.value = +options.type pageType.value = +options.type
pageId.value = options.id pageId.value = options.id
// getOpinionAbout({ ScaleId: pageId.value }).then((resp) => { getOpinionAbout({ ScaleId: pageId.value }).then((resp) => {
// if (resp.code === 200) { if (resp.code === 200) {
// studyRecord.value = resp.result as { studyRecord.value = resp.result as {
// description: string description: string
// title: string title: string
// picCharts: { radars: any[]; indicator: any[] } picCharts: { radars: any[]; indicator: any[] }
// reportItems: any[] reportItems: any[]
// tag: string tag: string
// } }
// } }
// }) })
}) })
</script> </script>

2
src/chart-sub/evaluate/components/AiFooter.vue
View File

@ -6,7 +6,7 @@
v-if="aiShow" v-if="aiShow"
> >
<view <view
class="rounded-[8rpx] border-[#1580FF] border-[2rpx] border-solid w-full py-[14rpx] flex items-center justify-center" class="rounded-[8rpx] border-[#1580FF] border-[2rpx] border-solid w-full py-[14rpx] flex items-center justify-center mb-[16rpx]"
> >
<view class="w-[52rpx] h-[52rpx] mr-[10rpx]"> <view class="w-[52rpx] h-[52rpx] mr-[10rpx]">
<image <image

6
src/http/http.ts
View File

@ -93,12 +93,6 @@ export function http<T>(options: CustomRequestOptions) {
return reject(res) return reject(res)
} }
// 不存在的用户处理
if (responseData.code === 400) {
tokenStore.logout()
uni.navigateTo({ url: LOGIN_PAGE })
}
// 处理其他成功状态（HTTP状态码200-299） // 处理其他成功状态（HTTP状态码200-299）
if (res.statusCode >= 200 && res.statusCode < 300) { if (res.statusCode >= 200 && res.statusCode < 300) {
// 处理业务逻辑错误 // 处理业务逻辑错误

12
src/pages-sub/about/userInfo.vue
View File

@ -174,19 +174,19 @@ onShow(() => {
<MxRadio v-model:value="userInfo.sex" v-model:label="formData.genderLabel" v-if="activeType == 'gender'" <MxRadio v-model:value="userInfo.sex" v-model:label="formData.genderLabel" v-if="activeType == 'gender'"
:options="genderClassification" label-key="label" value-key="value" :options="genderClassification" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
custom-root-class="px-[30rpx] pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" />
<MxRadio v-model:value="userInfo.userExtend.gradeId" v-model:label="userInfo.userExtend.gradeName" <MxRadio v-model:value="userInfo.userExtend.gradeId" v-model:label="userInfo.userExtend.gradeName"
v-if="activeType == 'grade'" :options="gradeClassification" label-key="label" value-key="value" v-if="activeType == 'grade'" :options="gradeClassification" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class="px-[30rpx] pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" />
<MxRadio v-model:value="userInfo.userExtend.area" v-if="activeType == 'area'" :options="areaList" <MxRadio v-model:value="userInfo.userExtend.area" v-if="activeType == 'area'" :options="areaList"
label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class="px-[30rpx] pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pt-[22rpx] pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" />
</view> </view>
</sar-popup> </sar-popup>

6
src/pages-sub/information/highSchool.vue
View File

@ -119,7 +119,7 @@ const handleComplete = () => {
<sar-dropdown-item :title="searchParams.region || '区域'" v-model:visible="visibleFlag1"> <sar-dropdown-item :title="searchParams.region || '区域'" v-model:visible="visibleFlag1">
<mx-radio-group v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value" <mx-radio-group v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value"
custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]" custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]" active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" default-item-class="bg-[#F3F4F8] border-[#F3F4F8]"
custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleComplete"/> custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleComplete"/>
</sar-dropdown-item> </sar-dropdown-item>
@ -127,7 +127,7 @@ const handleComplete = () => {
<mx-radio-group v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel" <mx-radio-group v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
:options="natureList" label-key="label" value-key="value" :options="natureList" label-key="label" value-key="value"
custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]" custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]" active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" default-item-class="bg-[#F3F4F8] border-[#F3F4F8]"
custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleComplete" /> custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleComplete" />
</sar-dropdown-item> </sar-dropdown-item>
@ -136,7 +136,7 @@ const handleComplete = () => {
:options="schoolTypeList" label-key="label" value-key="value" :options="schoolTypeList" label-key="label" value-key="value"
custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]" custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid"
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]" active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="handleComplete" /> default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="handleComplete" />
</sar-dropdown-item> </sar-dropdown-item>
</sar-dropdown> </sar-dropdown>

25
src/pages-sub/information/overTheYear.vue
View File

@ -113,8 +113,8 @@ onShow(() => {
} }
}) })
getHistoryYearList().then(resp => { getHistoryYearList().then(resp => {
if(resp.code ===200){ if (resp.code === 200) {
yearList.value = [{ value: '', label: '不限' },...resp.result] yearList.value = [{ value: '', label: '不限' }, ...resp.result]
} }
}) })
handleChange() handleChange()
@ -126,28 +126,28 @@ onShow(() => {
<sar-navbar title="历年分数" :show-back="true" @back="handleBack" <sar-navbar title="历年分数" :show-back="true" @back="handleBack"
:root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${safeAreaInsets?.top}px`, '--sar-navbar-item-color': 'black' }"> :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${safeAreaInsets?.top}px`, '--sar-navbar-item-color': 'black' }">
</sar-navbar> </sar-navbar>
<mx-search v-model:searchText="searchParams.keyword" rootStyle="margin: 16rpx 30rpx 0;" @complete="handleChange"/> <mx-search v-model:searchText="searchParams.keyword" rootStyle="margin: 16rpx 30rpx 0;" @complete="handleChange" />
<sar-dropdown <sar-dropdown
root-style="--sar-dropdown-placeholder-color:#666;--sar-dropdown-value-font-size:28rpx;--sar-dropdown-option-active-color:#1580FF;--sar-dropdown-box-shadow:0rpx 6rpx 8rpx 0rpx rgba(0,0,0,0.04);"> root-style="--sar-dropdown-placeholder-color:#666;--sar-dropdown-value-font-size:28rpx;--sar-dropdown-option-active-color:#1580FF;--sar-dropdown-box-shadow:0rpx 6rpx 8rpx 0rpx rgba(0,0,0,0.04);">
<sar-dropdown-item v-model:visible="visibleFlag1" :title="searchParams.region || '区域'" > <sar-dropdown-item v-model:visible="visibleFlag1" :title="searchParams.region || '区域'">
<mx-radio-group v-model:value="searchParams.region" :options="areaList" label-key="label" value-key="value" <mx-radio-group v-model:value="searchParams.region" :options="areaList" label-key="label" value-key="value"
custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]" custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]" active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" default-item-class="bg-[#F3F4F8] border-[#F3F4F8]"
custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange"/> custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange" />
</sar-dropdown-item> </sar-dropdown-item>
<sar-dropdown-item v-model:visible="visibleFlag2" :title="searchParams.natureLabel || '办学性质'" > <sar-dropdown-item v-model:visible="visibleFlag2" :title="searchParams.natureLabel || '办学性质'">
<mx-radio-group v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel" <mx-radio-group v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
:options="natureList" label-key="label" value-key="value" custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]" :options="natureList" label-key="label" value-key="value" custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]" active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" default-item-class="bg-[#F3F4F8] border-[#F3F4F8]"
custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange"/> custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" @change="handleChange" />
</sar-dropdown-item> </sar-dropdown-item>
<sar-dropdown-item v-model:visible="visibleFlag3" v-model="searchParams.year" :title="searchParams.year || '年份'"> <sar-dropdown-item v-model:visible="visibleFlag3" v-model="searchParams.year" :title="searchParams.year || '年份'">
<mx-radio-group v-model:value="searchParams.year" :options="yearList" label-key="label" value-key="value" <mx-radio-group v-model:value="searchParams.year" :options="yearList" label-key="label" value-key="value"
custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]" custom-root-class="px-[32rpx] pt-[30rpx] pb-[40rpx]"
custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid"
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]" active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="handleChange" /> default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="handleChange" />
</sar-dropdown-item> </sar-dropdown-item>
</sar-dropdown> </sar-dropdown>
@ -168,6 +168,11 @@ onShow(() => {
:style="{ 'text-align': item.align }">{{ record[item.prop] }}</view> :style="{ 'text-align': item.align }">{{ record[item.prop] }}</view>
</sar-table-cell> </sar-table-cell>
</sar-table-row> </sar-table-row>
<sar-table-row v-if="partialData.length === 0">
<sar-table-cell :colspan="partialColumns.length">
<view class="text-center text-[24rpx] text-[#999] py-[20rpx]">暂无数据</view>
</sar-table-cell>
</sar-table-row>
</sar-table> </sar-table>
</view> </view>
</scroll-view> </scroll-view>

24
src/pages-sub/information/quota.vue
View File

@ -53,7 +53,7 @@ const handleChange = () => {
onLoad(() => { onLoad(() => {
getAreaList().then(resp => { getAreaList().then(resp => {
if (resp.code === 200) { if (resp.code === 200) {
regions.value = [{label:'不限',value:''},...resp.result] regions.value = [{ label: '不限', value: '' }, ...resp.result]
} }
}) })
handleChange() handleChange()
@ -71,8 +71,7 @@ onLoad(() => {
<text class="text-[#666] text-[30rpx]">{{ searchParams.regionLabel === '' || searchParams.regionLabel === '不限' ? <text class="text-[#666] text-[30rpx]">{{ searchParams.regionLabel === '' || searchParams.regionLabel === '不限' ?
'区域' : searchParams.regionLabel }}</text> '区域' : searchParams.regionLabel }}</text>
<view class="w-[24rpx] h-[24rpx] ml-[10rpx] flex items-center"> <view class="w-[24rpx] h-[24rpx] ml-[10rpx] flex items-center">
<image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" class="w-[24rpx] h-[24rpx]" />
class="w-[24rpx] h-[24rpx]" />
</view> </view>
</view> </view>
<view class="flex-1 ml-[30rpx]"> <view class="flex-1 ml-[30rpx]">
@ -94,26 +93,23 @@ onLoad(() => {
<view class="pb-safe"></view> <view class="pb-safe"></view>
</scroll-view> </scroll-view>
<sar-popout :show-close="false" :show-footer="false" v-model:visible="regionVisible" @leave="handleChange" <sar-popup :visible="regionVisible" effect="slide-bottom" root-class="min-h-[560rpx]" @leave="handleChange">
root-style="--sar-popout-header-loose-padding-x:30rpx;"> <view class="bg-white rounded-[24rpx_24rpx_0_0] px-[30rpx] pb-safe pt-[30rpx] min-h-[492rpx]">
<template #title> <view class="text-[34rpx] font-500 flex items-center justify-between mb-[30rpx]">
<view class="flex items-center justify-between w-full"> <view>请选择中考所在地</view>
<view class="text-[34rpx] font-500">请选择中考所在地</view>
<view class="w-[36rpx] h-[36rpx] flex items-center" @click="regionVisible = false"> <view class="w-[36rpx] h-[36rpx] flex items-center" @click="regionVisible = false">
<image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill" <image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill"
class="w-[36rpx] h-[36rpx]" /> class="w-[36rpx] h-[36rpx]" />
</view> </view>
</view> </view>
</template>
<view class="px-[32rpx]">
<MxRadioGroup v-model:value="searchParams.region" v-model:label="searchParams.regionLabel" :options="regions" <MxRadioGroup v-model:value="searchParams.region" v-model:label="searchParams.regionLabel" :options="regions"
label-key="label" value-key="value" custom-root-class="" label-key="label" value-key="value" custom-root-class=""
custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid" custom-item-class="w-full py-[16rpx] text-center border-[1rpx] border-solid"
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-[#1580FF]" active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="regionVisible = false"/> default-item-class="bg-[#F3F4F8] border-[#F3F4F8]" @change="regionVisible = false" />
</view> </view>
</sar-popout>
</sar-popup>
</view> </view>
</template> </template>

6
src/pages-sub/me/evaluation.vue
View File

@ -23,9 +23,9 @@ onShow(() => {
<template> <template>
<view class="bg-[#F8F8F8] h-screen px-[30rpx] overflow-hidden"> <view class="bg-[#F8F8F8] h-screen px-[30rpx] overflow-hidden">
<view v-for="(val, index) in list" :key="index" class="flex first:mt-[30rpx]" v-if="list.length > 0" @click="useRouterDetail(val)"> <view v-for="(val, index) in list" :key="index" class="flex first:mt-[30rpx] not-last:mb-[20rpx]" v-if="list.length > 0" @click="useRouterDetail(val)">
<view <view
class="text-[30rpx] text-[#333] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] not-last:mb-[30rpx] rounded-[16rpx] w-full flex items-center justify-between"> class="text-[30rpx] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] rounded-[16rpx] w-full flex items-center justify-between">
<view class=""> <view class="">
<view class="text-[32rpx] font-600">{{ val.title }}</view> <view class="text-[32rpx] font-600">{{ val.title }}</view>
@ -33,7 +33,7 @@ onShow(() => {
{{ val.createTime }} {{ val.createTime }}
</view> </view>
</view> </view>
<view class="flex items-center border-[2rpx] border-[#ccc] border-solid rounded-[8rpx] px-[12rpx] py-[6rpx]"> <view class="flex items-center border-[2rpx] border-[#ccc] border-solid rounded-[8rpx] px-[12rpx] py-[4rpx]">
<view class="w-[32rpx] h-[32rpx] flex items-center"> <view class="w-[32rpx] h-[32rpx] flex items-center">
<image src="https://lwzk.ycymedu.com/img/qt/wd_shanchu.png" <image src="https://lwzk.ycymedu.com/img/qt/wd_shanchu.png"
class="w-[32rpx] h-[32rpx]" /> class="w-[32rpx] h-[32rpx]" />

6
src/pages-sub/me/starSchool.vue
View File

@ -42,9 +42,9 @@ onLoad(() => {
<template> <template>
<view class="bg-[#F8F8F8] h-screen px-[30rpx] overflow-hidden"> <view class="bg-[#F8F8F8] h-screen px-[30rpx] overflow-hidden">
<view v-for="(val, index) in schools" :key="index" class="flex items-center mb-[18rpx] px-[30rpx] py-[20rpx] bg-white first:mt-[30rpx]" <view v-for="(val, index) in schools" :key="index" class="flex items-center not-last:mb-[20rpx] px-[30rpx] py-[20rpx] bg-white first:mt-[30rpx]"
v-if="schools.length > 0" @click.stop="navigateToDetail(val.id)"> v-if="schools.length > 0" @click.stop="navigateToDetail(val.id)">
<view class="text-[30rpx] text-[#333] grid gap-[8rpx] not-last:mb-[30rpx] rounded-[16rpx] flex-1"> <view class="text-[30rpx] grid gap-[8rpx] rounded-[16rpx] flex-1">
<view class="text-[32rpx] font-600">{{ val.schoolName }}</view> <view class="text-[32rpx] font-600">{{ val.schoolName }}</view>
<view class="flex items-center text-[24rpx] gap-[14rpx]"> <view class="flex items-center text-[24rpx] gap-[14rpx]">
<view class="text-[#666] bg-[#F8F8F8] rounded-[8rpx] px-[10rpx] py-[4rpx]">{{ val.schoolType }}</view> <view class="text-[#666] bg-[#F8F8F8] rounded-[8rpx] px-[10rpx] py-[4rpx]">{{ val.schoolType }}</view>
@ -53,7 +53,7 @@ onLoad(() => {
{{ val.region }}·{{ val.schoolNature }} {{ val.region }}·{{ val.schoolNature }}
</view> </view>
</view> </view>
<view class="rounded-[8rpx] border-[2rpx] border-solid border-[#75b5ff] p-[12rpx] flex items-center" @click.stop="starSchool(val.id,index)"> <view class="rounded-[8rpx] border-[2rpx] border-solid border-[#75b5ff] px-[12rpx] py-[6rpx] flex items-center" @click.stop="starSchool(val.id,index)">
<view class="w-[24rpx] h-[24rpx] flex items-center"> <view class="w-[24rpx] h-[24rpx] flex items-center">
<image src="https://lwzk.ycymedu.com/img/qt/xq_shoucang2.png" mode="scaleToFill" <image src="https://lwzk.ycymedu.com/img/qt/xq_shoucang2.png" mode="scaleToFill"
class="w-[24rpx] h-[24rpx]" /> class="w-[24rpx] h-[24rpx]" />

10
src/pages-sub/me/wishlist.vue
View File

@ -37,6 +37,10 @@ const navigateToDetail = (val) => {
uni.navigateTo({url:"/pages-sub/me/wishlistInfo"}) uni.navigateTo({url:"/pages-sub/me/wishlistInfo"})
} }
const navigateToWish = () => {
uni.navigateTo({url:"/pages-sub/wishlist/create/first"})
}
onShow(() => { onShow(() => {
getWishlist().then(resp => { getWishlist().then(resp => {
if (resp.code === 200) { if (resp.code === 200) {
@ -48,9 +52,9 @@ onShow(() => {
<template> <template>
<view class="bg-[#F8F8F8] h-screen px-[30rpx] overflow-hidden"> <view class="bg-[#F8F8F8] h-screen px-[30rpx] overflow-hidden">
<view v-for="(val, index) in wishlist" :key="index" class="flex first:mt-[30rpx]" v-if="wishlist.length > 0" @click="navigateToDetail(val)"> <view v-for="(val, index) in wishlist" :key="index" class="flex first:mt-[30rpx] not-last:mb-[20rpx]" v-if="wishlist.length > 0" @click="navigateToDetail(val)">
<view <view
class="text-[30rpx] text-[#333] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] not-last:mb-[30rpx] rounded-[16rpx] w-full"> class="text-[30rpx] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] rounded-[16rpx] w-full">
<view class="text-[32rpx] font-600">{{ val.title }}</view> <view class="text-[32rpx] font-600">{{ val.title }}</view>
<view <view
class="text-[24rpx] text-[#333] bg-[url(https://lwzk.ycymedu.com/img/qt/wd_jianbian.png)] bg-no-repeat bg-origin-border bg-left px-[12rpx]"> class="text-[24rpx] text-[#333] bg-[url(https://lwzk.ycymedu.com/img/qt/wd_jianbian.png)] bg-no-repeat bg-origin-border bg-left px-[12rpx]">
@ -86,7 +90,7 @@ onShow(() => {
<view class="w-full mt-[70rpx]"> <view class="w-full mt-[70rpx]">
<view class="pb-safe px-[94rpx] py-[16rpx]"> <view class="pb-safe px-[94rpx] py-[16rpx]">
<button class="rounded-full bg-[#1580FF] text-[#fff] ">创建志愿表</button> <button class="rounded-full bg-[#1580FF] text-[#fff]" @click="navigateToWish">创建志愿表</button>
</view> </view>
</view> </view>
</view> </view>

6
src/pages-sub/talented/create/artFirst.vue
View File

@ -235,19 +235,19 @@ onLoad(() => {
:options="genderClassification" label-key="label" value-key="value" :options="genderClassification" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" />
<MxRadio v-model:value="userInfo.userExtend.gradeId" v-model:label="userInfo.userExtend.gradeName" <MxRadio v-model:value="userInfo.userExtend.gradeId" v-model:label="userInfo.userExtend.gradeName"
v-if="activeType == 'grade'" :options="gradeClassification" label-key="label" value-key="value" v-if="activeType == 'grade'" :options="gradeClassification" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" />
<MxRadio v-model:value="userInfo.talentExtend.specialtyDirection" v-if="activeType == 'artDirection'" <MxRadio v-model:value="userInfo.talentExtend.specialtyDirection" v-if="activeType == 'artDirection'"
:options="artList" label-key="label" value-key="value" :options="artList" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" />
</view> </view>
</sar-popup> </sar-popup>

2
src/pages-sub/talented/create/artSecond.vue
View File

@ -204,7 +204,7 @@ onLoad(() => {
:options="yearClassification" label-key="label" value-key="label" :options="yearClassification" label-key="label" value-key="label"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false"/>
</view> </view>
</sar-popup> </sar-popup>

8
src/pages-sub/talented/create/sportsFirst.vue
View File

@ -34,7 +34,7 @@ const handleBack = () => {
uni.navigateBack({ delta: 1 }) uni.navigateBack({ delta: 1 })
} }
const genderClassification = [{ label: '男', value: 1 }, { label: '女', value: 2 }] const genderClassification = [{ label: '男', value: "1" }, { label: '女', value: "2" }]
const gradeClassification = ref([]) const gradeClassification = ref([])
const areaList = ref([]) const areaList = ref([])
@ -251,19 +251,19 @@ onShow(() => {
:options="genderClassification" label-key="label" value-key="value" :options="genderClassification" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" />
<MxRadio v-model:value="userInfo.userExtend.gradeId" v-model:label="userInfo.userExtend.gradeName" <MxRadio v-model:value="userInfo.userExtend.gradeId" v-model:label="userInfo.userExtend.gradeName"
v-if="activeType == 'grade'" :options="gradeClassification" label-key="label" value-key="value" v-if="activeType == 'grade'" :options="gradeClassification" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class=" pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class=" pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" />
<MxRadio v-model:value="userInfo.userExtend.area" v-if="activeType == 'examinationArea'" <MxRadio v-model:value="userInfo.userExtend.area" v-if="activeType == 'examinationArea'"
:options="areaList" label-key="label" value-key="value" :options="areaList" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false" />
</view> </view>
</sar-popup> </sar-popup>

4
src/pages-sub/talented/create/sportsSecond.vue
View File

@ -252,13 +252,13 @@ onLoad(() => {
:options="projectClassification" label-key="label" value-key="value" :options="projectClassification" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" :label-string="true" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" :label-string="true"
custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false"/>
<MxRadio v-model:value="userInfo.talentExtend.ageLimit" v-if="activeType == 'year'" <MxRadio v-model:value="userInfo.talentExtend.ageLimit" v-if="activeType == 'year'"
:options="yearClassification" label-key="label" value-key="label" :options="yearClassification" label-key="label" value-key="label"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center " custom-root-class="pb-[20rpx]" custom-item-class="py-[12rpx] text-center "
active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" /> active-item-class="bg-[#e7f2ff] text-[#1580FF] border-none" @change="visible = false"/>
</view> </view>
</sar-popup> </sar-popup>

77
src/pages-sub/wishlist/create/components/FirstBatchSchool.vue
View File

@ -17,12 +17,12 @@ const chooseData = ref([])
const wishlistStore = useWishlistStore() const wishlistStore = useWishlistStore()
const handleChoose = (val) => { const handleChoose = (val) => {
chooseData.value.splice(0, 1, val.schoolId) chooseData.value.splice(0, 1, val.schoolId)
if(wishlistStore.getSchool()){ if (wishlistStore.getSchool()) {
const exitsSchool = JSON.parse(wishlistStore.getSchool()) const exitsSchool = JSON.parse(wishlistStore.getSchool())
const willSchool = exitsSchool.schools.filter((item)=>{item.type !== '指标生'}) const willSchool = exitsSchool.schools.filter((item) => { item.type !== '指标生' })
wishlistStore.setSchool(JSON.stringify({schools:[{...val,type:'firstBatch'},...willSchool]})) wishlistStore.setSchool(JSON.stringify({ schools: [{ ...val, type: 'firstBatch' }, ...willSchool] }))
}else{ } else {
wishlistStore.setSchool(JSON.stringify({schools:[{...val,type:'firstBatch'}]})) wishlistStore.setSchool(JSON.stringify({ schools: [{ ...val, type: 'firstBatch' }] }))
} }
} }
@ -65,7 +65,7 @@ const handleChangeSchool = () => {
} }
}) })
console.log(cwbs.value); console.log(cwbs.value);
totalCount.value = Number(resp.result.chongCount) + Number(resp.result.wenCount) + Number(resp.result.baoCount) totalCount.value = Number(resp.result.chongCount) + Number(resp.result.wenCount) + Number(resp.result.baoCount)
}) })
} }
@ -102,8 +102,7 @@ onLoad(() => {
@click="handleOpenPop('school')"> @click="handleOpenPop('school')">
<view class="mr-[10rpx]">全部({{ totalCount }})</view> <view class="mr-[10rpx]">全部({{ totalCount }})</view>
<view class="w-[18rpx] h-[18rpx] flex items-center"> <view class="w-[18rpx] h-[18rpx] flex items-center">
<image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" class="w-[18rpx] h-[18rpx]" />
class="w-[18rpx] h-[18rpx]" />
</view> </view>
</view> </view>
@ -111,8 +110,7 @@ onLoad(() => {
@click="handleOpenPop('nature')"> @click="handleOpenPop('nature')">
<view class="mr-[10rpx]">办学性质</view> <view class="mr-[10rpx]">办学性质</view>
<view class="w-[18rpx] h-[18rpx] flex items-center"> <view class="w-[18rpx] h-[18rpx] flex items-center">
<image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" class="w-[18rpx] h-[18rpx]" />
class="w-[18rpx] h-[18rpx]" />
</view> </view>
</view> </view>
@ -120,13 +118,13 @@ onLoad(() => {
@click="handleOpenPop('region')"> @click="handleOpenPop('region')">
<view class="mr-[10rpx]">所在地区</view> <view class="mr-[10rpx]">所在地区</view>
<view class="w-[18rpx] h-[18rpx] flex items-center"> <view class="w-[18rpx] h-[18rpx] flex items-center">
<image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" class="w-[18rpx] h-[18rpx]" />
class="w-[18rpx] h-[18rpx]" />
</view> </view>
</view> </view>
<MxSearch v-model:searchText="searchParams.keyword" root-class="py-[14rpx]! px-[20rpx]! w-[166rpx] rounded-[12rpx]!" :clear-icon="false" <MxSearch v-model:searchText="searchParams.keyword"
placeholder="请输入" @complete="handleChangeSchool"/> root-class="py-[14rpx]! px-[20rpx]! w-[166rpx] rounded-[12rpx]!" :clear-icon="false" placeholder="请输入"
@complete="handleChangeSchool" />
</view> </view>
<view v-if="tableData.length === 0" <view v-if="tableData.length === 0"
class="flex flex-col items-center justify-center bg-[#F7F7F7] min-h-[240rpx] rounded-[16rpx]"> class="flex flex-col items-center justify-center bg-[#F7F7F7] min-h-[240rpx] rounded-[16rpx]">
@ -170,44 +168,41 @@ onLoad(() => {
</sar-table> </sar-table>
</view> </view>
<sar-popout :show-close="false" :show-footer="false" v-model:visible="popVisible" <sar-popup :visible="popVisible" effect="slide-bottom" root-class="min-h-[560rpx]" @leave="handleChangeSchool">
root-style="--sar-popout-header-loose-padding-x:30rpx;" root-class="min-h-[560rpx]" @leave="handleChangeSchool"> <view class="bg-white rounded-[24rpx_24rpx_0_0] px-[30rpx] pb-safe pt-[30rpx] min-h-[492rpx]">
<template #title> <view class="text-[34rpx] font-500 flex items-center justify-between mb-[30rpx]">
<view class="flex items-center justify-between w-full"> <view>{{ popType === 'school' ? '全部学校' : (popType ===
<view class="text-[34rpx] font-500">{{ popType === 'school' ? '全部学校' : (popType ===
'nature' ? '请选择办学性质' : '请选择所在区(可多选)') }}</view> 'nature' ? '请选择办学性质' : '请选择所在区(可多选)') }}</view>
<view class="w-[36rpx] h-[36rpx] flex items-center" @click="popVisible = false"> <view class="w-[36rpx] h-[36rpx] flex items-center" @click="popVisible = false">
<image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill" <image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill"
class="w-[36rpx] h-[36rpx]" /> class="w-[36rpx] h-[36rpx]" />
</view> </view>
</view> </view>
</template> <MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
<view> label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
<view class="px-[30rpx]"> custom-root-class="pb-[16rpx]"
<MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs" custom-item-class="py-[16rpx] text-center border-1 border-solid border-[#F3F4F8]"
label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
custom-root-class="pt-[30rpx] pb-[16rpx]" v-if="popType === 'school'" @change="popVisible = false" />
custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]" <MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel" :options="natureList"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!" label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
v-if="popType === 'school'" @change="popVisible = false"/> custom-root-class="pb-[16rpx]"
<MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel" :options="natureList" custom-item-class="py-[16rpx] text-center border-1 border-solid border-[#F3F4F8]"
label-key="label" value-key="value" custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]" active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
custom-root-class="pt-[30rpx] pb-[16rpx]" v-if="popType === 'nature'" @change="popVisible = false" />
custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]" <MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!" custom-root-class="pb-[16rpx]" custom-item-class="w-full py-[16rpx] text-center"
v-if="popType === 'nature'" @change="popVisible = false"/> v-if="popType === 'region'" />
<MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value"
custom-root-class="pt-[30rpx] pb-[16rpx]" custom-item-class="w-full py-[16rpx] text-center"
v-if="popType === 'region'" />
</view>
<view class="grid grid-cols-2 gap-[20rpx] border-t-[1rpx] border-t-solid border-t-[#eee] pt-[16rpx] px-[30rpx]" <view class="grid grid-cols-2 gap-[20rpx] border-t-[1rpx] border-t-solid border-t-[#eee] pt-[16rpx] px-[30rpx]"
v-if="popType === 'region'"> v-if="popType === 'region'">
<view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center" @click="handleCancel"> <view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center"
@click="handleCancel">
取消</view> 取消</view>
<view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center" @click="handleChangeSchool">确定</view> <view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center"
@click="handleChangeSchool">确定</view>
</view> </view>
</view> </view>
</sar-popout> </sar-popup>
</view> </view>
</template> </template>

59
src/pages-sub/wishlist/create/components/SecondBatchSchool.vue
View File

@ -63,8 +63,8 @@ const handleOpenPop = (type: string) => {
} }
const handleCancel = () => { const handleCancel = () => {
searchParams.value.region = [] searchParams.value.region = []
popVisible.value = false; popVisible.value = false;
} }
@ -192,49 +192,44 @@ onLoad(() => {
</sar-table> </sar-table>
</view> </view>
<sar-popout :show-close="false" :show-footer="false" v-model:visible="popVisible" <sar-popup :visible="popVisible" effect="slide-bottom" root-class="min-h-[560rpx]" @leave="handleChangeSchool">
root-style="--sar-popout-header-loose-padding-x:30rpx;" root-class="min-h-[560rpx]" @leave="handleChangeSchool"> <view class="bg-white rounded-[24rpx_24rpx_0_0] px-[30rpx] pb-safe pt-[30rpx] min-h-[492rpx]">
<template #title> <view class="text-[34rpx] font-500 flex items-center justify-between mb-[30rpx]">
<view class="flex items-center justify-between w-full"> <view>{{ popType === 'school' ? '全部学校' : (popType === 'nature' ?
<view class="text-[34rpx] font-500">{{ popType === 'school' ? '全部学校' : (popType === 'nature' ?
'请选择办学性质' : '请选择所在区(可多选)') }}</view> '请选择办学性质' : '请选择所在区(可多选)') }}</view>
<view class="w-[36rpx] h-[36rpx] flex items-center" @click="popVisible = false"> <view class="w-[36rpx] h-[36rpx] flex items-center" @click="popVisible = false">
<image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill" <image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill"
class="w-[36rpx] h-[36rpx]" /> class="w-[36rpx] h-[36rpx]" />
</view> </view>
</view>
<MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-class=" pb-[16rpx]"
custom-item-class="py-[16rpx] text-center border-1 border-solid border-[#F3F4F8]"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
v-if="popType === 'school'" @change="popVisible = false" />
<MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
:options="natureList" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]" custom-root-class=" pb-[16rpx]"
custom-item-class="py-[16rpx] text-center border-1 border-solid border-[#F3F4F8]"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
v-if="popType === 'nature'" @change="popVisible = false" />
<MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value"
custom-root-class=" pb-[16rpx]" custom-item-class="w-full py-[16rpx] text-center"
v-if="popType === 'region'" />
</view>
</template>
<view>
<view class="px-[30rpx]">
<MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class="pt-[30rpx] pb-[16rpx]"
custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
v-if="popType === 'school'" @change="popVisible = false"/>
<MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
:options="natureList" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
custom-root-class="pt-[30rpx] pb-[16rpx]"
custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
v-if="popType === 'nature'" @change="popVisible = false"/>
<MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label"
value-key="value" custom-root-class="pt-[30rpx] pb-[16rpx]"
custom-item-class="w-full py-[16rpx] text-center" v-if="popType === 'region'" />
</view>
<view <view
class="grid grid-cols-2 gap-[20rpx] border-t-[1rpx] border-t-solid border-t-[#eee] pt-[16rpx] px-[30rpx]" class="grid grid-cols-2 gap-[20rpx] border-t-[1rpx] border-t-solid border-t-[#eee] pt-[16rpx] px-[30rpx]"
v-if="popType === 'region'"> v-if="popType === 'region'">
<view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center" @click="handleCancel"> <view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center"
@click="handleCancel">
取消</view> 取消</view>
<view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center" @click="handleChangeSchool"> <view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center"
@click="handleChangeSchool">
确定</view> 确定</view>
</view> </view>
</view> </view>
</sar-popout> </sar-popup>
</view> </view>
</template> </template>

80
src/pages-sub/wishlist/create/components/ThirdBatchSchool.vue
View File

@ -34,11 +34,11 @@ const handleChoose = (val) => {
chooseDataMap.set(val.schoolId, val) chooseDataMap.set(val.schoolId, val)
} }
let tempSchool = [] let tempSchool = []
chooseDataMap.forEach((val,key)=>{ chooseDataMap.forEach((val, key) => {
tempSchool.push({...val,type:"thirdBatch"}) tempSchool.push({ ...val, type: "thirdBatch" })
}) })
wishlistStore.setSchool(JSON.stringify({schools:tempSchool})) wishlistStore.setSchool(JSON.stringify({ schools: tempSchool }))
} }
const popVisible = ref(false) const popVisible = ref(false)
@ -80,13 +80,13 @@ const handleChangeSchool = () => {
} }
}) })
console.log(cwbs.value); console.log(cwbs.value);
totalCount.value = Number(resp.result.chongCount) + Number(resp.result.wenCount) + Number(resp.result.baoCount) totalCount.value = Number(resp.result.chongCount) + Number(resp.result.wenCount) + Number(resp.result.baoCount)
}) })
} }
const handleCancel = () => { const handleCancel = () => {
searchParams.value.region = [] searchParams.value.region = []
popVisible.value = false; popVisible.value = false;
} }
@ -115,7 +115,7 @@ onLoad(() => {
<view <view
class="text-[24rpx] text-[#303030] flex items-center py-[12rpx] px-[20rpx] bg-[#F3F4F8] rounded-[12rpx]" class="text-[24rpx] text-[#303030] flex items-center py-[12rpx] px-[20rpx] bg-[#F3F4F8] rounded-[12rpx]"
@click="handleOpenPop('school')"> @click="handleOpenPop('school')">
<view class="mr-[10rpx]">全部({{ totalCount }})</view> <view class="mr-[10rpx]">全部({{ totalCount }})</view>
<view class="w-[18rpx] h-[18rpx] flex items-center"> <view class="w-[18rpx] h-[18rpx] flex items-center">
<image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill" <image src="https://lwzk.ycymedu.com/img/qt/qt_quyu.png" mode="scaleToFill"
class="w-[18rpx] h-[18rpx]" /> class="w-[18rpx] h-[18rpx]" />
@ -179,9 +179,10 @@ onLoad(() => {
<sar-table-cell width="15%"> <sar-table-cell width="15%">
<view class="flex items-center justify-center" @click="handleChoose(record)"> <view class="flex items-center justify-center" @click="handleChoose(record)">
<view class="w-[36rpx] h-[36rpx] flex items-center" v-if="chooseData.includes(record.schoolId)"> <view class="w-[36rpx] h-[36rpx] flex items-center"
<image src="https://lwzk.ycymedu.com/img/tianbao/tb_duoxuan.png" v-if="chooseData.includes(record.schoolId)">
mode="scaleToFill" class="w-[36rpx] h-[36rpx]" /> <image src="https://lwzk.ycymedu.com/img/tianbao/tb_duoxuan.png" mode="scaleToFill"
class="w-[36rpx] h-[36rpx]" />
</view> </view>
<sar-icon name="square" size="36rpx" color="#CCC" v-else></sar-icon> <sar-icon name="square" size="36rpx" color="#CCC" v-else></sar-icon>
</view> </view>
@ -190,49 +191,44 @@ onLoad(() => {
</sar-table> </sar-table>
</view> </view>
<sar-popout :show-close="false" :show-footer="false" v-model:visible="popVisible" <sar-popup :visible="popVisible" effect="slide-bottom" root-class="min-h-[560rpx]" @leave="handleChangeSchool">
root-style="--sar-popout-header-loose-padding-x:30rpx;" root-class="min-h-[560rpx]" @leave="handleChangeSchool"> <view class="bg-white rounded-[24rpx_24rpx_0_0] px-[30rpx] pb-safe pt-[30rpx] min-h-[492rpx]">
<template #title> <view class="text-[34rpx] font-500 flex items-center justify-between mb-[30rpx]">
<view class="flex items-center justify-between w-full"> <view>{{ popType === 'school' ? '全部学校' : (popType === 'nature' ?
<view class="text-[34rpx] font-500">{{ popType === 'school' ? '全部学校' : (popType === 'nature' ?
'请选择办学性质' : '请选择所在区(可多选)') }}</view> '请选择办学性质' : '请选择所在区(可多选)') }}</view>
<view class="w-[36rpx] h-[36rpx] flex items-center" @click="popVisible = false"> <view class="w-[36rpx] h-[36rpx] flex items-center" @click="popVisible = false">
<image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" <image src="https://lwzk.ycymedu.com/img/tianbao/tb_guanbi.png" mode="scaleToFill"
mode="scaleToFill" class="w-[36rpx] h-[36rpx]" /> class="w-[36rpx] h-[36rpx]" />
</view> </view>
</view>
<MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]" custom-root-class=" pb-[16rpx]"
custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
v-if="popType === 'school'" @change="popVisible = false" />
<MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
:options="natureList" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]" custom-root-class=" pb-[16rpx]"
custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
v-if="popType === 'nature'" @change="popVisible = false" />
<MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label" value-key="value"
custom-root-class=" pb-[16rpx]" custom-item-class="w-full py-[16rpx] text-center"
v-if="popType === 'region'" />
</view>
</template>
<view>
<view class="px-[30rpx]">
<MxRadio v-model:value="searchParams.cwb" v-model:label="searchParams.cwbLabel" :options="cwbs"
label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-3 items-center gap-[16rpx]"
custom-root-class="pt-[30rpx] pb-[16rpx]"
custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
v-if="popType === 'school'" @change="popVisible = false"/>
<MxRadio v-model:value="searchParams.nature" v-model:label="searchParams.natureLabel"
:options="natureList" label-key="label" value-key="value"
custom-root-cols-class="grid grid-cols-2 items-center gap-[16rpx]"
custom-root-class="pt-[30rpx] pb-[16rpx]"
custom-item-class="py-[12rpx] text-center border-1 border-solid border-[#F3F4F8]"
active-item-class="bg-white text-[#1580FF] border-1 border-solid border-[#1580FF]!"
v-if="popType === 'nature'" @change="popVisible = false"/>
<MxCheckbox v-model:value="searchParams.region" :options="regions" label-key="label"
value-key="value" custom-root-class="pt-[30rpx] pb-[16rpx]"
custom-item-class="w-full py-[16rpx] text-center" v-if="popType === 'region'" />
</view>
<view <view
class="grid grid-cols-2 gap-[20rpx] border-t-[1rpx] border-t-solid border-t-[#eee] pt-[16rpx] px-[30rpx]" class="grid grid-cols-2 gap-[20rpx] border-t-[1rpx] border-t-solid border-t-[#eee] pt-[16rpx] px-[30rpx]"
v-if="popType === 'region'"> v-if="popType === 'region'">
<view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center" @click="handleCancel"> <view class="text-[34rpx] font-500 text-[#333] bg-[#F5F5F5] rounded-[12rpx] py-[20rpx] text-center"
@click="handleCancel">
取消</view> 取消</view>
<view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center" @click="handleChangeSchool"> <view class="text-[34rpx] font-500 text-white bg-[#1580FF] rounded-[12rpx] py-[20rpx] text-center"
@click="handleChangeSchool">
确定</view> 确定</view>
</view> </view>
</view> </view>
</sar-popout> </sar-popup>
</view> </view>
</template> </template>

53
src/pages-sub/wishlist/create/saveFirstBatchWishList.vue
View File

@ -6,7 +6,7 @@ import { storeToRefs } from "pinia"
const wishlistStore = useWishlistStore() const wishlistStore = useWishlistStore()
const {extendWishlist} = storeToRefs(wishlistStore) const { extendWishlist } = storeToRefs(wishlistStore)
definePage({ definePage({
style: { style: {
@ -19,18 +19,18 @@ const show = ref(false)
const handleSave = () => { const handleSave = () => {
show.value = true show.value = true
} }
const handleSubmit = () =>{ const handleSubmit = () => {
saveWishlist({data:{title:wishListName.value,contents:extendWishlist.value.contents,batchName:'第一批次',TotalScore:totalScore.value}}).then(resp => { saveWishlist({ data: { title: wishListName.value, contents: extendWishlist.value.contents, batchName: '第一批次', TotalScore: totalScore.value } }).then(resp => {
if(resp.code === 200){ if (resp.code === 200) {
show.value = false show.value = false
wishlistStore.clearExtendWishlist(); wishlistStore.clearExtendWishlist();
uni.switchTab({url:"/pages/index/index"}) uni.switchTab({ url: "/pages/index/index" })
} }
}) })
} }
const navigateToHome = () => { const navigateToHome = () => {
wishlistStore.clearExtendWishlist(); wishlistStore.clearExtendWishlist();
uni.switchTab({url:"/pages/index/index"}) uni.switchTab({ url: "/pages/index/index" })
} }
@ -41,9 +41,9 @@ const totalScore = ref(0)
onShow(() => { onShow(() => {
getMyScore().then(resp => { getMyScore().then(resp => {
if (resp.code === 200 && resp.result) { if (resp.code === 200 && resp.result) {
totalScore.value = resp.result.totalScore totalScore.value = resp.result.totalScore
} }
}) })
}) })
@ -61,7 +61,8 @@ onBackPress(() => {
<view <view
class="text-[30rpx] text-[#333] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] not-last:mb-[30rpx] rounded-[16rpx] w-full"> class="text-[30rpx] text-[#333] grid gap-[8rpx] bg-white px-[30rpx] py-[20rpx] not-last:mb-[30rpx] rounded-[16rpx] w-full">
<view class="text-[32rpx] font-600">{{ val.schoolName }}</view> <view class="text-[32rpx] font-600">{{ val.schoolName }}</view>
<view class="text-[24rpx] text-[#333]">{{new Date().getFullYear()}}计划招生：{{val.planCount}}人</view> <view class="text-[24rpx] text-[#333]">{{ new Date().getFullYear() }}计划招生：{{ val.planCount }}人
</view>
<!-- <view class="flex items-center text-[24rpx] gap-[14rpx]"> <!-- <view class="flex items-center text-[24rpx] gap-[14rpx]">
<view class="text-[#666] bg-[#F8F8F8] rounded-[8rpx] px-[10rpx] py-[4rpx]" <view class="text-[#666] bg-[#F8F8F8] rounded-[8rpx] px-[10rpx] py-[4rpx]"
v-for="value in 2" :key="value">重点高中</view> v-for="value in 2" :key="value">重点高中</view>
@ -71,14 +72,14 @@ onBackPress(() => {
</view> </view>
</view> </view>
<view class="w-[86rpx] h-[56rpx] ml-[-76rpx] mt-[26rpx]" v-if="val.type === '指标生'"> <view class="w-[86rpx] h-[56rpx] ml-[-76rpx] mt-[26rpx]" v-if="val.type === '指标生'">
<image src="https://lwzk.ycymedu.com/img/tianbao/tb_zhibiao.png" <image src="https://lwzk.ycymedu.com/img/tianbao/tb_zhibiao.png" mode="scaleToFill"
mode="scaleToFill" class="w-[86rpx] h-[56rpx]" /> class="w-[86rpx] h-[56rpx]" />
</view> </view>
</view> </view>
<view class=" bg-[#FEF6F6] rounded-[16rpx] mt-[30rpx]"> <view class=" bg-[#FEF6F6] rounded-[16rpx] mt-[30rpx]">
<view class="h-[52rpx] w-[178rpx] flex items-center m-[-8rpx] ml-[20rpx]"> <view class="h-[52rpx] w-[178rpx] flex items-center m-[-8rpx] ml-[20rpx]">
<image src="https://lwzk.ycymedu.com/img/tianbao/tb_shuoming.png" <image src="https://lwzk.ycymedu.com/img/tianbao/tb_shuoming.png" mode="scaleToFill"
mode="scaleToFill" class="h-[52rpx] w-[178rpx]" /> class="h-[52rpx] w-[178rpx]" />
</view> </view>
<view class="flex flex-col text-[#E03C33] py-[20rpx] pl-[26rpx] pr-[34rpx]"> <view class="flex flex-col text-[#E03C33] py-[20rpx] pl-[26rpx] pr-[34rpx]">
@ -95,7 +96,8 @@ onBackPress(() => {
</view> </view>
</view> </view>
<view class="grid grid-cols-2 gap-[20rpx] px-[28rpx] py-[16rpx]"> <view class="grid grid-cols-2 gap-[20rpx] px-[28rpx] py-[16rpx]">
<view class="rounded-[16rpx] bg-[#f5f5f5] text-[#333] text-[36rpx] py-[18rpx] text-center" @click="navigateToHome">重新测评</view> <view class="rounded-[16rpx] bg-[#f5f5f5] text-[#333] text-[36rpx] py-[18rpx] text-center"
@click="navigateToHome">重新测评</view>
<view class="rounded-[16rpx] bg-[#1580FF] text-white text-[36rpx] py-[18rpx] text-center" <view class="rounded-[16rpx] bg-[#1580FF] text-white text-[36rpx] py-[18rpx] text-center"
@click="handleSave">保存志愿表</view> @click="handleSave">保存志愿表</view>
</view> </view>
@ -106,16 +108,15 @@ onBackPress(() => {
<view class="rounded-[40rpx] bg-white p-[40rpx] custom-background" <view class="rounded-[40rpx] bg-white p-[40rpx] custom-background"
style="--status-bar-height:56rpx; --start-color:#ebf1ff"> style="--status-bar-height:56rpx; --start-color:#ebf1ff">
<view class="text-[40rpx] font-500 text-center">志愿表名称</view> <view class="text-[40rpx] font-500 text-center">志愿表名称</view>
<view class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]"> <view
<input type="text" v-model="wishListName" placeholder="请输入名字" confirm-type="done" class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]">
<input type="text" v-model="wishListName" placeholder="请输入志愿表名称" confirm-type="done"
placeholder-style="color:#C5C8D1;font-size:30rpx;text-align:left;" class="text-left flex-1"> placeholder-style="color:#C5C8D1;font-size:30rpx;text-align:left;" class="text-left flex-1">
<view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName" @click="wishListName = ''"> <view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName"
<image @click="wishListName = ''">
src="https://lwzk.ycymedu.com/img/tianbao/tb_shanchu.png" <image src="https://lwzk.ycymedu.com/img/tianbao/tb_shanchu.png" mode="scaleToFill"
mode="scaleToFill" class="w-[40rpx] h-[40rpx]" />
class="w-[40rpx] h-[40rpx]" </view>
/>
</view>
</view> </view>
<view class="grid grid-cols-2 items-center mx-[40rpx] gap-[24rpx]"> <view class="grid grid-cols-2 items-center mx-[40rpx] gap-[24rpx]">
@ -133,12 +134,10 @@ onBackPress(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
.custom-background { .custom-background {
background: linear-gradient(180deg, #ecf2ff 0%,#f6f8ff 40rpx, #fff 128rpx); background: linear-gradient(180deg, #ecf2ff 0%, #f6f8ff 40rpx, #fff 128rpx);
background-position: 50% 50%; background-position: 50% 50%;
background-origin: padding-box; background-origin: padding-box;
background-clip: border-box; background-clip: border-box;
background-size: auto auto; background-size: auto auto;
} }
</style> </style>

2
src/pages-sub/wishlist/create/saveSecondBatchWishList.vue
View File

@ -102,7 +102,7 @@ onBackPress(() => {
style="--status-bar-height:56rpx; --start-color:#ebf1ff"> style="--status-bar-height:56rpx; --start-color:#ebf1ff">
<view class="text-[40rpx] font-500 text-center">志愿表名称</view> <view class="text-[40rpx] font-500 text-center">志愿表名称</view>
<view class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]"> <view class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]">
<input type="text" v-model="wishListName" placeholder="请输入姓名" confirm-type="done" <input type="text" v-model="wishListName" placeholder="请输入志愿表名称" confirm-type="done"
placeholder-style="color:#C5C8D1;font-size:30rpx;text-align:left;" class="text-left flex-1"> placeholder-style="color:#C5C8D1;font-size:30rpx;text-align:left;" class="text-left flex-1">
<view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName" @click="wishListName = ''"> <view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName" @click="wishListName = ''">
<image <image

2
src/pages-sub/wishlist/create/saveThirdBatchWishList.vue
View File

@ -84,7 +84,7 @@ onBackPress(() => {
<view class="text-[40rpx] font-500 text-center">志愿表名称</view> <view class="text-[40rpx] font-500 text-center">志愿表名称</view>
<view <view
class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]"> class="rounded-full py-[20rpx] px-[30rpx] bg-[#F3F4F8] border-[#E5E5E5] border-solid border-[1rpx] flex items-center justify-between my-[60rpx]">
<input type="text" v-model="wishListName" placeholder="请输入姓名" confirm-type="done" <input type="text" v-model="wishListName" placeholder="请输入志愿表名称" confirm-type="done"
placeholder-style="color:#C5C8D1;font-size:30rpx;text-align:left;" class="text-left flex-1"> placeholder-style="color:#C5C8D1;font-size:30rpx;text-align:left;" class="text-left flex-1">
<view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName" @click="wishListName = ''"> <view class="w-[40rpx] h-[40rpx] flex items-center" v-if="wishListName" @click="wishListName = ''">
<image src="https://lwzk.ycymedu.com/img/tianbao/tb_shanchu.png" <image src="https://lwzk.ycymedu.com/img/tianbao/tb_shanchu.png"

30
src/service/requestApi.ts
View File

@ -1,24 +1,38 @@
import request from '@/http/vue-query'; import request from '@/http/vue-query';
import { CustomRequestOptions } from '@/http/types';
import * as API from './types'; import * as API from './types';
export const getAbilityDimension = () => { } export const getAbilityDimension = (options: any) => {
return request<API.Response>("/api/busscale/GetAbilityDimension", { method: "GET", ...options })
}
export const getMBTIDimension = () => { } export const getMBTIDimension = (options: any) => {
return request<API.Response>("/api/busScale/GetMBTIDimension", { method: "GET", ...options })
}
export const getHollandDimensionInfo = (options: any) => { export const getHollandDimensionInfo = (options: any) => {
return request<API.Response>("/api/busScale/GetHollandDimension", { method: "GET", ...options }) return request<API.Response>("/api/busScale/GetHollandDimension", { method: "GET", ...options })
} }
export const getOpinionAbout = () => { } export const getOpinionAbout = (options: any) => {
return request<API.Response>("/api/busScale/GetOpinionAbout", { method: "GET", ...options })
}
export const getCustomScaleExplains = () => { } export const getCustomScaleExplains = (options: any) => {
return request<API.Response>("/api/busScale/GetCustomScaleExplains", { method: "GET", ...options })
}
export const getTagMapPro = () => { } export const getTagMapPro = (options: any) => {
return request<API.Response>("/api/busScale/getTagMapPro", { method: "GET", ...options })
}
export const sysDictType = () => { } export const sysDictType = (options: any) => {
return request<API.Response>("/api/sysDictData/dicStatus", { method: "GET", ...options })
}
export const getTagMapPerson = () => { }
export const getTagMapPerson = (options: any) => {
return request<API.Response>("/api/busScale/getTagMapPerso", { method: "GET", ...options })
}
export const getMyBusReports = (options: any) => { export const getMyBusReports = (options: any) => {
return request<API.Response>('/api/busScale/GetBusCustomReports/v2', { method: "GET", ...options }); return request<API.Response>('/api/busScale/GetBusCustomReports/v2', { method: "GET", ...options });