From 8b66ef0d6c44636306f99a502f8bf8cf679a55b0 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 28 四月 2025 15:37:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/mainPlan/pipeProduceStatics/index.vue |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/views/mainPlan/pipeProduceStatics/index.vue b/src/views/mainPlan/pipeProduceStatics/index.vue
index 49b0121..31e7473 100644
--- a/src/views/mainPlan/pipeProduceStatics/index.vue
+++ b/src/views/mainPlan/pipeProduceStatics/index.vue
@@ -69,6 +69,7 @@
           icon="Refresh"
           @click="handleRefresh"
           v-hasPermi="['aps:apsGasPipingRouteStat:computeCapacity']"
+          :disabled="loading"
           >鏇存柊</el-button
         >
       </el-col>
@@ -290,6 +291,7 @@
           // item[`resourceName`] = flag
           //   ? `<div class='el-badge'><sup class="el-badge__content is-fixed is-dot"></sup>${key}</div>`
           //   : key;
+          item[`resourceName`] =  key;
         }
         exportData.value.push(data);
         dataList.push(item);

--
Gitblit v1.9.3