diff --git a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 45a2f95a..d080e0f1 100644 --- a/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot-master/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -133,9 +133,9 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://10.100.200.177:3306/hnjd_comp0728?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://182.92.169.222:3306/hnjd_comp0728?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root + password: ycwl2022. driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 10.121.0.28 #multi-datasource1: diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint.data.ts b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint.data.ts index a9d35897..53da78f6 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint.data.ts +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint.data.ts @@ -128,7 +128,7 @@ export const searchFormSchema: FormSchema[] = []; //表单数据 export const formSchema: FormSchema[] = [ { - label: '年度比赛id', + label: '年度比赛', field: 'annualCompId', component: 'JPopup', componentProps: ({formActionType}) => { @@ -145,7 +145,7 @@ export const formSchema: FormSchema[] = [ dynamicRules: ({model, schema}) => { return [ - {required: true, message: '请输入年度比赛id!'}, + {required: true, message: '请选择年度比赛'}, ]; }, }, diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue index eccc8258..1b7c9116 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue @@ -39,7 +39,7 @@ :disabled="disabled"/> - + {{ item.name }}