From 3d0597c2521fd3a072e3af6d8c019fe97eb6cf1c Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 5 Feb 2025 22:05:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0com=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index 0f79f9a7..b32535de 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, psu.sub_dept_name, psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group, psu.sub_dept_group_name, psu.user_name, psu.card_type, psu.card_code, psu.user_sex, psu.user_picture, psu.user_phone, psu.degree_grade, dic4.dict_label as degree_grade_name, psu.user_infos, psu.craft_type, dic1.dict_label as craft_type_name, psu.craft_post, dic2.dict_label as craft_post_name, psu.edu_status, psu.edu_file_path, psu.edu_date, psu.approve_status, psu.use_date, psu.use_status, psu.admit_guid, psu.qr_code, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, - psu.remark,psu.face_guid + psu.remark,psu.face_guid,sd.dept_name com_name from pro_project_info_subdepts_users psu left join pro_project_info pi on pi.id = psu.project_id left join sys_dept sd on sd.dept_id = pi.com_id From 3540ec00ee14e6c6e13acd18573623af74e19ff5 Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 5 Feb 2025 23:47:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-ui-vue3/src/views/login.vue | 4 ++-- yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue | 7 +++++-- .../src/views/manage/proProjectInfoSubdeptsUsers/index.vue | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/yanzhu-ui-vue3/src/views/login.vue b/yanzhu-ui-vue3/src/views/login.vue index 318b80da..2cd8cc38 100644 --- a/yanzhu-ui-vue3/src/views/login.vue +++ b/yanzhu-ui-vue3/src/views/login.vue @@ -165,10 +165,10 @@ getCookie(); border-radius: 6px; background-image: url("../assets/images/loginbg2.png"); background-size: 100% 100%; - width: 300px; + width: 360px; padding: 50px 25px 5px 25px; position: absolute; - height: 440px; + height: 480px; right: 10%; .el-form-item{ position: relative; diff --git a/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue index 9b1b026e..c3e6ceb7 100644 --- a/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue @@ -204,6 +204,7 @@ const data = reactive({ currentPrjId:'', types:greenCarbonData.types, delDatas:[], + delDataIds:[], importData:[], openImport:false, }); @@ -272,6 +273,7 @@ function resetQuery() { function handleSelectionChange(selection) { ids.value = selection.map(item => item.id); data.delDatas=selection.map(item=> getGreenCarbon(item.carbonFactorType).text +' - '+item.carbonName); + data.delDataIds=selection.map(item=> item.id); single.value = selection.length != 1; multiple.value = !selection.length; } @@ -324,8 +326,9 @@ function submitForm() { /** 删除按钮操作 */ function handleDelete(row) { - const _ids =row && row.id? getGreenCarbon(row.carbonFactorType).text +' - '+row.carbonName:data.delDatas.join(","); - proxy.$modal.confirm('是否确认删【' + _ids + '】的数据项？').then(function () { + const names =row && row.id? getGreenCarbon(row.carbonFactorType).text +' - '+row.carbonName:data.delDatas.join(","); + const _ids =row && row.id? row.id:data.delDataIds.join(","); + proxy.$modal.confirm('是否确认删【' + names + '】的数据项？').then(function () { return delGreenCarbonItem(_ids); }).then(() => { getList(); diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue index 3be3327a..4ea2738c 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue @@ -396,6 +396,7 @@ function doImageUpload(type) { form.value.userName=form.value.userName||d.data.name||''; form.value.certificateCode=form.value.certificateCode||d.data.cardId||''; form.value.address=form.value.address||d.data.address||''; + from.value.nativePlace=form.value.native||d.data.native||''; let nation=d.data.nation||""; if(nation){ let tmps= data.nationOpts.filter(it=>it.indexOf(nation)>=0); @@ -416,6 +417,7 @@ function doImageUpload(type) { }); } }else if(type==2){ + /* url=form.value.certificatePhoto2; if(url){ url=location.origin+url; @@ -423,7 +425,7 @@ function doImageUpload(type) { proxy.$http.get(`/system/tools/id/back?url=${url}`).then(d=>{ form.value.nativePlace=form.value.nativePlace||d.data.issuing||''; }); - } + } */ } }, 800); } From 1a9f23ee0ba7080e203f2c33e2dc084554e560c0 Mon Sep 17 00:00:00 2001 From: haha Date: Thu, 6 Feb 2025 22:28:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=BF=E7=A2=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/manage/greenCarbonItem/index.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue index c3e6ceb7..3b805a3b 100644 --- a/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue @@ -107,7 +107,7 @@ @@ -132,7 +132,7 @@ @@ -211,13 +211,14 @@ const data = reactive({ const { queryParams, form, rules } = toRefs(data); /** 查询项目列表 */ -function getProjectList() { +function getProjectList(cb) { findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => { data.projects = response.rows; if (userStore.currentPrjId) { queryParams.value.projectId = userStore.currentPrjId data.currentPrjId = userStore.currentPrjId; } + cb && cb(); }); } /** 查询碳因子管理列表 */ @@ -231,7 +232,7 @@ function getList() { } // 取消按钮 -function cancel() { +function doCancel() { open.value = false; reset(); } @@ -364,8 +365,10 @@ const handleFileSuccess = (response, file, fileList) => { }; -getList(); -getProjectList(); + +getProjectList(()=>{ + getList(); +});