From 04aec1977e69dfd70aab8936c1a2d587cbea334e Mon Sep 17 00:00:00 2001 From: JayChou <2064936853@qq.com> Date: Tue, 30 Jul 2024 09:47:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?'=E8=AE=BE=E7=BD=AE=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E9=97=B4'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecgboot-vue3-master/src/utils/http/axios/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecgboot-vue3-master/src/utils/http/axios/index.ts b/jeecgboot-vue3-master/src/utils/http/axios/index.ts index fe9c1e4c..b4082385 100644 --- a/jeecgboot-vue3-master/src/utils/http/axios/index.ts +++ b/jeecgboot-vue3-master/src/utils/http/axios/index.ts @@ -235,7 +235,7 @@ function createAxios(opt?: Partial) { // authentication schemes，e.g: Bearer // authenticationScheme: 'Bearer', authenticationScheme: '', - timeout: 10 * 1000, + timeout: 20 * 1000, // 基础接口地址 // baseURL: globSetting.apiUrl, headers: { 'Content-Type': ContentTypeEnum.JSON }, 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 2/3] =?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} }); } From 442b0407e5d0f49dd22bdec8acad3fa5615f3c32 Mon Sep 17 00:00:00 2001 From: JayChou <2064936853@qq.com> Date: Tue, 30 Jul 2024 09:54:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?'=E4=BF=AE=E6=94=B9=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E8=AF=84=E5=88=86=E4=B8=8D=E6=9B=B4=E6=96=B0'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecgboot-vue3-master/src/views/expscore/ExpScoreList.vue | 3 ++- .../src/views/expscore/components/ExpScoreModal.vue | 5 +++-- .../src/views/scorestapointd/ScoreStaPointDList.vue | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/jeecgboot-vue3-master/src/views/expscore/ExpScoreList.vue b/jeecgboot-vue3-master/src/views/expscore/ExpScoreList.vue index 4c79da7d..5772b182 100644 --- a/jeecgboot-vue3-master/src/views/expscore/ExpScoreList.vue +++ b/jeecgboot-vue3-master/src/views/expscore/ExpScoreList.vue @@ -146,8 +146,9 @@ xzzf({zjpfid:record.id}).then((result)=>{ console.log(result) if(result=="true"){ - registerModal.value.disableSubmit = false; registerModal.value.edit(record); + registerModal.value.disableSubmit = false; + }else{ createMessage.warning("评分细则总分不足100分，请先添加评分细则"); } diff --git a/jeecgboot-vue3-master/src/views/expscore/components/ExpScoreModal.vue b/jeecgboot-vue3-master/src/views/expscore/components/ExpScoreModal.vue index b59e76de..23d6bccf 100644 --- a/jeecgboot-vue3-master/src/views/expscore/components/ExpScoreModal.vue +++ b/jeecgboot-vue3-master/src/views/expscore/components/ExpScoreModal.vue @@ -8,7 +8,6 @@ import { ref, nextTick, defineExpose } from 'vue'; import ExpScoreForm from '../../scorestapointd/ScoreStaPointDList.vue' import { useRoute } from 'vue-router'; - const route = useRoute(); const title = ref(''); const width = ref(800); @@ -16,7 +15,6 @@ const disableSubmit = ref(false); const registerForm = ref(); const emit = defineEmits(['register', 'success']); - /** * 新增 */ @@ -33,6 +31,9 @@ * @param record */ function edit(record) { + console.log(record.id); + console.log(registerForm.value); + registerForm.value? registerForm.value.searchReset() : '' title.value = disableSubmit.value ? '详情' : '细则得分'; visible.value = true; let id= record.id; diff --git a/jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue b/jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue index e82904da..93b8cb34 100644 --- a/jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue +++ b/jeecgboot-vue3-master/src/views/scorestapointd/ScoreStaPointDList.vue @@ -184,6 +184,8 @@ * 查询 */ function searchQuery() { + console.log('查询'); + reload(); } @@ -218,6 +220,8 @@ } defineExpose({ submitForm, + searchQuery, + searchReset });