From 7bc3ef99482959956e6d483f32ab22c0d04a0046 Mon Sep 17 00:00:00 2001 From: admin <417727563@qq.com> Date: Mon, 29 Jul 2024 16:56:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?29-=E4=BF=AE=E6=94=B9=2002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecgboot-vue3-master/src/views/topic/TopicList.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jeecgboot-vue3-master/src/views/topic/TopicList.vue b/jeecgboot-vue3-master/src/views/topic/TopicList.vue index b24efe38..fbdd869f 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"> - - + From 21d60d369e123c154b2480b8a22a405eea7c1258 Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 29 Jul 2024 20:12:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E8=AF=84=E5=88=86?= =?UTF-8?q?=E5=8F=AA=E7=9C=8B=E5=88=86=E9=85=8D=E7=BB=99=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E7=BB=84=E7=9A=84=E4=BD=9C=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/demo/expscore/controller/ExpScoreController.java | 5 +++++ 1 file changed, 5 insertions(+) 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++){ From 1b1eb1f9201615ad21798e461311b7efa02b1efe Mon Sep 17 00:00:00 2001 From: significative <163999932+significative@users.noreply.github.com> Date: Mon, 29 Jul 2024 20:41:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecgboot-vue3-master/src/api/demo/depart.ts | 2 ++ .../src/views/comprehensiveEvaluation/individual.vue | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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/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工程教育理念，培养德、智、体、美、劳全面发展，掌握软件工程专业所需的数学与自然科学基础知识、专业基础理论知识；在企业级软件开发和工业智能软件开发方向，能承担软件分析、设计、开发、项目管理等任务，具备解决复杂工程问题的能力；具有终身学习和创新创业意识、国际交流能力、团队合作精神等良好素养，能适应产业与社会变革的国际化应用型人。 From fcd61e6ae0191e89727ad901a27f3002f2bea54d Mon Sep 17 00:00:00 2001 From: admin <417727563@qq.com> Date: Mon, 29 Jul 2024 22:17:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?29-=E4=BF=AE=E6=94=B9=2003?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg-system-start/src/main/resources/application-dev.yml | 4 ++-- .../views/annualCompPoint/committee/AnnualCompPoint.data.ts | 4 ++-- .../committee/components/AnnualCompPointForm.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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 }} From 0c514519cc33551a066eabe35f8c1c7fffd98bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Tue, 30 Jul 2024 09:53:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9C=9D=E4=B8=9C=E6=96=B9-topic=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/router/routes/index.ts | 17 ++++++++--------- .../committee/AnnualCompPointList.vue | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/jeecgboot-vue3-master/src/router/routes/index.ts b/jeecgboot-vue3-master/src/router/routes/index.ts index d9d068a2..0f689c7a 100644 --- a/jeecgboot-vue3-master/src/router/routes/index.ts +++ b/jeecgboot-vue3-master/src/router/routes/index.ts @@ -123,15 +123,14 @@ export const compcom = { }, - { - path:'topic/topic/list5', - name:'topic/topic/list5', - component: ()=> import('/@/views/topic/TopicList5.vue'), - meta:{ - title:'评分标准' - } - - }, + // { + // path:'topic/topic/list5', + // name:'topic/topic/list5', + // component: ()=> import('/@/views/topic/TopicList5.vue'), + // meta:{ + // title:'评分标准' + // } + // }, { path:'organizingCommittee', name:'OrganizingCommittee', diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue index fff73315..09260ca0 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue @@ -237,7 +237,7 @@ */ function pfbz(record: Recordable) { router.push({ - path: '/compp/topic/topic/list5', + path: '/topic/topic/list5', query: {acpid: record.id} }); }