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); }