From 1a9f23ee0ba7080e203f2c33e2dc084554e560c0 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 6 Feb 2025 22:28:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=BF=E7=A2=B3=E5=8A=9F?=
 =?UTF-8?q?=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 @@
       <template #footer>
         <div class="dialog-footer" style="text-align: center;">
           <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button @click="doCancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -132,7 +132,7 @@
     </el-table>
       <template #footer>
         <div class="dialog-footer" style="text-align: center;">
-          <el-button type="primary" @click="open=false">确 定</el-button>
+          <el-button type="primary" @click="data.openImport=false">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -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();
+});
 </script>
 <style type="scss">