diff --git a/.env.development b/.env.development index 8b24184..a488c2b 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # .env.production 和这个一样 # the APP baseURL -# VITE_APP_BASE_URL = 'http://127.0.0.1:8080/jeecg-boot/' -VITE_APP_BASE_URL = 'https://www.yitisheng.vip/jbt/' +VITE_APP_BASE_URL = 'http://127.0.0.1:8080/jeecg-boot/' +# VITE_APP_BASE_URL = 'https://www.yitisheng.vip/jbt/' # the token key VITE_APP_TOKEN_KEY = 'your_token_key' diff --git a/src/components/EditScoreInfo.vue b/src/components/EditScoreInfo.vue index fe2f956..8691281 100644 --- a/src/components/EditScoreInfo.vue +++ b/src/components/EditScoreInfo.vue @@ -27,15 +27,15 @@ - - - + + + - - + + @@ -60,7 +60,7 @@ - + @@ -70,9 +70,9 @@ - + - + @@ -117,7 +117,7 @@ const form = reactive({ professionalScore: '',//统考分 chineseScore: '',//语文成绩 englishScore: '',//英语成绩 - subjects:[] as Array,//专业选课 + subjectList:[] as Array,//专业选课 yybysy:'',//音乐表演声乐 yybyqy:'',//音乐表演器乐 yyjy:'',//音乐教育 @@ -139,7 +139,7 @@ const submitForm = () => { // 表单验证通过,可以提交表单数据 let submitForm = { ...form, - professionalCategoryChildren: form.subjects.join(',') + professionalCategoryChildren: form.subjectList.join(',') } console.log('Form submitted:', submitForm); axiosInstance({ @@ -199,7 +199,7 @@ function reloadScore(){ form.englishScore = scoreInfo.englishScore handleProfessionalCateGoryChange() if(scoreInfo.professionalCategoryChildren){ - form.subjects = scoreInfo.professionalCategoryChildren.split(',') + form.subjectList = scoreInfo.professionalCategoryChildren.split(',') } form.yybysy = scoreInfo.yybysy form.yybyqy = scoreInfo.yybyqy @@ -209,13 +209,13 @@ function reloadScore(){ form.xjysby = scoreInfo.xjysby console.log(scoreInfo) } - + reloadRules() } //切换专业类别事件 const handleProfessionalCateGoryChange=()=>{ - form.subjects = [] + form.subjectList = [] state.subjectsList = [] //判断选择专业是不是有专业选课 state.professionalCategoryList.forEach(item=>{ @@ -230,9 +230,9 @@ const handleProfessionalCateGoryChange=()=>{ //选择专业选课事件 const handleSubjectsSelectChange=(value:string[])=>{ if (value.includes('a')) { - form.subjects = value.filter((item) => item !== 'b'); + form.subjectList = value.filter((item) => item !== 'b'); } else if (value.includes('b')) { - form.subjects = value.filter((item) => item !== 'a'); + form.subjectList = value.filter((item) => item !== 'a'); } reloadRules() } @@ -246,8 +246,8 @@ const dynamicProfessionalCategoryLabel=()=>{ } // 将专业选课转换成字段 -const convertSubjectToField = (subjects: string) => { - switch (subjects) { +const convertSubjectToField = (subjectList: string) => { + switch (subjectList) { case '音乐表演声乐': return 'yybysy'; case '音乐表演器乐': @@ -262,18 +262,18 @@ const convertSubjectToField = (subjects: string) => { return 'xjysby'; } } -const validateInput = (subjects:any)=>{ - if(subjects === '音乐表演声乐'){ +const validateInput = (subjectList:any)=>{ + if(subjectList === '音乐表演声乐'){ form.yybysy = form.yybysy.replace(/\D/g, '') - }else if(subjects === '音乐表演器乐'){ + }else if(subjectList === '音乐表演器乐'){ form.yybyqy = form.yybyqy.replace(/\D/g, '') - }else if(subjects === '音乐教育'){ + }else if(subjectList === '音乐教育'){ form.yyjy = form.yyjy.replace(/\D/g, '') - }else if(subjects === '服装表演'){ + }else if(subjectList === '服装表演'){ form.fzby = form.fzby.replace(/\D/g, '') - }else if(subjects === '戏剧影视导演'){ + }else if(subjectList === '戏剧影视导演'){ form.xjysdy = form.xjysdy.replace(/\D/g, '') - }else if(subjects === '戏剧影视表演'){ + }else if(subjectList === '戏剧影视表演'){ form.xjysby = form.xjysby.replace(/\D/g, '') } } @@ -288,10 +288,10 @@ function reloadRules(){ culturalScore: [{ required: true, message: '请输入文化成绩', trigger: 'blur' }], chineseScore: [{ required: true, message: '请输入语文成绩', trigger: 'blur' }], englishScore: [{ required: true, message: '请输入英语成绩', trigger: 'blur' }], - subjects: [{ required: true, message: '请选择专业选课', trigger: 'change' }], + subjectList: [{ required: true, message: '请选择专业选课', trigger: 'change' }], } - if(form.subjects && form.subjects.length>0){ - form.subjects.forEach(item=>{ + if(form.subjectList && form.subjectList.length>0){ + form.subjectList.forEach(item=>{ ru[convertSubjectToField(item)] = [{ required: true, message: '请输入'+item, trigger: 'change' }] }) } diff --git a/src/components/Header.vue b/src/components/Header.vue index 50984c4..6377644 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -57,7 +57,7 @@ 文化成绩·{{ state.scoreInfo.culturalScore }} - {{state.scoreInfo.professionalCategory==='音乐类'?'主项成绩':'统考成绩'}}·{{ state.scoreInfo.professionalScore }} + {{state.scoreInfo.professionalCategory==='音乐类'?'主项成绩':'统考成绩'}}·{{ state.scoreInfo.professionalScore }} @@ -181,7 +181,7 @@ onMounted(() => { state.scoreInfo.xjysby = a.xjysby state.scoreInfo.fzby = a.fzby - + userInfo = null a = null scoreInfo = null @@ -189,7 +189,7 @@ onMounted(() => { }else{ state.token = '' state.userInfo = null - + } state.columnList = StaticConstant.defaultRouterList }); diff --git a/src/components/ScoreInfo.vue b/src/components/ScoreInfo.vue index d60e0c3..98fe405 100644 --- a/src/components/ScoreInfo.vue +++ b/src/components/ScoreInfo.vue @@ -103,7 +103,7 @@ - + + +