29-修改 03

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:

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: '请选择年度比赛'},
       ];
     },
   },

jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue

@@ -39,7 +39,7 @@
                            :disabled="disabled"/>
           </a-form-item>
         </a-col>
-        <a-col :span="12">
+        <a-col :span="24">
           <a-form-item label="项目层次" v-bind="validateInfos.objLevel" :labelCol="labelCol" :wrapperCol="wrapperCol7">
             <a-radio-group v-model:value="formData.objLevel">
               <a-radio v-for="item in objLevelll" :key="item.id" :value="item.id">{{ item.name }}</a-radio>

jeecgboot-vue3-master/src/views/topic/TopicList.vue

@@ -6,14 +6,14 @@
               :label-col="labelCol"
               :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="8">
-            <a-form-item label="年度比赛项目id" name="annualCompid">
+        <!--  <a-col :lg="8">
+            <a-form-item label="年度比赛项目" name="annualCompid">
               <j-search-select
-                placeholder="请选择年度比赛项目id"
+                placeholder="请选择年度比赛项目"
                 v-model:value="queryParam.annualCompid" dict="annual_comp_point,obj_name,id"
               />
             </a-form-item>
-          </a-col>
+          </a-col>-->
           <a-col :lg="8">
             <a-form-item label="题目名称">
               <j-input placeholder="请输入题目名称" v-model:value="queryParam.name"/>