From 0b9ae9dcd34710e337552f2463236e14f7ba80bf Mon Sep 17 00:00:00 2001
From: chenpingsen <chenpingsen>
Date: Tue, 3 Sep 2024 15:45:44 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/view/equipmentControl/airConditionControlSystem/tabs1.less   | 5 +++--
 .../src/view/equipmentControl/lightingManage/tabs1.less              | 5 +++--
 hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue | 2 +-
 hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue | 2 +-
 hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less   | 2 +-
 .../view/equipmentControl/ventilationSystem/components/tabs1.less    | 5 +++--
 .../src/view/equipmentControl/waterSystem/component/logTab.vue       | 5 +++--
 hx-ai-intelligent/src/view/equipmentControl/waterSystem/index.vue    | 5 +++--
 8 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs1.less b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs1.less
index 4bab724..ce0a42b 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs1.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs1.less
@@ -160,7 +160,8 @@
     font-size: 14px;
     font-weight: 400;
     opacity: 1;
-    border: 1px solid rgba(207, 212, 219, 1);
+    // border: 1px solid rgba(207, 212, 219, 1);
+    border: none;
     line-height: 20.27px;
     color: white;
     text-align: center;
@@ -171,7 +172,7 @@
   .selected {
     background: linear-gradient(180deg, rgba(201, 245, 255, 1) 0%, rgba(138, 215, 255, 1) 100%);
     color: rgba(0, 61, 90, 1);
-    border: 1px solid white;
+    border: none;
   }
 
   .btn:hover {
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.less b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.less
index d71139d..8e8680f 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.less
@@ -181,7 +181,8 @@
     font-size: 14px;
     font-weight: 400;
     opacity: 1;
-    border: 1px solid rgba(207, 212, 219, 1);
+    border: none;
+    // border: 1px solid rgba(207, 212, 219, 1);
     line-height: 20.27px;
     color: white;
     text-align: center;
@@ -192,7 +193,7 @@
   .selected {
     background: linear-gradient(180deg, rgba(201, 245, 255, 1) 0%, rgba(138, 215, 255, 1) 100%);
     color: rgba(0, 61, 90, 1);
-    border: 1px solid white;
+    border: none;
   }
 
   .btn:hover {
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
index cdbf70f..54dd72b 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -249,7 +249,7 @@
         </div>
       </div>
     </div>
-    <div style="width: 100%; height: 100px"></div>
+    <div style="width: 100%; height: 50px"></div>
     <div class="button-box">
       <button class="cancel" @click="executeVisible = false">取消</button>
       <a-popconfirm
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
index dbdc785..0776cd2 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
@@ -104,7 +104,7 @@
         </div>
       </div>
     </div>
-    <div style="width: 100%; height: 160px"></div>
+    <div style="width: 100%; height: 100px"></div>
     <div class="button-box">
       <button class="cancel" @click="logModalVisible = false">关闭</button>
     </div>
diff --git a/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less b/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less
index 831c65e..964587d 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/style/dialogStyle.less
@@ -1,7 +1,7 @@
 // 设备群控 > 抽屉 > 控制面板 & 日志 的附加弹窗
 .out-dialog {
   position: fixed;
-  right: 496px;
+  right: 497px;
   width: 500px;
   height: 100%;
   z-index: 0;
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/tabs1.less b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/tabs1.less
index a10a223..7d68ba0 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/tabs1.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/tabs1.less
@@ -180,7 +180,8 @@
     font-size: 14px;
     font-weight: 400;
     opacity: 1;
-    border: 1px solid rgba(207, 212, 219, 1);
+    // border: 1px solid rgba(207, 212, 219, 1);
+    border: none;
     line-height: 20.27px;
     color: white;
     text-align: center;
@@ -191,7 +192,7 @@
   .selected {
     background: linear-gradient(180deg, rgba(201, 245, 255, 1) 0%, rgba(138, 215, 255, 1) 100%);
     color: rgba(0, 61, 90, 1);
-    border: 1px solid white;
+    border: none;
   }
 
   .btn:hover {
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/component/logTab.vue b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/component/logTab.vue
index 243828a..275b4f9 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/component/logTab.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/component/logTab.vue
@@ -321,7 +321,8 @@
     font-size: 14px;
     font-weight: 400;
     opacity: 1;
-    border: 1px solid rgba(207, 212, 219, 1);
+    // border: 1px solid rgba(207, 212, 219, 1);
+    border: none;
     line-height: 20.27px;
     color: white;
     text-align: center;
@@ -332,7 +333,7 @@
   .selected {
     background: linear-gradient(180deg, rgba(201, 245, 255, 1) 0%, rgba(138, 215, 255, 1) 100%);
     color: rgba(0, 61, 90, 1);
-    border: 1px solid white;
+    border: none;
   }
 
   .btn:hover {
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/index.vue
index 7d7a596..cb12329 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/index.vue
@@ -523,7 +523,8 @@
     font-size: 14px;
     font-weight: 400;
     opacity: 1;
-    border: 1px solid rgba(207, 212, 219, 1);
+    // border: 1px solid rgba(207, 212, 219, 1);
+    border: none;
     line-height: 20.27px;
     color: white;
     text-align: center;
@@ -534,7 +535,7 @@
   .selected {
     background: linear-gradient(180deg, rgba(201, 245, 255, 1) 0%, rgba(138, 215, 255, 1) 100%);
     color: rgba(0, 61, 90, 1);
-    border: 1px solid white;
+    border: none;
   }
 
   .btn:hover {

From 0c822e6d291ba2b54d492afba9085d0b981404ec Mon Sep 17 00:00:00 2001
From: fks-yangshouda <yangshoudamhy@163.com>
Date: Tue, 3 Sep 2024 15:46:57 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/view/monitor/energyMonitor/page.vue           |  2 ++
 .../src/view/monitor/energyMonitor/tree/index.vue     | 19 +++++++++++++++++++
 .../src/view/monitor/environmentMonitor/index.vue     |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue
index 99e1ba4..ae09799 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue
@@ -104,6 +104,8 @@
     } else {
       treeRef.value.getSelectAnalyse(activeKey.value);
     }
+    isGraph.value = true;
+    iconName.value = 'biaoge1';
   };
 
   function change() {
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
index 08ed6c5..9c3dd37 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
@@ -131,6 +131,8 @@
   import { device, group } from '/@/api/deviceManage';
   import { energyMonitor } from '/@/api/monitor';
   import { dict, getEnum } from '/@/api';
+  // 全局变量
+  import { items } from '/@/store/item';
 
   export default defineComponent({
     // eslint-disable-next-line vue/multi-word-component-names
@@ -139,6 +141,9 @@
       const select = ref<HTMLElement | null>(null);
       const divWidth = ref(0); // 用于存储 div 的宽度
 
+      // 全局变量
+      const state = items();
+
       // 获取 div 的宽度
       // const getDivWidth = () => {
       //   if (select.value) {
@@ -311,6 +316,8 @@
       };
 
       const getSelectGraph = (key: any) => {
+        // 开
+        state.setLoading(true);
         if (key) {
           activeKey.value = key;
           // if (
@@ -407,9 +414,15 @@
               pageData.graphTableColumns = [];
               pageData.graphGraphList = [];
             }
+          })
+          .finally(() => {
+            // 关
+            state.setLoading(false);
           });
       };
       const getSelectAnalyse = (key: any) => {
+        // 开
+        state.setLoading(true);
         if (key) {
           activeKey.value = key;
           // if (pageData.analysisGraphList.length > 0 && pageData.analysisTableList.length > 0) {
@@ -480,6 +493,12 @@
               pageData.analysisTableList = [];
               pageData.analysisGraphList = [];
             }
+          })
+          .finally(() => {
+            // 关
+            setTimeout(function () {
+              state.setLoading(false);
+            }, 2000);
           });
       };
 
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
index 8410c21..2839fd0 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
@@ -29,7 +29,7 @@
 
     <aggregate-data ref="aggregateDataRef" v-if="activeKey == '1'" style="height: 85%" />
     <history-data ref="historyDataRef" v-if="activeKey == '2'" style="height: 90%" />
-    <average-data ref="averageDataRef" v-if="activeKey == '3'" style="height: 85%" />
+    <average-data ref="averageDataRef" v-if="activeKey == '3'" style="height: 90%" />
   </div>
 
   <a-modal

From 117db1c400df7519aba5d138cc69d68d8627f3fe Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Tue, 3 Sep 2024 17:01:10 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=AF=B9=E7=A2=B3=E6=8E=92=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/carbonEmissionFactorLibrary.ts         |  1 +
 .../carbonAssets/carbonAssetsDetail/index.vue      | 28 +++++--
 .../carbonEmissionFactorLibrary/index.vue          | 88 ++++++++++++++++++----
 .../carbonEmissions/index.vue                      | 50 ++++++++++--
 .../carbonEmissionStatistics/config.ts             |  2 +-
 .../energyConsumption/index.vue                    | 31 +++++++-
 .../carbonEmissionStatistics/index.vue             | 27 ++++---
 .../quickCalculation/index.vue                     | 20 +++--
 .../carbonInventoryCheck/config.ts                 |  5 +-
 .../carbonInventoryCheck/fillInPage/index.vue      | 56 ++++++++++++--
 .../carbonInventoryCheck/index.vue                 | 62 +++++++++------
 .../carbonPlanning/all/index.vue                   | 15 +++-
 .../carbonPlanning/category/categoryDeatil.vue     | 12 +++
 .../carbonPlanning/category/index.vue              | 30 +++++++-
 .../carbonEmissionManage/carbonPlanning/index.vue  | 28 ++++++-
 15 files changed, 370 insertions(+), 85 deletions(-)

diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
index 291f0b3..c0f5ff8 100644
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -12,6 +12,7 @@ export enum carbonEmissionFactorLibrary {
   import = '/carbon-smart/api/carbon/emission/factor/import',
   export = '/carbon-smart/api/carbon/emission/factor/export',
   gasAndDatabase = '/carbon-smart/api/carbon/emission/factor/gasAndDatabase',
+  checkDel = '/carbon-smart/api/carbon/emission/factor/checkDel',
   // 单位管理
   dictionaryUnitManagement = '/carbon-smart/client/dict/dictionaryUnitManagement',
   findOutermost = '/carbon-smart/client/dict/findOutermost',
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 95ef056..10801b2 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="search">
-    <a-card style="border-radius: 12px">
+    <a-card>
       <div class="ns-form-title">
         <div class="title">查询</div>
         <div class="operation">
@@ -483,6 +483,7 @@
       {
         title: '序号',
         width: 80,
+        align: 'center',
         customRender: (text: any) => {
           return text.index + 1;
         },
@@ -491,6 +492,7 @@
         title: '资产类别',
         dataIndex: 'accountType',
         width: 100,
+        align: 'center',
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
         },
@@ -499,6 +501,7 @@
         title: '交易方式',
         dataIndex: 'transactionTypeName',
         width: 100,
+        align: 'center',
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
         },
@@ -507,6 +510,7 @@
         title: '交易日期',
         dataIndex: 'transactionDate',
         width: 100,
+        align: 'center',
         sorter: (a, b) => a.transactionDate - b.transactionDate,
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
@@ -516,6 +520,7 @@
         title: '本期收入(tCO2)',
         dataIndex: 'income',
         width: 150,
+        align: 'center',
         sorter: (a, b) => a.income - b.income,
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
@@ -525,6 +530,7 @@
         title: '本期支出(tCO2)',
         dataIndex: 'expenditure',
         width: 150,
+        align: 'center',
         sorter: (a, b) => a.expenditure - b.expenditure,
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
@@ -533,6 +539,7 @@
       {
         title: '发生金额(￥）',
         width: 150,
+        align: 'center',
         dataIndex: 'amountIncurredValue',
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
@@ -541,6 +548,7 @@
       {
         title: '交易对象',
         width: 100,
+        align: 'center',
         dataIndex: 'tradingPartner',
         customRender: (text: any) => {
           return text.text !== '' ? text : '-';
@@ -549,6 +557,7 @@
       {
         title: '更新人',
         width: 100,
+        align: 'center',
         dataIndex: 'updateUser',
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
@@ -557,6 +566,7 @@
       {
         title: '更新时间',
         width: 150,
+        align: 'center',
         ellipsis: true,
         dataIndex: 'updateTime',
         customRender: (text: any) => {
@@ -813,14 +823,17 @@
     {
       title: '统计类型',
       dataIndex: 'statisticType',
+      align: 'center',
     },
     {
       title: '小计',
       dataIndex: 'subtotal',
+      align: 'center',
     },
     {
       title: '合计',
       dataIndex: 'amountTo',
+      align: 'center',
     },
   ];
 
@@ -865,21 +878,26 @@
   }
   .search {
     height: 15%;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 5px 16px rgb(118 126 145 / 20%);
   }
   .detailTable {
     width: 70%;
     margin-right: 20px;
     height: 100%;
-    background: white;
-    border-radius: 12px;
     padding: 16px;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
   }
   .total {
     width: calc(30% - 20px);
     height: 100%;
-    background: white;
-    border-radius: 12px;
     padding: 16px;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
   }
   :deep(.ns-table-search) {
     display: none;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 2527379..49aca31 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -144,12 +144,13 @@
             display: flex;
             justify-content: center;
             align-items: center;
+            margin-bottom: 16px;
           ">
           <a-select
             ref="select"
             :value="unitTreeParams.id"
             allowClear
-            style="width: 90%"
+            style="width: 100%"
             placeholder="选择分组"
             @change="handleChange">
             <a-select-option v-for="(item, index) in groupData" :key="index" :value="item.id">
@@ -171,13 +172,21 @@
                 <span>{{ data.cnValue }}</span>
               </div>
               <div class="actionMore">
-                <PlusCircleOutlined v-if="!data.parentId" @click="addUnit(data)" />
-                <MinusCircleOutlined style="margin-left: 6px" @click="delUnit(data)" />
+                <PlusCircleOutlined
+                  v-if="!data.parentId"
+                  style="color: #4388fb"
+                  @click="addUnit(data)" />
+                <MinusCircleOutlined
+                  style="margin-left: 6px; color: #4388fb"
+                  @click="delUnit(data)" />
                 <EditOutlined
-                  style="margin-left: 6px"
+                  style="margin-left: 6px; color: #4388fb"
                   v-if="!data.parentId"
                   @click="editGroup(data)" />
-                <EditOutlined style="margin-left: 6px" v-else @click="editUnit(data)" />
+                <EditOutlined
+                  style="margin-left: 6px; color: #4388fb"
+                  v-else
+                  @click="editUnit(data)" />
               </div>
             </div>
           </template>
@@ -424,7 +433,7 @@
 
   const onExpand = (keys: string[]) => {
     expandedKeys.value = keys;
-    autoExpandParent.value = false;
+    // autoExpandParent.value = false;
   };
   // watch(selectTreeDataValue, (value) => {
   //   const expanded = dataList
@@ -458,7 +467,7 @@
     mainRef.value?.nsTableRef.reload();
   };
   // 点击新增树节点
-  const addTreeNodeData = () => {
+  const addTreeNodeData = (data) => {
     operationTree.value = '新增';
     treeNodeAdd.value = true;
     editTreeNode.value.type = 'create';
@@ -557,6 +566,7 @@
   const editTreeNode = ref({});
   const onSelectKeys = ref([]);
   const onSelect = (selectedKey: string[], info: any) => {
+    expandedKeys.value = selectedKey;
     if (selectedKey.length === 1) {
       if (info.selectedNodes[0].emissionName === '全部') {
         onSelectKeys.value = [];
@@ -771,6 +781,7 @@
       {
         title: 'id',
         width: 50,
+        align: 'center',
         customRender: (text: any) => {
           return text.index + 1;
         },
@@ -778,57 +789,68 @@
       {
         title: '排放源',
         width: 100,
+        align: 'center',
         dataIndex: 'emissionSources',
       },
       {
         title: '排放类型',
         width: 100,
+        align: 'center',
         dataIndex: 'emissionTypeColumn',
       },
       {
         title: '排放气体',
         width: 100,
+        align: 'center',
         dataIndex: 'emissionGas',
       },
       {
         title: '排放环节',
         width: 100,
+        align: 'center',
         dataIndex: 'emissionProcess',
       },
       {
         title: '排放因子',
         width: 100,
+        align: 'center',
         dataIndex: 'emissionFactors',
       },
       {
         title: '排放因子单位',
         width: 100,
+        align: 'center',
         dataIndex: 'emissionFactorUnits',
       },
       {
         title: '数据来源',
         width: 100,
+        align: 'center',
         dataIndex: 'dataSources',
       },
       {
         title: '数据库',
         width: 100,
+        align: 'center',
         dataIndex: 'carbonDatabase',
       },
       {
         title: '参考文献',
         width: 100,
+        align: 'center',
         dataIndex: 'bibliography',
         ellipsis: true,
       },
       {
         title: '引用数量',
         width: 100,
+        align: 'center',
         dataIndex: 'numberOfReferences',
       },
     ],
     columnActions: {
       title: '操作',
+      align: 'center',
       actions: [
         {
           label: '编辑',
@@ -875,10 +897,42 @@
         {
           label: '删除',
           name: 'userDelete',
-          dynamicParams: { ids: 'id[]' },
-          confirm: true,
-          isReload: true,
-          api: carbonEmissionFactorLibrary.del,
+          // dynamicParams: { ids: 'id[]' },
+          // confirm: true,
+          // isReload: true,
+          // api: carbonEmissionFactorLibrary.del,
+          handle: (record: any) => {
+            fetch(carbonEmissionFactorLibrary.checkDel, { ids: [record.id] }).then((res) => {
+              if (res.data === '确定要删除吗？') {
+                Modal.confirm({
+                  title: res.data,
+                  icon: createVNode(ExclamationCircleOutlined),
+                  onOk() {
+                    fetch(carbonEmissionFactorLibrary.del, { ids: [record.id] }).then((res) => {
+                      mainRef.value?.nsTableRef.reload();
+                      NsMessage.success('操作成功');
+                    });
+                  },
+                  onCancel() {
+                    console.log('Cancel');
+                  },
+                  class: 'test',
+                });
+              } else {
+                Modal.confirm({
+                  title: res.data,
+                  icon: createVNode(ExclamationCircleOutlined),
+                  onOk() {
+                    console.log('OK');
+                  },
+                  onCancel() {
+                    console.log('Cancel');
+                  },
+                  class: 'test',
+                });
+              }
+            });
+          },
         },
       ],
     },
@@ -1147,7 +1201,7 @@
     display: flex;
   }
   .left {
-    width: 300px;
+    width: 255px;
     // max-height: calc(100vh - 96px);
     margin-right: @ns-gap;
     min-width: fit-content;
@@ -1198,7 +1252,8 @@
     margin-bottom: unset;
     padding-bottom: unset;
     border-bottom: unset;
-    width: 70%;
+    margin-bottom: 16px;
+    width: 255px;
     height: 5vh;
     display: flex;
     align-items: center;
@@ -1238,18 +1293,19 @@
     justify-content: space-evenly;
   }
   .treePart {
-    width: 70%;
-    height: calc(100% - 5vh);
+    width: 255px;
+    height: 700px;
     display: flex;
     border: 1px solid #bfbfbf;
     margin-left: 10%;
     flex-direction: column;
     border-radius: 12px;
     overflow: auto;
+    padding: 16px;
     align-items: center;
     :deep(.ant-tree) {
       height: 90%;
-      width: 90%;
+      width: 100%;
       overflow: auto;
     }
   }
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 e07a9ec..d27738c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -1,11 +1,12 @@
 <template>
-  <div>
+  <div style="height: 100%">
     <a-table
+      v-if="data && data.length > 0"
       :columns="column"
       :data-source="data"
       :bordered="true"
       :pagination="false"
-      :scroll="{ x: 1700, y: 480 }">
+      :scroll="{ x: 1700 }">
       <template #title>
         <a-date-picker
           v-model:value="selectYear"
@@ -17,10 +18,28 @@
           <a-button type="primary" style="margin-left: 6px" @click="clickSelect">搜索</a-button>
         </span>
       </template>
-      <template #bodyCell="{ column, text }">
-        <span>{{ text || '-' }}</span>
+      <template #bodyCell="{ column, text, record }">
+        <template v-if="column.dataIndex === 'averageFactorValue'">
+          <span v-if="record.averageFactorValue !== undefined">
+            {{ record.averageFactorValue + record.measurement + '/' + record.unitName }}
+          </span>
+          <span v-else>
+            {{ '-' }}
+          </span>
+        </template>
+        <span v-else>{{ text || '-' }}</span>
       </template>
     </a-table>
+    <a-empty
+      v-else
+      style="
+        width: 100%;
+        height: 100%;
+        justify-content: center;
+        display: flex;
+        align-items: center;
+        flex-direction: column;
+      " />
     <!-- <a-pagination
       :current="queryParams.pageNum"
       :total="total"
@@ -77,6 +96,7 @@
       title: '排放类型',
       dataIndex: 'cnValue',
       width: 100,
+      align: 'center',
       customCell: (record, rowIndex) => {
         if (rowIndex == undefined) {
           return {
@@ -100,81 +120,97 @@
       title: '能源种类',
       dataIndex: 'energyType',
       width: 100,
+      align: 'center',
     },
     {
       title: '计量单位',
-      dataIndex: 'unitName',
+      dataIndex: 'measurement',
       width: 100,
+      align: 'center',
     },
     {
       title: '加权平均',
       dataIndex: 'averageFactorValue',
       width: 100,
+      align: 'center',
     },
     {
       title: '全年',
       dataIndex: 'carbonYearly',
       width: 100,
+      align: 'center',
     },
     {
       title: '1月',
       dataIndex: 'jan',
       width: 100,
+      align: 'center',
     },
     {
       title: '2月',
       dataIndex: 'feb',
       width: 100,
+      align: 'center',
     },
     {
       title: '3月',
       dataIndex: 'mar',
       width: 100,
+      align: 'center',
     },
     {
       title: '4月',
       dataIndex: 'apr',
       width: 100,
+      align: 'center',
     },
     {
       title: '5月',
       dataIndex: 'may',
       width: 100,
+      align: 'center',
     },
     {
       title: '6月',
       dataIndex: 'jun',
       width: 100,
+      align: 'center',
     },
     {
       title: '7月',
       dataIndex: 'jul',
       width: 100,
+      align: 'center',
     },
     {
       title: '8月',
       dataIndex: 'aug',
       width: 100,
+      align: 'center',
     },
     {
       title: '9月',
       dataIndex: 'sep',
       width: 100,
+      align: 'center',
     },
     {
       title: '10月',
       dataIndex: 'oct',
       width: 100,
+      align: 'center',
     },
     {
       title: '11月',
       dataIndex: 'nov',
       width: 100,
+      align: 'center',
     },
     {
       title: '12月',
       dataIndex: 'dece',
       width: 100,
+      align: 'center',
     },
   ];
   // 合并单元格
@@ -220,6 +256,10 @@
   :deep(.ant-table-container) {
     margin: 0px 16px;
   }
+  :deep(.ant-table-container) {
+    height: 64vh;
+    overflow: auto;
+  }
   // :deep(.ant-table-cell) {
   //   border: 1px solid #f0f0f0;
   // }
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index ec50605..736fac9 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -177,7 +177,7 @@ export const setFactorConfig = (orgId) => {
     },
     rowSelection: {
       type: 'radio',
-      // selectedRowKeys: [],
+      selectedRowKeys: undefined,
     },
     columns: [
       {
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 f07dabf..e76cafb 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="height: 100%">
     <div class="table" style="height: 100%">
-      <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1500 }">
+      <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1600 }">
       </ns-view-list-table>
     </div>
     <!-- 新增数据库数据 -->
@@ -367,12 +367,24 @@
           return text.index + 1;
         },
         width: 100,
+        align: 'center',
       },
       {
         title: '能源种类',
         dataIndex: 'energyType',
         width: 100,
         ellipsis: true,
+        align: 'center',
+        customRender: (text: any) => {
+          return text.text !== undefined ? text : '-';
+        },
+      },
+      {
+        title: '编码',
+        dataIndex: 'code',
+        width: 100,
+        ellipsis: true,
+        align: 'center',
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
         },
@@ -382,6 +394,7 @@
         className: 'unitName',
         dataIndex: 'unitName',
         width: 100,
+        align: 'center',
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
         },
@@ -390,6 +403,7 @@
         title: '全年',
         dataIndex: 'yearly',
         width: 100,
+        align: 'center',
         customRender: (text: any) => {
           return text.text !== undefined ? text : '-';
         },
@@ -398,6 +412,7 @@
         title: '1月',
         dataIndex: 'jan',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -419,6 +434,7 @@
         title: '2月',
         dataIndex: 'feb',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -440,6 +456,7 @@
         title: '3月',
         dataIndex: 'mar',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -461,6 +478,7 @@
         title: '4月',
         dataIndex: 'apr',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -482,6 +500,7 @@
         title: '5月',
         dataIndex: 'may',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -503,6 +522,7 @@
         title: '6月',
         dataIndex: 'jun',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -524,6 +544,7 @@
         title: '7月',
         dataIndex: 'jul',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -545,6 +566,7 @@
         title: '8月',
         dataIndex: 'aug',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -566,6 +588,7 @@
         title: '9月',
         dataIndex: 'sep',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -587,6 +610,7 @@
         title: '10月',
         dataIndex: 'oct',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -608,6 +632,7 @@
         title: '11月',
         dataIndex: 'nov',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -629,6 +654,7 @@
         title: '12月',
         dataIndex: 'dece',
         width: 100,
+        align: 'center',
         customRender: (value) => {
           let text;
           let color;
@@ -649,6 +675,7 @@
     ],
     columnActions: {
       title: '操作',
+      align: 'center',
       actions: [
         {
           label: '编辑',
@@ -904,7 +931,7 @@
   const getDictList = async () => {
     // 获取能耗类型
     const options = await dict({ params: { dicKey: 'ENERGY_TYPE' } });
-    energyTypeOptions.value = options.data.data;
+    energyTypeOptions.value = options.data.data.filter((item) => item.cnValue !== '碳排量');
     // 获取排放类型的数据
     fetch(energyConsumption.getDicList, { grp: 'EMISSION_TYPE' }).then((res) => {
       emissionTypeDic.value = res.data;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue
index 349ed1a..8170792 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue
@@ -48,23 +48,22 @@
   };
 </script>
 <style scoped lang="less">
+  :deep(.ant-tabs-ink-bar) {
+    width: 31px !important;
+    height: 3px !important;
+    border-radius: 2px !important;
+    margin-left: 5%;
+    background: rgba(67, 136, 251, 1);
+  }
+  //table 颜色
   :deep(.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn) {
-    font-size: 16px;
-    font-weight: 700;
-    letter-spacing: 1.33px;
-    line-height: 21px;
-    color: rgba(51, 51, 51, 1);
-    text-align: left;
-    vertical-align: top;
+    font-size: 14px !important;
+    font-weight: bolb !important;
+    color: #333333 !important;
   }
   :deep(.ant-tabs-tab-btn) {
-    font-size: 16px;
-    font-weight: 700;
-    letter-spacing: 1.33px;
-    line-height: 21px;
-    color: #666666;
-    text-align: left;
-    vertical-align: top;
+    font-size: 14px !important;
+    color: #666666 !important;
   }
   :deep(.ant-tabs-content) {
     height: 100%;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
index 37d5572..0fb05b2 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -37,7 +37,7 @@
               }}
             </span> -->
             <span v-if="data.code" :title="data.energyType + data.code">
-              {{ truncatedName(data.energyType + data.code) }}
+              {{ truncatedName(data.energyType + '（' + data.code + '）') }}
             </span>
             <span v-else :title="data.energyType">{{ truncatedName(data.energyType) }}</span>
           </template>
@@ -129,7 +129,7 @@
       title="选择因子"
       @ok="btnClick"
       @cancel="onCloseClick">
-      <ns-view-list-table v-bind="config" ref="setFactorRef" style="height: 500px" />
+      <ns-view-list-table v-bind="config" ref="setFactorRef" />
     </a-modal>
   </div>
 </template>
@@ -315,6 +315,7 @@
     columns: [
       {
         title: '序号',
+        align: 'center',
         customRender: (text: any) => {
           return text.index + 1;
         },
@@ -322,36 +323,43 @@
       {
         title: '因子值',
         dataIndex: 'emissionFactors',
+        align: 'center',
       },
       {
         title: '计量单位',
         className: 'carbonEmissionSuffix',
         dataIndex: 'carbonEmissionSuffix',
+        align: 'center',
       },
       {
         title: '启用时间',
         className: 'startTime',
         dataIndex: 'startTime',
+        align: 'center',
       },
       {
         title: '结束时间',
         className: 'endTime',
         dataIndex: 'endTime',
+        align: 'center',
       },
       {
         title: '数据来源',
         className: 'dataSources',
         dataIndex: 'dataSources',
+        align: 'center',
       },
       {
         title: '更新时间',
         className: 'updateTime',
         dataIndex: 'updateTime',
+        align: 'center',
         ellipsis: true,
       },
     ],
     columnActions: {
       title: '操作',
+      align: 'center',
       actions: [
         {
           label: '编辑',
@@ -520,8 +528,8 @@
       nextTick(() => {
         setFactorRef.value.nsTableRef.params.emissionList = treeId.value;
         setFactorRef.value.nsTableRef.treeElRef.selectedKeys = treeId.value;
-        setFactorRef.value.nsTableRef.rowSelection.selectedRowKeys = tableId.value;
-        setFactorRef.value.nsTableRef.reload();
+        setFactorRef.value.nsTableRef.rowSelection.selectedRowKeys = [...tableId.value];
+        // setFactorRef.value.nsTableRef.reload();
         treeId.value = [];
         tableId.value = [];
       });
@@ -531,7 +539,7 @@
         setFactorRef.value.nsTableRef.params.emissionList = [0];
         setFactorRef.value.nsTableRef.treeElRef.selectedKeys = [];
         setFactorRef.value.nsTableRef.rowSelection.selectedRowKeys = undefined;
-        setFactorRef.value.nsTableRef.reload();
+        // setFactorRef.value.nsTableRef.reload();
       });
     }
   };
@@ -569,7 +577,7 @@
     padding: 16px;
   }
   .left {
-    width: 300px;
+    width: 255px;
     margin-right: @ns-gap;
     min-width: fit-content;
     border-radius: 8px;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts
index 469874a..431b082 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts
@@ -5,6 +5,7 @@ export const voucherColumns = [
   {
     title: '序号',
     width: 80,
+    align: 'center',
     customRender: (text: any) => {
       return text.index + 1;
     },
@@ -13,12 +14,14 @@ export const voucherColumns = [
     title: '日期',
     dataIndex: 'bizName',
     key: 'bizName',
+    align: 'center',
     ellipsis: true,
   },
   {
     title: '文件名称',
     dataIndex: 'fileName',
     key: 'fileName',
+    align: 'center',
     ellipsis: true,
   },
 ];
@@ -53,7 +56,7 @@ export const setFactorConfig = (orgId) => {
         icon: 'deviceType',
         title: '排放分类',
       },
-      params: { orgId},
+      params: { orgId },
       dynamicParams: { emissionList: 'id[]' },
       defaultExpandAll: true,
       // checkable:true,
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 8b88443..6534d8e 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -2,12 +2,12 @@
   <div class="main">
     <div class="totalTitle">
       <div class="ns-form-title">
-        <div class="title">{{ props.year }}年济阳站碳盘查报告</div>
-        <div class="standard" style="display: flex; align-items: center">
+        <div style="display: flex; align-items: center">
+          <div class="title">{{ props.year }}年济阳站碳盘查报告</div>
           <img
             width="11"
             height="11"
-            style="margin-right: 5px"
+            style="margin-right: 5px; margin-left: 10px"
             src="../../../../../src/icon/carbonInventoryCheck.svg" />
           <span
             style="
@@ -18,16 +18,19 @@
               color: rgba(67, 136, 251, 1);
               text-align: left;
               vertical-align: top;
-            ">
-            适用标准：{{ props.standard }}
+            "
+            :title="props.standard">
+            适用标准：{{ truncatedName(props.standard) }}
           </span>
+        </div>
+        <div class="standard" style="display: flex; align-items: center">
           <a-button type="primary" @click="changeParentData" ghost style="margin-left: 6px">
             返回
           </a-button>
         </div>
       </div>
     </div>
-    <div style="display: flex; height: 90%">
+    <div style="display: flex; height: 93%">
       <div class="left">
         <div class="top">
           <a-form style="width: 100%; margin: 0 auto">
@@ -909,38 +912,45 @@
       title: '日期',
       dataIndex: 'acquisitionDate',
       width: 80,
+      align: 'center',
       key: 'acquisitionDate',
     },
     {
       title: '消耗量',
+      align: 'center',
       children: [
         {
           title: '数据来源',
           dataIndex: 'dataSources',
           width: 100,
+          align: 'center',
           key: 'dataSources',
         },
         {
           title: '数值',
           dataIndex: 'consumption',
           width: 100,
+          align: 'center',
           key: 'consumption',
         },
       ],
     },
     {
       title: '碳排因子',
+      align: 'center',
       children: [
         {
           title: '数据来源',
           dataIndex: 'carbonSource',
           width: 100,
+          align: 'center',
           key: 'carbonSource',
         },
         {
           title: '数值',
           dataIndex: 'emissionFactors',
           width: 100,
+          align: 'center',
           key: 'emissionFactors',
         },
       ],
@@ -949,11 +959,13 @@
       title: '排放量',
       dataIndex: 'emissions',
       width: 100,
+      align: 'center',
       key: 'emissions',
       fixed: 'right',
     },
     {
       title: '操作',
+      align: 'center',
       dataIndex: 'action',
       key: 'action',
       width: 80,
@@ -1677,6 +1689,13 @@
       });
     }
   };
+
+  const truncatedName = (name) => {
+    if (name.length > 30) {
+      return name.substring(0, 30) + '...';
+    }
+    return name;
+  };
   // 点击返回
   const emit = defineEmits(['change-data']);
   const changeParentData = () => {
@@ -1689,6 +1708,7 @@
     background-color: #ffffff;
     height: 100%;
     padding: 16px;
+    border-radius: 8px;
   }
   .left {
     width: 300px;
@@ -1708,6 +1728,7 @@
       position: relative;
       height: 100%;
       margin-bottom: 20px;
+      border-radius: 8px;
       .ns-form-title {
         font-weight: bold;
         user-select: text;
@@ -1928,4 +1949,27 @@
     background: rgba(255, 255, 255, 1);
     box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
   }
+
+  :deep(.ant-tabs-ink-bar) {
+    // width: 31px !important;
+    height: 3px !important;
+    border-radius: 2px !important;
+    background: rgba(67, 136, 251, 1);
+  }
+  //table 颜色
+  :deep(.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn) {
+    font-size: 14px !important;
+    font-weight: bolb !important;
+    color: #333333 !important;
+  }
+  :deep(.ant-tabs-tab-btn) {
+    font-size: 14px !important;
+    color: #666666 !important;
+  }
+  :deep(.ant-tabs-content) {
+    height: 100%;
+  }
+  :deep(.ant-tabs-tabpane) {
+    height: 100%;
+  }
 </style>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index b85db16..d03dc80 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -44,7 +44,7 @@
         <a-form-item ref="name" label="适用标准" name="genericStandard">
           <a-input
             v-model:value="formState.genericStandard"
-            :maxlength="20"
+            :maxlength="100"
             @keydown="handleKeyDown"
             placeholder="请输入适用标准" />
         </a-form-item>
@@ -172,26 +172,35 @@
               spinning.value = false;
             });
           } else {
-            Modal.confirm({
-              title: '修改日期会导致已有数据丢失，是否继续修改？',
-              icon: createVNode(ExclamationCircleOutlined),
-              onOk() {
-                spinning.value = true;
-                fetch(carbonInventoryCheck.createOrUpdate, formState.value)
-                  .then((res) => {
-                    visible.value = false;
-                    mainRef.value?.nsTableRef.reload();
-                    spinning.value = false;
-                  })
-                  .catch((error) => {
-                    message.error(error ? error : '保存失败！');
-                  });
-              },
-              onCancel() {
-                console.log('Cancel');
-              },
-              class: 'test',
-            });
+            if (count.value === '0') {
+              spinning.value = true;
+              fetch(carbonInventoryCheck.createOrUpdate, formState.value).then((res) => {
+                visible.value = false;
+                mainRef.value?.nsTableRef.reload();
+                spinning.value = false;
+              });
+            } else {
+              Modal.confirm({
+                title: '修改日期会导致已有数据丢失，是否继续修改？',
+                icon: createVNode(ExclamationCircleOutlined),
+                onOk() {
+                  spinning.value = true;
+                  fetch(carbonInventoryCheck.createOrUpdate, formState.value)
+                    .then((res) => {
+                      visible.value = false;
+                      mainRef.value?.nsTableRef.reload();
+                      spinning.value = false;
+                    })
+                    .catch((error) => {
+                      message.error(error ? error : '保存失败！');
+                    });
+                },
+                onCancel() {
+                  console.log('Cancel');
+                },
+                class: 'test',
+              });
+            }
           }
         }
       })
@@ -209,6 +218,7 @@
   const year = ref();
   const oldStartTime = ref();
   const oldEndTime = ref();
+  const count = ref();
   const tableConfig = ref({
     title: '数据库',
     api: carbonInventoryCheck.carbonInventoryList,
@@ -230,6 +240,7 @@
       {
         title: '序号',
         width: 50,
+        align: 'center',
         customRender: (text: any) => {
           return text.index + 1;
         },
@@ -237,37 +248,45 @@
       {
         title: '企业名称',
         width: 130,
+        align: 'center',
         dataIndex: 'enterpriseName',
       },
       {
         title: '报告名称',
         width: 100,
+        align: 'center',
         dataIndex: 'reportName',
       },
       {
         title: '报告年度',
         width: 70,
+        align: 'center',
         dataIndex: 'reportYear',
       },
       {
         title: '适用标准',
         width: 100,
+        align: 'center',
         dataIndex: 'genericStandard',
+        ellipsis: true,
       },
       {
         title: '更新人',
         width: 100,
+        align: 'center',
         dataIndex: 'updateUser',
       },
       {
         title: '更新时间',
         width: 100,
+        align: 'center',
         dataIndex: 'updateTime',
       },
     ],
     columnActions: {
       title: '操作',
       width: 100,
+      align: 'center',
       actions: [
         {
           label: '编辑',
@@ -275,6 +294,7 @@
           handle: (record: any) => {
             text.value = '编辑报告';
             visible.value = true;
+            count.value = record.count;
             fetch(carbonInventoryCheck.findById, { id: record.id }).then((res) => {
               formState.value = res.data;
               formState.value.reportScope = [res.data.startTime, res.data.endTime];
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
index 701c8fc..8448b8a 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
@@ -63,12 +63,14 @@
         </div>
         <div class="tablePart">
           <a-table
+            v-if="data && data.length > 0"
             :columns="columns"
             :data-source="data"
+            size="middle"
             bordered
-            :pagination="false"
-            :scroll="{ x: 1300, y: 300 }">
+            :pagination="false">
           </a-table>
+          <a-empty v-else />
         </div>
       </div>
     </a-spin>
@@ -266,41 +268,50 @@
     {
       title: '序号',
       width: 100,
+      align: 'center',
       customRender: (text: any) => {
         return text.index + 1;
       },
     },
     {
       title: '名称',
+      align: 'center',
       dataIndex: 'itemizeName',
     },
     {
       title: '年份',
       dataIndex: 'year',
+      align: 'center',
     },
     {
       title: '计量单位',
       dataIndex: 'unitMeasurement',
+      align: 'center',
     },
     {
       title: '总实际用量',
       dataIndex: 'actualUsage',
+      align: 'center',
     },
     {
       title: '总预算量',
       dataIndex: 'budget',
+      align: 'center',
     },
     {
       title: '基准值',
       dataIndex: 'referenceValue',
+      align: 'center',
     },
     {
       title: '节能量',
       dataIndex: 'energyConservation',
+      align: 'center',
     },
     {
       title: '预算达成率',
       dataIndex: 'budgetAchievement',
+      align: 'center',
     },
   ]);
 
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 b5b0fef..536709e 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
@@ -81,6 +81,7 @@
             </a-button>
           </div>
           <a-table
+            v-if="data && data.length > 0"
             :columns="columns"
             :data-source="data"
             rowKey="id"
@@ -123,6 +124,7 @@
               </a-table-summary-row>
             </template>
           </a-table>
+          <a-empty v-else />
         </a-card>
       </div>
     </a-spin>
@@ -369,46 +371,55 @@
   const columns = ref([
     {
       title: '序号',
+      align: 'center',
       customRender: (text: any) => {
         return text.index + 1;
       },
     },
     {
       title: '日期',
+      align: 'center',
       dataIndex: 'yearMonth',
     },
     {
       title: Number(props.year) - 1 + '年实际用量',
       dataIndex: 'lastYearActualUsage',
+      align: 'center',
       customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: props.year + '年实际用量',
       dataIndex: 'actualUsage',
+      align: 'center',
       customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '基准值',
+      align: 'center',
       dataIndex: 'referenceValue',
       customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '是否按去年折算',
       dataIndex: 'lastYear',
+      align: 'center',
     },
     {
       title: '折算率',
       dataIndex: 'conversionRate',
+      align: 'center',
       customRender: ({ text }: { text: number }) => `${text}%`, // 在这里添加单位
     },
     {
       title: '2024年预算',
       dataIndex: 'budget',
+      align: 'center',
       customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '操作',
       key: 'action',
+      align: 'center',
       width: 200,
     },
   ]);
@@ -891,6 +902,7 @@
       border-radius: 12px;
       background: rgba(255, 255, 255, 1);
       box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
+      padding: 16px;
       .chart {
         width: 100%;
         height: 65%;
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 6caa848..c27dc1f 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
@@ -46,6 +46,7 @@
         </div>
         <div class="tablePart">
           <a-table
+            v-if="data && data.length > 0"
             :columns="columns"
             :data-source="data"
             bordered
@@ -61,6 +62,7 @@
               </template>
             </template>
           </a-table>
+          <a-empty v-else />
         </div>
       </div>
     </a-spin>
@@ -382,11 +384,21 @@
     ballChartInstance = echarts.init(ballChartRef.value);
     let ballData = (Number(ballValue.value) / 100).toFixed(2);
     const option = {
+      title: {
+        text: selectedTime.value
+          ? '历年' + props.energyTypeName + '分析'
+          : '每月' + props.energyTypeName + '分析',
+        x: '0',
+        textStyle: {
+          color: 'rgba(51, 51, 51, 1)',
+          fontSize: '16',
+        },
+      },
       series: [
         {
           type: 'liquidFill',
-          radius: '78.1%',
-          center: ['50%', '50%'],
+          radius: '70%',
+          center: ['55%', '55%'],
           color: !selectedTime.value
             ? ['#ecf3fe', '#c8dcfe', '#5594fa']
             : ['rgba(12, 168, 126, 0.5)', 'rgba(12, 168, 126, 0.1)', 'rgba(12, 168, 126, 1)'],
@@ -402,7 +414,7 @@
             textStyle: {
               color: !selectedTime.value ? 'rgba(68, 197, 253,1)' : 'rgba(12, 168, 126, 1)',
               insideColor: '#12786f',
-              fontSize: Number(ballData) > 1000 ? 20 : 40,
+              fontSize: Number(ballData) > 100 ? 20 : 40,
             },
             formatter: (params) => {
               // return `${(params.value * 100).toFixed(2)}%`;
@@ -549,6 +561,7 @@
   const columns = ref([
     {
       title: '序号',
+      align: 'center',
       customRender: (text: any) => {
         return text.index + 1;
       },
@@ -556,37 +569,45 @@
     {
       title: '分项名称',
       dataIndex: 'itemizeName',
+      align: 'center',
     },
     {
       title: '年份',
+      align: 'center',
       dataIndex: 'year',
     },
     {
       title: '实际用量',
       dataIndex: 'actualUsage',
+      align: 'center',
       customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '预算量',
       dataIndex: 'budget',
+      align: 'center',
       customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '基准值',
       dataIndex: 'referenceValue',
+      align: 'center',
       customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '节能量',
       dataIndex: 'energyConservation',
+      align: 'center',
       customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '预算达成率',
+      align: 'center',
       dataIndex: 'budgetAchievement',
     },
     {
       title: '操作',
+      align: 'center',
       key: 'action',
     },
   ]);
@@ -693,13 +714,14 @@
         background: #ffffff;
         box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
         border-radius: 8px;
+        padding: 16px;
       }
       .pillarChart {
         width: calc(80% - 12px);
         background: #ffffff;
         box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
         border-radius: 8px;
-        padding: 5px;
+        padding: 16px;
       }
     }
     .tablePart {
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
index f107a76..60cd659 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
@@ -103,7 +103,7 @@
       });
     } else if (key === '5') {
       tabId.value = 7;
-      energyType.value = 'CARBON_EMISSIONS';
+      energyType.value = 'HEAT_SUPPLY';
       energyTypeName.value = '供热量';
       nextTick(() => {
         if (carbonEmissionsRef.value) {
@@ -113,7 +113,7 @@
       });
     } else if (key === '6') {
       tabId.value = 8;
-      energyType.value = 'HEAT_SUPPLY';
+      energyType.value = 'CARBON_EMISSIONS';
       energyTypeName.value = '碳排量';
       nextTick(() => {
         if (provideHotRef.value) {
@@ -124,3 +124,27 @@
     }
   };
 </script>
+
+<style scoped lang="less">
+  :deep(.ant-tabs-ink-bar) {
+    height: 3px !important;
+    border-radius: 2px !important;
+    background: rgba(67, 136, 251, 1);
+  }
+  //table 颜色
+  :deep(.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn) {
+    font-size: 14px !important;
+    font-weight: bolb !important;
+    color: #333333 !important;
+  }
+  :deep(.ant-tabs-tab-btn) {
+    font-size: 14px !important;
+    color: #666666 !important;
+  }
+  :deep(.ant-tabs-content) {
+    height: 100%;
+  }
+  :deep(.ant-tabs-tabpane) {
+    height: 100%;
+  }
+</style>

From 7a7e2bb968b8a92b4b915c56b5eae42bd517699d Mon Sep 17 00:00:00 2001
From: chenpingsen <chenpingsen>
Date: Tue, 3 Sep 2024 17:02:13 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=E7=BE=A4=E6=8E=A7=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/equipmentControl/airConditionControlSystem/index.vue    | 3 ++-
 .../src/view/equipmentControl/lightingManage/indexs.vue          | 3 ++-
 .../src/view/equipmentControl/ventilationSystem/index.vue        | 9 ++++++---
 .../src/view/equipmentControl/waterSystem/index.vue              | 3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/index.vue
index 8415b71..e84315f 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/index.vue
@@ -38,7 +38,8 @@
       width="496"
       :forceRender="preload"
       placement="right"
-      :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8 }"
+      style="opacity: 0.8"
+      :body-style="{ background: 'black' }"
       :closable="false"
       id="drawer"
       :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index 74af70e..3f55e9b 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -37,8 +37,9 @@
       class="drawer-item"
       width="496"
       :forceRender="preload"
+      style="opacity: 0.8"
       placement="right"
-      :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8 }"
+      :body-style="{ background: 'black' }"
       :closable="false"
       id="drawer"
       :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
index 60fe4dc..00ed608 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
@@ -127,7 +127,8 @@
       :width="496"
       :forceRender="preload"
       placement="right"
-      :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8, color: 'white' }"
+      style="opacity: 0.8"
+      :body-style="{ background: 'black' }"
       :closable="false"
       id="drawer"
       :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }"
@@ -189,7 +190,8 @@
       :width="496"
       :forceRender="preload"
       placement="right"
-      :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8, color: 'white' }"
+      style="opacity: 0.8"
+      :body-style="{ background: 'black' }"
       :closable="false"
       id="drawer"
       :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }"
@@ -250,7 +252,8 @@
       :width="496"
       :forceRender="preload"
       placement="right"
-      :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8, color: 'white' }"
+      style="opacity: 0.8"
+      :body-style="{ background: 'black' }"
       :closable="false"
       id="drawer"
       :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }"
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/index.vue
index cb12329..f5eb723 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/index.vue
@@ -55,7 +55,8 @@
       class="drawer-item"
       width="496"
       placement="right"
-      :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8 }"
+      style="opacity: 0.8"
+      :body-style="{ background: 'black' }"
       :closable="false"
       id="drawer"
       :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">

From 3fa365520097d149004f37e526781201d7e64ce6 Mon Sep 17 00:00:00 2001
From: fks-yangshouda <yangshoudamhy@163.com>
Date: Tue, 3 Sep 2024 17:02:14 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/public/asset/file/groupList.xlsx       | Bin 0 -> 9459 bytes
 .../src/view/equipmentManage/group/config.ts             |   6 +++---
 .../view/equipmentManage/group/editCarbonEquipment.vue   |   3 +++
 .../src/view/monitor/energyMonitor/graphGraph/index.vue  |   2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 hx-ai-intelligent/public/asset/file/groupList.xlsx

diff --git a/hx-ai-intelligent/public/asset/file/groupList.xlsx b/hx-ai-intelligent/public/asset/file/groupList.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d36689629e0285947a9c3eae398f71a39e769ab9
GIT binary patch
literal 9459
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
Irr*B(AEl|)W&i*H

literal 0
HcmV?d00001

diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
index 523aa0b..77a8be2 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
@@ -346,8 +346,8 @@ export const tableConfig = (el, elGroup, elFormula, defaultParams) => {
           api: group.importGroup, // 导入接口名
           // dynamicParams: { defaultParams: defaultParams },
           params: defaultParams.value,
-          title: '设备信息', // 弹窗title
-          templateName: 'whiteListUser', // 所使用的文件名称
+          title: '计算节点', // 弹窗title
+          templateName: 'groupList', // 所使用的文件名称
           indexName: '设备id', // 匹配类型字段
           message: [
             { label: '1、若必填项未填写，则不能进行导入操作' },
@@ -364,7 +364,7 @@ export const tableConfig = (el, elGroup, elFormula, defaultParams) => {
         type: 'primary',
         handle: () => {
           // http.get('/asset/file/whiteListUser.xlsx');
-          doWnload('/hx-ai-intelligent/asset/file/whiteListUser.xlsx');
+          doWnload('/hx-ai-intelligent/asset/file/groupList.xlsx');
         },
       },
     ],
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue
index 2ccf6db..79ac962 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue
@@ -158,4 +158,7 @@
   ::v-deep .ant-table-pagination.ant-pagination {
     margin: 26px 0 !important; /* 根据需要调整 padding 大小 */
   }
+  :deep(.ns-list-table[data-v-64b9682f]:not(.ant-drawer-body > *):not(.ant-form > *)) {
+    background-color: #ffffff !important;
+  }
 </style>
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue
index 3284fc0..f995434 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue
@@ -116,7 +116,7 @@
               const date = params[0].name;
               const values = params
                 .map((param: any) => {
-                  const unit = data.value.find((d) => d.date === date)?.unit || '';
+                  const unit = data.value[0]?.unit || '';
                   return `<tr>
                           <td>${param.marker}${param.seriesName}</td>
                           <td style="text-align: right;">${param.value} ${unit}</td>

From 87243b212d401d40a9a01cd31272aa1a95baa506 Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Tue, 3 Sep 2024 17:04:29 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/component/table/table.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/component/table/table.vue b/lib/component/table/table.vue
index 7f76ad6..8315fa9 100644
--- a/lib/component/table/table.vue
+++ b/lib/component/table/table.vue
@@ -340,6 +340,9 @@
             onChange: (selectedRowKeys: never[], selectedRows: never[]) => {
               tableState.selectedRowKeys = selectedRowKeys;
               tableState.selectedRows = selectedRows;
+              if ('radio' === rowSelection.type) {
+                rowSelection.selectedRowKeys = selectedRowKeys;
+              }
             },
           },
           isFunction(rowSelection) ? rowSelection(tableState) : rowSelection,