Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecgboot-vue3-master/src/api/demo/depart.ts

@@ -5,9 +5,11 @@ enum Api {
   PAGE_SCHOOL = '/user/login/homepage/school',
   PAGE_DEPARTMENT = '/user/login/homepage/depart',
   PAGE_ZJSYBSJS = '/AnnualCompPoint/annualCompPoint/zjsybsjs',
+  PAGE_XSFXBG = '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xsfxbg',
 }
 // Get personal center-basic settings
 export const pageSchoolApi = () => defHttp.get<GetAccountInfoModel>({ url: Api.PAGE_SCHOOL });
 export const pageDepartmentApi = (orgCode: string) => defHttp.get<GetAccountInfoModel>({ url: Api.PAGE_DEPARTMENT, params: { orgCode } });
 export const getZjsybsjs = () => defHttp.get({ url: Api.PAGE_ZJSYBSJS });
+export const getXsfxbg = () => defHttp.get({ url: Api.PAGE_XSFXBG });
 

jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue

@@ -95,7 +95,7 @@
                 </div>
             </a-col>
         </a-row>
-        <cardList style="border: 1px solid #000;"></cardList>
+        <!-- <cardList style="border: 1px solid #000;"></cardList> -->
         <img src="../../assets/images/card.png" alt="">
         <p class="paragraph">
             我是比赛参赛情况综述：全面落实立德树人根本任务，依据CDIO工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识；在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力；具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好素养，能适应产业与社会变革的国际化应用型人。