From 8ef988b7b2e716b99ba95c890f03ab47375a3d7a Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Fri, 23 Aug 2024 15:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/asset/file/energyConsumption.xlsx       | Bin 10585 -> 10613 bytes
 .../carbonAssets/carbonAssetsDetail/index.vue      |  14 ++-
 .../carbonEmissionManage/carbonAssets/index.vue    |  89 +++++++++---------
 .../carbonEmissionFactorLibrary/index.vue          |  75 +++++++++-------
 .../carbonEmissions/index.vue                      |  49 +++++-----
 .../carbonEmissionStatistics/config.ts             |   2 +-
 .../energyConsumption/index.vue                    |   9 +-
 .../carbonInventoryCheck/fillInPage/index.vue      |  99 ++++++++++++---------
 .../carbonInventoryCheck/index.vue                 |  88 +++++++++---------
 .../carbonPlanning/category/categoryDeatil.vue     |  24 ++++-
 .../carbonPlanning/category/index.vue              |  10 ++-
 lib/component/form/input/input-number.vue          |  12 ++-
 lib/component/form/input/textarea.vue              |  13 ++-
 13 files changed, 293 insertions(+), 191 deletions(-)

diff --git a/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx b/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx
index 2687e05cab72b633554a2281348bf7af27d80aa1..a9eae6eccd48016ea7b6a3353844f687e88c991f 100644
GIT binary patch
delta 3101
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
Cf2dUe

delta 3106
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

diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
index d2c5c2e..0862a76 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
@@ -73,9 +73,10 @@
       </div>
       <a-table :columns="totalColumns" :data-source="totalData" bordered :pagination="false">
         <template #bodyCell="{ column, text }">
-          <template v-if="column.dataIndex === 'name'">
+          <span>{{ text || '-' }}</span>
+          <!-- <template v-if="column.dataIndex === 'name'">
             <a>{{ text }}</a>
-          </template>
+          </template> -->
         </template>
       </a-table>
     </div>
@@ -391,6 +392,7 @@
           api: carbonAssets.import, // 导入接口名
           params: {
             orgId,
+            year,
           },
           title: '碳资产', // 弹窗title
           templateName: 'carbonAssets', // 所使用的文件名称
@@ -413,6 +415,7 @@
             pageSize: 999,
             year: queryParams.value.year,
             ids: selectedRowKeys.value,
+            accountType: props.parentId,
           });
           const config = {
             responseType: 'blob',
@@ -674,6 +677,7 @@
       .validate()
       .then(() => {
         console.log('values', formState, toRaw(formState));
+        formState.value.orgId = orgId.value;
         if (formState.value.transactionType) {
           formState.value.transactionType = formState.value.transactionType.join(',').split(',')[1];
         }
@@ -699,7 +703,8 @@
                 message.success('操作成功！');
                 visible.value = false;
                 delIds.value = [];
-                getDetailList();
+                // getDetailList();
+                mainRef.value?.nsTableRef.reload();
                 getTotalTable();
               })
               .catch((error) => {
@@ -709,7 +714,8 @@
             message.success('操作成功！');
             visible.value = false;
             delIds.value = [];
-            getDetailList();
+            // getDetailList();
+            mainRef.value?.nsTableRef.reload();
           }
         });
       })
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue
index a15dd8c..b73b0d7 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue
@@ -2,26 +2,27 @@
   <div class="mainContant" v-if="homePage">
     <a-card class="card" v-if="nationwide" style="margin-right: 1%; margin-bottom: 1%">
       <div class="top" style="background: rgba(252, 139, 78, 0.05)">
-        <div class="moneyImg"
-          ><img width="68px" height="68px" src="../../../../src/icon/carbonAssetsMoney-1.svg"
-        /></div>
+        <div class="moneyImg"><img width="68" height="68" src="../../../../src/icon/carbonAssetsMoney-1.svg" /></div>
         <div class="moneyTitle">全国碳账户估值（CNY）</div>
         <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">{{
           nationwide.valuation
         }}</div>
         <div class="moneyDetail">
-          <div class="detailClick" @click="viewDetail(1)" style="border: 1px solid rgba(229, 102, 22, 1);">
+          <div
+            class="detailClick"
+            @click="viewDetail(1)"
+            style="border: 1px solid rgba(229, 102, 22, 1)">
             <img
-              width="20px"
-              height="20px"
+              width="20"
+              height="20"
               src="../../../../src/icon/carbonAssetsToDetail-1.svg"
               alt="" />
-            <span style="color: rgba(229, 102, 22, 1);">交易明细</span>
+            <span style="color: rgba(229, 102, 22, 1)">交易明细</span>
           </div>
         </div>
       </div>
       <div class="title">
-        <img width="24px" height="24px" src="../../../../src/icon/carbonAssetsTitle-1.svg" />
+        <img width="24" height="24" src="../../../../src/icon/carbonAssetsTitle-1.svg" />
         <span>全国碳账户余额</span>
       </div>
       <div class="bottom">
@@ -29,23 +30,23 @@
           <div class="money">{{ nationwide.opening }}</div>
           <div class="moneyType">期初余额（tCO2）</div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsAdd.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsAdd.svg" />
         <div class="calculation TLCard">
           <div class="money">{{ nationwide.income }}</div>
           <div class="moneyType">
-            <img width="20px" height="17px" src="../../../../src/icon/carbonAssetsIncrease.svg" />
+            <img width="20" height="17" src="../../../../src/icon/carbonAssetsIncrease.svg" />
             增加（tCO2）
           </div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsReduce.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsReduce.svg" />
         <div class="calculation TLCard">
           <div class="money">{{ nationwide.expenditure }}</div>
           <div class="moneyType">
-            <img width="20px" height="17px" src="../../../../src/icon/carbonAssetsLower.svg" />
+            <img width="20" height="17" src="../../../../src/icon/carbonAssetsLower.svg" />
             减少（tCO2）
           </div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsEqual.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsEqual.svg" />
         <div class="calculation TLCard">
           <div class="money">{{ nationwide.period }}</div>
           <div class="moneyType">期末余额（tCO2）</div>
@@ -55,23 +56,26 @@
     <a-card class="card" v-if="place" style="margin-bottom: 1%">
       <div class="top" style="background: rgba(234, 71, 54, 0.05)">
         <div class="moneyImg"
-          ><img width="68px" height="68px" src="../../../../src/icon/carbonAssetsMoney-2.svg"
+          ><img width="68" height="68" src="../../../../src/icon/carbonAssetsMoney-2.svg"
         /></div>
         <div class="moneyTitle">地方碳账户估值（CNY）</div>
         <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">{{ place.valuation }}</div>
         <div class="moneyDetail">
-          <div class="detailClick" @click="viewDetail(2)" style="border: 1px solid rgba(230, 51, 44, 1);">
+          <div
+            class="detailClick"
+            @click="viewDetail(2)"
+            style="border: 1px solid rgba(230, 51, 44, 1)">
             <img
-              width="20px"
-              height="20px"
+              width="20"
+              height="20"
               src="../../../../src/icon/carbonAssetsToDetail-2.svg"
               alt="" />
-            <span style="color: rgba(230, 51, 44, 1);">交易明细</span>
+            <span style="color: rgba(230, 51, 44, 1)">交易明细</span>
           </div>
         </div>
       </div>
       <div class="title">
-        <img width="24px" height="24px" src="../../../../src/icon/carbonAssetsTitle-2.svg" />
+        <img width="24" height="24" src="../../../../src/icon/carbonAssetsTitle-2.svg" />
         <span>地方碳账户余额</span>
       </div>
       <div class="bottom">
@@ -79,23 +83,23 @@
           <div class="money">{{ place.opening }}</div>
           <div class="moneyType">期初余额（tCO2）</div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsAdd.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsAdd.svg" />
         <div class="calculation TRCard">
           <div class="money">{{ place.income }}</div>
           <div class="moneyType">
-            <img width="20px" height="17px" src="../../../../src/icon/carbonAssetsIncrease.svg" />
+            <img width="20" height="17" src="../../../../src/icon/carbonAssetsIncrease.svg" />
             增加（tCO2）
           </div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsReduce.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsReduce.svg" />
         <div class="calculation TRCard">
           <div class="money">{{ place.expenditure }}</div>
           <div class="moneyType">
-            <img width="20px" height="17px" src="../../../../src/icon/carbonAssetsLower.svg" />
+            <img width="20" height="17" src="../../../../src/icon/carbonAssetsLower.svg" />
             减少（tCO2）
           </div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsEqual.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsEqual.svg" />
         <div class="calculation TRCard">
           <div class="money">{{ place.period }}</div>
           <div class="moneyType">期末余额（tCO2）</div>
@@ -105,23 +109,26 @@
     <a-card class="card" v-if="ccer" style="margin-right: 1%">
       <div class="top" style="background: rgba(65, 163, 224, 0.05)">
         <div class="moneyImg"
-          ><img width="68px" height="68px" src="../../../../src/icon/carbonAssetsMoney-3.svg"
+          ><img width="68" height="68" src="../../../../src/icon/carbonAssetsMoney-3.svg"
         /></div>
         <div class="moneyTitle">CCER资产估值（CNY）</div>
         <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">{{ ccer.valuation }}</div>
-        <div class="moneyDetail" >
-          <div class="detailClick" @click="viewDetail(3)" style="border: 1px solid rgba(56, 157, 220, 1);">
+        <div class="moneyDetail">
+          <div
+            class="detailClick"
+            @click="viewDetail(3)"
+            style="border: 1px solid rgba(56, 157, 220, 1)">
             <img
-              width="20px"
-              height="20px"
+              width="20"
+              height="20"
               src="../../../../src/icon/carbonAssetsToDetail-3.svg"
               alt="" />
-            <span style="color: rgba(56, 157, 220, 1);">交易明细</span>
+            <span style="color: rgba(56, 157, 220, 1)">交易明细</span>
           </div>
         </div>
       </div>
       <div class="title">
-        <img width="24px" height="24px" src="../../../../src/icon/carbonAssetsTitle-3.svg" />
+        <img width="24" height="24" src="../../../../src/icon/carbonAssetsTitle-3.svg" />
         <span>全国碳账户余额</span>
       </div>
       <div class="bottom">
@@ -129,23 +136,23 @@
           <div class="money">{{ ccer.opening }}</div>
           <div class="moneyType">期初余额（tCO2）</div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsAdd.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsAdd.svg" />
         <div class="calculation BLCard">
           <div class="money">{{ ccer.income }}</div>
           <div class="moneyType">
-            <img width="20px" height="17px" src="../../../../src/icon/carbonAssetsIncrease.svg" />
+            <img width="20" height="17" src="../../../../src/icon/carbonAssetsIncrease.svg" />
             增加（tCO2）
           </div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsReduce.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsReduce.svg" />
         <div class="calculation BLCard">
           <div class="money">{{ ccer.expenditure }}</div>
           <div class="moneyType">
-            <img width="20px" height="17px" src="../../../../src/icon/carbonAssetsLower.svg" />
+            <img width="20" height="17" src="../../../../src/icon/carbonAssetsLower.svg" />
             减少（tCO2）
           </div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsEqual.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsEqual.svg" />
         <div class="calculation BLCard">
           <div class="money">{{ ccer.period }}</div>
           <div class="moneyType">期末余额（tCO2）</div>
@@ -155,15 +162,15 @@
     <a-card class="card" v-if="whole">
       <div class="top" style="background: rgba(37, 192, 150, 0.05)">
         <div class="moneyImg"
-          ><img width="68px" height="68px" src="../../../../src/icon/carbonAssetsMoney-4.svg"
+          ><img width="68" height="68" src="../../../../src/icon/carbonAssetsMoney-4.svg"
         /></div>
         <div class="moneyTitle">碳资产总估值（CNY）</div>
         <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">{{ whole.whole }}</div>
       </div>
       <div class="title" style="justify-content: center">
         <img
-          width="17px"
-          height="17px"
+          width="17"
+          height="17"
           style="transform: rotate(90deg)"
           src="../../../../src/icon/carbonAssetsEqual.svg" />
       </div>
@@ -172,12 +179,12 @@
           <div class="money">{{ whole.nationwide }}</div>
           <div class="moneyType">全国碳账户资产估值</div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsAdd.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsAdd.svg" />
         <div class="BRCard">
           <div class="money">{{ whole.place }}</div>
           <div class="moneyType">地方碳账户资产估值</div>
         </div>
-        <img width="17px" height="17px" src="../../../../src/icon/carbonAssetsAdd.svg" />
+        <img width="17" height="17" src="../../../../src/icon/carbonAssetsAdd.svg" />
         <div class="BRCard">
           <div class="money">{{ whole.ccer }}</div>
           <div class="moneyType">CCER碳资产估值</div>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 773d362..bdfdf63 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -38,41 +38,37 @@
           <template #title="data">
             <div class="treeRow">
               <div>
-                <span
-                  v-if="
-                    data.emissionName &&
-                    selectTreeDataValue &&
-                    data.emissionName.indexOf(selectTreeDataValue) > -1
-                  ">
-                  {{
-                    data.emissionName.substring(0, data.emissionName.indexOf(selectTreeDataValue))
-                  }}
-                  <span style="color: #f50">{{ selectTreeDataValue }}</span>
-                  {{
-                    data.emissionName.substring(
-                      data.emissionName.indexOf(selectTreeDataValue) + selectTreeDataValue.length,
-                    )
-                  }}
-                </span>
-                <span v-else>{{ data.emissionName }}</span>
+                <span>{{ data.emissionName }}</span>
               </div>
               <a-dropdown>
                 <ns-icon name="actionMore" size="14" class="actionMore" />
                 <template #overlay>
                   <a-menu>
-                    <a-menu-item @click="editTreeNodeData(data)">编辑</a-menu-item>
-                    <a-menu-item @click="addTreeNodeData">新增子节点</a-menu-item>
-                    <a-menu-item
-                      v-if="!data.isFirst && data.emissionName !== '未分类'"
-                      @click="moveNode(data, 'up')"
-                      >上移</a-menu-item
+                    <a-menu-item v-if="data.emissionName !== '全部'" @click="editTreeNodeData(data)"
+                      >编辑</a-menu-item
                     >
+                    <a-menu-item @click="addTreeNodeData"> 新增子节点 </a-menu-item>
+                    <a-menu-item
+                      v-if="
+                        !data.isFirst &&
+                        data.emissionName !== '未分类' &&
+                        data.emissionName !== '全部'
+                      "
+                      @click="moveNode(data, 'up')">
+                      上移
+                    </a-menu-item>
                     <a-menu-item
-                      v-if="!data.isEnd && data.emissionName !== '未分类'"
-                      @click="moveNode(data, 'down')"
-                      >下移</a-menu-item
+                      v-if="
+                        !data.isEnd &&
+                        data.emissionName !== '未分类' &&
+                        data.emissionName !== '全部'
+                      "
+                      @click="moveNode(data, 'down')">
+                      下移
+                    </a-menu-item>
+                    <a-menu-item v-if="data.emissionName !== '全部'" @click="deleteTreeNode(data)"
+                      >删除</a-menu-item
                     >
-                    <a-menu-item @click="deleteTreeNode(data)">删除</a-menu-item>
                   </a-menu>
                 </template>
               </a-dropdown>
@@ -311,6 +307,7 @@
     },
   ];
   const checkedTreeNodeKeys = ref<string[]>();
+  const selectedKeys = ref<string[]>();
 
   // const generateData = (_level: number, _preKey?: string, _tns?: TreeProps['treeData']) => {
   //   const preKey = _preKey || '0';
@@ -565,7 +562,10 @@
   // 被选中的树节点
   const editTreeNode = ref({});
   const onSelectKeys = ref([]);
-  const onSelect = (selectedKeys: string[], info: any) => {
+  const onSelect = (selectedKey: string[], info: any) => {
+    if (selectedKey.length === 1) {
+      selectedKeys.value = selectedKey;
+    }
     if (info.selected) {
       // showOperation.value = true;
       editTreeNode.value = {
@@ -575,7 +575,7 @@
         sortNumber: info.selectedNodes[0].sortNumber,
         parentEmissionId: info.selectedNodes[0].parentEmissionId,
       };
-      onSelectKeys.value.push(info.selectedNodes[0].id);
+      onSelectKeys.value = [info.selectedNodes[0].id];
       emissionList.value = [...onSelectKeys.value, ...checkedIds.value];
       mainRef.value?.nsTableRef.reload();
     } else {
@@ -766,49 +766,60 @@
     columns: [
       {
         title: 'id',
+        width: 50,
         customRender: (text: any) => {
           return text.index + 1;
         },
       },
       {
         title: '排放源',
+        width: 100,
         dataIndex: 'emissionSources',
       },
       {
         title: '排放类型',
+        width: 100,
         dataIndex: 'emissionTypeColumn',
       },
       {
         title: '排放气体',
+        width: 100,
         dataIndex: 'emissionGas',
       },
       {
         title: '排放环节',
+        width: 100,
         dataIndex: 'emissionProcess',
       },
       {
         title: '排放因子',
+        width: 100,
         dataIndex: 'emissionFactors',
       },
       {
         title: '排放因子单位',
+        width: 100,
         dataIndex: 'emissionFactorUnits',
       },
       {
         title: '数据来源',
+        width: 100,
         dataIndex: 'dataSources',
       },
       {
         title: '数据库',
+        width: 100,
         dataIndex: 'carbonDatabase',
       },
       {
         title: '参考文献',
+        width: 100,
         dataIndex: 'bibliography',
         ellipsis: true,
       },
       {
         title: '引用数量',
+        width: 100,
         dataIndex: 'numberOfReferences',
       },
     ],
@@ -1224,13 +1235,17 @@
   }
   .treePart {
     width: 70%;
-    height: 100%;
+    height: calc(100% - 5vh);
     display: flex;
     border: 1px solid #bfbfbf;
     margin-left: 10%;
     flex-direction: column;
     border-radius: 12px;
     overflow: auto;
+    :deep(.ant-tree) {
+      height: 90%;
+      overflow: auto;
+    }
   }
   .actionMore {
     display: none;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
index c113322..4022831 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -5,7 +5,7 @@
       :data-source="data"
       :bordered="true"
       :pagination="false"
-      :scroll="{ x: 2000, y: 480 }">
+      :scroll="{ x: 1700, y: 480 }">
       <template #title>
         <a-date-picker v-model:value="selectYear" picker="year" valueFormat="YYYY" />
         <span style="margin-left: 30px">
@@ -14,14 +14,14 @@
         </span>
       </template>
     </a-table>
-    <a-pagination
+    <!-- <a-pagination
       :current="queryParams.pageNum"
       :total="total"
       :page-size="queryParams.pageSize"
       style="display: flex; justify-content: center; margin-top: 16px"
       :show-size-changer="true"
       :show-quick-jumper="true"
-      @change="onChange" />
+      @change="onChange" /> -->
   </div>
 </template>
 <script lang="ts" setup>
@@ -67,7 +67,7 @@
     {
       title: '排放类型',
       dataIndex: 'cnValue',
-      width: 130,
+      width: 100,
       customCell: (record, rowIndex) => {
         if (rowIndex == undefined) {
           return {
@@ -90,82 +90,82 @@
     {
       title: '能源种类',
       dataIndex: 'energyType',
-      width: 80,
+      width: 100,
     },
     {
       title: '计量单位',
       dataIndex: 'unitName',
-      width: 80,
+      width: 100,
     },
     {
       title: '加权平均',
       dataIndex: 'averageFactorValue',
-      width: 80,
+      width: 100,
     },
     {
       title: '全年',
       dataIndex: 'carbonYearly',
-      width: 80,
+      width: 100,
     },
     {
       title: '1月',
       dataIndex: 'jan',
-      width: 80,
+      width: 100,
     },
     {
       title: '2月',
       dataIndex: 'feb',
-      width: 80,
+      width: 100,
     },
     {
       title: '3月',
       dataIndex: 'mar',
-      width: 80,
+      width: 100,
     },
     {
       title: '4月',
       dataIndex: 'apr',
-      width: 80,
+      width: 100,
     },
     {
       title: '5月',
       dataIndex: 'may',
-      width: 80,
+      width: 100,
     },
     {
       title: '6月',
       dataIndex: 'jun',
-      width: 80,
+      width: 100,
     },
     {
       title: '7月',
       dataIndex: 'jul',
-      width: 80,
+      width: 100,
     },
     {
       title: '8月',
       dataIndex: 'aug',
-      width: 80,
+      width: 100,
     },
     {
       title: '9月',
       dataIndex: 'sep',
-      width: 80,
+      width: 100,
     },
     {
       title: '10月',
       dataIndex: 'oct',
-      width: 80,
+      width: 100,
     },
     {
       title: '11月',
       dataIndex: 'nov',
-      width: 80,
+      width: 100,
     },
     {
       title: '12月',
-      dataIndex: 'dec',
-      width: 80,
+      dataIndex: 'dece',
+      width: 100,
     },
   ];
   // 合并单元格
@@ -209,7 +209,7 @@
     display: flex;
   }
   :deep(.ant-table-container) {
-    padding: 0px 16px;
+    margin: 0px 16px;
   }
   // :deep(.ant-table-cell) {
   //   border: 1px solid #f0f0f0;
@@ -223,4 +223,9 @@
   td.column-money {
     text-align: right !important;
   }
+  .custom-cell {
+    display: flex;
+    align-items: center;
+    padding: 8px;
+  }
 </style>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index 42621d2..d259443 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -71,7 +71,7 @@ export const tableColumns = [
   },
   {
     title: '12月',
-    dataIndex: 'dec',
+    dataIndex: 'dece',
   },
   {
     title: '操作',
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
index 3454b15..7c7280d 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -625,18 +625,18 @@
       },
       {
         title: '12月',
-        dataIndex: 'dec',
+        dataIndex: 'dece',
         width: 100,
         customRender: (value) => {
           let text;
           let color;
           switch (value.record.decFlag) {
             case 1:
-              text = value.record.dec ? value.record.dec : '';
+              text = value.record.dece ? value.record.dece : '';
               color = 'rgba(243, 97, 99, 1)';
               break;
             case 0:
-              text = value.record.dec ? value.record.dec : '';
+              text = value.record.dece ? value.record.dece : '';
               color = 'rgba(57, 215, 287, 1)';
               break;
           }
@@ -659,6 +659,7 @@
               if (res.data.emissionType) {
                 res.data.emissionType = Number(res.data.emissionType);
               }
+              changeEnergyType(res.data.energyConsumptionType);
               if (res.data.unit) {
                 let selectDevice = ref([Number(res.data.unit)]);
                 findParentIds(measurementUnit.value, res.data.unit, selectDevice.value);
@@ -773,6 +774,8 @@
     mainRef.value?.nsTableRef.reload();
   };
   const changeEnergyType = (value) => {
+    debugger;
+    formState.value.collectionNode = '';
     // 获取自动采集节点的数据
     fetch(group.queryDeviceGroupTree, { energyType: value, orgId: orgId.value }).then((res) => {
       treeData.value = res.data;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
index 8f7d450..658c67b 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -5,8 +5,8 @@
         <div class="title">{{ props.year }}年济阳站碳盘查报告</div>
         <div class="standard" style="display: flex; align-items: center">
           <img
-            width="11px"
-            height="11px"
+            width="11"
+            height="11"
             style="margin-right: 5px"
             src="../../../../../src/icon/carbonInventoryCheck.svg" />
           <span
@@ -19,7 +19,7 @@
               text-align: left;
               vertical-align: top;
             ">
-            适用标准：ISO 14064-1
+            适用标准：{{ props.standard }}
           </span>
           <a-button type="primary" @click="changeParentData" ghost style="margin-left: 6px">
             返回
@@ -328,7 +328,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item ref="name" label="消耗量" name="consumption">
-              <ns-input
+              <ns-input-number
                 v-model:value="editFormState.consumption"
                 :maxlength="20"
                 @keydown="handleKeyDown"
@@ -482,6 +482,9 @@
     endTime: {
       type: String,
     },
+    standard: {
+      type: String,
+    },
   });
   const activeKey = ref('1');
   const orgId = ref('');
@@ -641,16 +644,18 @@
         }
       } else {
         selectedKeysR.value = ['0-0-0'];
-        getTableId.value = res.data[0].children[0].id;
-        bizId.value = res.data[0].children[0].id;
-        if (res.data.length != 0) {
-          getPFYTableList(getTableId.value);
-          getTableHeardUnit(getTableId.value);
-        } else {
-          data.value = [];
-          columns.value[1].title = '消耗量';
-          columns.value[2].title = '碳排因子';
-          columns.value[3].title = '排放量';
+        if (res.data[0].children.length > 0) {
+          getTableId.value = res.data[0].children[0].id;
+          bizId.value = res.data[0].children[0].id;
+          if (res.data.length != 0) {
+            getPFYTableList(getTableId.value);
+            getTableHeardUnit(getTableId.value);
+          } else {
+            data.value = [];
+            columns.value[1].title = '消耗量';
+            columns.value[2].title = '碳排因子';
+            columns.value[3].title = '排放量';
+          }
         }
       }
     });
@@ -658,10 +663,12 @@
   // 排放源树中被选中的树节点
   const onSelectR = (selectedKey: string[], info: any) => {
     selectedKeysR.value = selectedKey;
-    getTableId.value = info.selectedNodes[0].id;
-    bizId.value = info.selectedNodes[0].id;
-    getPFYTableList(getTableId.value);
-    getTableHeardUnit(getTableId.value);
+    if (info.selectedNodes[0].emissionSource !== '全部') {
+      getTableId.value = info.selectedNodes[0].id;
+      bizId.value = info.selectedNodes[0].id;
+      getPFYTableList(getTableId.value);
+      getTableHeardUnit(getTableId.value);
+    }
   };
   // 获取表头单位
   const getTableHeardUnit = (id) => {
@@ -815,16 +822,17 @@
       .validate()
       .then(() => {
         console.log('values', formState, toRaw(formState));
-        if (formState.value.unitId) {
-          formState.value.unitId = formState.value.unitId.join(',').split(',')[1];
+        const addformState = JSON.parse(JSON.stringify(formState.value));
+        if (addformState.unitId) {
+          addformState.unitId = addformState.unitId.join(',').split(',')[1];
         }
-        if (formState.value.carbonEmissionUnits) {
-          formState.value.carbonEmissionUnits = formState.value.carbonEmissionUnits
+        if (addformState.carbonEmissionUnits) {
+          addformState.carbonEmissionUnits = addformState.carbonEmissionUnits
             .join(',')
             .split(',')[1];
         }
-        if (formState.value.id) {
-          fetch(carbonInventoryCheck.update, formState.value).then((res) => {
+        if (addformState.id) {
+          fetch(carbonInventoryCheck.update, addformState).then((res) => {
             addTreeNodeVisible.value = false;
             formState.value = {
               orgId: orgId.value,
@@ -837,20 +845,25 @@
             getEmissionSourceTree();
           });
         } else {
-          fetch(carbonInventoryCheck.create, formState.value).then((res) => {
+          if (addformState.categoryId) {
+            fetch(carbonInventoryCheck.create, addformState).then((res) => {
+              addTreeNodeVisible.value = false;
+              formState.value = {
+                orgId: orgId.value,
+                year: props.year,
+                startTime: props.startTime,
+                endTime: props.endTime,
+                categoryId: categoryId.value,
+              };
+              message.success('操作成功！');
+              changeSelectedKeys.value = true;
+              getEmissionSourceTree();
+              getPFYTableList(res.data.id);
+            });
+          } else {
+            message.warning('请选择能源类别');
             addTreeNodeVisible.value = false;
-            formState.value = {
-              orgId: orgId.value,
-              year: props.year,
-              startTime: props.startTime,
-              endTime: props.endTime,
-              categoryId: categoryId.value,
-            };
-            message.success('操作成功！');
-            changeSelectedKeys.value = true;
-            getEmissionSourceTree();
-            getPFYTableList(res.data.id);
-          });
+          }
         }
       })
       .catch((error) => {
@@ -1266,10 +1279,10 @@
     fetch(carbonInventoryCheck.carbonFlowDirection, queryFlowDirection.value).then((res) => {
       console.log(res);
       linksData.value = res.data[0];
-      if (linksData.value[0].value !== 0) {
-        showChart.value = true;
-      } else {
+      if (linksData.value[0].value === 0 || linksData.value[0].value === undefined) {
         showChart.value = false;
+      } else {
+        showChart.value = true;
       }
       datalist.value = res.data[1];
       drawEcharts();
@@ -1487,11 +1500,13 @@
             colorStops: [
               {
                 offset: 1,
-                color: Color[d], // 0% 处的颜色
+                // color: Color[d], // 0% 处的颜色
+                color: Color[d % Color.length],
               },
               {
                 offset: 0,
-                color: Color1[d], // 100% 处的颜色
+                // color: Color1[d], // 100% 处的颜色
+                color: Color1[d % Color1.length],
               },
             ],
             global: false, // 缺省为 false
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index b8971e5..7f24ef6 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -10,6 +10,7 @@
       :year="year"
       :startTime="startTime"
       :endTime="endTime"
+      :standard="standard"
       @change-data="updateData" />
   </div>
   <!-- 新增报告弹窗 -->
@@ -23,46 +24,48 @@
     <div class="ns-form-title"
       ><div class="title">{{ text }}</div></div
     >
-    <a-form
-      ref="formRef"
-      :model="formState"
-      :rules="rules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol">
-      <a-form-item ref="name" label="报告名称" name="reportName">
-        <a-input
-          v-model:value="formState.reportName"
-          :maxlength="15"
-          @keydown="handleKeyDown"
-          placeholder="请输入报告名称" />
-      </a-form-item>
-      <a-form-item ref="name" label="报告年度" name="reportYear">
-        <a-date-picker v-model:value="formState.reportYear" picker="year" valueFormat="YYYY" />
-      </a-form-item>
-      <a-form-item ref="name" label="适用标准" name="genericStandard">
-        <a-input
-          v-model:value="formState.genericStandard"
-          :maxlength="20"
-          @keydown="handleKeyDown"
-          placeholder="请输入适用标准" />
-      </a-form-item>
-      <a-form-item label="报告周期" name="reportPeriod">
-        <a-select
-          v-model:value="formState.reportPeriod"
-          placeholder="请选择报告周期"
-          @change="selectChange">
-          <a-select-option value="1">年度</a-select-option>
-          <a-select-option value="2">月度</a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item ref="name" label="报告范围" name="reportScope">
-        <a-range-picker
-          v-model:value="formState.reportScope"
-          picker="month"
-          :disabledDate="disabledDate"
-          valueFormat="YYYY-MM" />
-      </a-form-item>
-    </a-form>
+    <a-spin :spinning="spinning">
+      <a-form
+        ref="formRef"
+        :model="formState"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol">
+        <a-form-item ref="name" label="报告名称" name="reportName">
+          <a-input
+            v-model:value="formState.reportName"
+            :maxlength="15"
+            @keydown="handleKeyDown"
+            placeholder="请输入报告名称" />
+        </a-form-item>
+        <a-form-item ref="name" label="报告年度" name="reportYear">
+          <a-date-picker v-model:value="formState.reportYear" picker="year" valueFormat="YYYY" />
+        </a-form-item>
+        <a-form-item ref="name" label="适用标准" name="genericStandard">
+          <a-input
+            v-model:value="formState.genericStandard"
+            :maxlength="20"
+            @keydown="handleKeyDown"
+            placeholder="请输入适用标准" />
+        </a-form-item>
+        <a-form-item label="报告周期" name="reportPeriod">
+          <a-select
+            v-model:value="formState.reportPeriod"
+            placeholder="请选择报告周期"
+            @change="selectChange">
+            <a-select-option value="1">年度</a-select-option>
+            <a-select-option value="2">月度</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item ref="name" label="报告范围" name="reportScope">
+          <a-range-picker
+            v-model:value="formState.reportScope"
+            picker="month"
+            :disabledDate="disabledDate"
+            valueFormat="YYYY-MM" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
     <template #footer>
       <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
       <a-button type="primary" @click="onSubmit">确定</a-button>
@@ -121,8 +124,10 @@
       event.preventDefault();
     }
   };
+  const spinning = ref(false);
   // 点击确定提交
   const onSubmit = () => {
+    spinning.value = true;
     formRef.value
       .validate()
       .then(() => {
@@ -133,6 +138,7 @@
         fetch(carbonInventoryCheck.createOrUpdate, formState.value).then((res) => {
           visible.value = false;
           mainRef.value?.nsTableRef.reload();
+          spinning.value = false;
         });
       })
       .catch((error) => {
@@ -145,6 +151,7 @@
   const reportId = ref();
   const startTime = ref();
   const endTime = ref();
+  const standard = ref();
   const year = ref();
   const tableConfig = ref({
     title: '数据库',
@@ -220,6 +227,7 @@
             year.value = record.reportYear;
             startTime.value = record.startTime;
             endTime.value = record.endTime;
+            standard.value = record.genericStandard;
           },
         },
         {
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
index 1954135..2ec3dde 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
@@ -96,6 +96,28 @@
               </span>
             </template>
           </template>
+          <!-- <template #summary>
+            <a-table-summary-row>
+              <a-table-summary-cell></a-table-summary-cell>
+              <a-table-summary-cell>合计</a-table-summary-cell>
+              <a-table-summary-cell></a-table-summary-cell>
+              <a-table-summary-cell>
+                <a-typography-text type="danger">{{ 111 }}</a-typography-text>
+              </a-table-summary-cell>
+              <a-table-summary-cell>
+                <a-typography-text>{{ 222 }}</a-typography-text>
+              </a-table-summary-cell>
+              <a-table-summary-cell>
+                <a-typography-text>{{ 222 }}</a-typography-text>
+              </a-table-summary-cell>
+              <a-table-summary-cell></a-table-summary-cell>
+              <a-table-summary-cell></a-table-summary-cell>
+              <a-table-summary-cell>
+                <a-typography-text>{{ 222 }}</a-typography-text>
+              </a-table-summary-cell>
+              <a-table-summary-cell></a-table-summary-cell>
+            </a-table-summary-row>
+          </template> -->
         </a-table>
       </a-card>
     </div>
@@ -769,7 +791,7 @@
   }
   .contant {
     width: 100%;
-    height: calc(100% - 5vh);
+    height: calc(95% - 5vh);
     overflow: auto;
     .chartsPart {
       width: 100%;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
index c474d07..aad1da3 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
@@ -155,7 +155,7 @@
     selectedTime.value = false;
     getMonthData();
     getBallQuery.value.yearAndMonth = 'month';
-    getMonthPillarData();
+    // getMonthPillarData();
   };
   const changeToYear = () => {
     monthStyles.value = 'background: #transparent';
@@ -167,7 +167,7 @@
     selectedTime.value = true;
     getYearData();
     getBallQuery.value.yearAndMonth = 'year';
-    getYearPillarData();
+    // getYearPillarData();
   };
   // echarts图
   const pillarChartRef = ref(null);
@@ -514,7 +514,6 @@
     getBallQuery.value.year = selectYearValue.value;
     addTreeNode.value.year = selectYearValue.value;
     getYearData();
-    getYearPillarData();
   };
   const getYearData = () => {
     fetch(carbonPlanning.searchListByYear, yearQueryParams.value).then((res) => {
@@ -522,6 +521,9 @@
       res.data.forEach((item) => {
         treeCheckedKeys.value.push(item.itemizeId.toString());
       });
+      addTreeNode.value.itemizeIds = treeCheckedKeys.value;
+      getPillarQuery.value.itemizeIds = treeCheckedKeys.value;
+      getYearPillarData();
     });
   };
   // 获取月数据
@@ -536,11 +538,11 @@
     getPillarQuery.value.selectedMonth = selectMonthValue.value;
     getBallQuery.value.yearMonth = selectMonthValue.value;
     getMonthData();
-    getMonthPillarData();
   };
   const getMonthData = () => {
     fetch(carbonPlanning.searchListByMonth, monthQueryParams.value).then((res) => {
       data.value = res.data;
+      getMonthPillarData();
     });
   };
   defineExpose({
diff --git a/lib/component/form/input/input-number.vue b/lib/component/form/input/input-number.vue
index bfb9148..ed37f33 100644
--- a/lib/component/form/input/input-number.vue
+++ b/lib/component/form/input/input-number.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-input-number>
+  <a-input-number @keydown="handleKeyDown">
     <template #[item]="data" v-for="item in Object.keys($slots)" :key="item">
       <slot :name="item" v-bind="data || {}"> </slot>
     </template>
@@ -10,7 +10,15 @@
   export default defineComponent({
     name: 'NsInputNumber',
     setup() {
-      return {};
+      const handleKeyDown = (event: KeyboardEvent) => {
+        // Check if the pressed key is a space
+        if (event.code === 'Space') {
+          event.preventDefault();
+        }
+      };
+      return {
+        handleKeyDown,
+      };
     },
   });
 </script>
diff --git a/lib/component/form/input/textarea.vue b/lib/component/form/input/textarea.vue
index 89ad0fb..3fb0e0d 100644
--- a/lib/component/form/input/textarea.vue
+++ b/lib/component/form/input/textarea.vue
@@ -1,11 +1,22 @@
 <template>
-  <a-textarea />
+  <a-textarea @keydown="handleKeyDown" />
 </template>
 <script lang="ts">
   import { defineComponent } from 'vue';
 
   export default defineComponent({
     name: 'NsTextarea',
+    setup() {
+      const handleKeyDown = (event: KeyboardEvent) => {
+        // Check if the pressed key is a space
+        if (event.code === 'Space') {
+          event.preventDefault();
+        }
+      };
+      return {
+        handleKeyDown,
+      };
+    },
   });
 </script>
 <style lang="less" scoped></style>