Compare commits

..

8 Commits

3 changed files with 1148 additions and 96 deletions

View File

@ -5,6 +5,11 @@ VITE_USE_MOCK = true
VITE_PUBLIC_PATH = / VITE_PUBLIC_PATH = /
## 跨域代理,您可以配置多个 ,请注意,没有换行符
#VITE_PROXY = [["/jeecgboot","http://62.234.217.137:10000/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
##后台接口全路径地址(必填)
#VITE_GLOB_DOMAIN_URL=http://62.234.217.137:10000/jeecg-boot
# 跨域代理,您可以配置多个 ,请注意,没有换行符 # 跨域代理,您可以配置多个 ,请注意,没有换行符
VITE_PROXY = [["/jeecgboot","http://127.0.0.1:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]] VITE_PROXY = [["/jeecgboot","http://127.0.0.1:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]

View File

@ -214,12 +214,26 @@
// //
async getBatch() { async getBatch() {
const getBatch = await defHttp.get({ url: this.Url.getBatch }); const getBatch = await defHttp.get({ url: this.Url.getBatch });
console.log('1111', getBatch);
this.batchOptions = getBatch.batches.map((item) => { this.batchOptions = getBatch.batches.map((item) => {
return { return {
value: item.value, value: item.value,
label: item.label, label: item.label,
}; };
}); });
console.log('2222', this.batchOptions);
this.batchOptions.forEach((item) => {
const year = item.label.substring(0, 4);
if (item.label.includes('12-01')) {
item.label = `${year}冬季`;
} else if (item.label.includes('06-01')) {
item.label = `${year}夏季`;
} else if (item.label.includes('09-01')) {
item.label = `${year}夏季`;
} else if (item.label.includes('03-01')) {
item.label = `${year}春季`;
}
});
// const getCollege = await defHttp.get({ url: this.Url.getCollege }); // const getCollege = await defHttp.get({ url: this.Url.getCollege });
// this.collegeOptions = getCollege.colleges; // this.collegeOptions = getCollege.colleges;
@ -253,6 +267,7 @@
}, },
// //
async query() { async query() {
this.getBatch();
let resultData = null; let resultData = null;
try { try {
//this.batchnull //this.batchnull

File diff suppressed because it is too large Load Diff