From 0e4e73b8fdd1703a8ccc114d8fdadc92c2e7da1d Mon Sep 17 00:00:00 2001 From: JayChou <2064936853@qq.com> Date: Sat, 14 Sep 2024 16:18:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?'=E6=8E=92=E9=99=A4=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..808e19ab --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +.DS_Store +node_modules/ +node_modules +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log +pnpm-lock.yaml +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock From 6110bd286f1574efcdff59256666287762d978ea Mon Sep 17 00:00:00 2001 From: JayChou <2064936853@qq.com> Date: Sat, 14 Sep 2024 17:03:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?'=E4=BF=AE=E6=94=B9=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E6=AF=94=E8=B5=9B=E9=A1=B9=E7=9B=AE=E8=B5=9B=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=97=B6=E9=97=B4=E5=9B=9E=E5=86=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../committee/AnnualCompPointList.vue | 4 ++++ .../components/AnnualCompPointFormscgl.vue | 20 +++++++++---------- .../committee/components/cardItem.vue | 5 +++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue index e2a634d3..1a1b421b 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue @@ -134,6 +134,8 @@ */ const handleDetail = (record) => { registerModal.value.disableSubmit = true; + console.log(record.value,'record.value', raceList.value); + registerModal.value.edit(record.value); }; /** @@ -142,6 +144,8 @@ const registerModalscgl = ref(); const handleEditscgl = (record) => { registerModalscgl.value.disableSubmit = false; + console.log(record.value,'record.value'); + registerModalscgl.value.edit(record.value); }; /** diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue index 0050dd72..d4c8e713 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue @@ -328,16 +328,16 @@ function add() { function edit(record) { nextTick(() => { resetFields(); - record.applyStartTime=''; - record.applyStartTime=''; - record.applyEndTime=''; - record.topicStartTime=''; - record.topicEndTime=''; - record.uploadStartTime=''; - record.uploadEndTime=''; - record.scoreStartTime=''; - record.scoreEndTime=''; - record.uploadWorksType=''; + // record.applyStartTime=''; + // record.applyStartTime=''; + // record.applyEndTime=''; + // record.topicStartTime=''; + // record.topicEndTime=''; + // record.uploadStartTime=''; + // record.uploadEndTime=''; + // record.scoreStartTime=''; + // record.scoreEndTime=''; + // record.uploadWorksType=''; //赋值 Object.assign(formData, record); }); diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue index 3b223e82..9896c93b 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue @@ -63,9 +63,12 @@ emits('delChange', data); }; const info = () => { + console.log(data.value,'子'); emits('infoChange', data); }; const editscgl = () => { + console.log(data.value,'子'); + emits('editscglChange', data); }; const updateApply = () => { @@ -126,6 +129,8 @@ watch( () => props.data, (newVal) => { + console.log(newVal,'newVal'); + data.value = newVal; } );