|
@@ -136,7 +136,7 @@
|
|
|
import { ref, computed, watch } from "vue";
|
|
import { ref, computed, watch } from "vue";
|
|
|
import { assignCard, getExamTypes, getAgentList } from "@/api/dz/cards";
|
|
import { assignCard, getExamTypes, getAgentList } from "@/api/dz/cards";
|
|
|
import { getPaperProvinces } from "@/api/dz/papers";
|
|
import { getPaperProvinces } from "@/api/dz/papers";
|
|
|
-import { listUniversity } from "@/api/dz/school";
|
|
|
|
|
|
|
+import { getCampusList } from "@/api/dz/cards";
|
|
|
|
|
|
|
|
const props = defineProps({
|
|
const props = defineProps({
|
|
|
modelValue: {
|
|
modelValue: {
|
|
@@ -252,32 +252,41 @@ async function getSchoolListByProvince(province) {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- const response = await listUniversity({
|
|
|
|
|
|
|
+ const response = await getCampusList({
|
|
|
location: province,
|
|
location: province,
|
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
|
- pageSize: 1000,
|
|
|
|
|
|
|
+ pageSize: 9999,
|
|
|
});
|
|
});
|
|
|
if (response.code === 200) {
|
|
if (response.code === 200) {
|
|
|
// 处理API返回的数据结构
|
|
// 处理API返回的数据结构
|
|
|
let schoolData = [];
|
|
let schoolData = [];
|
|
|
|
|
|
|
|
- // 检查是否有rows字段(直接在response中)
|
|
|
|
|
- if (response.rows) {
|
|
|
|
|
- schoolData = response.rows;
|
|
|
|
|
- }
|
|
|
|
|
- // 检查是否有data.rows字段
|
|
|
|
|
- else if (response.data && response.data.rows) {
|
|
|
|
|
- schoolData = response.data.rows;
|
|
|
|
|
|
|
+ // 检查是否有data字段
|
|
|
|
|
+ if (response.data) {
|
|
|
|
|
+ schoolData = Array.isArray(response.data) ? response.data : [];
|
|
|
}
|
|
}
|
|
|
- // 检查是否有data数组
|
|
|
|
|
- else if (response.data && Array.isArray(response.data)) {
|
|
|
|
|
- schoolData = response.data;
|
|
|
|
|
|
|
+ // 检查是否有rows字段
|
|
|
|
|
+ else if (response.rows) {
|
|
|
|
|
+ schoolData = response.rows;
|
|
|
}
|
|
}
|
|
|
- // 检查是否有data对象
|
|
|
|
|
- else if (response.data && response.data.id) {
|
|
|
|
|
- schoolData = [response.data];
|
|
|
|
|
|
|
+ // 检查是否有list字段
|
|
|
|
|
+ else if (response.list) {
|
|
|
|
|
+ schoolData = response.list;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // 确保数据格式符合配置要求
|
|
|
|
|
+ schoolData = schoolData.map((item) => {
|
|
|
|
|
+ // 如果API返回的是 {id, name, ...} 格式,直接使用
|
|
|
|
|
+ if (item.id && item.name) {
|
|
|
|
|
+ return item;
|
|
|
|
|
+ }
|
|
|
|
|
+ // 如果是其他格式,需要转换
|
|
|
|
|
+ return {
|
|
|
|
|
+ id: item.id || item.value || item.schoolId,
|
|
|
|
|
+ name: item.name || item.label || item.schoolName || item.title,
|
|
|
|
|
+ };
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
schoolList.value = schoolData;
|
|
schoolList.value = schoolData;
|
|
|
console.log("学校数据:", schoolData); // 添加调试日志
|
|
console.log("学校数据:", schoolData); // 添加调试日志
|
|
|
}
|
|
}
|