diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java index 2124ed14..ae0ee480 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java @@ -9,8 +9,11 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.demo.anncomgrotop.entity.AnnComGroTop; import org.jeecg.modules.demo.anncomgrotop.service.IAnnComGroTopService; @@ -155,11 +158,13 @@ public class ExpScoreController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(expScore, req.getParameterMap()); queryWrapper.eq("annid",annComGroTop.getAnnid()); queryWrapper.eq("annal_comp",annualCompPointService.getById(annComGroTop.getAnnComP()).getAnnualCompId()); queryWrapper.eq("ann_com_p",annComGroTop.getAnnComP()); queryWrapper.eq("topid",annComGroTop.getTopid()); + queryWrapper.eq("userid",sysUser.getId()); Page page = new Page(pageNo, pageSize); IPage pageList = expScoreService.page(page, queryWrapper); for (int k = 0 ; k < pageList.getRecords().size();k++){ 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/api/demo/depart.ts b/jeecgboot-vue3-master/src/api/demo/depart.ts index 37a031a5..518cafe7 100644 --- a/jeecgboot-vue3-master/src/api/demo/depart.ts +++ b/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({ url: Api.PAGE_SCHOOL }); export const pageDepartmentApi = (orgCode: string) => defHttp.get({ url: Api.PAGE_DEPARTMENT, params: { orgCode } }); export const getZjsybsjs = () => defHttp.get({ url: Api.PAGE_ZJSYBSJS }); +export const getXsfxbg = () => defHttp.get({ url: Api.PAGE_XSFXBG }); 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 }} diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue index 31c5f0d4..a21d3848 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/individual.vue @@ -95,7 +95,7 @@ - +

我是比赛参赛情况综述：全面落实立德树人根本任务，依据CDIO工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识；在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力；具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好素养，能适应产业与社会变革的国际化应用型人。 diff --git a/jeecgboot-vue3-master/src/views/topic/TopicList.vue b/jeecgboot-vue3-master/src/views/topic/TopicList.vue index d2798413..407a167e 100644 --- a/jeecgboot-vue3-master/src/views/topic/TopicList.vue +++ b/jeecgboot-vue3-master/src/views/topic/TopicList.vue @@ -6,14 +6,14 @@ :label-col="labelCol" :wrapper-col="wrapperCol"> - - +