diff --git a/hx-ai-intelligent/src/api/index.ts b/hx-ai-intelligent/src/api/index.ts
index ff85a4e..4460e8d 100644
--- a/hx-ai-intelligent/src/api/index.ts
+++ b/hx-ai-intelligent/src/api/index.ts
@@ -59,4 +59,14 @@ export const getEnum = async ({
 }: dictHttpConfig) => {
   const res = await http.get(api, params);
   return Promise.resolve(res);
-};
\ No newline at end of file
+};
+/**
+ * 获取谈规划单位(需传参，参数 enumType)
+ */
+export const getEnumEnergy = async ({
+  api = `${BASE_URL}/operation/enum/getEnumEnergy`,
+  params = {},
+}: dictHttpConfig) => {
+  const res = await http.get(api, params);
+  return Promise.resolve(res);
+};
diff --git a/hx-ai-intelligent/src/api/planManage.ts b/hx-ai-intelligent/src/api/planManage.ts
index beb8075..e453fbe 100644
--- a/hx-ai-intelligent/src/api/planManage.ts
+++ b/hx-ai-intelligent/src/api/planManage.ts
@@ -2,7 +2,7 @@ const prefix = '/carbon-smart/api';
 // 照明系统及相关接口
 export enum planManage {
   /**
-   * @param deviceType 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
+   * @param deviceType 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水)
    */
   // 获得未激活的计划
   getTransData = prefix + '/deviceCtrlPlan/getDeActivatedPlanList',
diff --git a/hx-ai-intelligent/src/api/waterSystem.ts b/hx-ai-intelligent/src/api/waterSystem.ts
new file mode 100644
index 0000000..e8c282c
--- /dev/null
+++ b/hx-ai-intelligent/src/api/waterSystem.ts
@@ -0,0 +1,13 @@
+// 前缀
+const prefix = '/carbon-smart/api';
+// 通风系统相关接口
+export enum waterSys {
+  // 获得污水池状态
+  getPool1 = prefix + '/waterSysCtrl/getSewagePoolState',
+  // 获得阀门状态
+  getValve = prefix + '/waterSysCtrl/getValveState',
+  // 获得集水池状态
+  getPool2 = prefix + '/waterSysCtrl/getCollectPoolState',
+  // 获得水泵状态
+  getPump = prefix + '/waterSysCtrl/getPumpState',
+}
diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts
index 988ddc3..9d4dd25 100644
--- a/hx-ai-intelligent/src/router/equipmentControl.ts
+++ b/hx-ai-intelligent/src/router/equipmentControl.ts
@@ -157,6 +157,25 @@ const equipmentControl = {
         },
       ],
     },
+    {
+      path: 'coldAndHeatSources',
+      name: 'coldAndHeatSources',
+      meta: { title: '冷热源', hideChildren: true, icon: 'shebeiqunkong' },
+      component: Base,
+      redirect: { name: 'coldAndHeatSourcesIndex' },
+      children: [
+        {
+          path: 'index',
+          name: 'coldAndHeatSourcesIndex',
+          component: () => import('/@/view/equipmentControl/coldAndHeatSources/index.vue'),
+          meta: {
+            title: '冷热源',
+            keepAlive: false,
+            // backApi: [],
+          },
+        },
+      ],
+    },
   ],
 };
 export default equipmentControl;
diff --git a/hx-ai-intelligent/src/util/Export2Excel.js b/hx-ai-intelligent/src/util/Export2Excel.js
new file mode 100644
index 0000000..d8a2af3
--- /dev/null
+++ b/hx-ai-intelligent/src/util/Export2Excel.js
@@ -0,0 +1,220 @@
+/* eslint-disable */
+import { saveAs } from 'file-saver'
+import XLSX from 'xlsx'
+
+function generateArray(table) {
+  var out = [];
+  var rows = table.querySelectorAll('tr');
+  var ranges = [];
+  for (var R = 0; R < rows.length; ++R) {
+    var outRow = [];
+    var row = rows[R];
+    var columns = row.querySelectorAll('td');
+    for (var C = 0; C < columns.length; ++C) {
+      var cell = columns[C];
+      var colspan = cell.getAttribute('colspan');
+      var rowspan = cell.getAttribute('rowspan');
+      var cellValue = cell.innerText;
+      if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
+
+      //Skip ranges
+      ranges.forEach(function (range) {
+        if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
+          for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
+        }
+      });
+
+      //Handle Row Span
+      if (rowspan || colspan) {
+        rowspan = rowspan || 1;
+        colspan = colspan || 1;
+        ranges.push({
+          s: {
+            r: R,
+            c: outRow.length
+          },
+          e: {
+            r: R + rowspan - 1,
+            c: outRow.length + colspan - 1
+          }
+        });
+      };
+
+      //Handle Value
+      outRow.push(cellValue !== "" ? cellValue : null);
+
+      //Handle Colspan
+      if (colspan)
+        for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
+    }
+    out.push(outRow);
+  }
+  return [out, ranges];
+};
+
+function datenum(v, date1904) {
+  if (date1904) v += 1462;
+  var epoch = Date.parse(v);
+  return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
+}
+
+function sheet_from_array_of_arrays(data, opts) {
+  var ws = {};
+  var range = {
+    s: {
+      c: 10000000,
+      r: 10000000
+    },
+    e: {
+      c: 0,
+      r: 0
+    }
+  };
+  for (var R = 0; R != data.length; ++R) {
+    for (var C = 0; C != data[R].length; ++C) {
+      if (range.s.r > R) range.s.r = R;
+      if (range.s.c > C) range.s.c = C;
+      if (range.e.r < R) range.e.r = R;
+      if (range.e.c < C) range.e.c = C;
+      var cell = {
+        v: data[R][C]
+      };
+      if (cell.v == null) continue;
+      var cell_ref = XLSX.utils.encode_cell({
+        c: C,
+        r: R
+      });
+
+      if (typeof cell.v === 'number') cell.t = 'n';
+      else if (typeof cell.v === 'boolean') cell.t = 'b';
+      else if (cell.v instanceof Date) {
+        cell.t = 'n';
+        cell.z = XLSX.SSF._table[14];
+        cell.v = datenum(cell.v);
+      } else cell.t = 's';
+
+      ws[cell_ref] = cell;
+    }
+  }
+  if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
+  return ws;
+}
+
+function Workbook() {
+  if (!(this instanceof Workbook)) return new Workbook();
+  this.SheetNames = [];
+  this.Sheets = {};
+}
+
+function s2ab(s) {
+  var buf = new ArrayBuffer(s.length);
+  var view = new Uint8Array(buf);
+  for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+  return buf;
+}
+
+export function export_table_to_excel(id) {
+  var theTable = document.getElementById(id);
+  var oo = generateArray(theTable);
+  var ranges = oo[1];
+
+  /* original data */
+  var data = oo[0];
+  var ws_name = "SheetJS";
+
+  var wb = new Workbook(),
+    ws = sheet_from_array_of_arrays(data);
+
+  /* add ranges to worksheet */
+  // ws['!cols'] = ['apple', 'banan'];
+  ws['!merges'] = ranges;
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  var wbout = XLSX.write(wb, {
+    bookType: 'xlsx',
+    bookSST: false,
+    type: 'binary'
+  });
+
+  saveAs(new Blob([s2ab(wbout)], {
+    type: "application/octet-stream"
+  }), "test.xlsx")
+}
+
+export function export_json_to_excel({
+  multiHeader = [],
+  header,
+  data,
+  filename,
+  merges = [],
+  autoWidth = true,
+  bookType = 'xlsx'
+} = {}) {
+  /* original data */
+  filename = filename || 'excel-list'
+  data = [...data]
+  data.unshift(header);
+
+  for (let i = multiHeader.length - 1; i > -1; i--) {
+    data.unshift(multiHeader[i])
+  }
+
+  var ws_name = "SheetJS";
+  var wb = new Workbook(),
+    ws = sheet_from_array_of_arrays(data);
+
+  if (merges.length > 0) {
+    if (!ws['!merges']) ws['!merges'] = [];
+    merges.forEach(item => {
+      ws['!merges'].push(XLSX.utils.decode_range(item))
+    })
+  }
+
+  if (autoWidth) {
+    /*设置worksheet每列的最大宽度*/
+    const colWidth = data.map(row => row.map(val => {
+      /*先判断是否为null/undefined*/
+      if (val == null) {
+        return {
+          'wch': 10
+        };
+      }
+      /*再判断是否为中文*/
+      else if (val.toString().charCodeAt(0) > 255) {
+        return {
+          'wch': val.toString().length * 2
+        };
+      } else {
+        return {
+          'wch': val.toString().length
+        };
+      }
+    }))
+    /*以第一行为初始值*/
+    let result = colWidth[0];
+    for (let i = 1; i < colWidth.length; i++) {
+      for (let j = 0; j < colWidth[i].length; j++) {
+        if (result[j]['wch'] < colWidth[i][j]['wch']) {
+          result[j]['wch'] = colWidth[i][j]['wch'];
+        }
+      }
+    }
+    ws['!cols'] = result;
+  }
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  var wbout = XLSX.write(wb, {
+    bookType: bookType,
+    bookSST: false,
+    type: 'binary'
+  });
+  saveAs(new Blob([s2ab(wbout)], {
+    type: "application/octet-stream"
+  }), `${filename}.${bookType}`);
+}
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
index f9502e9..7261d62 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
@@ -84,7 +84,7 @@
         <!-- 配置设备告警-->
         <configureDeviceAlarms v-show="!equipmentAlarm" ref="configureDeviceAlarms" />
       </a-tab-pane>
-      <a-tab-pane key="3" tab="能耗告警">
+      <a-tab-pane key="3" tab="能碳告警">
         <ns-view-list-table
           v-bind="energyAlarmConfig"
           v-show="energyAlarm"
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 0862a76..87ff329 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
@@ -36,6 +36,7 @@
             style="width: 200px"
             v-model:value="queryParams.year"
             placeholder="请选择账期"
+            :allowClear="false"
             picker="year"
             valueFormat="YYYY" />
         </a-form-item>
@@ -60,15 +61,15 @@
       <div class="ns-form-title">
         <div class="title">配额统计</div>
         <div class="operation" style="display: flex; justify-content: flex-end; width: 63%">
-          <a-button type="primary" v-if="parentId === 1" @click="getTotalTable(1)"
-            >全国配额</a-button
-          >
-          <a-button type="primary" v-if="parentId === 2" @click="getTotalTable(2)"
-            >地方配额</a-button
-          >
-          <a-button type="primary" v-if="parentId === 3" @click="getTotalTable(3)"
-            >CCER配额</a-button
-          >
+          <a-button type="primary" v-if="queryParams.accountType === 1" @click="getTotalTable(1)">
+            全国配额
+          </a-button>
+          <a-button type="primary" v-if="queryParams.accountType === 2" @click="getTotalTable(2)">
+            地方配额
+          </a-button>
+          <a-button type="primary" v-if="queryParams.accountType === 3" @click="getTotalTable(3)">
+            CCER配额
+          </a-button>
         </div>
       </div>
       <a-table :columns="totalColumns" :data-source="totalData" bordered :pagination="false">
@@ -205,6 +206,7 @@
     year.value = queryParams.value.year;
     transactionType.value = queryParams.value.transactionType;
     accountType.value = queryParams.value.accountType;
+    getTotalTable(queryParams.value.accountType);
     mainRef.value?.nsTableRef.reload();
     // getDetailList();
   };
@@ -299,11 +301,11 @@
       }));
     });
     formState.value = JSON.parse(JSON.stringify(record));
-    if (formState.value.expenditure === 0) {
-      formState.value.transactionQuantity = formState.value.income;
-    } else {
-      formState.value.transactionQuantity = formState.value.expenditure;
-    }
+    // if (formState.value.expenditure === 0) {
+    //   formState.value.transactionQuantity = formState.value.income;
+    // } else {
+    //   formState.value.transactionQuantity = formState.value.expenditure;
+    // }
     setTimeout(() => {
       let selectDevice = ref([Number(formState.value.transactionType)]);
       findParentIds(options.value, formState.value.transactionType, selectDevice.value);
@@ -427,7 +429,7 @@
               // 创建一个 <a> 标签，用于触发下载
               const link = document.createElement('a');
               link.href = url;
-              link.setAttribute('download', 'carbonTradeDetails.xlsx'); // 设置下载的文件名
+              link.setAttribute('download', '碳资产导出.xlsx'); // 设置下载的文件名
               document.body.appendChild(link);
               link.click();
 
@@ -523,11 +525,6 @@
               }));
             });
             formState.value = JSON.parse(JSON.stringify(record));
-            if (formState.value.expenditure === 0) {
-              formState.value.transactionQuantity = formState.value.income;
-            } else {
-              formState.value.transactionQuantity = formState.value.expenditure;
-            }
             setTimeout(() => {
               let selectDevice = ref([Number(formState.value.transactionType)]);
               findParentIds(options.value, formState.value.transactionType, selectDevice.value);
@@ -702,6 +699,7 @@
               .then((res) => {
                 message.success('操作成功！');
                 visible.value = false;
+                formState.value = {};
                 delIds.value = [];
                 // getDetailList();
                 mainRef.value?.nsTableRef.reload();
@@ -714,6 +712,7 @@
             message.success('操作成功！');
             visible.value = false;
             delIds.value = [];
+            formState.value = {};
             // getDetailList();
             mainRef.value?.nsTableRef.reload();
           }
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index1.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index1.vue
deleted file mode 100644
index 05bbc92..0000000
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index1.vue
+++ /dev/null
@@ -1,642 +0,0 @@
-<template>
-  <div class="search">
-    <a-card style="border-radius: 12px">
-      <div class="ns-form-title">
-        <div class="title">查询</div>
-        <div class="operation">
-          <a-button type="primary" @click="changeParentData"> 返回 </a-button>
-        </div>
-      </div>
-      <a-form layout="inline">
-        <a-form-item>
-          <a-select
-            v-model:value="queryParams.accountType"
-            style="width: 200px"
-            placeholder="请输入账户类型">
-            <a-select-option :value="1">全国账户</a-select-option>
-            <a-select-option :value="2">地方账户</a-select-option>
-            <a-select-option :value="3">CCER</a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item>
-          <a-cascader
-            v-model:value="queryParams.transactionType"
-            multiple
-            style="width: 200px"
-            :options="options"
-            placeholder="请选择交易类型"
-            suffix-icon="Shopping Around">
-            <template #tagRender="data">
-              <a-tag :key="data.value" color="blue">{{ data.label }}</a-tag>
-            </template>
-          </a-cascader>
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker
-            style="width: 200px"
-            v-model:value="queryParams.year"
-            placeholder="请选择账期"
-            picker="year"
-            valueFormat="YYYY" />
-        </a-form-item>
-        <a-form-item>
-          <a-button type="primary" @click="searchTableList">查询</a-button>
-          <a-button html-type="submit" style="margin-left: 6px" @click="reset">重置</a-button>
-        </a-form-item>
-      </a-form>
-    </a-card>
-  </div>
-  <div style="display: flex; margin-top: 20px; height: calc(84% - 20px)">
-    <div class="detailTable">
-      <div class="ns-form-title">
-        <div class="title">交易明细</div>
-        <div class="operation" style="display: flex">
-          <a-button type="primary" @click="addDetail">新增</a-button>
-          <a-upload
-            v-model:file-list="importFileList"
-            name="file"
-            accept=".xlsx"
-            :showUploadList="false"
-            :custom-request="importFile">
-            <a-button type="primary" style="margin-left: 6px">导入</a-button>
-          </a-upload>
-          <a-button type="primary" style="margin-left: 6px" @click="exportFile">导出</a-button>
-          <a-button
-            type="primary"
-            style="margin-left: 6px"
-            :disabled="selectedRowKeys.length === 0"
-            @click="deleteMore"
-            >批量删除</a-button
-          >
-        </div>
-      </div>
-      <a-table
-        :columns="columns"
-        :data-source="data"
-        rowKey="id"
-        @change="onChange"
-        :rowSelection="{
-          selectedRowKeys: selectedRowKeys,
-          onChange: onSelectionChange,
-        }"
-        :scroll="{ x: 1500, y: 400 }"
-        :pagination="false">
-        <template #bodyCell="{ column, text, record }">
-          <template v-if="column.dataIndex === 'accountType'">
-            <span v-if="record.accountType">{{ record.accountType.label }}</span>
-          </template>
-          <template v-if="column.key === 'action'">
-            <span>
-              <a @click="editData(record)">编辑</a>
-              <a-divider type="vertical" />
-              <a @click="delData(record)">删除</a>
-            </span>
-          </template>
-        </template>
-      </a-table>
-      <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" />
-    </div>
-    <div class="total">
-      <div class="ns-form-title">
-        <div class="title">配额统计</div>
-        <div class="operation" style="display: flex; justify-content: space-around; width: 63%">
-          <a-button type="primary" @click="getTotalTable(1)">全国配额</a-button>
-          <a-button type="primary" @click="getTotalTable(2)">地方配额</a-button>
-          <a-button type="primary" @click="getTotalTable(3)">CCER配额</a-button>
-        </div>
-      </div>
-      <a-table :columns="totalColumns" :data-source="totalData" bordered :pagination="false">
-        <template #bodyCell="{ column, text }">
-          <template v-if="column.dataIndex === 'name'">
-            <a>{{ text }}</a>
-          </template>
-        </template>
-      </a-table>
-    </div>
-  </div>
-  <!-- 新增报告弹窗 -->
-  <a-drawer
-    :width="500"
-    :visible="visible"
-    :body-style="{ paddingBottom: '80px' }"
-    :footer-style="{ textAlign: 'right' }"
-    destroyOnClose
-    @close="onClose">
-    <div class="ns-form-title" style="display: flex">
-      <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="accountType">
-        <a-select v-model:value="formState.accountType" placeholder="请输入账户类型">
-          <a-select-option value="1">全国账户</a-select-option>
-          <a-select-option value="2">地方账户</a-select-option>
-          <a-select-option value="3">CCER</a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item ref="name" label="交易类型" name="transactionType">
-        <a-cascader
-          v-model:value="formState.transactionType"
-          :options="options"
-          placeholder="请选择交易类型" />
-      </a-form-item>
-      <a-form-item ref="name" label="交易日期" name="transactionDate">
-        <a-date-picker v-model:value="formState.transactionDate" valueFormat="YYYY-MM-DD" />
-      </a-form-item>
-      <a-form-item ref="name" label="交易数量" name="transactionQuantity">
-        <a-input v-model:value="formState.transactionQuantity" placeholder="请输入交易数量" />
-      </a-form-item>
-      <a-form-item ref="name" label="发生金额" name="amountIncurred">
-        <a-input v-model:value="formState.amountIncurred" placeholder="请输入发生金额" />
-      </a-form-item>
-      <a-form-item ref="name" label="交易对象" name="tradingPartner">
-        <a-input v-model:value="formState.tradingPartner" placeholder="请输入交易对象" />
-      </a-form-item>
-      <a-form-item ref="name" label="交易凭证">
-        <a-upload
-          :file-list="fileList"
-          name="file"
-          accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf"
-          @remove="handleFileRemove"
-          :before-upload="beforeUpload"
-          @change="handleChange">
-          <a-button>
-            <upload-outlined></upload-outlined>
-            上传
-          </a-button>
-        </a-upload>
-      </a-form-item>
-    </a-form>
-    <template #footer>
-      <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
-      <a-button type="primary" @click="onSubmit">确定</a-button>
-    </template>
-  </a-drawer>
-</template>
-
-<script lang="ts" setup>
-  import { ref, defineEmits, toRaw } from 'vue';
-  import { http } from '/nerv-lib/util/http';
-  import { UploadOutlined } from '@ant-design/icons-vue';
-  import type { UploadChangeParam, UploadProps } from 'ant-design-vue';
-  import { Pagination, Modal, message } from 'ant-design-vue';
-  import {
-    carbonAssets,
-    carbonEmissionFactorLibrary,
-    uploadPic,
-  } from '/@/api/carbonEmissionFactorLibrary';
-  import { log } from 'console';
-  defineOptions({
-    energyType: 'carbonAssets', // 与页面路由name一致缓存才可生效
-    components: {
-      'a-pagination': Pagination,
-    },
-  });
-  // 父组件id
-  const props = defineProps({
-    parentId: {
-      type: Number,
-    },
-  });
-  const orgId = ref('');
-  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
-  orgId.value = result;
-  const fetch = (api, params = { orgId }, config) => {
-    return http.post(api, params, config);
-  };
-  // 详情部分变量
-  const selectedRowKeys = ref([]);
-  const onSelectionChange = (selectedKeys, selectedRows) => {
-    selectedRowKeys.value = selectedKeys;
-  };
-  const total = ref<number>();
-  const thisYear = ref(new Date().getFullYear().toString());
-  const queryParams = ref({
-    pageNum: 1,
-    pageSize: 10,
-    orgId: orgId.value,
-    accountType: props.parentId,
-    year: thisYear.value,
-  });
-  const searchTableList = () => {
-    getDetailList();
-  };
-  // 获取左侧列表数据
-  const getDetailList = () => {
-    fetch(carbonAssets.carbonDetailsList, queryParams.value).then((res) => {
-      data.value = res.data.records;
-      total.value = res.data.total;
-    });
-  };
-  getDetailList();
-  const columns = [
-    {
-      title: '序号',
-      customRender: (text: any) => {
-        return text.index + 1;
-      },
-    },
-    {
-      title: '资产类别',
-      dataIndex: 'accountType',
-    },
-    {
-      title: '交易方式',
-      dataIndex: 'transactionTypeName',
-    },
-    {
-      title: '交易日期',
-      dataIndex: 'transactionDate',
-      sorter: (a, b) => a.transactionDate - b.transactionDate,
-    },
-    {
-      title: '本期收入(tCO2)',
-      dataIndex: 'income',
-      sorter: (a, b) => a.income - b.income,
-    },
-    {
-      title: '本期支出(tCO2)',
-      dataIndex: 'expenditure',
-      sorter: (a, b) => a.expenditure - b.expenditure,
-    },
-    {
-      title: '发生金额(￥）',
-      dataIndex: 'amountIncurredValue',
-    },
-    {
-      title: '交易对象',
-      dataIndex: 'tradingPartner',
-    },
-    {
-      title: '更新人',
-      dataIndex: 'updateUser',
-    },
-    {
-      title: '更新时间',
-      dataIndex: 'updateTime',
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 130,
-    },
-  ];
-  const data = ref([]);
-  const reset = () => {
-    queryParams.value = {
-      pageNum: 1,
-      pageSize: 10,
-      orgId: orgId.value,
-      year: new Date().getFullYear(),
-    };
-    getDetailList();
-  };
-  const editData = (record) => {
-    getDictList();
-    text.value = '编辑';
-    visible.value = true;
-    formState.value.id = record.id;
-    fetch(uploadPic.select, { bizId: record.id, bizType: 1 }).then((res) => {
-      fileList.value = res.data.map((item) => ({
-        uid: item.id.toString(), // 使用文件的id作为唯一标识
-        name: item.fileName, // 文件名
-        status: 'done', // 设置默认状态为已完成
-        type: 'done',
-        url: item.filePath, // 文件的URL，这里假设用示例的URL格式
-      }));
-    });
-    formState.value = JSON.parse(JSON.stringify(record));
-    if (formState.value.expenditure === 0) {
-      formState.value.transactionQuantity = formState.value.income;
-    } else {
-      formState.value.transactionQuantity = formState.value.expenditure;
-    }
-    setTimeout(() => {
-      let selectDevice = ref([Number(formState.value.transactionType)]);
-      findParentIds(options.value, formState.value.transactionType, selectDevice.value);
-      formState.value.transactionType = selectDevice;
-      formState.value.transactionType = formState.value.transactionType;
-    }, 500);
-  };
-  // 定义一个递归函数来查找每一级的id 设备类型回显 层级方法
-  function findParentIds(tree: any, targetId: number, result: any) {
-    for (let item of tree) {
-      if (item.children && item.children.length > 0) {
-        if (item.children.some((child: any) => child.value === targetId)) {
-          result.unshift(item.value); // 将当前节点的id添加到结果数组的最前面
-          findParentIds(tree, item.value, result); // 递归查找父级节点的id
-          break; // 找到后可以退出循环
-        }
-      }
-    }
-  }
-  const delData = (record) => {
-    const id = [record.id];
-    Modal.confirm({
-      title: '警告',
-      content: '确定要删除吗?',
-      okText: '确定',
-      okType: 'primary',
-      cancelText: '取消',
-      onOk() {
-        fetch(carbonAssets.delete, { ids: id }).then((res) => {
-          message.success('操作成功！');
-          getDetailList();
-        });
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  };
-  const deleteMore = () => {
-    Modal.confirm({
-      title: '警告',
-      content: '确定要删除吗?',
-      okText: '确定',
-      okType: 'primary',
-      cancelText: '取消',
-      onOk() {
-        fetch(carbonAssets.delete, { ids: selectedRowKeys.value }).then((res) => {
-          message.success('操作成功！');
-          getDetailList();
-        });
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  };
-  // 分页器
-  const onChange = (pageNumber: number, size: number) => {
-    queryParams.value.pageNum = pageNumber;
-    queryParams.value.pageSize = size;
-    getDetailList();
-  };
-  // 新增相关数据
-  const visible = ref(false);
-  const text = ref('新增');
-  const formState = ref({
-    orgId: orgId.value,
-  });
-  const formRef = ref();
-  const labelCol = { span: 5 };
-  const wrapperCol = { span: 19 };
-  const options = ref([]);
-  // 获取字典值
-  const getDictList = () => {
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'TRANSACTION_TYPE' }).then(
-      (res) => {
-        options.value = res.data;
-        options.value = options.value.map((item) => ({
-          value: item.id,
-          label: item.cnValue,
-          children: item.children
-            ? item.children.map((child) => ({
-                value: child.id,
-                label: child.cnValue,
-              }))
-            : [],
-        }));
-      },
-    );
-  };
-  getDictList();
-  // 点击新增
-  const addDetail = () => {
-    text.value = '新增';
-    visible.value = true;
-    getDictList();
-  };
-  const importFileList = ref<UploadProps['fileList']>([]);
-  const importFile = (options: UploadRequestOption) => {
-    const { file, onSuccess, onError } = options;
-    const formData = ref(new FormData());
-    formData.value.append('file', file as any);
-    formData.value.append('orgId', orgId.value);
-    formData.value.append('year', queryParams.value.year);
-    fetch(carbonAssets.import, formData.value)
-      .then((res) => {
-        message.success('操作成功！');
-        getDetailList();
-      })
-      .catch((error) => {
-        console.log('error', error);
-      });
-  };
-  const exportFile = () => {
-    const exportQuery = ref({
-      orgId: orgId.value,
-      pageNum: 1,
-      pageSize: 999,
-      year: queryParams.value.year,
-      ids: selectedRowKeys.value,
-    });
-    const config = {
-      responseType: 'blob',
-    };
-    fetch(carbonAssets.export, exportQuery.value, config)
-      .then((res) => {
-        // 创建一个 URL 对象，指向图片数据的 blob
-        const url = window.URL.createObjectURL(new Blob([res]));
-        // 创建一个 <a> 标签，用于触发下载
-        const link = document.createElement('a');
-        link.href = url;
-        link.setAttribute('download', 'carbonTradeDetails.xlsx'); // 设置下载的文件名
-        document.body.appendChild(link);
-        link.click();
-
-        // 清理 URL 对象
-        window.URL.revokeObjectURL(url);
-        selectedRowKeys.value = [];
-      })
-      .catch((error) => {
-        console.error('下载失败：', error);
-      });
-  };
-  // 上传附件
-  const fileList = ref<UploadProps['fileList']>([]);
-  const beforeUpload: UploadProps['beforeUpload'] = (file) => {
-    return false;
-  };
-  const handleChange = (info: UploadChangeParam) => {
-    fileList.value = [...info.fileList];
-    if (info.file.status !== 'uploading') {
-      console.log(info.file, info.fileList);
-    }
-    if (info.file.status === 'done') {
-      message.success(`${info.file.name} 文件上传成功`);
-    } else if (info.file.status === 'error') {
-      message.error(`${info.file.name} 文件上传失败`);
-    }
-  };
-  const delIds = ref([]);
-  const handleFileRemove = (file) => {
-    delIds.value.push(file.uid);
-    const newFileList = [];
-    fileList.value.forEach((item) => {
-      if (item.uid !== file.uid) {
-        newFileList.push(item);
-      }
-    });
-    fileList.value = newFileList;
-  };
-  const onSubmit = () => {
-    formRef.value
-      .validate()
-      .then(() => {
-        console.log('values', formState, toRaw(formState));
-        if (formState.value.transactionType) {
-          formState.value.transactionType = formState.value.transactionType.join(',').split(',')[1];
-        }
-        if (formState.value.accountType.value) {
-          formState.value.accountType = formState.value.accountType.value;
-        }
-        fetch(carbonAssets.createOrUpdate, formState.value).then((res) => {
-          if (res.data.id && fileList.value.length !== 0) {
-            // uploadQuery.value.bizId = res.data.id;
-            const formData = ref(new FormData());
-            fileList.value.forEach((file) => {
-              if (file.type !== 'done') {
-                formData.value.append('files', file.originFileObj);
-              }
-            });
-            formData.value.append('bizType', 1);
-            formData.value.append('bizId', res.data.id);
-            delIds.value.forEach((item) => {
-              formData.value.append('deleteList', item);
-            });
-            fetch(uploadPic.uploadfiles, formData.value)
-              .then((res) => {
-                message.success('操作成功！');
-                visible.value = false;
-                delIds.value = [];
-                getDetailList();
-                getTotalTable();
-              })
-              .catch((error) => {
-                console.log('error', error);
-              });
-          } else {
-            message.success('操作成功！');
-            visible.value = false;
-            delIds.value = [];
-            getDetailList();
-          }
-        });
-      })
-      .catch((error) => {
-        console.log('error', error);
-      });
-  };
-  // 定义form表单的必填
-  const rules: Record<string, Rule[]> = {
-    accountType: [{ required: true, message: '请输入账户类型', trigger: 'change' }],
-    transactionType: [{ required: true, message: '请选择交易类型', trigger: 'change' }],
-    transactionDate: [{ required: true, message: '请选择交易日期', trigger: 'change' }],
-    transactionQuantity: [{ required: true, message: '请输入交易数量', trigger: 'change' }],
-    amountIncurred: [{ required: true, message: '请输入发生金额', trigger: 'change' }],
-    tradingPartner: [{ required: true, message: '请输入交易对象', trigger: 'change' }],
-  };
-  // 关闭新增抽屉
-  const onClose = () => {
-    visible.value = false;
-    delIds.value = [];
-    formState.value = {};
-    fileList.value = [];
-    formRef.value.resetFields();
-  };
-  // 统计表格
-  const getTotalTable = (type) => {
-    if (type) {
-      queryParams.value.accountType = type;
-    }
-    fetch(carbonAssets.quotaStatistics, queryParams.value).then((res) => {
-      totalData.value = res.data;
-    });
-  };
-  getTotalTable();
-  const totalColumns = [
-    {
-      title: '统计类型',
-      dataIndex: 'statisticType',
-    },
-    {
-      title: '小计',
-      dataIndex: 'subtotal',
-    },
-    {
-      title: '合计',
-      dataIndex: 'amountTo',
-    },
-  ];
-
-  const totalData = ref([]);
-  // 点击返回
-  const emit = defineEmits(['change-data']);
-  const changeParentData = () => {
-    emit('change-data', true);
-  };
-</script>
-
-<style lang="less" scoped>
-  .ns-form-title {
-    font-weight: bold;
-    user-select: text;
-    padding-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-  }
-  .title {
-    text-align: left;
-    height: 32px;
-    line-height: 32px;
-    font-weight: bold;
-    user-select: text;
-    position: relative;
-    padding-left: 9px;
-  }
-  .title::before {
-    content: '';
-    position: absolute;
-    left: 0;
-    top: 50%;
-    transform: translateY(-50%);
-    height: 13px;
-    width: 3px;
-    border-radius: 1px;
-    background-color: #2778ff;
-  }
-  :deep(.ant-card-body) {
-    padding: 16px;
-  }
-  .search {
-    height: 16%;
-  }
-  .detailTable {
-    width: 65%;
-    margin-right: 20px;
-    height: 100%;
-    background: white;
-    border-radius: 12px;
-    padding: 16px;
-  }
-  .total {
-    width: calc(35% - 20px);
-    height: 100%;
-    background: white;
-    border-radius: 12px;
-    padding: 16px;
-  }
-</style>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue
index b73b0d7..b03ede5 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue
@@ -129,7 +129,7 @@
       </div>
       <div class="title">
         <img width="24" height="24" src="../../../../src/icon/carbonAssetsTitle-3.svg" />
-        <span>全国碳账户余额</span>
+        <span>CCER账户余额</span>
       </div>
       <div class="bottom">
         <div class="calculation BLCard">
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
index 25fdcf1..4b8d12d 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
@@ -167,7 +167,7 @@ export const formConfig = (disabled) => {
             label: '已引用数',
             field: 'numberOfReferences',
             component: 'NsInput',
-            show:disabled,
+            show: disabled,
             componentProps: {
               defaultValue: '',
               disabled: true,
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index bdfdf63..cac49c8 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -299,13 +299,7 @@
   const x = 3;
   const y = 2;
   const z = 1;
-  const genData: TreeProps['treeData'] = [
-    {
-      emissionName: '全部',
-      key: '0-0',
-      children: [],
-    },
-  ];
+  const genData: TreeProps['treeData'] = [];
   const checkedTreeNodeKeys = ref<string[]>();
   const selectedKeys = ref<string[]>();
 
@@ -532,7 +526,7 @@
   const getOrgTree = () => {
     fetch(carbonEmissionFactorLibrary.getCarbonFactorTree, getClassificationTree.value).then(
       (res) => {
-        gData.value[0].children = res.data;
+        gData.value = res.data;
         // 找到匹配的节点数据
         // const selectedNodes = [];
         // checkedTreeNodeKeys.value.forEach(key => {
@@ -564,10 +558,12 @@
   const onSelectKeys = ref([]);
   const onSelect = (selectedKey: string[], info: any) => {
     if (selectedKey.length === 1) {
+      if (info.selectedNodes[0].emissionName === '全部') {
+        onSelectKeys.value = [];
+      } else {
+        onSelectKeys.value = [info.selectedNodes[0].id];
+      }
       selectedKeys.value = selectedKey;
-    }
-    if (info.selected) {
-      // showOperation.value = true;
       editTreeNode.value = {
         id: info.selectedNodes[0].id,
         level: info.selectedNodes[0].level,
@@ -575,15 +571,18 @@
         sortNumber: info.selectedNodes[0].sortNumber,
         parentEmissionId: info.selectedNodes[0].parentEmissionId,
       };
-      onSelectKeys.value = [info.selectedNodes[0].id];
-      emissionList.value = [...onSelectKeys.value, ...checkedIds.value];
-      mainRef.value?.nsTableRef.reload();
-    } else {
-      editTreeNode.value = {};
-      onSelectKeys.value = [];
       emissionList.value = [...onSelectKeys.value, ...checkedIds.value];
       mainRef.value?.nsTableRef.reload();
     }
+    // if (info.selected) {
+    //   // showOperation.value = true;
+
+    // } else {
+    //   editTreeNode.value = {};
+    //   onSelectKeys.value = [];
+    //   emissionList.value = [...onSelectKeys.value, ...checkedIds.value];
+    //   mainRef.value?.nsTableRef.reload();
+    // }
   };
 
   const onSearch = () => {
@@ -705,12 +704,17 @@
         label: '导出',
         type: 'primary',
         handle: () => {
-          // console.log( mainRef.value.nsTableRef.tableState.selectedRowKeys)
+          // console.log(mainRef.value.nsTableRef.formParamsRef)
           const exportQuery = {
             orgId: orgId.value,
             pageNum: 1,
             pageSize: 999,
             ids: mainRef.value.nsTableRef.tableState.selectedRowKeys,
+            bibliography:mainRef.value.nsTableRef.formParamsRef.bibliography,
+            emissionGas:mainRef.value.nsTableRef.formParamsRef.emissionGas,
+            carbonDatabase:mainRef.value.nsTableRef.formParamsRef.carbonDatabase,
+            emissionProcess:mainRef.value.nsTableRef.formParamsRef.emissionProcess,
+            emissionSources:mainRef.value.nsTableRef.formParamsRef.emissionSources,
           };
           const config = {
             responseType: 'blob',
@@ -722,7 +726,7 @@
               // 创建一个 <a> 标签，用于触发下载
               const link = document.createElement('a');
               link.href = url;
-              link.setAttribute('download', 'carbonFactor.xlsx'); // 设置下载的文件名
+              link.setAttribute('download', '碳排因子库导出.xlsx'); // 设置下载的文件名
               document.body.appendChild(link);
               link.click();
 
@@ -1242,8 +1246,10 @@
     flex-direction: column;
     border-radius: 12px;
     overflow: auto;
+    align-items: center;
     :deep(.ant-tree) {
       height: 90%;
+      width: 90%;
       overflow: auto;
     }
   }
@@ -1257,12 +1263,12 @@
       }
     }
   }
-  :deep(
-      .ant-form-item-label
-        > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before
-    ) {
-    display: none !important;
-  }
+  // :deep(
+  //     .ant-form-item-label
+  //       > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before
+  //   ) {
+  //   display: none !important;
+  // }
   :deep(.ant-form-item-label) {
     z-index: 20;
     text-align: right;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index d259443..2a1c2de 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -1,3 +1,5 @@
+import { quickCalculation, carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
+import { ref } from 'vue';
 // 能耗统计表表头
 export const tableColumns = [
   {
@@ -144,3 +146,107 @@ export const drawerColumns = [
     dataIndex: 'dataSources',
   },
 ];
+export const setFactorConfig = (orgId) => {
+  return ref({
+    api: carbonEmissionFactorLibrary.getTableList,
+    params: { orgId, pageNum: 1, pageSize: 9999, emissionList: [0] },
+    treeConfig: {
+      header: {
+        icon: 'deviceType',
+        title: '排放分类',
+      },
+      params: { orgId},
+      dynamicParams: { emissionList: 'id[]' },
+      defaultExpandAll: true,
+      // checkable:true,
+      api: carbonEmissionFactorLibrary.getCarbonFactorTree,
+      fieldNames: { title: 'emissionName', key: 'id' },
+      formConfig: {
+        schemas: [
+          {
+            field: 'deviceType',
+            label: '设备名称',
+            component: 'NsInput',
+            autoSubmit: true,
+            componentProps: {
+              placeholder: '请输入关键字',
+            },
+          },
+        ],
+      },
+    },
+    rowSelection: { type: 'radio' },
+    columns: [
+      {
+        title: '序号',
+        textNumber: 2,
+        dataIndex: 'address',
+        customRender: (text: any) => {
+          return text.index + 1;
+        },
+      },
+      {
+        title: '名称',
+        dataIndex: 'emissionSources',
+        textNumber: 3,
+      },
+      {
+        title: '排放因子',
+        dataIndex: 'emissionFactors',
+        textNumber: 4,
+        textEllipsis: true,
+      },
+      {
+        title: '排放因子单位',
+        dataIndex: 'emissionFactorUnits',
+        width: 100,
+        textEllipsis: true,
+      },
+      {
+        title: '排放环节',
+        dataIndex: 'emissionProcess',
+        textWidth: 88,
+        textEllipsis: true,
+      },
+      {
+        title: '数据来源',
+        dataIndex: 'dataSources',
+        textNumber: 5,
+        textEllipsis: true,
+      },
+    ],
+    formConfig: {
+      schemas: [
+        {
+          field: 'emissionSources',
+          label: '排放源',
+          component: 'NsInput',
+          componentProps: {
+            placeholder: '请输入排放源',
+            maxLength: 20,
+          },
+        },
+        {
+          field: 'emissionProcess',
+          label: '排放环节',
+          component: 'NsSelectApi',
+          componentProps: {
+            placeholder: '请选择排放环节',
+            api: carbonEmissionFactorLibrary.gasAndDatabase,
+            resultField: 'data',
+            params: {
+              orgId: orgId.value,
+              type: 'emissionProcess',
+            },
+            immediate: true,
+            labelField: 'label',
+            valueField: 'value',
+          },
+        },
+      ],
+      params: {},
+    },
+    // pagination: { pageSizeOptions: false },
+    rowKey: 'id',
+  });
+};
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 2ef50c2..33851cf 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -57,7 +57,7 @@
             <a-radio :value="1">否</a-radio>
           </a-radio-group>
         </a-form-item>
-        <a-form-item label="排放类型" name="emissionType" :required="isRequired">
+        <a-form-item label="排放类型" name="emissionType" :required="isRequired" v-if="isRequired">
           <a-select
             v-model:value="formState.emissionType"
             placeholder="请选择排放类型"
@@ -330,7 +330,7 @@
               // 创建一个 <a> 标签，用于触发下载
               const link = document.createElement('a');
               link.href = url;
-              link.setAttribute('download', 'carbonStats.xlsx'); // 设置下载的文件名
+              link.setAttribute('download', '能耗统计导出.xlsx'); // 设置下载的文件名
               document.body.appendChild(link);
               link.click();
 
@@ -342,13 +342,13 @@
             });
         },
       },
-      {
-        label: '模板下载',
-        type: 'primary',
-        handle: () => {
-          doWnload('/hx-ai-intelligent/asset/file/energyConsumption.xlsx');
-        },
-      },
+      // {
+      //   label: '模板下载',
+      //   type: 'primary',
+      //   handle: () => {
+      //     doWnload('/hx-ai-intelligent/asset/file/energyConsumption.xlsx');
+      //   },
+      // },
       // {
       //   label: '上传凭证',
       //   type: 'primary',
@@ -782,24 +782,18 @@
     // 获取自动采集节点的数据
     fetch(group.queryDeviceGroupTree, { energyType: value, orgId: orgId.value }).then((res) => {
       treeData.value = res.data;
-      treeData.value = treeData.value.map((item) => ({
-        value: item.id,
-        label: item.pointName,
-        children: item.children
-          ? item.children.map((child) => ({
-              value: child.id,
-              label: child.pointName,
-              children: child.children
-                ? child.children.map((childs) => ({
-                    value: childs.id,
-                    label: childs.pointName,
-                  }))
-                : [],
-            }))
-          : [],
-      }));
+      treeData.value = transformData(treeData.value);
     });
   };
+  // 将数据转换为树形结构
+  const transformData = (data: any[]) => {
+    return data.map((item) => ({
+      title: item.pointName,
+      value: item.id,
+      key: item.id,
+      children: item.children ? transformData(item.children) : [],
+    }));
+  };
   // 计算碳排切换
   const emissionType = ref();
   const changeRadio = (e) => {
@@ -819,7 +813,9 @@
       .validate()
       .then(() => {
         console.log('values', formState, toRaw(formState));
-        formState.value.year = selectYear.value.format('YYYY');
+        formState.value.year = mainRef.value.nsTableRef.formParamsRef.year
+          ? mainRef.value.nsTableRef.formParamsRef.year
+          : selectYear.value.format('YYYY');
         if (formState.value.unit) {
           formState.value.unit = formState.value.unit.join(',').split(',')[1];
         }
@@ -973,6 +969,7 @@
     formState.value = {
       orgId: orgId.value,
     };
+    fileList.value = [];
     formRef.value.resetFields();
   };
   // 点击上传凭证按钮
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 5350ea0..8f7add6 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -40,40 +40,11 @@
       </div>
     </div>
     <div class="right">
-      <!-- <a-table 
-        :columns="columns" 
-        :data-source="tableData" 
-        bordered
-        :pagination="false">
-        <template #bodyCell="{ column, text, record }">
-          <template v-if="column.key === 'action'">
-            <span>
-              <a @click="editData(record)">编辑</a>
-              <a-divider type="vertical" />
-              <a @click="delData(record)">删除</a>
-            </span>
-          </template>
-        </template>
-        <template #title>
-          <div class="ns-table-title"><span>排放因子库</span></div>
-          <div class="buttonGroup">
-            <a-button type="primary" @click="addNewData">新增</a-button>
-          </div>
-        </template>
-      </a-table> -->
       <ns-view-list-table
         v-bind="tableConfig"
         :model="tableData"
         ref="mainRef"
         :scroll="{ x: 1000 }" />
-      <!-- <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" /> -->
       <!-- 新增/编辑 -->
       <a-drawer
         :width="500"
@@ -93,20 +64,20 @@
           :wrapper-col="wrapperCol">
           <a-row>
             <a-col :span="24">
-              <a-form-item ref="name" label="日期范围" name="dateRange">
+              <a-form-item ref="name" label="适用日期" name="dateRange">
                 <a-range-picker
                   v-model:value="formState.dateRange"
                   picker="month"
                   valueFormat="YYYY-MM" />
               </a-form-item>
             </a-col>
-            <a-col :span="24">
+            <!-- <a-col :span="24">
               <a-form-item ref="name" label="排放因子" name="emissionFactors">
                 <ns-input v-model:value="formState.emissionFactors" disabled />
               </a-form-item>
-            </a-col>
+            </a-col> -->
           </a-row>
-          <span
+          <!-- <span
             key=""
             style="font-size: 16px; font-weight: 700; color: rgba(51, 51, 51, 1); text-align: left">
             因子列表
@@ -117,8 +88,11 @@
                 <ns-input style="margin-top: 5px" v-model:value="selectData" @change="keyChange" />
               </a-form-item>
             </a-col>
-          </a-row>
+          </a-row> -->
         </a-form>
+        <a-button type="primary" style="margin-bottom: 10px" @click="selectFactor"
+          >选择因子</a-button
+        >
         <a-table
           :columns="drawerColumns"
           :data-source="newTableData"
@@ -142,6 +116,15 @@
         </template>
       </a-drawer>
     </div>
+    <!-- 选择因子 -->
+    <a-modal
+      v-model:visible="openVisible"
+      width="60%"
+      title="选择因子"
+      @ok="onSubmit"
+      @cancel="onClose">
+      <ns-view-list-table v-bind="config" ref="setFactorRef" style="height: 500px" />
+    </a-modal>
   </div>
 </template>
 
@@ -156,6 +139,7 @@
     carbonEmissionFactorLibrary,
   } from '/@/api/carbonEmissionFactorLibrary';
   import { or } from '@vueuse/core';
+  import { setFactorConfig } from '../config';
   defineOptions({
     energyType: 'quickCalculation', // 与页面路由name一致缓存才可生效
     components: {
@@ -499,6 +483,11 @@
       },
     });
   };
+  const openVisible = ref(false);
+  const config = setFactorConfig(orgId.value);
+  const selectFactor = () => {
+    openVisible.value = true;
+  };
   // 关闭新增抽屉
   const onClose = () => {
     visible.value = false;
@@ -611,6 +600,12 @@
   :deep(.ant-table-container) {
     padding: unset;
   }
+  :deep(.ant-modal-header) {
+    border-bottom: 10px solid #f0f0f0 !important;
+  }
+  :deep(.ant-modal-footer) {
+    border-top: 10px solid #f0f0f0 !important;
+  }
 </style>
 <style scoped>
   th.column-money,
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index copy.vue
deleted file mode 100644
index ee8df02..0000000
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index copy.vue	
+++ /dev/null
@@ -1,1632 +0,0 @@
-<template>
-  <div class="main">
-    <div class="left">
-      <div class="top">
-        <a-form style="width: 100%; margin: 0 auto">
-          <div class="ns-form-title">
-            <div class="title">{{ props.year }}年济阳站碳盘查报告</div>
-            <div class="standard">
-              <span>适用标准：ISO 14064-1</span>
-              <a-button type="primary" style="margin-left: 12px" @click="openCategoryConfig"
-                >类别配置</a-button
-              >
-            </div>
-          </div>
-          <div style="padding: 0 16px !important; width: 100%">
-            <a-row>
-              <a-col :span="24" style="margin-bottom: 16px">
-                <a-input-search
-                  v-model:value="searchValue"
-                  style="margin-bottom: 8px"
-                  placeholder="请输入关键词" />
-              </a-col>
-            </a-row>
-          </div>
-        </a-form>
-        <a-tree
-          :expanded-keys="expandedKeysL"
-          :selectedKeys="selectedKeysL"
-          :auto-expand-parent="autoExpandParent"
-          :tree-data="gData"
-          v-if="gData && gData.length > 0"
-          :height="233"
-          show-line
-          style="padding: 0 16px !important"
-          @expand="onExpandL"
-          @select="onSelectL"
-          block-node>
-          <template #title="{ cnValue }">
-            <span v-if="cnValue && searchValue && cnValue.indexOf(searchValue) > -1">
-              {{ cnValue.substring(0, cnValue.indexOf(searchValue)) }}
-              <span style="color: #f50">{{ searchValue }}</span>
-              {{ cnValue.substring(cnValue.indexOf(searchValue) + searchValue.length) }}
-            </span>
-            <span v-else>{{ cnValue }}</span>
-          </template>
-        </a-tree>
-      </div>
-      <!-- <div class="bottom">
-        <a-form style="width: 100%; margin: 0 auto">
-          <div class="ns-form-title"><div class="title">报告相关</div></div>
-          <div class="button" style="padding: 0 16px !important">
-            <div :class="{ pftj: isClickedPftj }" @click="showPftj">排放统计</div>
-            <div :class="{ tplx: isClickedTplx }" @click="showTplx">碳排流向</div>
-          </div>
-        </a-form>
-      </div> -->
-    </div>
-    <div class="right">
-      <a-button
-        type="primary"
-        @click="changeParentData"
-        style="position: absolute; right: 25px; top: 10px; z-index: 99">
-        返回
-      </a-button>
-      <a-tabs v-model:activeKey="activeKey" @change="handleTabChange" style="height: 100%">
-        <a-tab-pane key="1" tab="排放源">
-          <div style="display: flex; height: 100%">
-            <div class="mainLeft">
-              <a-tree
-                :expandedKeys="expandedKeysR"
-                :selectedKeys="selectedKeysR"
-                :checkedKeys="checkedKeys"
-                :tree-data="treeData"
-                @select="onSelectR"
-                block-node>
-                <template #title="data">
-                  <div class="treeRow">
-                    <div>
-                      <span>{{ data.emissionSource }}</span>
-                    </div>
-                    <div class="actionMore">
-                      <EditOutlined @click="editUnit(data)" />
-                      <MinusCircleOutlined style="margin-left: 6px" @click="delUnit(data)" />
-                    </div>
-                  </div>
-                </template>
-              </a-tree>
-              <div class="addTreeNode">
-                <a-button type="primary" style="width: 100%" @click="addTreeNodeData"
-                  >新增</a-button
-                >
-              </div>
-            </div>
-            <div class="mainRight">
-              <a-table
-                :columns="columns"
-                :data-source="data"
-                :pagination="false"
-                bordered
-                size="middle"
-                :scroll="{ y: 500 }">
-                <template #title>
-                  <a-button type="primary" @click="downLoadVoucher">凭证</a-button>
-                </template>
-                <template #bodyCell="{ column, text, record }">
-                  <template v-if="column.dataIndex === 'dataSources'">
-                    <span v-if="record.dataSources">{{ record.dataSources.label }}</span>
-                  </template>
-                  <template v-if="column.dataIndex === 'carbonSource'">
-                    <span v-if="record.carbonSource">{{ record.carbonSource.label }}</span>
-                  </template>
-                  <template v-if="column.key === 'action'">
-                    <span>
-                      <a @click="edit(record)">编辑</a>
-                    </span>
-                  </template>
-                </template>
-              </a-table>
-            </div>
-          </div>
-        </a-tab-pane>
-        <a-tab-pane key="2" tab="排放统计">
-          <a-table
-            :columns="pftjColumn"
-            :data-source="pftjData"
-            bordered
-            :pagination="false"
-            :scroll="{ x: 2000, y: 500 }">
-            <template #bodyCell="{ column, text, record }">
-              {{ text || '-' }}
-            </template>
-          </a-table>
-        </a-tab-pane>
-        <a-tab-pane key="3" tab="碳排流向">
-          <div ref="tplxChart" style="width: 100%; height: 68vh"></div>
-        </a-tab-pane>
-      </a-tabs>
-    </div>
-    <!-- 类别配置 -->
-    <a-drawer
-      :width="500"
-      :visible="categoryConfig"
-      v-if="categoryConfig"
-      :body-style="{ paddingBottom: '80px' }"
-      :footer-style="{ textAlign: 'right' }"
-      destroyOnClose
-      title="类别配置"
-      @close="closeCategoryConfig">
-      <div class="search">
-        <a-input-search
-          v-model:value="searchcategoryConfig"
-          placeholder="请输入类别名称"
-          style="width: 250px"
-          @search="onSearch" />
-      </div>
-      <div class="treePart">
-        <a-tree
-          :expanded-keys="categoryExpandedKeys"
-          :selectedKeys="categorySelectedKeys"
-          :checkedKeys="categoryCheckedKeys"
-          :tree-data="categoryTreeData"
-          v-if="categoryTreeData && categoryTreeData.length > 0"
-          class="draggable-tree"
-          @check="checkTreeNode"
-          checkable
-          block-node>
-          <template #title="data">
-            <div class="treeRow">
-              <div>
-                <span>{{ data.cnValue }}</span>
-              </div>
-            </div>
-          </template>
-        </a-tree>
-      </div>
-      <template #footer>
-        <a-button style="margin-right: 8px" @click="closeCategoryConfig">取消</a-button>
-        <a-button type="primary" @click="submitCategory">确定</a-button>
-      </template>
-    </a-drawer>
-    <!-- 新增/编辑排放源树节点 -->
-    <a-drawer
-      :width="500"
-      :visible="addTreeNodeVisible"
-      :body-style="{ paddingBottom: '80px' }"
-      :footer-style="{ textAlign: 'right' }"
-      destroyOnClose
-      @close="onClose">
-      <a-form
-        ref="formRef"
-        :model="formState"
-        :rules="rules"
-        :label-col="labelCol"
-        :wrapper-col="wrapperCol">
-        <a-form-item ref="name" label="排放源" name="emissionSource">
-          <a-input v-model:value="formState.emissionSource" placeholder="请输入排放源" />
-        </a-form-item>
-        <a-form-item ref="name" label="计量单位" name="unitId">
-          <a-cascader v-model:value="formState.unitId" :options="measurementUnit" />
-        </a-form-item>
-        <a-form-item ref="name" label="温室气体" name="greenhouseGases">
-          <a-select ref="select" v-model:value="formState.greenhouseGases">
-            <a-select-option v-for="(item, index) in groupData" :key="index" :value="item.id">
-              {{ item.cnValue }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item ref="name" label="碳排单位" name="carbonEmissionUnits">
-          <a-cascader v-model:value="formState.carbonEmissionUnits" :options="CarbonUnit" />
-        </a-form-item>
-        <!-- <a-form-item label="排放类型" name="emissionType" :required="isRequired">
-          <a-select v-model:value="formState.emissionType" placeholder="请选择排放类型">
-            <a-select-option v-for="(item, index) in emissionTypeDic" :key="index" :value="item.id">
-              {{ item.cnValue }}
-            </a-select-option>
-          </a-select>
-        </a-form-item> -->
-      </a-form>
-      <template #footer>
-        <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
-        <a-button type="primary" @click="onSubmit">确定</a-button>
-      </template>
-    </a-drawer>
-    <!-- 点击凭证弹出框 -->
-    <a-drawer
-      :width="500"
-      :visible="openVoucher"
-      :body-style="{ paddingBottom: '80px' }"
-      :footer-style="{ textAlign: 'right' }"
-      destroyOnClose
-      @close="onCloseVoucher">
-      <a-table
-        :columns="voucherColumns"
-        :data-source="voucherData"
-        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectionChange }"
-        rowKey="id"
-        :pagination="false">
-        <template #bodyCell="{ column, text }">
-          <template v-if="column.dataIndex === 'name'">
-            <a>{{ text }}</a>
-          </template>
-        </template>
-      </a-table>
-      <template #footer>
-        <a-button style="margin-right: 8px" @click="onCloseVoucher">取消</a-button>
-        <a-button type="primary" @click="downLoadMore">批量下载</a-button>
-      </template>
-    </a-drawer>
-    <!-- 点击编辑弹出框 -->
-    <a-drawer
-      :width="500"
-      :visible="editData"
-      :body-style="{ paddingBottom: '80px' }"
-      :footer-style="{ textAlign: 'right' }"
-      destroyOnClose
-      @close="onCloseEditData">
-      <a-form
-        ref="editFormRef"
-        :model="editFormState"
-        :label-col="labelCol"
-        :wrapper-col="wrapperCol">
-        <a-row>
-          <a-col :span="24">
-            <a-form-item ref="name" label="数据来源" name="dataSources">
-              <a-select
-                ref="select"
-                v-model:value="editFormState.dataSources"
-                @change="changeSelect">
-                <a-select-option value="1">自行推估</a-select-option>
-                <a-select-option value="2">定期量测</a-select-option>
-                <a-select-option value="3">自动测量</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item ref="name" label="消耗量" name="consumption">
-              <ns-input v-model:value="editFormState.consumption" :disabled="canEdit" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row v-if="automatic">
-          <a-col :span="24">
-            <a-form-item label="能耗类型">
-              <a-select
-                v-model:value="editFormState.energyConsumptionType"
-                @change="changeEnergyType"
-                placeholder="请选择能耗类型">
-                <a-select-option
-                  v-for="(item, index) in energyTypeOptions"
-                  :key="index"
-                  :value="item.dicKey">
-                  {{ item.cnValue }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item ref="name" label="采集节点" name="collectionNode">
-              <a-tree-select
-                v-model:value="editFormState.collectionNode"
-                :tree-line="true"
-                @select="selectNode"
-                :tree-data="collectingNodes">
-              </a-tree-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="24">
-            <a-form-item ref="name" label="因子值" name="factorId">
-              <ns-input v-model:value="editFormState.factorId" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item ref="name" label="关键字" name="emissionFactors">
-              <a-input-search
-                v-model:value="editFormState.emissionFactors"
-                @search="searchKey"
-                placeholder="请输入关键字" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-      <a-table
-        :columns="drawerColumns"
-        :data-source="newTableData"
-        bordered
-        rowKey="id"
-        :scroll="{ y: 300 }"
-        size="small"
-        style="margin-bottom: 10px"
-        :rowSelection="{
-          selectedRowKeys: selectedRowKeysEdit,
-          onChange: onSelectionChangeEdit,
-          type: 'radio',
-        }"
-        :pagination="false">
-      </a-table>
-      <a-pagination
-        :current="queryData.pageNum"
-        :total="total"
-        :page-size="queryData.pageSize"
-        :pageSizeOptions="['5']"
-        style="display: flex; justify-content: center; margin-top: 16px"
-        :show-size-changer="true"
-        :show-quick-jumper="true"
-        @change="onChange" />
-      <a-upload-dragger
-        v-model:fileList="fileList"
-        accept=".pdf"
-        name="file"
-        @remove="handleFileRemove"
-        :before-upload="beforeUpload"
-        @change="handleChange">
-        <p class="ant-upload-drag-icon">
-          <inbox-outlined></inbox-outlined>
-        </p>
-        <p class="ant-upload-hint">1.仅支持pdf格式文件或文件夹</p>
-        <p class="ant-upload-hint">2.文件名命名规则为【能源种类_年份】</p>
-        <p class="ant-upload-hint">3.每次上传自动覆盖</p>
-      </a-upload-dragger>
-      <template #footer>
-        <a-button style="margin-right: 8px" @click="onCloseEditData">取消</a-button>
-        <a-button type="primary" @click="submitEditData">确定</a-button>
-      </template>
-    </a-drawer>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { ref, watch, toRaw, defineEmits, nextTick } from 'vue';
-  import { http } from '/nerv-lib/util/http';
-  import { Pagination, Modal, message, Upload } from 'ant-design-vue';
-  import type { TreeProps, UploadChangeParam } from 'ant-design-vue';
-  import {
-    EditOutlined,
-    PlusCircleOutlined,
-    MinusCircleOutlined,
-    UploadOutlined,
-    InboxOutlined,
-  } from '@ant-design/icons-vue';
-  import * as echarts from 'echarts';
-  import { voucherColumns, drawerColumns } from '../config';
-  import {
-    energyConsumption,
-    carbonEmissionFactorLibrary,
-    carbonInventoryCheck,
-    uploadPic,
-  } from '/@/api/carbonEmissionFactorLibrary';
-  import { group } from '/@/api/deviceManage';
-  import { debug, log } from 'node:console';
-  import { dict } from '/@/api';
-  defineOptions({
-    energyType: 'fillInPage', // 与页面路由name一致缓存才可生效
-    components: {
-      'a-pagination': Pagination,
-    },
-  });
-  // 父组件id和年份
-  const props = defineProps({
-    reportId: {
-      type: Number,
-    },
-    year: {
-      type: String,
-    },
-    startTime: {
-      type: String,
-    },
-    endTime: {
-      type: String,
-    },
-  });
-  const activeKey = ref('1');
-  const orgId = ref('');
-  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
-  orgId.value = result;
-  const fetch = (api, params = { orgId: orgId.value }, config) => {
-    return http.post(api, params, config);
-  };
-  // 左侧树结构
-  const x = 3;
-  const y = 2;
-  const z = 1;
-  const genData: TreeProps['treeData'] = [];
-
-  const generateData = (_level: number, _preKey?: string, _tns?: TreeProps['treeData']) => {
-    const preKey = _preKey || '0';
-    const tns = _tns || genData;
-
-    const children = [];
-    for (let i = 0; i < x; i++) {
-      const key = `${preKey}-${i}`;
-      tns.push({ title: key, key });
-      if (i < y) {
-        children.push(key);
-      }
-    }
-    if (_level < 0) {
-      return tns;
-    }
-    const level = _level - 1;
-    children.forEach((key, index) => {
-      tns[index].children = [];
-      return generateData(level, key, tns[index].children);
-    });
-  };
-  generateData(z);
-
-  const dataList: TreeProps['treeData'] = [];
-  const generateList = (data: TreeProps['treeData']) => {
-    for (let i = 0; i < data.length; i++) {
-      const node = data[i];
-      const key = node.key;
-      dataList.push({ key, title: key });
-      if (node.children) {
-        generateList(node.children);
-      }
-    }
-  };
-  generateList(genData);
-
-  const getParentKey = (
-    key: string | number,
-    tree: TreeProps['treeData'],
-  ): string | number | undefined => {
-    let parentKey;
-    for (let i = 0; i < tree.length; i++) {
-      const node = tree[i];
-      if (node.children) {
-        if (node.children.some((item) => item.key === key)) {
-          parentKey = node.key;
-        } else if (getParentKey(key, node.children)) {
-          parentKey = getParentKey(key, node.children);
-        }
-      }
-    }
-    return parentKey;
-  };
-  const expandedKeysL = ref<(string | number)[]>(['0-0']);
-  const selectedKeysL = ref<string[]>(['0-0-0']);
-  const searchValue = ref<string>('');
-  const autoExpandParent = ref<boolean>(true);
-  const gData = ref<TreeProps['treeData']>(genData);
-
-  const onExpandL = (keys: string[]) => {
-    expandedKeysL.value = keys;
-    autoExpandParent.value = false;
-  };
-
-  watch(searchValue, (value) => {
-    const expanded = dataList
-      .map((item: TreeProps['treeData'][number]) => {
-        if (item.title.indexOf(value) > -1) {
-          return getParentKey(item.key, gData.value);
-        }
-        return null;
-      })
-      .filter((item, i, self) => item && self.indexOf(item) === i);
-    expandedKeysL.value = expanded;
-    searchValue.value = value;
-    autoExpandParent.value = true;
-  });
-  // 被选中的树节点
-  const categoryId = ref();
-  const onSelectL = (selectedKey: string[], info: any) => {
-    selectedKeysL.value = selectedKey;
-    categoryId.value = info.node.conId;
-    formState.value.categoryId = categoryId.value;
-    if (fillInPage.value) {
-      getEmissionSourceTree();
-    } else if (isClickedPftj.value) {
-      queryEmissionData.value.categoryId = info.node.conId;
-      getEmissionStatistic();
-    } else if (isClickedTplx.value) {
-      queryFlowDirection.value.categoryId = info.node.conId;
-      getCarbonFlowDirection();
-    }
-  };
-  // 获取碳盘查报告树
-  const selectedIds = ref([]);
-  const getReportTree = () => {
-    fetch(carbonInventoryCheck.getCategoryTree, {
-      reportId: props.reportId,
-      orgId: orgId.value,
-    }).then((res) => {
-      gData.value = res.data;
-      if (res.data.length > 0) {
-        categoryId.value = res.data[0].children[0].conId;
-        formState.value.categoryId = categoryId.value;
-        queryEmissionData.value.categoryId = categoryId.value;
-        queryFlowDirection.value.categoryId = categoryId.value;
-        selectedIds.value = getAllIds(gData.value);
-      }
-      getEmissionSourceTree();
-    });
-  };
-  getReportTree();
-  const getAllIds = (nodes: TreeNode[]): number[] => {
-    return nodes.flatMap((node) => [node.id, ...(node.children ? getAllIds(node.children) : [])]);
-  };
-  // 右侧树数据
-  const treeData = ref<TreeProps['treeData']>(genData);
-  // 获取数据
-  const getTableId = ref();
-  const changeSelectedKeys = ref(false);
-  const getEmissionSourceTree = () => {
-    fetch(carbonInventoryCheck.getInventoryTree, { categoryId: categoryId.value }).then((res) => {
-      treeData.value = res.data;
-      if (changeSelectedKeys.value) {
-        selectedKeysR.value = [`0-${treeData.value.length - 1}`];
-        changeSelectedKeys.value = false;
-        getTableId.value = res.data[res.data.length - 1].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 = '排放量';
-        }
-      } else {
-        selectedKeysR.value = ['0-0'];
-        getTableId.value = res.data[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 = '排放量';
-        }
-      }
-    });
-  };
-  // 排放源树中被选中的树节点
-  const onSelectR = (selectedKey: string[], info: any) => {
-    selectedKeysR.value = selectedKey;
-    getTableId.value = info.selectedNodes[0].id;
-    getPFYTableList(getTableId.value);
-    getTableHeardUnit(getTableId.value);
-  };
-  // 获取表头单位
-  const getTableHeardUnit = (id) => {
-    fetch(carbonInventoryCheck.findUnitById, { id: id }).then((res) => {
-      if (res.data) {
-        columns.value[1].title = '消耗量【' + res.data.unit + '】';
-        columns.value[2].title = '碳排因子【' + res.data.carbonEmission + '】';
-        columns.value[3].title = '排放量【' + res.data.carbonUnits + '】';
-      }
-    });
-  };
-  const expandedKeysR = ref<string[]>([]);
-  const selectedKeysR = ref<string[]>(['0-0']);
-  const checkedKeys = ref<string[]>([]);
-  watch(expandedKeysR, () => {
-    console.log('expandedKeysR', expandedKeysR);
-  });
-  watch(selectedKeysR, () => {
-    console.log('selectedKeys', selectedKeysR);
-  });
-  watch(checkedKeys, () => {
-    console.log('checkedKeys', checkedKeys);
-  });
-  // 类别配置
-  const categoryConfig = ref(false);
-  const searchcategoryConfig = ref();
-  const categoryTreeData = ref<TreeProps['treeData']>(genData);
-  const categoryExpandedKeys = ref<string[]>();
-  const categorySelectedKeys = ref<string[]>([]);
-  const categoryCheckedKeys = ref<string[]>([]);
-
-  const checkTreeNode = (checkedKeys, info) => {
-    categoryCheckedKeys.value = checkedKeys;
-    queryConfigure.value.dictionaryIdList = categoryCheckedKeys.value;
-  };
-  const getUnitTree = () => {
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, {
-      grp: 'CATEGORY_CONFIGURATION',
-    }).then((res) => {
-      categoryTreeData.value = res.data;
-      categoryCheckedKeys.value = selectedIds.value.map((id) => String(id));
-      // 格式化树节点数据并设置 key
-      categoryTreeData.value = formatTreeData(categoryTreeData.value);
-    });
-  };
-
-  const formatTreeData = (treeData) => {
-    return treeData.map((node) => {
-      const newNode = { ...node };
-      newNode.key = String(node.id); // 将 id 转换为字符串作为 key
-      if (node.children) {
-        newNode.children = formatTreeData(node.children);
-      }
-      return newNode;
-    });
-  };
-  const openCategoryConfig = () => {
-    categoryConfig.value = true;
-    getUnitTree();
-  };
-  // 类别配置树点击确定
-  const queryConfigure = ref({
-    orgId: orgId.value,
-    reportId: props.reportId,
-  });
-  const submitCategory = () => {
-    fetch(carbonInventoryCheck.updateCategoryTree, queryConfigure.value).then((res) => {
-      categoryConfig.value = false;
-      getReportTree();
-    });
-  };
-  const closeCategoryConfig = () => {
-    categoryConfig.value = false;
-  };
-  // 新增/编辑排放源树节点
-  const addTreeNodeVisible = ref(false);
-  const formRef = ref();
-  const labelCol = { span: 5 };
-  const wrapperCol = { span: 19 };
-  const formState = ref({
-    orgId: orgId.value,
-    year: props.year,
-    startTime: props.startTime,
-    endTime: props.endTime,
-  });
-  // 计量单位的变量
-  const measurementUnit = ref([]);
-  // 碳排单位变量
-  const CarbonUnit = ref([]);
-  // 温室气体变量
-  const groupData = ref([]);
-  // 定义form表单的必填
-  const rules: Record<string, Rule[]> = {
-    emissionSource: [{ required: true, message: '请输入排放源', trigger: 'change' }],
-    unitId: [{ required: true, message: '请选择计量单位', trigger: 'change' }],
-    greenhouseGases: [{ required: true, message: '请选择温室气体', trigger: 'change' }],
-    carbonEmissionUnits: [{ required: true, message: '请选择碳排单位', trigger: 'change' }],
-  };
-  const addTreeNodeData = () => {
-    addTreeNodeVisible.value = true;
-    getDictData();
-  };
-  // 获取字典值
-  const getDictData = () => {
-    // 获取计量单位的数据
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'MEASUREMENT_UNIT' }).then(
-      (res) => {
-        measurementUnit.value = res.data;
-        measurementUnit.value = measurementUnit.value.map((item) => ({
-          value: item.id,
-          label: item.cnValue,
-          children: item.children
-            ? item.children.map((child) => ({
-                value: child.id,
-                label: child.cnValue,
-              }))
-            : [],
-        }));
-      },
-    );
-    // 获取碳排单位的数据
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'GREENHOUSE_GASES' }).then(
-      (res) => {
-        CarbonUnit.value = res.data;
-        CarbonUnit.value = CarbonUnit.value.map((item) => ({
-          value: item.id,
-          label: item.cnValue,
-          children: item.children
-            ? item.children.map((child) => ({
-                value: child.id,
-                label: child.cnValue,
-              }))
-            : [],
-        }));
-      },
-    );
-    // 获取温室气体数据
-    fetch(carbonEmissionFactorLibrary.findOutermost, { grp: 'GREENHOUSE_GASES' }).then((res) => {
-      groupData.value = res.data;
-    });
-  };
-  const onSubmit = () => {
-    formRef.value
-      .validate()
-      .then(() => {
-        console.log('values', formState, toRaw(formState));
-        if (formState.value.unitId) {
-          formState.value.unitId = formState.value.unitId.join(',').split(',')[1];
-        }
-        if (formState.value.carbonEmissionUnits) {
-          formState.value.carbonEmissionUnits = formState.value.carbonEmissionUnits
-            .join(',')
-            .split(',')[1];
-        }
-        if (formState.value.id) {
-          fetch(carbonInventoryCheck.update, formState.value).then((res) => {
-            addTreeNodeVisible.value = false;
-            formState.value = {
-              orgId: orgId.value,
-            };
-            message.success('操作成功！');
-            getEmissionSourceTree();
-          });
-        } else {
-          fetch(carbonInventoryCheck.create, formState.value).then((res) => {
-            addTreeNodeVisible.value = false;
-            formState.value = {
-              orgId: orgId.value,
-            };
-            message.success('操作成功！');
-            changeSelectedKeys.value = true;
-            getEmissionSourceTree();
-            getPFYTableList(res.data.id);
-          });
-        }
-      })
-      .catch((error) => {
-        console.log('error', error);
-      });
-  };
-  // 填报表格数据
-  const data = ref([]);
-  // 填报页表头
-  const columns = ref([
-    {
-      title: '日期',
-      dataIndex: 'acquisitionDate',
-      key: 'acquisitionDate',
-    },
-    {
-      title: '消耗量',
-      children: [
-        {
-          title: '数据来源',
-          dataIndex: 'dataSources',
-          key: 'dataSources',
-        },
-        {
-          title: '数值',
-          dataIndex: 'consumption',
-          key: 'consumption',
-        },
-      ],
-    },
-    {
-      title: '碳排因子',
-      children: [
-        {
-          title: '数据来源',
-          dataIndex: 'carbonSource',
-          key: 'carbonSource',
-        },
-        {
-          title: '数值',
-          dataIndex: 'emissionFactors',
-          key: 'emissionFactors',
-        },
-      ],
-    },
-    {
-      title: '排放量',
-      dataIndex: 'emissions',
-      key: 'emissions',
-      fixed: 'right',
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      key: 'action',
-      width: 80,
-      fixed: 'right',
-    },
-  ]);
-  // 获取table数据
-  const getPFYTableList = (id) => {
-    fetch(carbonInventoryCheck.getDetailsList, { inventoryId: id }).then((res) => {
-      data.value = res.data;
-    });
-  };
-  const editUnit = (data) => {
-    getDictData();
-    addTreeNodeVisible.value = true;
-
-    setTimeout(() => {
-      let selectDevice = ref([Number(data.unitId)]);
-      findParentIds(measurementUnit.value, data.unitId, selectDevice.value);
-      data.unitId = selectDevice;
-
-      let selectDeviceC = ref([Number(data.carbonEmissionUnits)]);
-      findParentIds(CarbonUnit.value, data.carbonEmissionUnits, selectDeviceC.value);
-      data.carbonEmissionUnits = selectDeviceC;
-
-      formState.value.id = data.id;
-      formState.value = data;
-    }, 500);
-  };
-  // 定义一个递归函数来查找每一级的id 设备类型回显 层级方法
-  function findParentIds(tree: any, targetId: number, result: any) {
-    for (let item of tree) {
-      if (item.children && item.children.length > 0) {
-        if (item.children.some((child: any) => child.value === targetId)) {
-          result.unshift(item.value); // 将当前节点的id添加到结果数组的最前面
-          findParentIds(tree, item.value, result); // 递归查找父级节点的id
-          break; // 找到后可以退出循环
-        }
-      }
-    }
-  }
-  // 删除排放源左侧树节点
-  const delUnit = (data) => {
-    Modal.confirm({
-      title: '警告',
-      content: '确定要删除吗?',
-      okText: '确定',
-      okType: 'primary',
-      cancelText: '取消',
-      onOk() {
-        fetch(carbonInventoryCheck.del, { id: data.id }).then((res) => {
-          message.success('操作成功！');
-          getEmissionSourceTree();
-        });
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  };
-  const onClose = () => {
-    addTreeNodeVisible.value = false;
-    formState.value = {
-      orgId: orgId.value,
-    };
-    formRef.value.resetFields();
-  };
-  // 点击凭证弹出框
-  const openVoucher = ref(false);
-  const downLoadVoucher = () => {
-    fetch(carbonInventoryCheck.voucherDownloadList, { bizType: 2 }).then((res) => {
-      voucherData.value = res.data;
-    });
-    openVoucher.value = true;
-  };
-  const selectedRowKeys = ref([]);
-  const onSelectionChange = (selectedKeys, selectedRows) => {
-    selectedRowKeys.value = selectedKeys;
-  };
-
-  const voucherData = ref([]);
-  const downLoadMore = () => {
-    const deleteIds = ref(new FormData());
-    selectedRowKeys.value.forEach((item) => {
-      deleteIds.value.append('ids', item);
-    });
-    const config = {
-      responseType: 'blob',
-    };
-    fetch(uploadPic.downloadZip, deleteIds.value, config)
-      .then((res) => {
-        // 创建一个 URL 对象，指向图片数据的 blob
-        const url = window.URL.createObjectURL(new Blob([res]));
-        // 创建一个 <a> 标签，用于触发下载
-        const link = document.createElement('a');
-        link.href = url;
-        link.setAttribute('download', '碳盘查凭证.zip'); // 设置下载的文件名
-        document.body.appendChild(link);
-        link.click();
-
-        // 清理 URL 对象
-        window.URL.revokeObjectURL(url);
-        onCloseVoucher();
-      })
-      .catch((error) => {
-        console.error('下载图片失败：', error);
-      });
-  };
-  const onCloseVoucher = () => {
-    selectedRowKeys.value = [];
-    openVoucher.value = false;
-  };
-  // 点击编辑弹出框
-  const editData = ref(false);
-  const editFormRef = ref();
-  const editFormState = ref({
-    orgId: orgId.value,
-  });
-  const newTableData = ref([]);
-  const total = ref<number>();
-  const selectedRowKeysEdit = ref([]);
-  const onSelectionChangeEdit = (selectedKeys, selectedRows) => {
-    selectedRowKeysEdit.value = selectedKeys;
-    editFormState.value.factorId = selectedKeys;
-  };
-  const queryParams = ref({
-    pageNum: 1,
-    pageSize: 10,
-    orgId: orgId.value,
-  });
-  const queryData = ref({
-    orgId: orgId.value,
-    pageNum: 1,
-    pageSize: 5,
-  });
-  const energyTypeOptions = ref([]);
-  const acquisitionDate = ref();
-  const edit = async (record) => {
-    acquisitionDate.value = record.acquisitionDate;
-    // 获取能耗类型
-    const options = await dict({ params: { dicKey: 'ENERGY_TYPE' } });
-    energyTypeOptions.value = options.data.data;
-    getNewTable();
-    editFormState.value.id = record.id;
-    editFormState.value.dataSources = record.dataSources;
-    editFormState.value.consumption = record.emissions;
-    editFormState.value.collectionNode = record.carbonSource;
-    editFormState.value.factorId = record.factorId;
-    selectedRowKeysEdit.value = [record.factorId];
-    fetch(uploadPic.select, { bizId: record.id, bizType: 2 }).then((res) => {
-      fileList.value = res.data.map((item) => ({
-        uid: item.id.toString(), // 使用文件的id作为唯一标识
-        name: item.fileName, // 文件名
-        status: 'done', // 设置默认状态为已完成
-        type: 'done',
-        url: item.filePath, // 文件的URL，这里假设用示例的URL格式
-      }));
-    });
-    editData.value = true;
-  };
-  const getNewTable = () => {
-    fetch(carbonEmissionFactorLibrary.getTableList, queryData.value).then((res) => {
-      newTableData.value = res.data.records;
-      total.value = res.data.total;
-    });
-  };
-  const searchKey = () => {
-    queryData.value.emissionSources = editFormState.value.emissionFactors;
-    getNewTable();
-  };
-  // 数据来源选择框改变
-  const canEdit = ref(false);
-  const automatic = ref(false);
-  const changeSelect = (value) => {
-    if (value === '3') {
-      canEdit.value = true;
-      automatic.value = true;
-    } else {
-      automatic.value = false;
-    }
-  };
-  // 定义采集节点数的变量
-  const collectingNodes = ref<TreeSelectProps['treeData']>([]);
-  const getTypeConsume = ref();
-  const changeEnergyType = (value) => {
-    getTypeConsume.value = value;
-    // 获取自动采集节点的数据
-    fetch(group.queryDeviceGroupTree, { energyType: value, orgId: orgId.value }).then((res) => {
-      collectingNodes.value = res.data;
-      collectingNodes.value = collectingNodes.value.map((item) => ({
-        value: item.id,
-        label: item.pointName,
-        children: item.children
-          ? item.children.map((child) => ({
-              value: child.id,
-              label: child.pointName,
-            }))
-          : [],
-      }));
-    });
-  };
-  const selectNode = (value) => {
-    const getConsumeData = ref({
-      acquisitionDate: acquisitionDate.value,
-      collectionNode: value,
-      orgId: orgId.value,
-      energyConsumptionType: getTypeConsume.value,
-    });
-    fetch(carbonInventoryCheck.nodeCancellationConsumption, getConsumeData.value).then((res) => {
-      editFormState.value.consumption = res.data;
-    });
-  };
-  // 上传附件
-  const fileList = ref<UploadProps['fileList']>([]);
-  const isValidFileName = (filename: string): boolean => {
-    const regex = /^[\s\S]+_\d{4}\.pdf$/;
-    return regex.test(filename);
-  };
-  const beforeUpload: UploadProps['beforeUpload'] = (file) => {
-    const filename = file.name;
-    if (!isValidFileName(filename)) {
-      message.error('文件名不符合规则');
-      return Upload.LIST_IGNORE; // 阻止文件上传
-    }
-    return false;
-  };
-  const handleChange = (info: UploadChangeParam) => {
-    // fileList.value = [...info.fileList];
-    const { fileList: newFileList } = info;
-    // 删除fileList中的第一条数据
-    if (newFileList.length > 1) {
-      delIds.value.push(info.fileList[0].uid);
-      newFileList.shift(); // 删除第一条数据
-    }
-
-    // 更新fileList
-    fileList.value = [...newFileList];
-  };
-  const delIds = ref([]);
-  const handleFileRemove = (file) => {
-    delIds.value.push(file.uid);
-    const newFileList = [];
-    fileList.value.forEach((item) => {
-      if (item.uid !== file.uid) {
-        newFileList.push(item);
-      }
-    });
-    fileList.value = newFileList;
-  };
-  // 数据提交;
-  const submitEditData = () => {
-    editFormRef.value
-      .validate()
-      .then(() => {
-        console.log('values', editFormState, toRaw(editFormState));
-        if (editFormState.value.factorId.length > 0) {
-          editFormState.value.factorId = editFormState.value.factorId.join(',');
-        }
-        if (editFormState.value.dataSources.value) {
-          editFormState.value.dataSources = editFormState.value.dataSources.value;
-        }
-        if (editFormState.value.collectionNode) {
-          editFormState.value.collectionNode = editFormState.value.collectionNode.value;
-        }
-        fetch(carbonInventoryCheck.updateTable, editFormState.value).then((res) => {
-          if (fileList.value.length !== 0) {
-            const formData = ref(new FormData());
-            fileList.value.forEach((file) => {
-              if (file.type !== 'done') {
-                formData.value.append('files', file.originFileObj);
-              }
-            });
-            formData.value.append('bizType', 2);
-            formData.value.append('bizId', editFormState.value.id);
-            delIds.value.forEach((item) => {
-              formData.value.append('deleteList', item);
-            });
-            fetch(uploadPic.uploadfiles, formData.value)
-              .then((res) => {
-                message.success('操作成功！');
-                editData.value = false;
-                delIds.value = [];
-                getPFYTableList(getTableId.value);
-              })
-              .catch((error) => {
-                console.log('error', error);
-              });
-          } else {
-            editData.value = false;
-            delIds.value = [];
-            getPFYTableList(getTableId.value);
-          }
-        });
-      })
-      .catch((error) => {
-        console.log('error', error);
-      });
-  };
-  const onCloseEditData = () => {
-    editData.value = false;
-    delIds.value = [];
-    editFormState.value = {
-      orgId: orgId.value,
-    };
-    selectedRowKeysEdit.value = [];
-    canEdit.value = false;
-    automatic.value = false;
-  };
-  // 分页器
-  const onChange = (pageNumber: number, size: number) => {
-    queryData.value.pageNum = pageNumber;
-    queryData.value.pageSize = size;
-    getNewTable();
-  };
-  // 点击切换排放统计/碳排流向
-  const fillInPage = ref(true);
-  const isClickedPftj = ref(false);
-  const isClickedTplx = ref(false);
-  const pftjData = ref([]);
-  const showPftj = () => {
-    fillInPage.value = false;
-    isClickedPftj.value = true;
-    isClickedTplx.value = false;
-    getEmissionStatistic();
-  };
-  const showTplx = () => {
-    fillInPage.value = false;
-    isClickedPftj.value = false;
-    isClickedTplx.value = true;
-    getCarbonFlowDirection();
-  };
-  // 获取碳排流向数据
-  const queryFlowDirection = ref({
-    orgId: orgId.value,
-    reportId: props.reportId,
-    year: props.year,
-    categoryId: categoryId.value,
-  });
-  const linksData = ref([]);
-  const datalist = ref([]);
-  const getCarbonFlowDirection = () => {
-    fetch(carbonInventoryCheck.carbonFlowDirection, queryFlowDirection.value).then((res) => {
-      console.log(res);
-      linksData.value = res.data[0];
-      datalist.value = res.data[1];
-      drawEcharts();
-    });
-  };
-  // 获取排放统计数据
-  const queryEmissionData = ref({
-    orgId: orgId.value,
-    reportId: props.reportId,
-    year: props.year,
-    categoryId: categoryId.value,
-  });
-  const tableHeader = ref([]);
-  const getEmissionStatistic = () => {
-    fetch(carbonInventoryCheck.emissionStatistic, queryEmissionData.value).then((res) => {
-      pftjData.value = res.data.body;
-      // 将数据表头数据按顺序组织
-      const orderedKeys = res.data.title.map((obj) => Object.keys(obj)[0]); // 获取原始键的顺序
-      const result: { [key: string]: string } = {};
-
-      res.data.title.forEach((obj) => {
-        const key = Object.keys(obj)[0];
-        result[key] = obj[key];
-      });
-
-      // 确保按照原始顺序返回结果
-      const orderedResult: { [key: string]: string } = {};
-      orderedKeys.forEach((key) => {
-        if (result[key] !== undefined) {
-          orderedResult[key] = result[key];
-        }
-      });
-
-      const data = orderedResult;
-      // 将数据转换为 DataItem 数组
-      tableHeader.value = [];
-      pftjColumn.value = [
-        {
-          title: '排放分类',
-          dataIndex: 'emissionClassify',
-          customCell: (record, rowIndex) => {
-            if (rowIndex == undefined) {
-              return {
-                rowSpan: 0,
-                colSpan: 0,
-              };
-            }
-            const rowSpan = getRowSpan('emissionClassify', record, pftjData.value);
-            if (
-              rowIndex != 0 &&
-              pftjData.value[rowIndex - 1].emissionClassify == record.emissionClassify
-            ) {
-              return {
-                rowSpan: 0,
-                colSpan: 0,
-              };
-            }
-            return {
-              rowSpan: rowSpan,
-            };
-          },
-        },
-        {
-          title: '运行边界',
-          dataIndex: 'operatingBoundary',
-          customCell: (record, rowIndex) => {
-            if (rowIndex == undefined) {
-              return {
-                rowSpan: 0,
-                colSpan: 0,
-              };
-            }
-            const rowSpan = getRowSpan('operatingBoundary', record, pftjData.value);
-            if (
-              rowIndex != 0 &&
-              pftjData.value[rowIndex - 1].operatingBoundary == record.operatingBoundary
-            ) {
-              return {
-                rowSpan: 0,
-                colSpan: 0,
-              };
-            }
-            return {
-              rowSpan: rowSpan,
-            };
-          },
-        },
-        {
-          title: '排放类别',
-          dataIndex: 'emissionCategory',
-        },
-        {
-          title: '排放源',
-          dataIndex: 'emissionSources',
-        },
-        {
-          title: '温室气体',
-          dataIndex: 'greenhouseGases',
-        },
-      ];
-      tableHeader.value = Object.keys(data).map((key) => ({
-        title: data[key],
-        dataIndex: key,
-      }));
-      pftjColumn.value = pftjColumn.value.concat(tableHeader.value);
-    });
-  };
-  // 排放统计表头
-  const pftjColumn = ref([]);
-  // 合并单元格
-  const getRowSpan = (dataIndex: string, record: any, data: any, dependents: string[] = []) => {
-    let rowSpan = 1;
-    for (let i = data.indexOf(record) + 1; i < data.length; i++) {
-      let shouldMerge = true;
-      for (const dependent of dependents) {
-        if (data[i][dependent] !== record[dependent]) {
-          shouldMerge = false;
-          break;
-        }
-      }
-      if (shouldMerge && data[i][dataIndex] === record[dataIndex]) {
-        rowSpan++;
-      } else {
-        break;
-      }
-    }
-    return rowSpan;
-  };
-  // 碳排流向
-  const tplxChart = ref(null);
-  let chartInstance: echarts.ECharts | null = null;
-  const drawEcharts = () => {
-    chartInstance = echarts.init(tplxChart.value);
-    let listData = datalist.value;
-    let linkDatas = linksData.value;
-    let Color = [
-      '#61FEFF',
-      '#937FE6',
-      '#2B56D3',
-      '#87E7AA',
-      '#937FE6',
-      '#FF9B97',
-      '#8f23f5',
-      '#0576ea',
-      '#2cb8cf',
-      '#8A7EE0',
-      '#2cb8cf',
-      '#4e70f0',
-      '#1fa3de',
-      '#bbc951',
-      '#FFC14B',
-      '#b785a6',
-      '#c23531',
-      '#2f4554',
-    ];
-    let Color1 = [
-      '#04E0F3',
-      '#682EFC',
-      '#35A7FE',
-      '#0DC09F',
-      '#682EFC',
-      '#ED6663',
-      '#8f23f5',
-      '#0576ea',
-      '#2cb8cf',
-      '#8A7EE0',
-      '#2cb8cf',
-      '#4e70f0',
-      '#1fa3de',
-      '#bbc951',
-      '#FFC14B',
-      '#b785a6',
-      '#c23531',
-      '#2f4554',
-    ];
-    let sourceLabel = [
-      'right',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-      'left',
-    ];
-    let itemStyleColor = [];
-    let labelSource = [];
-    for (let i = 0; i < listData.length; i++) {
-      listData[i].label = {
-        normal: {
-          position: sourceLabel[i],
-        },
-      };
-      labelSource.push(sourceLabel[i]);
-    }
-    for (let d = 0; d < listData.length; d++) {
-      listData[d].itemStyle = {
-        normal: {
-          color: {
-            type: 'linear',
-            x: 0,
-            y: 1,
-            x2: 0,
-            y2: 0,
-            colorStops: [
-              {
-                offset: 1,
-                color: Color[d], // 0% 处的颜色
-              },
-              {
-                offset: 0,
-                color: Color1[d], // 100% 处的颜色
-              },
-            ],
-            global: false, // 缺省为 false
-          },
-        },
-      };
-      itemStyleColor.push(listData[d]);
-    }
-    const option = {
-      backgroundColor: 'transparent',
-      tooltip: {
-        trigger: 'item',
-        triggerOn: 'mousemove',
-      },
-      series: [
-        {
-          type: 'sankey',
-          layout: 'none',
-          top: '4%',
-          bottom: '12%',
-          left: '20',
-          right: '20',
-          nodeGap: 15,
-          nodeWidth: 25,
-          focusNodeAdjacency: 'allEdges',
-          data: itemStyleColor,
-          links: linkDatas,
-          label: {
-            normal: {
-              color: '#fff',
-              fontSize: 14,
-              formatter: function (params) {
-                if (params.data.name == '公共平台') {
-                  let strs = params.data.name.split(''); //字符串数组
-                  let str = '';
-                  for (let i = 0, s; (s = strs[i++]); ) {
-                    //遍历字符串数组
-                    str += s;
-                    if (!(i % 1)) str += '\n'; //按需要求余
-                  }
-                  return '{white|' + str + '}';
-                } else {
-                  return params.data.name;
-                }
-              },
-              rich: {
-                white: {
-                  fontSize: 16,
-                  lineHeight: 30,
-                  padding: [0, 0, 0, -26],
-                },
-              },
-            },
-          },
-          lineStyle: {
-            normal: {
-              opacity: 0.4,
-              color: 'source',
-              curveness: 0.5,
-            },
-          },
-          itemStyle: {
-            normal: {
-              borderWidth: 1,
-              borderColor: 'transparent',
-            },
-          },
-        },
-      ],
-    };
-    chartInstance = echarts.init(tplxChart.value);
-    chartInstance.setOption(option);
-  };
-
-  const handleTabChange = (key) => {
-    console.log('Tab changed:', key);
-    // 在这里可以执行需要在页面切换时执行的逻辑
-    if (key === '2') {
-      nextTick(() => {
-        getEmissionStatistic();
-      });
-    } else if (key === '3') {
-      nextTick(() => {
-        getCarbonFlowDirection();
-      });
-    }
-  };
-  // 点击返回
-  const emit = defineEmits(['change-data']);
-  const changeParentData = () => {
-    emit('change-data', true, false);
-  };
-</script>
-
-<style lang="less" scoped>
-  .main {
-    background-color: @ns-content-bg;
-    display: flex;
-    height: 100%;
-  }
-  .left {
-    width: 300px;
-    margin-right: @ns-gap;
-    min-width: fit-content;
-    > div {
-      background-color: @white;
-    }
-
-    display: flex;
-    flex-direction: column;
-    .top {
-      position: relative;
-      height: 100%;
-      margin-bottom: 20px;
-      .ns-form-title {
-        font-weight: bold;
-        user-select: text;
-        padding: 16px;
-        margin-bottom: 16px;
-        padding-bottom: 10px;
-        border-bottom: 1px solid #e9e9e9;
-      }
-      .title {
-        text-align: left;
-        height: 32px;
-        line-height: 32px;
-        font-weight: bold;
-        user-select: text;
-        position: relative;
-        padding-left: 9px;
-      }
-      .title::before {
-        content: '';
-        position: absolute;
-        left: 0;
-        top: 50%;
-        transform: translateY(-50%);
-        height: 13px;
-        width: 3px;
-        border-radius: 1px;
-        background-color: #2778ff;
-      }
-    }
-    .bottom {
-      position: relative;
-      height: 20%;
-      .ns-form-title {
-        font-weight: bold;
-        user-select: text;
-        padding: 16px;
-        margin-bottom: 16px;
-        padding-bottom: 10px;
-        border-bottom: 1px solid #e9e9e9;
-      }
-      .title {
-        text-align: left;
-        height: 32px;
-        line-height: 32px;
-        font-weight: bold;
-        user-select: text;
-        position: relative;
-        padding-left: 9px;
-      }
-      .title::before {
-        content: '';
-        position: absolute;
-        left: 0;
-        top: 50%;
-        transform: translateY(-50%);
-        height: 13px;
-        width: 3px;
-        border-radius: 1px;
-        background-color: #2778ff;
-      }
-      .button > div {
-        height: 3vh;
-        display: flex;
-        align-items: center;
-      }
-      .pftj {
-        background: #c9e4ff;
-      }
-      .tplx {
-        background: #c9e4ff;
-      }
-    }
-  }
-  .right {
-    flex: 1;
-    min-width: 0;
-    height: 100%;
-    background-color: @white;
-    border-radius: @ns-border-radius;
-    box-shadow: @ns-content-box-shadow;
-    position: relative;
-    :deep(.ant-tabs-content-holder) {
-      padding: 20px;
-    }
-    .ns-table-title {
-      text-align: left;
-      font-size: 16px;
-      font-weight: bold;
-      user-select: text;
-      width: 92%;
-      margin-bottom: @ns-gap;
-    }
-    .mainLeft {
-      width: 19%;
-      margin-right: 1%;
-      border-right: 1px solid #f2f2f2;
-      position: relative;
-      height: 96%;
-      .treeRow {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-      .actionMore {
-        display: none;
-      }
-      :deep(.ant-tree-node-content-wrapper) {
-        &:hover {
-          .actionMore {
-            display: block;
-          }
-        }
-      }
-      .addTreeNode {
-        width: 100%;
-        padding: 16px;
-        position: absolute;
-        bottom: 0;
-      }
-    }
-    .mainRight {
-      width: 80%;
-    }
-  }
-
-  .search {
-    width: 70%;
-    height: 5vh;
-    display: flex;
-    align-items: center;
-    margin-left: 10%;
-  }
-  .treePart {
-    width: 70%;
-    height: 100%;
-    display: flex;
-    border: 1px solid #bfbfbf;
-    margin-left: 10%;
-    flex-direction: column;
-  }
-  :deep(.ant-upload.ant-upload-drag) {
-    height: 18vh;
-    margin-top: 10px;
-  }
-</style>
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 658c67b..f176d3c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -308,80 +308,82 @@
       <div class="ns-form-title-edit">
         <div class="title">编辑</div>
       </div>
-      <a-form
-        ref="editFormRef"
-        :model="editFormState"
-        :label-col="labelCol"
-        :wrapper-col="wrapperCol">
-        <a-row>
-          <a-col :span="24">
-            <a-form-item ref="name" label="数据来源" name="dataSources">
-              <a-select
-                ref="select"
-                v-model:value="editFormState.dataSources"
-                @change="changeSelect">
-                <a-select-option value="1">自行推估</a-select-option>
-                <a-select-option value="2">定期量测</a-select-option>
-                <a-select-option value="3">自动测量</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item ref="name" label="消耗量" name="consumption">
-              <ns-input-number
-                v-model:value="editFormState.consumption"
-                :maxlength="20"
-                @keydown="handleKeyDown"
-                :disabled="canEdit" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row v-if="automatic">
-          <a-col :span="24">
-            <a-form-item label="能耗类型">
-              <a-select
-                v-model:value="editFormState.energyConsumptionType"
-                @change="changeEnergyType"
-                placeholder="请选择能耗类型">
-                <a-select-option
-                  v-for="(item, index) in energyTypeOptions"
-                  :key="index"
-                  :value="item.dicKey">
-                  {{ item.cnValue }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item ref="name" label="采集节点" name="collectionNode">
-              <a-tree-select
-                v-model:value="editFormState.collectionNode"
-                :tree-line="true"
-                @select="selectNode"
-                :tree-data="collectingNodes">
-              </a-tree-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="24">
-            <a-form-item ref="name" label="因子值" name="emissionFactors">
-              <ns-input
-                v-model:value="editFormState.emissionFactors"
-                :maxlength="20"
-                @keydown="handleKeyDown" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item ref="name" label="关键字" name="key">
-              <a-input-search
-                v-model:value="editFormState.key"
-                @search="searchKey"
-                placeholder="请输入关键字" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
+      <a-spin :spinning="spinning">
+        <a-form
+          ref="editFormRef"
+          :model="editFormState"
+          :label-col="labelCol"
+          :wrapper-col="wrapperCol">
+          <a-row>
+            <a-col :span="24">
+              <a-form-item ref="name" label="数据来源" name="dataSources">
+                <a-select
+                  ref="select"
+                  v-model:value="editFormState.dataSources"
+                  @change="changeSelect">
+                  <a-select-option value="1">自行推估</a-select-option>
+                  <a-select-option value="2">定期量测</a-select-option>
+                  <a-select-option value="3">自动测量</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item ref="name" label="消耗量" name="consumption">
+                <ns-input-number
+                  v-model:value="editFormState.consumption"
+                  :maxlength="20"
+                  @keydown="handleKeyDown"
+                  :disabled="canEdit" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row v-if="automatic">
+            <a-col :span="24">
+              <a-form-item label="能耗类型">
+                <a-select
+                  v-model:value="editFormState.energyConsumptionType"
+                  @change="changeEnergyType"
+                  placeholder="请选择能耗类型">
+                  <a-select-option
+                    v-for="(item, index) in energyTypeOptions"
+                    :key="index"
+                    :value="item.dicKey">
+                    {{ item.cnValue }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item ref="name" label="采集节点" name="collectionNode">
+                <a-tree-select
+                  v-model:value="editFormState.collectionNode"
+                  :tree-line="true"
+                  @select="selectNode"
+                  :tree-data="collectingNodes">
+                </a-tree-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="24">
+              <a-form-item ref="name" label="因子值" name="emissionFactors">
+                <ns-input
+                  v-model:value="editFormState.emissionFactors"
+                  :maxlength="20"
+                  @keydown="handleKeyDown" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item ref="name" label="关键字" name="key">
+                <a-input-search
+                  v-model:value="editFormState.key"
+                  @search="searchKey"
+                  placeholder="请输入关键字" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </a-spin>
       <div class="ns-form-title-edit" style="display: flex">
         <div class="titleEdit">因子列表</div>
       </div>
@@ -1121,19 +1123,21 @@
     // 获取自动采集节点的数据
     fetch(group.queryDeviceGroupTree, { energyType: value, orgId: orgId.value }).then((res) => {
       collectingNodes.value = res.data;
-      collectingNodes.value = collectingNodes.value.map((item) => ({
-        value: item.id,
-        label: item.pointName,
-        children: item.children
-          ? item.children.map((child) => ({
-              value: child.id,
-              label: child.pointName,
-            }))
-          : [],
-      }));
+      collectingNodes.value = collectingNodes.value = transformData(collectingNodes.value);
     });
   };
+  // 将数据转换为树形结构
+  const transformData = (data: any[]) => {
+    return data.map((item) => ({
+      title: item.pointName,
+      value: item.id,
+      key: item.id,
+      children: item.children ? transformData(item.children) : [],
+    }));
+  };
+  const spinning = ref(false);
   const selectNode = (value) => {
+    spinning.value = true;
     const getConsumeData = ref({
       acquisitionDate: acquisitionDate.value,
       collectionNode: value,
@@ -1142,6 +1146,7 @@
     });
     fetch(carbonInventoryCheck.nodeCancellationConsumption, getConsumeData.value).then((res) => {
       editFormState.value.consumption = res.data;
+      spinning.value = false;
     });
   };
   // 上传附件
@@ -1696,6 +1701,13 @@
         background: #c9e4ff;
       }
     }
+    :deep(.ant-empty) {
+      height: 80%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+    }
   }
   .right {
     flex: 1;
@@ -1811,4 +1823,11 @@
     display: flex;
     justify-content: right;
   }
+  :deep(.ant-empty) {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+  }
 </style>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index 7f24ef6..e3cb0f7 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -39,7 +39,11 @@
             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-date-picker
+            v-model:value="formState.reportYear"
+            @openChange="openChange"
+            picker="year"
+            valueFormat="YYYY" />
         </a-form-item>
         <a-form-item ref="name" label="适用标准" name="genericStandard">
           <a-input
@@ -60,6 +64,7 @@
         <a-form-item ref="name" label="报告范围" name="reportScope">
           <a-range-picker
             v-model:value="formState.reportScope"
+            :defaultPickerValue="defaultPickerValue"
             picker="month"
             :disabledDate="disabledDate"
             valueFormat="YYYY-MM" />
@@ -78,6 +83,8 @@
   import { http } from '/nerv-lib/util/http';
   import { carbonInventoryCheck } from '/@/api/carbonEmissionFactorLibrary';
   import fillIn from './fillInPage/index.vue';
+  import { message } from 'ant-design-vue';
+  import dayjs, { Dayjs } from 'dayjs';
   defineOptions({ name: 'CarbonInventoryCheck' });
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
@@ -104,6 +111,17 @@
   const selectChange = (value) => {
     formState.value.reportScope = '';
   };
+  const defaultPickerValue = ref([
+    dayjs('2020'), // 默认开始日期
+    dayjs('2020'), // 默认结束日期
+  ]);
+  const openChange = (status) => {
+    if (status === false) {
+      if (formState.value.reportYear) {
+        defaultPickerValue.value = [dayjs('2022'), dayjs('2022')];
+      }
+    }
+  };
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     reportName: [{ required: true, message: '请输入报告名称', trigger: 'change' }],
@@ -241,17 +259,21 @@
             };
             fetch(carbonInventoryCheck.downloadZip, deleteId.value, config)
               .then((res) => {
-                // 创建一个 URL 对象，指向图片数据的 blob
-                const url = window.URL.createObjectURL(new Blob([res]));
-                // 创建一个 <a> 标签，用于触发下载
-                const link = document.createElement('a');
-                link.href = url;
-                link.setAttribute('download', '碳盘查凭证.zip'); // 设置下载的文件名
-                document.body.appendChild(link);
-                link.click();
+                if (res.type === 'application/json') {
+                  handlerResponseError(res);
+                } else {
+                  // 创建一个 URL 对象，指向图片数据的 blob
+                  const url = window.URL.createObjectURL(new Blob([res]));
+                  // 创建一个 <a> 标签，用于触发下载
+                  const link = document.createElement('a');
+                  link.href = url;
+                  link.setAttribute('download', '碳盘查凭证.zip'); // 设置下载的文件名
+                  document.body.appendChild(link);
+                  link.click();
 
-                // 清理 URL 对象
-                window.URL.revokeObjectURL(url);
+                  // 清理 URL 对象
+                  window.URL.revokeObjectURL(url);
+                }
               })
               .catch((error) => {
                 console.error('下载图片失败：', error);
@@ -295,6 +317,21 @@
     },
     rowKey: 'id',
   });
+  const handlerResponseError = (data) => {
+    const fileReader = new FileReader();
+    fileReader.onload = function () {
+      try {
+        const jsonData = JSON.parse(fileReader.result); // 说明是普通对象数据，后台转换失败
+        console.log('后台返回的信息', jsonData.data);
+        message.warning(jsonData.data);
+        // dosomething……
+      } catch (err) {
+        // 解析成对象失败，说明是正常的文件流
+        console.log('success...');
+      }
+    };
+    fileReader.readAsText(data);
+  };
   // 填报页点击返回
   const updateData = (newDataOne, newDataTwo) => {
     isMainPage.value = newDataOne;
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 4b15713..f07ea0c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
@@ -360,6 +360,9 @@
     background: #f2f2f2 !important;
     color: black !important;
   }
+  :deep(.ant-picker) {
+    border-radius: unset;
+  }
   .month {
     width: 50%;
     display: flex;
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 2ec3dde..8e39645 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
@@ -96,28 +96,32 @@
               </span>
             </template>
           </template>
-          <!-- <template #summary>
+          <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 :colSpan="2">合计</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-typography-text>{{ totalLastYearActualUsage + unit }}</a-typography-text>
               </a-table-summary-cell>
               <a-table-summary-cell>
-                <a-typography-text>{{ 222 }}</a-typography-text>
+                <a-typography-text>{{ totalActualUsage + unit }}</a-typography-text>
               </a-table-summary-cell>
               <a-table-summary-cell>
-                <a-typography-text>{{ 222 }}</a-typography-text>
+                <a-typography-text>{{ totalReferenceValue + unit }}</a-typography-text>
+              </a-table-summary-cell>
+              <a-table-summary-cell>
+                <a-typography-text>-</a-typography-text>
+              </a-table-summary-cell>
+              <a-table-summary-cell>
+                <a-typography-text>-</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-typography-text>{{ totalBudget + unit }}</a-typography-text>
               </a-table-summary-cell>
               <a-table-summary-cell></a-table-summary-cell>
             </a-table-summary-row>
-          </template> -->
+          </template>
         </a-table>
       </a-card>
     </div>
@@ -135,16 +139,16 @@
             v-model:value="formState.conversionRate"
             :maxlength="15"
             @keydown="handleKeyDown"
-            suffix="%"
             :disabled="disabled" />
+          <span class="unit">%</span>
         </a-form-item>
         <a-form-item label="预算值" :required="true">
           <a-input-number
             v-model:value="formState.budget"
             :maxlength="15"
             @keydown="handleKeyDown"
-            suffix="kWh"
             :disabled="!disabled" />
+          <span class="unit">kWh</span>
         </a-form-item>
       </a-form>
     </a-modal>
@@ -247,6 +251,7 @@
     QuestionCircleOutlined,
   } from '@ant-design/icons-vue';
   import { carbonPlanning } from '/@/api/carbonEmissionFactorLibrary';
+  import { getEnumEnergy } from '/@/api';
   import * as echarts from 'echarts';
   import { any, string } from 'vue-types';
   import type { Dayjs } from 'dayjs';
@@ -265,8 +270,10 @@
     nodeName: {
       type: string,
     },
+    resourceType: {
+      type: string,
+    },
   });
-  console.log(props, 'xxy');
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   orgId.value = result;
@@ -291,11 +298,29 @@
     itemizeId: props.parentId,
     type: props.type,
   });
+  console.log(props.type, '6666');
   const ids = ref([]);
+  const lastActualUsageList = ref([]);
+  // 获取单位
+  const unit = ref();
+  const totalActualUsage = ref();
+  const totalBudget = ref();
+  const totalLastYearActualUsage = ref();
+  const totalReferenceValue = ref();
   const getTableData = () => {
-    fetch(carbonPlanning.detailedStatisticalDataTable, queryParams.value).then((res) => {
-      data.value = res.data;
-      ids.value = data.value.map((item) => item.id);
+    fetch(carbonPlanning.detailedStatisticalDataTable, queryParams.value).then(async (res) => {
+      let resUnit = await getEnumEnergy({ params: { code: props.resourceType } });
+      unit.value = resUnit.data.unit;
+      data.value = res.data.list;
+      totalActualUsage.value = res.data.actualUsage;
+      totalBudget.value = res.data.budget;
+      totalLastYearActualUsage.value = res.data.lastYearActualUsage;
+      totalReferenceValue.value = res.data.referenceValue;
+      if (data.value.length > 0) {
+        ids.value = data.value.map((item) => item.id);
+        lastActualUsageList.value = data.value.map((item) => item.lastYearActualUsage);
+        formState.value.lastYearList = lastActualUsageList.value;
+      }
     });
   };
   getTableData();
@@ -313,14 +338,17 @@
     {
       title: Number(props.year) - 1 + '年实际用量',
       dataIndex: 'lastYearActualUsage',
+      customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: props.year + '年实际用量',
       dataIndex: 'actualUsage',
+      customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '基准值',
       dataIndex: 'referenceValue',
+      customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '是否按去年折算',
@@ -329,10 +357,12 @@
     {
       title: '折算率',
       dataIndex: 'conversionRate',
+      customRender: ({ text }: { text: number }) => `${text}%`, // 在这里添加单位
     },
     {
       title: '2024年预算',
       dataIndex: 'budget',
+      customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
     },
     {
       title: '操作',
@@ -346,10 +376,10 @@
   const formRef = ref();
   const formState = ref({});
   const labelCol = { span: 6 };
-  const wrapperCol = { span: 18 };
+  const wrapperCol = { span: 17 };
   const editData = (record) => {
     open.value = true;
-    if (record.isLastYear) {
+    if (record.isLastYear !== undefined) {
       formState.value.ids = [record.id];
       if (record.lastYear === '是') {
         formState.value.isLastYear = 1;
@@ -357,6 +387,7 @@
         formState.value.isLastYear = 0;
       }
       formState.value.conversionRate = record.conversionRate;
+      formState.value.lastYearList = [record.lastYearActualUsage];
       formState.value.budget = record.budget;
     }
   };
@@ -593,7 +624,7 @@
           '基准值',
         ],
         top: '0',
-        left: '0',
+        right: '0',
         textStyle: {
           color: '#666',
           fontSize: 12,
@@ -650,6 +681,30 @@
       ],
       series: [
         {
+          name: props.year + '年预算',
+          type: 'line',
+          // smooth: true, // 开启平滑曲线
+          symbol: 'emptyCircle', //标记的图形为实心圆
+          itemStyle: {
+            normal: {
+              color: 'rgba(255, 188, 70, 1)',
+            },
+          },
+          data: budgetList.value,
+        },
+        {
+          name: '基准值',
+          type: 'line',
+          // smooth: true, // 开启平滑曲线
+          symbol: 'emptyCircle', //标记的图形为实心圆
+          itemStyle: {
+            normal: {
+              color: 'rgba(195, 142, 255, 1)',
+            },
+          },
+          data: referenceValueList.value,
+        },
+        {
           name: Number(props.year) - 1 + '年实际用量',
           type: 'bar',
           barWidth: 18,
@@ -707,28 +762,6 @@
           },
           data: actualUsageList.value,
         },
-        {
-          name: props.year + '年预算',
-          type: 'line',
-          smooth: true, // 开启平滑曲线
-          symbol: 'none', //标记的图形为实心圆
-          lineStyle: {
-            color: 'rgba(255, 188, 70, 1)',
-            width: 2,
-          },
-          data: budgetList.value,
-        },
-        {
-          name: '基准值',
-          type: 'line',
-          smooth: true, // 开启平滑曲线
-          symbol: 'none', //标记的图形为实心圆
-          lineStyle: {
-            color: 'rgba(195, 142, 255, 1)',
-            width: 2,
-          },
-          data: referenceValueList.value,
-        },
       ],
     };
     chartInstance = echarts.init(chartRef.value);
@@ -827,8 +860,8 @@
         background: #f7f9ff;
         padding: 12px;
         border-radius: 12px;
-        background: linear-gradient(180deg, rgba(255, 255, 255, 1) 0%, rgba(222, 255, 246, 1) 100%);
-        border: 1px solid rgba(18, 174, 132, 1);
+        background: linear-gradient(180deg, #ffffff 0%, #defff663 100%);
+        border: 1px solid #12ae8424;
         .quantity {
           font-size: 12px;
           font-weight: 400;
@@ -900,6 +933,11 @@
     ) {
     display: none !important;
   }
+  .unit {
+    position: absolute;
+    right: 10px;
+    top: 5px;
+  }
 </style>
 <style scoped>
   .editable-row-operations a {
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 aad1da3..ec75aca 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
@@ -69,7 +69,8 @@
       :parentId="parentId"
       :year="year"
       :type="type"
-      :nodeName="nodeName" />
+      :nodeName="nodeName"
+      :resourceType="resourceType" />
   </div>
   <!-- 新增节点 -->
   <a-drawer :visible="visible" :width="500" @close="onClose" :footer-style="{ textAlign: 'right' }">
@@ -81,6 +82,7 @@
       :selectedKeys="selectedKeys"
       :checkedKeys="treeCheckedKeys"
       :tree-data="treeData"
+      :checkStrictly="true"
       :show-line="{ showLeafIcon: false }"
       v-if="treeData && treeData.length > 0"
       class="draggable-tree"
@@ -110,6 +112,7 @@
   import categoryDeatil from './categoryDeatil.vue';
   import { group } from '/@/api/deviceManage';
   import { carbonPlanning } from '/@/api/carbonEmissionFactorLibrary';
+  import { getEnumEnergy } from '/@/api';
   import type { TreeProps } from 'ant-design-vue';
   import 'echarts-liquidfill';
   defineOptions({
@@ -124,8 +127,6 @@
       type: String,
     },
   });
-  console.log(props, 'xxy');
-
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   orgId.value = result;
@@ -155,6 +156,9 @@
     selectedTime.value = false;
     getMonthData();
     getBallQuery.value.yearAndMonth = 'month';
+    getBallQuery.value.itemizeIds = [];
+    getBallQuery.value.itemizeId = '';
+    getPillarQuery.value.itemizeId = '';
     // getMonthPillarData();
   };
   const changeToYear = () => {
@@ -167,6 +171,9 @@
     selectedTime.value = true;
     getYearData();
     getBallQuery.value.yearAndMonth = 'year';
+    getBallQuery.value.itemizeIds = [];
+    getBallQuery.value.itemizeId = '';
+    getPillarQuery.value.itemizeId = '';
     // getYearPillarData();
   };
   // echarts图
@@ -299,8 +306,8 @@
           symbolSize: [14, 4],
           symbolMargin: 0.5,
           symbolPosition: 'start',
-          z: -20,
           data: actualUsage.value,
+          barGap: '5%',
           label: {
             normal: {
               show: false,
@@ -320,8 +327,8 @@
           symbolSize: [14, 4],
           symbolMargin: 0.5,
           symbolPosition: 'start',
-          z: -20,
           data: budget.value,
+          barGap: '5%',
           label: {
             normal: {
               show: false,
@@ -339,7 +346,8 @@
             color: '#f4664a',
             width: 2,
           },
-          data: referenceValue.value,
+          // data: referenceValue.value,
+          data: [600],
         },
       ],
     };
@@ -386,7 +394,7 @@
             textStyle: {
               color: !selectedTime.value ? 'rgba(68, 197, 253,1)' : 'rgba(12, 168, 126, 1)',
               insideColor: '#12786f',
-              fontSize: 40,
+              fontSize: Number(ballData) > 1000 ? 20 : 40,
             },
             formatter: (params) => {
               // return `${(params.value * 100).toFixed(2)}%`;
@@ -431,7 +439,7 @@
   const selectedKeys = ref<string[]>([]);
   const treeCheckedKeys = ref<string[]>([]);
   const checkTreeNode = (checkedKeys, info) => {
-    treeCheckedKeys.value = checkedKeys;
+    treeCheckedKeys.value = checkedKeys.checked;
     addTreeNode.value.itemizeIds = treeCheckedKeys.value;
   };
   const formatTreeData = (treeData) => {
@@ -450,7 +458,9 @@
     year: selectYearValue.value.format('YYYY'),
   });
   const onSubmit = () => {
-    fetch(carbonPlanning.addNodes, addTreeNode.value).then((res) => {
+    fetch(carbonPlanning.addNodes, addTreeNode.value).then(async (res) => {
+      let resUnit = await getEnumEnergy({ params: { code: props.energyType } });
+      unit.value = resUnit.data.unit;
       data.value = res.data;
       visible.value = false;
       changeToYear();
@@ -459,49 +469,6 @@
   const onClose = () => {
     visible.value = false;
   };
-  // 表格
-  const columns = ref([
-    {
-      title: '序号',
-      customRender: (text: any) => {
-        return text.index + 1;
-      },
-    },
-    {
-      title: '分项名称',
-      dataIndex: 'itemizeName',
-    },
-    {
-      title: '年份',
-      dataIndex: 'year',
-    },
-    {
-      title: '实际用量',
-      dataIndex: 'actualUsage',
-    },
-    {
-      title: '预算量',
-      dataIndex: 'budget',
-    },
-    {
-      title: '基准值',
-      dataIndex: 'referenceValue',
-    },
-    {
-      title: '节能量',
-      dataIndex: 'energyConservation',
-    },
-    {
-      title: '预算达成率',
-      dataIndex: 'budgetAchievement',
-    },
-    {
-      title: '操作',
-      key: 'action',
-    },
-  ]);
-
-  const data = ref([]);
   // 获取年数据
   const yearQueryParams = ref({
     orgId: orgId.value,
@@ -515,8 +482,13 @@
     addTreeNode.value.year = selectYearValue.value;
     getYearData();
   };
+  // 获取单位
+  const unit = ref();
   const getYearData = () => {
-    fetch(carbonPlanning.searchListByYear, yearQueryParams.value).then((res) => {
+    treeCheckedKeys.value = [];
+    fetch(carbonPlanning.searchListByYear, yearQueryParams.value).then(async (res) => {
+      let resUnit = await getEnumEnergy({ params: { code: props.energyType } });
+      unit.value = resUnit.data.unit;
       data.value = res.data;
       res.data.forEach((item) => {
         treeCheckedKeys.value.push(item.itemizeId.toString());
@@ -540,7 +512,9 @@
     getMonthData();
   };
   const getMonthData = () => {
-    fetch(carbonPlanning.searchListByMonth, monthQueryParams.value).then((res) => {
+    fetch(carbonPlanning.searchListByMonth, monthQueryParams.value).then(async (res) => {
+      let resUnit = await getEnumEnergy({ params: { code: props.energyType } });
+      unit.value = resUnit.data.unit;
       data.value = res.data;
       getMonthPillarData();
     });
@@ -553,17 +527,68 @@
   const year = ref(selectYearValue.value.format('YYYY'));
   const type = ref();
   const nodeName = ref();
+  const resourceType = ref();
   const detailData = (record) => {
     electricTotal.value = false;
     parentId.value = record.itemizeId;
     type.value = props.tabId;
     nodeName.value = record.itemizeName;
+    resourceType.value = props.energyType;
   };
+  // 表格
+  const columns = ref([
+    {
+      title: '序号',
+      customRender: (text: any) => {
+        return text.index + 1;
+      },
+    },
+    {
+      title: '分项名称',
+      dataIndex: 'itemizeName',
+    },
+    {
+      title: '年份',
+      dataIndex: 'year',
+    },
+    {
+      title: '实际用量',
+      dataIndex: 'actualUsage',
+      customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
+    },
+    {
+      title: '预算量',
+      dataIndex: 'budget',
+      customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
+    },
+    {
+      title: '基准值',
+      dataIndex: 'referenceValue',
+      customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
+    },
+    {
+      title: '节能量',
+      dataIndex: 'energyConservation',
+      customRender: ({ text }: { text: number }) => `${text ? text + unit.value : 0 + unit.value}`, // 在这里添加单位
+    },
+    {
+      title: '预算达成率',
+      dataIndex: 'budgetAchievement',
+    },
+    {
+      title: '操作',
+      key: 'action',
+    },
+  ]);
+
+  const data = ref([]);
   const customRow = (record) => {
     return {
       //点击 行 进行查看详情
       onClick: (event) => {
+        getPillarQuery.value.itemizeIds = [record.itemizeId];
         getPillarQuery.value.itemizeId = record.itemizeId;
+        getBallQuery.value.itemizeIds = [record.itemizeId];
         getBallQuery.value.itemizeId = record.itemizeId;
         if (selectedTime.value) {
           getYearPillarData();
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
index 5e6b40b..19b84dd 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
@@ -70,7 +70,7 @@
       });
     } else if (key === '4') {
       tabId.value = 6;
-      energyType.value = 'gongshuiliang';
+      energyType.value = 'GAS_USAGE';
       nextTick(() => {
         if (provideWaterRef.value) {
           provideWaterRef.value.electricTotal = true;
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
index fccad2a..0fb7d5d 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
@@ -161,7 +161,7 @@
       .get(planManage.getTableData, {
         projectId: state.projectId,
         siteId: state.siteId,
-        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
+        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水)
         ctrlType: 2,
       })
       .then((res) => {
@@ -235,7 +235,7 @@
       .get(planManage.getTransData, {
         projectId: state.projectId,
         siteId: state.siteId,
-        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
+        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水)
         ctrlType: 2,
       })
       .then((res) => {
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue
index 85ed84f..d84c549 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue
@@ -11,6 +11,7 @@
               class="box-center-button"
               :style="{
                 backgroundColor: item.title === selectConditioning.title ? '#a7e5ff' : '#b5cdd9',
+                color: item.title === selectConditioning.title ? 'rgb(0, 61, 90)' : '#fff',
               }"
               @click="selectConditioningData(item, index)">
               {{ item.title }}
@@ -28,6 +29,7 @@
               class="box-center-button"
               :style="{
                 backgroundColor: item.title === selectConditioning.title ? '#a7e5ff' : '#b5cdd9',
+                color: item.title === selectConditioning.title ? 'rgb(0, 61, 90)' : '#fff',
               }"
               @click="selectConditioningData(item, index)">
               {{ item.title }}
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts
index b74337e..52fb605 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/devicePosition.ts
@@ -19,7 +19,13 @@ export const newTrendPosition = [
 //空调箱
 export const airConditioningPosition = [
   {
-    styleText: { left: '13%', bottom: '30%', width: '120px', color: 'rgba(165, 209, 123, 0.5)' },
+    styleText: {
+      left: '13%',
+      bottom: '30%',
+      width: '120px',
+      color: 'rgba(96, 241, 125, 0.2)',
+      border: '1px solid rgba(96, 241, 125, 1)',
+    },
     lineType: 1,
   },
   {
@@ -28,7 +34,8 @@ export const airConditioningPosition = [
       bottom: '38%',
       mLeft: '120px',
       width: '100px',
-      color: 'rgba(217, 223, 179, 0.5)',
+      color: 'rgba(249, 214, 76, 0.2)',
+      border: '1px solid rgba(249, 214, 76, 1)',
     },
     lineType: 1,
   },
@@ -37,17 +44,44 @@ export const airConditioningPosition = [
       left: '41%',
       bottom: '55.5%',
       width: '300px',
-      height: '150px',
-      color: 'rgba(168, 226, 233, 0.5)',
+      height: '160px',
+      color: 'rgba(38, 255, 255, 0.2)',
+      border: '1px solid rgba(38, 255, 255, 1)',
+    },
+    lineType: 1,
+  },
+  {
+    styleText: {
+      left: '60%',
+      bottom: '63%',
+      width: '315px',
+      height: '180px',
+      color: 'rgba(255, 118, 54, 0.2)',
+      border: '1px solid rgba(255, 118, 54, 1)',
+    },
+    lineType: 1,
+  },
+  {
+    styleText: {
+      left: '76%',
+      bottom: '63%',
+      width: '90px',
+      color: 'rgba(92, 77, 245, 0.2)',
+      border: '1px solid rgba(92, 77, 245, 1)',
     },
     lineType: 1,
   },
-  { styleText: { left: '60%', bottom: '63%' }, lineType: 1 },
-  { styleText: { left: '76%', bottom: '63%' }, lineType: 1 },
   {
     styleText: {
       left: '71%',
       bottom: '48%',
+      width: '315px',
+      height: '120px',
+      color: 'rgba(103, 255, 0, 0.2)',
+      border: '1px solid rgba(103, 255, 0, 1)',
+      position: 'absolute',
+      top: '185px',
+      abLeft: '650px',
     },
     lineType: '',
   },
@@ -57,8 +91,11 @@ export const airConditioningPosition = [
       bottom: '32%',
       width: '300px',
       height: '150px',
-      mTop: '150px',
-      color: 'rgba(168, 226, 233, 0.5)',
+      color: 'rgba(155, 216, 224, 0.2)',
+      border: '1px solid rgba(155, 216, 224, 1)',
+      position: 'absolute',
+      top: '163px',
+      abLeft: '343px',
     },
     lineType: '',
   },
@@ -70,7 +107,8 @@ export const floorHeatingPosition = [
       left: '13.4%',
       bottom: '44%',
       width: '120px',
-      color: 'rgba(242, 209, 156, 0.5)',
+      color: 'rgba(242, 209, 156, 0.2)',
+      border: '1px solid rgba(242, 209, 156, 1)',
     },
     lineType: '',
   },
@@ -79,7 +117,8 @@ export const floorHeatingPosition = [
       left: '21%',
       bottom: '48%',
       width: '115px',
-      color: 'rgba(224, 244, 102,0.5)',
+      color: 'rgba(224, 244, 102, 0.2)',
+      border: '1px solid rgba(224, 244, 102, 1)',
     },
     lineType: 1,
   },
@@ -88,7 +127,8 @@ export const floorHeatingPosition = [
       left: '34.5%',
       bottom: '53.5%',
       width: '355px',
-      color: 'rgba(167, 128, 244, 0.5)',
+      color: 'rgba(167, 128, 244, 0.2)',
+      border: '1px solid rgba(167, 128, 244, 1)',
     },
     lineType: 1,
   },
@@ -97,7 +137,8 @@ export const floorHeatingPosition = [
       left: '47.5%',
       bottom: '60.3%',
       width: '90px',
-      color: 'rgba(155, 216, 224, 0.5)',
+      color: 'rgba(155, 216, 224, 0.2)',
+      border: '1px solid rgba(155, 216, 224, 1)',
     },
     lineType: 1,
   },
@@ -106,7 +147,8 @@ export const floorHeatingPosition = [
       left: '60.5%',
       bottom: '65.5%',
       width: '350px',
-      color: 'rgba(222, 111, 141, 0.5)',
+      color: 'rgba(222, 111, 141, 0.2)',
+      border: '1px solid rgba(222, 111, 141, 1)',
     },
     lineType: 1,
   },
@@ -115,7 +157,8 @@ export const floorHeatingPosition = [
       left: '73%',
       bottom: '72%',
       width: '140px',
-      color: 'rgba(152, 190, 162, 0.5)',
+      color: 'rgba(152, 190, 162, 0.2)',
+      border: '1px solid rgba(152, 190, 162, 1)',
     },
     lineType: 1,
   },
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
index 5ab571a..0ae891a 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
@@ -18,7 +18,7 @@
     </div>
     <div class="map-box">
       <!-- 温度 -->
-      <div v-if="selectIndex === 1">
+      <div v-if="selectIndex === 0">
         <template v-for="(item, index) in sensorData" :key="index">
           <div
             style="position: absolute"
@@ -76,7 +76,7 @@
         <newTrendModel :dataSource="newTrend" />
       </a-drawer>
       <!-- 空调箱 -->
-      <div v-if="selectIndex === 0">
+      <div v-if="selectIndex === 3">
         <template v-for="(item, index) in conditioningData" :key="index">
           <div
             style="position: absolute; z-index: 2"
@@ -116,7 +116,7 @@
           ref="conditioningModels"
           @selectConditioningData="selectConditioningData" />
       </a-drawer>
-      <div v-if="selectIndex === 0" class="area">
+      <div v-if="selectIndex === 3" class="area-air">
         <div
           v-for="(item, index) in airConditioningPosition"
           :key="index"
@@ -126,7 +126,10 @@
             height: item.styleText.height,
             background: item.styleText.color,
             marginLeft: item.styleText.mLeft,
-            marginTop: item.styleText.mTop,
+            position: item.styleText.position,
+            top: item.styleText.top,
+            left: item.styleText.abLeft,
+            border: item.styleText.border,
           }">
         </div>
       </div>
@@ -165,12 +168,16 @@
             src="../image/airConditioningSystem/floorHeatingIcon.png" />
         </template>
       </div>
-      <div v-if="selectIndex === 4" class="area">
+      <div v-if="selectIndex === 4" class="area-air">
         <div
           v-for="(item, index) in floorHeatingData"
           :key="index"
           style="display: flex"
-          :style="{ width: item.styleText.width, background: item.styleText.color }">
+          :style="{
+            width: item.styleText.width,
+            background: item.styleText.color,
+            border: item.styleText.border,
+          }">
         </div>
       </div>
       <!-- 地暖详情 -->
@@ -223,8 +230,6 @@
   } from './devicePosition';
   // 全局变量
   const state = items();
-  onMounted(() => {});
-  onUnmounted(() => {});
   //图例
   const legend = ref([
     { url: temperature, name: '温度' },
@@ -240,105 +245,9 @@
   //人流
   const peopleData = ref([]);
   //新风主机
-  const newTrend = ref([
-    {
-      title: 'D区新风主机',
-      styleText: { left: '43%', bottom: '44%' },
-      type: '新风主机',
-      unit: '℃',
-      number: 10,
-      url: freshAir,
-    },
-    {
-      title: 'C区新风主机',
-      styleText: { left: '45%', bottom: '23%' },
-      type: '新风主机',
-      number: 20,
-      unit: '℃',
-    },
-    {
-      title: 'B区新风主机',
-      styleText: { left: '61.5%', bottom: '54%' },
-      type: '新风主机',
-      unit: '℃',
-      number: 20,
-      url: freshAir,
-    },
-    {
-      title: 'A区新风主机',
-      styleText: { left: '63%', bottom: '36%' },
-      type: '新风主机',
-      number: 30,
-      unit: '℃',
-    },
-  ]);
+  const newTrend = ref([]);
   //空调箱
-  const conditioningData = ref([
-    {
-      title: '走廊区',
-      styleText: { left: '13%', bottom: '23%' },
-      type: '空调箱',
-      lineType: 1,
-      enableRules: 1,
-      unit: '℃',
-      number: 20,
-      url: freshAir,
-    },
-    {
-      title: '西区',
-      styleText: { left: '28%', bottom: '28%' },
-      type: '空调箱',
-      lineType: 1,
-      unit: '℃',
-      number: 34,
-      url: freshAir,
-    },
-    {
-      title: '西北区',
-      styleText: { left: '38%', bottom: '45.5%' },
-      type: '空调箱',
-      lineType: 1,
-      unit: '℃',
-      number: 34,
-      url: freshAir,
-    },
-    {
-      title: '东北区',
-      styleText: { left: '57%', bottom: '53%' },
-      lineType: 1,
-      type: '空调箱',
-      unit: '℃',
-      number: 34,
-      url: freshAir,
-    },
-    {
-      title: '东区',
-      styleText: { left: '73%', bottom: '53%' },
-      lineType: 1,
-      type: '空调箱',
-      unit: '℃',
-      number: 34,
-      url: freshAir,
-    },
-    {
-      title: '东南区',
-      styleText: { left: '68%', bottom: '38%' },
-      lineType: 2,
-      type: '空调箱',
-      unit: '℃',
-      number: 15,
-      url: freshAir,
-    },
-    {
-      title: '西南区',
-      styleText: { left: '43.5%', bottom: '22%' },
-      lineType: 2,
-      type: '空调箱',
-      unit: '℃',
-      number: 15,
-      url: freshAir,
-    },
-  ]);
+  const conditioningData = ref([]);
   const conditioningModels = ref(null);
   //选择的空调箱
   const selectConditioning = ref({});
@@ -350,61 +259,7 @@
     }, 100);
   };
   // 地暖
-  const floorHeatingData = ref([
-    {
-      title: '走廊西地暖',
-      styleText: { left: '13.5%', bottom: '34%' },
-      type: '地暖',
-      unit: '℃',
-      number: 10,
-      setUpNumber: 12,
-    },
-    {
-      title: '站厅西地暖',
-      styleText: { left: '19.5%', bottom: '38.5%' },
-      type: '地暖',
-      lineType: 1,
-      unit: '℃',
-      number: 10,
-      setUpNumber: 14,
-    },
-    {
-      title: '站厅西地暖',
-      styleText: { left: '33%', bottom: '43%' },
-      type: '地暖',
-      lineType: 1,
-      unit: '℃',
-      number: 24,
-      setUpNumber: 16,
-    },
-    {
-      title: '安检区地暖',
-      styleText: { left: '46%', bottom: '49.5%' },
-      type: '地暖',
-      lineType: 1,
-      unit: '℃',
-      number: 40,
-      setUpNumber: 18,
-    },
-    {
-      title: '站厅东地暖',
-      styleText: { left: '57.5%', bottom: '56%' },
-      type: '地暖',
-      lineType: 1,
-      unit: '℃',
-      number: 10,
-      setUpNumber: 20,
-    },
-    {
-      title: '办公东地暖',
-      styleText: { left: '69.5%', bottom: '62%' },
-      type: '地暖',
-      lineType: 1,
-      unit: '℃',
-      number: 10,
-      setUpNumber: 22,
-    },
-  ]);
+  const floorHeatingData = ref([]);
   // 选择的图例
   const selectIndex = ref(0);
   const selectLegend = (item: any, index: any) => {
@@ -567,7 +422,7 @@
     clearInterval(intervalId);
   });
 </script>
-<style lang="less" scoped>
+<style lang="less">
   .legend-box {
     width: 80px;
     height: 100%;
@@ -619,7 +474,7 @@
     perspective-origin: 900px 43px;
   }
 
-  .map-box .area {
+  .map-box .area-air {
     position: absolute;
     bottom: 230px;
     left: 250px;
diff --git a/hx-ai-intelligent/src/view/equipmentControl/coldAndHeatSources/index.vue b/hx-ai-intelligent/src/view/equipmentControl/coldAndHeatSources/index.vue
new file mode 100644
index 0000000..8d03c79
--- /dev/null
+++ b/hx-ai-intelligent/src/view/equipmentControl/coldAndHeatSources/index.vue
@@ -0,0 +1,966 @@
+<template>
+  <div class="box-cold">
+    <!-- 空气源热泵 -->
+    <template v-for="(item, index) in airSourceThermalCollapse" :key="index">
+      <div
+        style="
+          width: 135px;
+          height: 200px;
+          position: relative;
+          font-size: 12px;
+          position: absolute;
+          color: #ffff80;
+          z-index: 2;
+        "
+        :style="{ left: item.style.mLeft, bottom: item.style.mBottom }">
+        <div style="width: 100%; height: 20px; color: rgb(128, 255, 255)">
+          {{ item.deviceInfoName }}
+        </div>
+        <div style="width: 100%; height: 20px">
+          模式: <span style="color: #fff">{{ item.type }}</span>
+        </div>
+        <div style="width: 100%; height: 20px">
+          设定温度: <span style="color: #fff">{{ item.number }}</span>
+        </div>
+        <img
+          style="position: absolute; width: 135px; height: 130px; left: -20px; top: 40px"
+          :src="item.url" />
+      </div>
+    </template>
+    <!-- 水泵 -->
+    <div
+      style="
+        width: 111px;
+        height: 110px;
+        position: relative;
+        left: 1%;
+        bottom: 50%;
+        position: absolute;
+      ">
+      <a-switch
+        :checked="selectAllCheckbox === 1 ? true : false"
+        size="small"
+        :disabled="true"
+        style="top: 20px; left: -10px; position: absolute"
+        :class="{
+          'blue-background': selectAllCheckbox === 1 ? true : false,
+          'grey-background': selectAllCheckbox === 1 ? false : true,
+        }"
+        @change="toggleAllSelection" />
+      <img style="display: flex; width: 111px; height: 100px" :src="waterPumpSrc" />
+      <div style="width: 100%; height: 20px; color: rgb(128, 255, 255)"> 水泵 </div>
+    </div>
+    <!-- 螺杆式地源热泵 -->
+    <template v-for="(item, index) in screwGeothermalHeatPump" :key="index">
+      <div
+        style="
+          width: 101.21px;
+          height: 101.21px;
+          position: relative;
+          font-size: 12px;
+          position: absolute;
+          color: #ffff80;
+          z-index: 2;
+        "
+        :style="{ left: item.style.mLeft, bottom: item.style.mBottom }">
+        <img
+          style="position: absolute; width: 101.21px; height: 101.21px; left: 42%; top: -80%"
+          :src="item.url" />
+        <div style="width: 100%; height: 20px; color: rgb(128, 255, 255); z-index: 2">
+          {{ item.deviceInfoName }}
+        </div>
+        <div style="width: 100%; height: 20px">
+          模式: <span style="color: #fff">{{ item.type }}</span>
+        </div>
+        <div style="width: 100%; height: 20px">
+          设定温度: <span style="color: #fff">{{ item.number }}</span>
+        </div>
+      </div>
+    </template>
+    <!-- 稀冷泵 -->
+    <template v-for="(item, index) in diluteCoolingPump" :key="index">
+      <div
+        style="
+          width: 135px;
+          height: 200px;
+          position: relative;
+          font-size: 12px;
+          position: absolute;
+          color: #ffff80;
+          z-index: 2;
+        "
+        :style="{ left: item.style.mLeft, bottom: item.style.mBottom }">
+        <div style="width: 100%; height: 20px; color: rgb(128, 255, 255)">
+          {{ item.deviceInfoName }}
+        </div>
+        <div style="width: 100%; height: 20px">
+          出水温度: <span style="color: #fff">{{ item.number }}</span>
+        </div>
+        <div style="width: 100%; height: 20px">
+          流量: <span style="color: #fff">{{ item.lNumber }}</span>
+        </div>
+        <img
+          style="position: absolute; width: 117.42px; height: 106.31px; left: -20px; top: 60px"
+          :src="item.url" />
+      </div>
+    </template>
+    <!-- 冷热水双蓄储能罐 -->
+    <template v-for="(item, index) in coldWater" :key="index">
+      <div
+        style="
+          width: 110px;
+          height: 110px;
+          position: relative;
+          font-size: 12px;
+          position: absolute;
+          color: #ffff80;
+          z-index: 2;
+        "
+        :style="{ left: item.style.mLeft, bottom: item.style.mBottom }">
+        <div style="width: 100%; height: 20px; color: rgb(128, 255, 255)">
+          {{ item.deviceInfoName }}
+        </div>
+        <div style="width: 100%; height: 20px">
+          出水温度: <span style="color: #fff">{{ item.number }}</span>
+        </div>
+        <div style="width: 100%; height: 20px">
+          容量: <span style="color: #fff">{{ item.rNumber }}</span>
+        </div>
+        <div style="width: 100%; height: 20px">
+          流量: <span style="color: #fff">{{ item.lNumber }}</span>
+        </div>
+        <img
+          style="position: absolute; width: 110px; height: 110px; left: -20px; top: 80px"
+          :src="item.url" />
+      </div>
+    </template>
+    <!-- 用户水泵 -->
+    <template v-for="(item, index) in userWaterPump" :key="index">
+      <div
+        style="
+          width: 70.85px;
+          height: 70.85px;
+          position: relative;
+          font-size: 12px;
+          position: absolute;
+        "
+        :style="{ left: item.style.mLeft, bottom: item.style.mBottom }">
+        <a-switch
+          :checked="item.user === 1 ? true : false"
+          size="small"
+          :disabled="true"
+          style="position: absolute; left: 30px; bottom: 0px; z-index: 2"
+          :class="{
+            'blue-background': item.user === 1 ? true : false,
+            'grey-background': item.user === 1 ? false : true,
+          }" />
+        <img
+          style="
+            display: flex;
+            width: 70.85px;
+            height: 70.85px;
+            transform: rotateX(-4deg) rotateY(180deg) rotateZ(1deg);
+          "
+          :src="waterPumpSrc" />
+        <div
+          style="
+            color: rgb(128, 255, 255);
+            font-size: 12px;
+            position: absolute;
+            left: -40px;
+            top: 30px;
+            transform: rotateZ(-24deg);
+          "
+          >{{ item.deviceInfoName }}</div
+        >
+      </div>
+    </template>
+    <!-- 集水器 -->
+    <div
+      style="
+        width: 226.19px;
+        height: 186.19px;
+        position: relative;
+        font-size: 12px;
+        position: absolute;
+        left: 66%;
+        bottom: 54%;
+        z-index: 2;
+      ">
+      <div style="position: absolute; left: 24%; color: rgb(128, 255, 255)">集水器</div>
+      <img
+        style="width: 226.19px; height: 176.19px; transform: rotateY(13deg)"
+        :src="manifoldSrc" />
+    </div>
+    <!-- 定压补水装置 -->
+    <template v-for="(item, index) in pressureWater" :key="index">
+      <div
+        style="width: 137px; height: 137px; position: relative; position: absolute; z-index: 2"
+        :style="{ left: item.style.mLeft, bottom: item.style.mBottom }">
+        <img style="width: 137px; height: 127px; transform: rotateY(157deg)" :src="item.url" />
+        <a-switch
+          :checked="item.user === 1 ? true : false"
+          size="small"
+          :disabled="true"
+          style="position: absolute; left: 40px; bottom: 0px"
+          :class="{
+            'blue-background': item.user === 1 ? true : false,
+            'grey-background': item.user === 1 ? false : true,
+          }" />
+        <div
+          style="
+            width: 100%;
+            height: 40px;
+            color: rgb(128, 255, 255);
+            position: absolute;
+            bottom: -40px;
+            font-size: 12px;
+          ">
+          <div> {{ item.deviceInfoName }}</div>
+          <div style="width: 100%; height: 20px; color: #ffff80">
+            压差: <span style="color: #fff">{{ item.yc }}</span>
+          </div>
+        </div>
+      </div>
+    </template>
+    <!-- 软化水箱 -->
+    <div
+      style="
+        width: 110px;
+        height: 110px;
+        position: relative;
+        position: absolute;
+        left: 40%;
+        bottom: 2%;
+        z-index: 2;
+      ">
+      <img
+        style="
+          width: 110px;
+          height: 110px;
+          transform: rotateX(3deg) rotateY(157deg) rotateZ(356deg);
+        "
+        :src="softenedWaterTankSrc" />
+      <div style="color: rgb(128, 255, 255); font-size: 12px; position: absolute; bottom: -10px"
+        >软化水箱</div
+      >
+    </div>
+    <!-- 软化水装置 -->
+    <div
+      style="
+        width: 110px;
+        height: 110px;
+        position: relative;
+        position: absolute;
+        left: 47%;
+        bottom: 11%;
+        z-index: 2;
+      ">
+      <img style="width: 110px; height: 110px" :src="coldWaterSrc" />
+      <div style="color: rgb(128, 255, 255); font-size: 12px; position: absolute; left: 20px"
+        >软化水装置</div
+      >
+    </div>
+    <!-- 循环水处理器 -->
+    <div
+      style="
+        width: 116.39px;
+        height: 116.39px;
+        position: relative;
+        position: absolute;
+        left: 54%;
+        bottom: 15%;
+        font-size: 12px;
+        z-index: 2;
+      ">
+      <img
+        style="
+          width: 116.39px;
+          height: 116.39px;
+          transform: rotateX(3deg) rotateY(157deg) rotateZ(356deg);
+        "
+        :src="waterProcessorSrc" />
+      <div style="position: absolute; left: 24%; color: rgb(128, 255, 255)">循环水处理器</div>
+    </div>
+    <!-- 地源水泵 -->
+    <template v-for="(item, index) in waterPump" :key="index">
+      <div
+        style="
+          width: 70.85px;
+          height: 70.85px;
+          position: relative;
+          font-size: 12px;
+          position: absolute;
+        "
+        :style="{ left: item.style.mLeft, bottom: item.style.mBottom }">
+        <a-switch
+          :checked="item.user === 1 ? true : false"
+          size="small"
+          :disabled="true"
+          style="position: absolute; left: 30px; bottom: 0px; z-index: 2"
+          :class="{
+            'blue-background': item.user === 1 ? true : false,
+            'grey-background': item.user === 1 ? false : true,
+          }" />
+        <img
+          style="
+            display: flex;
+            width: 70.85px;
+            height: 70.85px;
+            transform: rotateX(-4deg) rotateY(180deg) rotateZ(1deg);
+          "
+          :src="waterPumpSrc" />
+        <div
+          style="
+            color: rgb(128, 255, 255);
+            font-size: 12px;
+            position: absolute;
+            left: -40px;
+            top: 30px;
+            transform: rotateZ(-24deg);
+          "
+          >{{ item.deviceInfoName }}</div
+        >
+      </div>
+    </template>
+    <!-- 分水器 -->
+    <div
+      style="
+        width: 216.19px;
+        height: 186.19px;
+        position: relative;
+        font-size: 12px;
+        position: absolute;
+        left: 80%;
+        bottom: 38%;
+        z-index: 2;
+      ">
+      <div style="position: absolute; left: 24%; color: rgb(128, 255, 255)">分水器</div>
+      <img
+        style="width: 226.19px; height: 176.19px; transform: rotateY(13deg)"
+        :src="manifoldSrc" />
+    </div>
+    <!-- 土壤耦合器 -->
+    <div
+      style="
+        width: 290.75px;
+        height: 215.29px;
+        position: relative;
+        font-size: 12px;
+        position: absolute;
+        left: 77%;
+        bottom: 6.5%;
+      ">
+      <div style="position: absolute; left: 60%; color: rgb(128, 255, 255); bottom: 5%"
+        >土壤耦合器</div
+      >
+      <img style="width: 290.75px; height: 215.29px" :src="soilCouplerSrc" />
+    </div>
+    <!-- 线 -->
+    <template v-for="(item, index) in line" :key="index">
+      <div
+        style="height: 12px; position: absolute; border-radius: 4px"
+        :style="{
+          'background-image': 'url(' + item.url + ')',
+          left: item.style.mLeft,
+          width: item.style.width,
+          bottom: item.style.mBottom,
+          transform: item.style.transform,
+          'z-index': item.style.zIndex,
+        }">
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { ref, onMounted, onUnmounted } from 'vue';
+  //图片资源
+  import airSourceThermalCollapseSrc from '../image/coldAndHeatSources/airSourceThermalCollapse.png';
+  import waterPumpSrc from '../image/coldAndHeatSources/waterPump.png';
+  import screwGeothermalHeatPumpSrc from '../image/coldAndHeatSources/screwGeothermalHeatPump.png';
+  import diluteCoolingPumpSrc from '../image/coldAndHeatSources/diluteCoolingPump.png';
+  import coldWaterSrc from '../image/coldAndHeatSources/coldWater.png';
+  import manifoldSrc from '../image/coldAndHeatSources/manifold.png';
+  import pressureWaterSrc from '../image/coldAndHeatSources/pressureWater.png';
+  import softenedWaterTankSrc from '../image/coldAndHeatSources/softenedWaterTank.png';
+  import waterProcessorSrc from '../image/coldAndHeatSources/waterProcessor.png';
+  import soilCouplerSrc from '../image/coldAndHeatSources/soilCoupler.png';
+  import blueGif from '../image/coldAndHeatSources/blue.gif';
+  import bluePng from '../image/coldAndHeatSources/blue.png';
+  import greenGif from '../image/coldAndHeatSources/green.gif';
+  import greenPng from '../image/coldAndHeatSources/green.png';
+  const line = ref([
+    //水泵线-热泵
+    {
+      url: bluePng,
+      style: {
+        width: '36%',
+        mLeft: '1%',
+        mBottom: '77%',
+        transform: 'rotateZ(-23deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '35%',
+        mLeft: '15%',
+        mBottom: '56%',
+        transform: 'rotateZ(-23deg) rotateY(180deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '16.5%',
+        mLeft: '13%',
+        mBottom: '62.5%',
+        transform: 'rotateZ(-144deg) rotateY(180deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '16.5%',
+        mLeft: '19%',
+        mBottom: '67.5%',
+        transform: 'rotateZ(-144deg) rotateY(180deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '16.5%',
+        mLeft: '25%',
+        mBottom: '73.5%',
+        transform: 'rotateZ(-144deg) rotateY(180deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '16.5%',
+        mLeft: '33.5%',
+        mBottom: '81.5%',
+        transform: 'rotateZ(-144deg) rotateY(180deg)',
+      },
+    },
+    //水泵 - 定压补水
+    {
+      url: bluePng,
+      style: {
+        width: '41%',
+        mLeft: '3%',
+        mBottom: '27.5%',
+        transform: 'rotateZ(213deg) rotateY(180deg)',
+      },
+    },
+    // 线 - 稀冷泵
+    {
+      url: bluePng,
+      style: {
+        width: '9%',
+        mLeft: '23.5%',
+        mBottom: '31%',
+        transform: 'rotateZ(-23deg) rotateY(180deg)',
+      },
+    },
+    //热泵 - 冷热水双蓄储能罐
+    {
+      url: bluePng,
+      style: {
+        width: '12.5%',
+        mLeft: '25.5%',
+        mBottom: '37%',
+        transform: 'rotateZ(213deg) rotateY(180deg)',
+      },
+    },
+    //冷热水双蓄储能罐 - 用户水泵
+    {
+      url: greenPng,
+      style: {
+        width: '10%',
+        mLeft: '47%',
+        mBottom: '47.8%',
+        transform: 'rotateZ(203deg)',
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '20%',
+        mLeft: '37%',
+        mBottom: '41.5%',
+        transform: 'rotateZ(-28deg)',
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '4%',
+        mLeft: '47%',
+        mBottom: '54%',
+        transform: 'rotateZ(-28deg)',
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '4%',
+        mLeft: '56%',
+        mBottom: '46%',
+        transform: 'rotateZ(-28deg)',
+      },
+    },
+    //第二段线
+    {
+      url: greenPng,
+      style: {
+        width: '17.5%',
+        mLeft: '53%',
+        mBottom: '70%',
+        transform: 'rotateZ(-28deg)',
+        zIndex: 3,
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '2%',
+        mLeft: '68.2%',
+        mBottom: '77%',
+        transform: 'rotateZ(-28deg) rotatez(-63deg)',
+        zIndex: 3,
+      },
+    },
+
+    {
+      url: greenPng,
+      style: {
+        width: '16.5%',
+        mLeft: '57.9%',
+        mBottom: '65%',
+        transform: 'rotateZ(-28deg)',
+        zIndex: 3,
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '1%',
+        mLeft: '72.8%',
+        mBottom: '72%',
+        transform: 'rotateZ(-28deg) rotatez(-63deg)',
+        zIndex: 3,
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '15%',
+        mLeft: '62%',
+        mBottom: '60.3%',
+        transform: 'rotateZ(-28deg)',
+        zIndex: 3,
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '1%',
+        mLeft: '75%',
+        mBottom: '68%',
+        transform: 'rotateZ(-28deg) rotatez(-63deg)',
+        zIndex: 3,
+      },
+    },
+    //软水箱 - 地源水泵
+    {
+      url: bluePng,
+      style: {
+        width: '34.5%',
+        mLeft: '38.5%',
+        mBottom: '20%',
+        transform: 'rotateZ(-27deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '4%',
+        mLeft: '62%',
+        mBottom: '40%',
+        transform: 'rotateZ(-28deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '4%',
+        mLeft: '72%',
+        mBottom: '30%',
+        transform: 'rotateZ(-28deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '11.5%',
+        mLeft: '62%',
+        mBottom: '33%',
+        transform: 'rotateZ(203deg)',
+      },
+    },
+    //第二段线
+    {
+      url: bluePng,
+      style: {
+        width: '16.5%',
+        mLeft: '68%',
+        mBottom: '55%',
+        transform: 'rotateZ(-28deg)',
+        zIndex: 3,
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '2.5%',
+        mLeft: '82%',
+        mBottom: '61.3%',
+        transform: 'rotateZ(-28deg) rotatez(-63deg)',
+        zIndex: 3,
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '15.5%',
+        mLeft: '73%',
+        mBottom: '49.5%',
+        transform: 'rotateZ(-28deg)',
+        zIndex: 3,
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '1.5%',
+        mLeft: '86.5%',
+        mBottom: '56.3%',
+        transform: 'rotateZ(-28deg) rotatez(-63deg)',
+        zIndex: 3,
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '13%',
+        mLeft: '78%',
+        mBottom: '44.5%',
+        transform: 'rotateZ(-32deg)',
+        zIndex: 3,
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '1%',
+        mLeft: '89%',
+        mBottom: '52.3%',
+        transform: 'rotateZ(-28deg) rotatez(-63deg)',
+        zIndex: 3,
+      },
+    },
+    //回温水线段
+    {
+      url: greenPng,
+      style: {
+        width: '2.5%',
+        mLeft: '71.5%',
+        mBottom: '61.5%',
+        transform: 'rotateZ(-28deg) rotatez(-63deg)',
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '11.5%',
+        mLeft: '72%',
+        mBottom: '65%',
+        transform: 'rotateZ(-28deg)',
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '22%',
+        mLeft: '80.5%',
+        mBottom: '58%',
+        transform: 'rotateZ(213deg) rotateY(180deg)',
+      },
+    },
+    {
+      url: greenPng,
+      style: {
+        width: '9%',
+        mLeft: '92.5%',
+        mBottom: '38%',
+        transform: 'rotateZ(-28deg)',
+      },
+    },
+    //供水水线段
+    {
+      url: bluePng,
+      style: {
+        width: '2.5%',
+        mLeft: '85.5%',
+        mBottom: '44.5%',
+        transform: 'rotateZ(-28deg) rotatez(-63deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '8%',
+        mLeft: '86%',
+        mBottom: '46%',
+        transform: 'rotateZ(-28deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '5%',
+        mLeft: '92.5%',
+        mBottom: '47%',
+        transform: 'rotateZ(213deg) rotateY(180deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '23%',
+        mLeft: '75.5%',
+        mBottom: '32.5%',
+        transform: 'rotateZ(-28deg)',
+      },
+    },
+    {
+      url: bluePng,
+      style: {
+        width: '7%',
+        mLeft: '76%',
+        mBottom: '17%',
+        transform: 'rotateZ(213deg) rotateY(180deg)',
+      },
+    },
+  ]);
+  const airSourceThermalCollapse = ref([
+    {
+      deviceInfoName: '1#空气源热泵',
+      type: '制热',
+      number: '40℃',
+      style: {
+        mLeft: '17%',
+        mBottom: '54%',
+      },
+      url: airSourceThermalCollapseSrc,
+    },
+    {
+      deviceInfoName: '2#空气源热泵',
+      type: '制热',
+      number: '40℃',
+      style: {
+        mLeft: '24%',
+        mBottom: '59%',
+      },
+      url: airSourceThermalCollapseSrc,
+    },
+    {
+      deviceInfoName: '3#空气源热泵',
+      type: '制热',
+      number: '40℃',
+      style: {
+        mLeft: '31%',
+        mBottom: '66%',
+      },
+      url: airSourceThermalCollapseSrc,
+    },
+    {
+      deviceInfoName: '4#空气源热泵',
+      type: '制热',
+      number: '40℃',
+      style: {
+        mLeft: '38%',
+        mBottom: '73%',
+      },
+      url: airSourceThermalCollapseSrc,
+    },
+  ]);
+  //螺杆式地源热泵
+  const screwGeothermalHeatPump = ref([
+    {
+      deviceInfoName: '1#螺杆式地源热泵',
+      type: '制热',
+      number: '40℃',
+      style: {
+        mLeft: '9.5%',
+        mBottom: '22.5%',
+      },
+      url: screwGeothermalHeatPumpSrc,
+    },
+    {
+      deviceInfoName: '2#螺杆式地源热泵',
+      type: '制热',
+      number: '40℃',
+      style: {
+        mLeft: '18.5%',
+        mBottom: '31.5%',
+      },
+      url: screwGeothermalHeatPumpSrc,
+    },
+  ]);
+  //稀冷泵
+  const diluteCoolingPump = ref([
+    {
+      deviceInfoName: '稀冷泵',
+      number: '40℃',
+      lNumber: '139 m3/h',
+      style: {
+        mLeft: '30%',
+        mBottom: '29%',
+      },
+      url: diluteCoolingPumpSrc,
+    },
+  ]);
+  //冷热水双蓄储能罐
+  const coldWater = ref([
+    {
+      deviceInfoName: '冷热水双蓄储能罐',
+      number: '40℃',
+      lNumber: '139 m3/h',
+      rNumber: '135L',
+      style: {
+        mLeft: '36%',
+        mBottom: '39%',
+      },
+      url: coldWaterSrc,
+    },
+  ]);
+  //用户水泵
+  const userWaterPump = ref([
+    {
+      deviceInfoName: '1#用户水泵',
+      number: '40℃',
+      user: 1,
+      style: {
+        mLeft: '50%',
+        mBottom: '55.5%',
+      },
+      url: waterPumpSrc,
+    },
+    {
+      deviceInfoName: '2#用户水泵',
+      number: '40℃',
+      user: 1,
+      style: {
+        mLeft: '55%',
+        mBottom: '51%',
+      },
+      url: waterPumpSrc,
+    },
+    {
+      deviceInfoName: '3#用户水泵',
+      number: '40℃',
+      user: 1,
+      style: {
+        mLeft: '59%',
+        mBottom: '47%',
+      },
+      url: waterPumpSrc,
+    },
+  ]);
+  //地源水泵
+  const waterPump = ref([
+    {
+      deviceInfoName: '1#地源水泵',
+      number: '40℃',
+      user: 1,
+      style: {
+        mLeft: '65%',
+        mBottom: '41%',
+      },
+      url: waterPumpSrc,
+    },
+    {
+      deviceInfoName: '2#地源水泵',
+      number: '40℃',
+      user: 1,
+      style: {
+        mLeft: '70%',
+        mBottom: '36%',
+      },
+      url: waterPumpSrc,
+    },
+    {
+      deviceInfoName: '3#地源水泵',
+      number: '40℃',
+      user: 1,
+      style: {
+        mLeft: '75%',
+        mBottom: '31%',
+      },
+      url: waterPumpSrc,
+    },
+  ]);
+  // 定压补水装置
+  const pressureWater = ref([
+    {
+      deviceInfoName: '定压补水装置',
+      yc: '0.05 Bar',
+      user: 1,
+      style: {
+        mLeft: '29.4%',
+        mBottom: '8.4%',
+      },
+      url: pressureWaterSrc,
+    },
+  ]);
+  const selectAllCheckbox = ref(1);
+  onMounted(() => {});
+  onUnmounted(() => {});
+</script>
+<style lang="less" scoped>
+  .box-cold {
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 10, 48, 1);
+    border-radius: 4px;
+    display: flex;
+    position: relative;
+    color: white;
+    overflow: hidden;
+  }
+  .ant-switch-checked {
+    background-color: #04d919 !important;
+  }
+  .grey-background.ant-switch .ant-switch-handle {
+    background-color: rgba(238, 238, 238, 1) !important;
+  }
+
+  .grey-background.ant-switch {
+    background-color: grey !important;
+  }
+  :deep(.ant-switch-handle::before) {
+    background-color: rgba(0, 0, 0, 1) !important;
+  }
+
+  .grey-background.ant-switch .ant-switch-handle {
+    background-color: grey !important;
+  }
+  :deep(.ant-switch-disabled) {
+    opacity: 1 !important;
+  }
+</style>
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/airSourceThermalCollapse.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/airSourceThermalCollapse.png
new file mode 100644
index 0000000..c39c3bd
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/airSourceThermalCollapse.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/blue.gif b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/blue.gif
new file mode 100644
index 0000000..6160008
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/blue.gif differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/blue.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/blue.png
new file mode 100644
index 0000000..5fb9f94
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/blue.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/coldWater.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/coldWater.png
new file mode 100644
index 0000000..46d71b2
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/coldWater.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/diluteCoolingPump.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/diluteCoolingPump.png
new file mode 100644
index 0000000..5e01a62
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/diluteCoolingPump.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/green.gif b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/green.gif
new file mode 100644
index 0000000..14d82f9
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/green.gif differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/green.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/green.png
new file mode 100644
index 0000000..54b8432
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/green.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/manifold.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/manifold.png
new file mode 100644
index 0000000..8655b5b
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/manifold.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/pressureWater.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/pressureWater.png
new file mode 100644
index 0000000..2c83044
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/pressureWater.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/screwGeothermalHeatPump.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/screwGeothermalHeatPump.png
new file mode 100644
index 0000000..d8a88d1
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/screwGeothermalHeatPump.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/softenedWaterTank.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/softenedWaterTank.png
new file mode 100644
index 0000000..7714108
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/softenedWaterTank.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/soilCoupler.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/soilCoupler.png
new file mode 100644
index 0000000..27a33f8
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/soilCoupler.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/waterProcessor.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/waterProcessor.png
new file mode 100644
index 0000000..ce007fd
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/waterProcessor.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/waterPump.png b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/waterPump.png
new file mode 100644
index 0000000..82999c6
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/image/coldAndHeatSources/waterPump.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
index 2c3a7e3..d09713b 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
@@ -162,7 +162,7 @@
       .get(planManage.getTableData, {
         projectId: state.projectId,
         siteId: state.siteId,
-        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
+        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水)
         ctrlType: 1,
       })
       .then((res) => {
@@ -236,7 +236,7 @@
       .get(planManage.getTransData, {
         projectId: state.projectId,
         siteId: state.siteId,
-        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
+        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水)
         ctrlType: 1,
       })
       .then((res) => {
diff --git a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue
index d26233a..0f92b99 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue
@@ -166,6 +166,7 @@
             name: 'energyAlarmEdit',
             dynamicParams: ['uuid', 'appealType'],
             handle: (data: any) => {
+              console.log(mainRef.value, '数据');
               if (data?.executeStatus?.value === 2) {
                 NsMessage.warning('当前计划正在执行，无法进行编辑。如需编辑，请先停止计划.');
               } else {
@@ -191,7 +192,7 @@
             dynamicParams: ['uuid', 'appealType'],
             confirm: true,
             handle: (data: any) => {
-              http.post(planToAddApi.updPlan, { id: data.id, isDeleted: 1 }).then((res) => {
+              http.post(planToAddApi.updPlan, [data.id]).then((res) => {
                 if (res.msg === 'success') {
                   NsMessage.success('操作成功');
                   mainRef.value?.nsTableRef.reload();
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
index 4d9e8d6..de58199 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
@@ -1,18 +1,52 @@
 <template>
+  <!-- 分区部分 -->
+  <div>
+    <div class="light-area">
+      <div class="light-area-tab"></div>
+      <span class="light-area-text"> 设备分区 </span>
+    </div>
+    <!-- 照明区域按钮部分 -->
+    <div class="area">
+      <template v-if="!showAllButtonsArea">
+        <button
+          v-for="(button, index) in limitedButtons1"
+          :key="index"
+          :class="{ btn: true, selected: button.selected }"
+          @click="changeArea(button)">
+          {{ button.name }}
+        </button>
+        <div style="margin-top: 10px">
+          <span @click="showAllButtonsArea = true" class="openzm"><down-outlined /> 展开</span>
+        </div>
+      </template>
+      <template v-else>
+        <button
+          v-for="(button, index) in props.treeData"
+          :key="index"
+          :class="{ btn: true, selected: button.selected }"
+          @click="changeArea(button)">
+          {{ button.name }}
+        </button>
+        <div style="margin-top: 10px">
+          <span @click="showAllButtonsArea = false" class="openzm"><up-outlined /> 回缩</span>
+        </div>
+      </template>
+    </div>
+  </div>
   <!-- 设备部分 -->
   <div>
     <div class="circuit-area">
       <div class="circuit-tab"></div>
       <span class="circuit-text">{{ props.type }}</span>
       <div class="btn2">
-        <a-badge :offset="[-10, 2]" :count="lockList.length">
+        <!-- <a-badge :offset="[-10, 2]" :count="lockList.length">
           <button
             class="openPlan"
             :class="{ enabled2: isPlanEnabled2, disabled2: !isPlanEnabled2 }"
             @click="togglePlan2">
             {{ isPlanEnabled2 ? '启用开关' : '禁用开关' }}
           </button>
-        </a-badge>
+        </a-badge> -->
         <a-switch
           v-model:checked="selectAllCheckbox"
           :disabled="singleSelection"
@@ -35,9 +69,9 @@
           :class="{ btn: true, selected: button.selected }"
           class="zmhlbtn"
           @click="changeLine(button)">
-          <div v-if="button.lockStatus" class="btn-back">
+          <!-- <div v-if="button.lockStatus" class="btn-back">
             <stop-outlined />
-          </div>
+          </div> -->
           {{ button.name }}
         </button>
         <div style="margin-top: 10px">
@@ -147,9 +181,13 @@
             <div class="btn-item">
               <div class="left">控制模式</div>
               <div class="right">
-                <span>{{ item.stateBefore.autoStatus.label.replace('模式', '') }}</span>
+                <span>{{
+                  item.stateBefore.autoStatus.label ? item.stateBefore.autoStatus.label : '--'
+                }}</span>
                 <img src="/asset/image/bulbLogo/22406.png" alt="" />
-                <span>{{ item.stateAfter.autoStatus.label.replace('模式', '') }}</span></div
+                <span>{{
+                  item.stateAfter.autoStatus.label ? item.stateAfter.autoStatus.label : '--'
+                }}</span></div
               >
             </div>
             <div class="btn-item">
@@ -297,6 +335,29 @@
    */
   const emit = defineEmits(['reset', 'reload', 'resetAll']);
 
+  // 设备分区业务 =====================================================================
+
+  // 按钮区展开与收起状态
+  const showAllButtonsArea = ref(false);
+  // 被选中的分区  默认为1 用于选中样式渲染
+  const selectedButton = ref<string | undefined>('1');
+
+  // 分区切换
+  const changeArea = (button: any) => {
+    // 当前选中按钮
+    selectedButton.value = button.id;
+    // 设置当前选中的回路
+    buttons2.value = button.childList;
+    // 重置按钮状态
+    emit('reset');
+    // 设置选中按钮状态
+    button.selected = true;
+    // 当前选中回路 - 置空
+    resetMode();
+  };
+  // 默认最多展示8个按钮
+  const limitedButtons1 = computed(() => props.treeData.slice(0, 8));
+
   // 照明回路业务 ======================================================================
 
   // 开关启用/禁用状态
@@ -374,7 +435,6 @@
   const selectAllCheckbox = ref(false);
   // 全选切换事件（switch）
   const toggleAllSelection = () => {
-    let arr = [];
     // 全选
     if (selectAllCheckbox.value) {
       buttons2.value.forEach((item: any, index: number) => {
@@ -383,7 +443,6 @@
           thisButton2.value = item;
         }
         item.selected = true;
-        arr.push(item.id);
       });
       // 全不选
     } else {
@@ -618,6 +677,8 @@
   const refresh = (reload = false) => {
     // 关闭执行弹窗
     executeVisible.value = false;
+    // 设置当前选中的序列
+    selectedButton.value = '1';
     // 重置选中样式 和 按钮选中状态
     emit('reset');
     // 如果是中途刷新，需要将所有修改改回
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue
index da7fa3e..dfc2138 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue
@@ -176,7 +176,7 @@
       .get(planManage.getTableData, {
         projectId: state.projectId,
         siteId: state.siteId,
-        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
+        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水)
         ctrlType: props.type,
       })
       .then((res) => {
@@ -249,7 +249,7 @@
       .get(planManage.getTransData, {
         projectId: state.projectId,
         siteId: state.siteId,
-        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
+        // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6给排水)
         ctrlType: props.type,
       })
       .then((res) => {
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
index 6590098..1a083e3 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
@@ -139,6 +139,7 @@
         <a-tab-pane key="1" tab="控制面板">
           <fanControl
             ref="tabs1Ref"
+            @reset="reset"
             @reset-all="resetDrawer"
             :treeData="treeData"
             :type="`排风扇`" />
@@ -200,6 +201,7 @@
         <a-tab-pane key="1" tab="控制面板">
           <fanControl
             ref="tabs1Ref"
+            @reset="reset"
             @reset-all="resetDrawer"
             :treeData="treeData"
             :type="`风幕机`" />
@@ -260,6 +262,7 @@
         <a-tab-pane key="1" tab="控制面板">
           <fanControl
             ref="tabs1Ref"
+            @reset="reset"
             @reset-all="resetDrawer"
             :treeData="treeData"
             :type="`电动窗`" />
@@ -374,8 +377,18 @@
   // 刷新当前的树形结构数据
   const reload = () => {
     http.get(url, { projectId: state.projectId, siteId: state.siteId }).then((res) => {
-      const data = res.data;
-      treeData.value = data[0].childList;
+      const data = res.data[0].childList;
+      // 默认选中第一个分区
+      data.forEach((item: any, index: number) => {
+        if (index === 0) {
+          item.selected = true;
+        } else {
+          item.selected = false;
+        }
+      });
+      treeData.value = data;
+      // 楼层信息
+      // selectIndex.value = index;
       // 反向刷新
       try {
         tabs1Ref.value.setButtons2(treeData.value[0].childList);
@@ -398,8 +411,16 @@
       url = ventilating.getTree3;
     }
     http.get(url, { projectId: state.projectId, siteId: state.siteId }).then((res) => {
-      const data = res.data;
-      treeData.value = data[0].childList;
+      const data = res.data[0].childList;
+      // 默认选中第一个分区
+      data.forEach((item: any, index: number) => {
+        if (index === 0) {
+          item.selected = true;
+        } else {
+          item.selected = false;
+        }
+      });
+      treeData.value = data;
       selectIndex.value = index;
     });
   };
@@ -442,6 +463,15 @@
       }
     });
   };
+  // 重置分区树所有当前选项
+  const reset = () => {
+    treeData.value.forEach((item: any) => {
+      item.selected = false;
+      item.childList.forEach((i: any) => {
+        i.selected = false;
+      });
+    });
+  };
   // 温度数组
   const sensorData = ref<any>([]);
   // 湿度数组
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm1.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm1.png
new file mode 100644
index 0000000..306285a
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm1.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm2.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm2.png
new file mode 100644
index 0000000..67f0378
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/alarm2.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.gif b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.gif
new file mode 100644
index 0000000..14d82f9
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.gif differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.png
new file mode 100644
index 0000000..2a1a98d
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/back.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device1.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device1.png
new file mode 100644
index 0000000..1fbe341
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device1.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device2.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device2.png
new file mode 100644
index 0000000..60209f6
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/device2.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/edit.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/edit.png
new file mode 100644
index 0000000..54f9788
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/edit.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type1off.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type1off.png
new file mode 100644
index 0000000..7e2d810
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type1off.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type2off.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type2off.png
new file mode 100644
index 0000000..d5c2082
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type2off.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type3off.png b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type3off.png
new file mode 100644
index 0000000..6eb3afd
Binary files /dev/null and b/hx-ai-intelligent/src/view/equipmentControl/waterSystem/images/type3off.png differ
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
index aedce11..6bbf0fb 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
@@ -48,16 +48,17 @@ const tableCarbonKeyMap = [
     // textEllipsis: true,
     textNumber: 5,
   },
+
   {
-    title: '设备名称',
+    title: '设备id',
+    dataIndex: 'deviceInfoCode',
     textNumber: 10,
-    dataIndex: 'deviceName',
-    // textEllipsis: true,
   },
   {
-    title: '设备id',
-    dataIndex: 'deviceInfoCode',
+    title: '设备编号',
     textNumber: 10,
+    dataIndex: 'deviceName',
+    // textEllipsis: true,
   },
   {
     textNumber: 5,
@@ -77,14 +78,22 @@ const tableCarbonKeyMap = [
   {
     title: '分组名称',
     textNumber: 10,
-    dataIndex: 'deviceNameType',
+    dataIndex: 'pointName',
   },
   {
     textNumber: 5,
     title: '设备状态',
     dataIndex: 'status',
     customRender: ({ value }) => {
-      return value === '0' ? '启用' : '停用';
+      if (value) {
+        if (value === '0') {
+          return '启用';
+        } else if (value === '1') {
+          return '停用';
+        }
+      } else {
+        return '';
+      }
     },
   },
 ];
@@ -219,7 +228,7 @@ export const editCalTreeConfig = (orgId) => ({
     ],
   },
 });
-export const treeConfig = (orgId) => {
+export const treeConfig = (orgId, editCarbonEquipmentRef, tableRef) => {
   return {
     defaultExpandAll: true,
     header: {
@@ -233,6 +242,8 @@ export const treeConfig = (orgId) => {
       return [{ pointName: '全部', id: 'all', selectable: false, children: data }];
     },
     formConfig: {
+      callList: true, // 刷新列表
+      // defaultSelection: true, //树默认选择第一个
       schemas: [
         {
           field: 'energyType',
@@ -248,6 +259,12 @@ export const treeConfig = (orgId) => {
             valueField: 'dicKey',
             placeholder: '请选择能耗种类',
             autoSelectFirst: true,
+            onSelect: async (cur, record) => {
+              editCarbonEquipmentRef.value.changeEnergyType(cur);
+              tableRef.value?.nsTableRef.clearCheck();
+              tableRef.value?.nsTableRef.reload();
+              // value.value = cur;
+            },
           },
         },
         {
@@ -402,12 +419,12 @@ export const tableConfigCal = (
         label: '编辑',
         name: 'GroupPointEdit',
         type: 'primary',
-        handle: (a, b) => {
-          if (isCarbon) {
-            editCarbonEquipmentRef.value.toggle();
-          } else {
-            el.value.toggle();
-          }
+        handle: async (a, b) => {
+          // if (isCarbon) {
+          editCarbonEquipmentRef.value.toggle();
+          // } else {
+          //   el.value.toggle();
+          // }
         },
       },
       {
@@ -457,7 +474,7 @@ export const tableConfigCal = (
           return data.list.length === 0;
         },
         extra: {
-          xlsxMap: tableKeyMap,
+          xlsxMap: isCarbon ? tableCarbonKeyMap : tableCalKeyMap,
           xlsxName: '分组信息YYYY-MM-DD',
         },
       },
@@ -656,7 +673,7 @@ export const tableConfigCal = (
   };
 };
 
-export const editCarbonEquipmentConfig = (orgId) => {
+export const editCarbonEquipmentConfig = (orgId, props) => {
   return ref({
     title: '设备信息',
     api: device.queryDevicePage,
@@ -674,22 +691,6 @@ export const editCarbonEquipmentConfig = (orgId) => {
       formConfig: {
         schemas: [
           {
-            field: 'energyType',
-            label: '',
-            component: 'NsSelectApi',
-            autoSubmit: true,
-            componentProps: {
-              api: () => dict({ params: { dicKey: 'ENERGY_TYPE' } }),
-              // params: { dicKey: 'ENERGY_TYPE' },
-              immediate: true,
-              // resultField: 'data.ENERGY_TYPE',
-              labelField: 'cnValue',
-              valueField: 'dicKey',
-              placeholder: '请选择能耗种类',
-              autoSelectFirst: true,
-            },
-          },
-          {
             field: 'deviceType',
             label: '设备名称',
             component: 'NsInput',
@@ -743,6 +744,26 @@ export const editCarbonEquipmentConfig = (orgId) => {
     formConfig: {
       schemas: [
         {
+          field: 'energyType',
+          label: '',
+          component: 'NsSelectApi',
+          // autoSubmit: true,
+          defaultValue: props.params.energyType,
+          componentProps: {
+            api: () => dict({ params: { dicKey: 'ENERGY_TYPE' } }),
+            // params: { dicKey: 'ENERGY_TYPE' },
+            immediate: true,
+            // resultField: 'data.ENERGY_TYPE',
+            labelField: 'cnValue',
+            valueField: 'dicKey',
+            placeholder: '请选择能耗种类',
+            // autoSelectFirst: true,
+          },
+          dynamicDisabled: (data: any) => {
+            return props.params.energyType !== 'CARBON_EMISSIONS';
+          },
+        },
+        {
           field: 'areas',
           label: '设备区域',
           component: 'NsCascader',
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue
index e6db509..2ccf6db 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue
@@ -28,6 +28,7 @@
       <a-select
         placeholder="请选择"
         style="width: 200px"
+        v-model:value="linkOrgId"
         :options="linkList"
         :field-names="{ label: 'orgName', value: 'orgId' }"
         @change="handleChange" />
@@ -44,33 +45,46 @@
   import { http } from '/nerv-lib/util';
   import { group, device } from '/@/api/deviceManage';
   const orgId = ref('');
+
   const key = ref(Date.now());
 
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   orgId.value = result;
 
+  const linkOrgId = ref('');
+
   // const selectOrgId = ref(orgId.value);
+  const props = defineProps({ params: Object });
 
   const linkList = JSON.parse(sessionStorage.getItem('LINKLIST')!);
-  let config = editCarbonEquipmentConfig(orgId.value);
+  linkOrgId.value = linkList[0].orgId;
+  let config = editCarbonEquipmentConfig(orgId.value, props);
   const visible = ref(false);
   const carbonEquipment = ref();
   // defineOptions({
   //   name: 'LedgerIndex', // 与页面路由name一致缓存才可生效
   // });
 
+  const changeEnergyType = (val) => {
+    props.params.energyType = val;
+    config = editCarbonEquipmentConfig(linkOrgId.value, props);
+    key.value = Date.now();
+  };
   const handleChange = (value: string) => {
     // selectOrgId.value = value;
-    config = editCarbonEquipmentConfig(value);
-    debugger;
+    config = editCarbonEquipmentConfig(value, props);
     key.value = Date.now();
     // carbonEquipment.value?.nsTableRef.reload();
     // carbonEquipment.value?.nsTableRef.treeReload();
   };
 
-  const props = defineProps({ params: Object });
   const emit = defineEmits(['sure']);
-  const toggle = () => {
+  const toggle = (val) => {
+    if (val) {
+      config = editCarbonEquipmentConfig(linkOrgId.value, props);
+      key.value = Date.now();
+    }
+
     visible.value = !visible.value;
     // clearData();
     // visible.value && getData(currentId.value);
@@ -93,14 +107,35 @@
         deviceInfoCode: selectedRowKeys[i],
       });
     }
-    http.post(group.addCarbonDevice, params).then(() => {
-      emit('sure');
-      NsMessage.success('操作成功');
-      toggle();
-    });
+    if (props.params.energyType && props.params.energyType == 'CARBON_EMISSIONS') {
+      http.post(group.addCarbonDevice, params).then(() => {
+        emit('sure');
+        NsMessage.success('操作成功');
+        toggle(null);
+      });
+    } else if (props.params.energyType && props.params.energyType != 'CARBON_EMISSIONS') {
+      // if (!currentId.value) {
+      //   NsMessage.warn('请先选择公司');
+      //   return;
+      // }
+      http
+        .post(group.saveComputeList, {
+          energyType: props.params.energyType,
+          orgId: props.params?.orgId,
+          hxDeviceGroupId: props.params?.hxDeviceGroupId,
+          saveOrgId: linkOrgId.value,
+          saveDeviceInfoCodes: selectedRowKeys,
+        })
+        .then(() => {
+          emit('sure');
+          NsMessage.success('操作成功');
+          toggle(null);
+        });
+    }
   };
   defineExpose({
     toggle,
+    changeEnergyType,
   });
 </script>
 <style lang="less" scoped>
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
index bbb7769..5901973 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
@@ -54,7 +54,7 @@
       v-show="!defaultType && isCarbon"
       class="table"
       v-bind="configCarbon"
-      ref="tableCalRef" />
+      ref="tableCalRef2" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -80,6 +80,7 @@
   const modalFormRef = ref();
   const tableRef = ref();
   const tableCalRef = ref();
+  const tableCalRef2 = ref();
   const editDrawerRef = ref();
   const editDrawerCalRef = ref();
   const editGroupRef = ref();
@@ -89,7 +90,7 @@
 
   const treeRef = ref();
   const defaultType = ref(true);
-  const isCarbon = ref(true);
+  const isCarbon = ref(false);
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   const defaultParams = ref({
     orgId: result,
@@ -119,7 +120,7 @@
     setFactorRef,
   );
 
-  const tConfig = treeConfig(result);
+  const tConfig = treeConfig(result, editCarbonEquipmentRef, tableRef);
   const nsModalFormConfig = ref({
     api: group.creatOrUpdate,
     data: {},
@@ -219,6 +220,7 @@
     //清除选中行数据
     tableRef.value?.nsTableRef.clearCheck();
     tableCalRef.value?.nsTableRef.clearCheck();
+    tableCalRef2.value?.nsTableRef.clearCheck();
     const {
       node: { pointType, id, energyType },
     } = record;
@@ -226,20 +228,24 @@
     defaultParams.value.id = id;
     defaultParams.value.hxDeviceGroupId = id;
     defaultType.value = pointType === 'GROUPING_NODE';
-    defaultType.value
-      ? tableRef.value?.nsTableRef.reload()
-      : tableCalRef.value?.nsTableRef.reload();
 
     if (energyType == 'CARBON_EMISSIONS') {
       isCarbon.value = true;
     } else {
       isCarbon.value = false;
     }
+    defaultType.value
+      ? tableRef.value?.nsTableRef.reload()
+      : isCarbon.value
+      ? tableCalRef2.value?.nsTableRef.reload()
+      : tableCalRef.value?.nsTableRef.reload();
   };
 
   const handleOk = () => {
     defaultType.value
       ? tableRef.value?.nsTableRef.reload()
+      : isCarbon.value
+      ? tableCalRef2.value?.nsTableRef.reload()
       : tableCalRef.value?.nsTableRef.reload();
   };
 </script>
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 2389b5e..c93b784 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
@@ -340,11 +340,25 @@
           // 获取当天的时间
           const today = new Date();
           const year = today.getFullYear();
-          const month = String(today.getMonth() + 1).padStart(2, '0'); // getMonth() 返回的月份是0-11
-          const day = String(today.getDate()).padStart(2, '0');
+          const month = Number(String(today.getMonth() + 1).padStart(2, '0')); // getMonth() 返回的月份是0-11
+          const day = Number(String(today.getDate()).padStart(2, '0'));
 
-          startTime = year + '-' + month + '-' + day;
-          endTime = year + '-' + month + '-' + day;
+          if (dateTypeValue.value == 'month') {
+            startTime = year + '-' + month + '-01';
+            // 创建下一个月的第一天
+            const date = new Date(year, month, 1);
+
+            // 减去一天得到当月的最后一天
+            // date.setDate(date.getDate() - 1);
+            endTime = date.toISOString().split('T')[0];
+            // endTime = endDate.value + '-01';
+          } else if (dateTypeValue.value == 'year') {
+            startTime = year + '-01-01';
+            endTime = year + '-12-31';
+          } else {
+            startTime = year + '-' + month + '-' + day;
+            endTime = year + '-' + month + '-' + day;
+          }
         }
 
         // 图表数据
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue
index 6883240..5870226 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue
@@ -59,7 +59,10 @@
                 查询
               </a-button>
             </div>
-            <a-button type="primary" style="position: absolute; right: 40px; top: -45px">
+            <a-button
+              type="primary"
+              style="position: absolute; right: 40px; top: -45px"
+              @click="exportExcel()">
               导出
             </a-button>
           </div>
@@ -84,6 +87,9 @@
   </div>
 </template>
 <script lang="ts" setup>
+  import XLSX from 'xlsx';
+  // import Export2Excel from '/@/util/Export2Excel.js';
+
   import { ref, onMounted, defineOptions } from 'vue';
   // import { http } from '/nerv-lib/util/http';
   import { Pagination, SelectProps, TreeSelectProps, TableColumnType } from 'ant-design-vue';
@@ -346,6 +352,61 @@
         }
       });
   };
+  // 导出excel
+  /**导出按钮点击事件函数
+   * @前期准备 npm install -S xlsx file-saver 及 Export2Excel.js
+   */
+  const exportExcel = () => {
+    import('/@/util/Export2Excel.js').then((excel) => {
+      // 导出的表头名
+      let tHeader = [];
+      let filterVal = [];
+      for (let i = 0; i < tableColumns.value.length; i++) {
+        if (tableColumns.value[i].dataIndex) {
+          tHeader.push(tableColumns.value[i].title);
+          filterVal.push(tableColumns.value[i].dataIndex);
+        }
+      }
+      // const tHeader = [
+      //   'ID',
+      //   '名称',
+      //   '视频ID',
+      //   '视频标题',
+      //   '发布',
+      //   '视频类型',
+      //   '播放量',
+      //   '上传时间',
+      // ];
+      // // 导出的表头字段名
+      // const filterVal = [
+      //   'id',
+      //   'name',
+      //   'videoId',
+      //   'videoTitle',
+      //   'release',
+      //   'videoType',
+      //   'playVolume',
+      //   'updateTime',
+      // ];
+      //传入的数据
+      const list = data.value;
+
+      const datas = formatJson(filterVal, list);
+      excel.export_json_to_excel({
+        header: tHeader, // 表格头部
+        data: datas, // 表格数据
+        filename: '表格导出测试', // excel文件名
+      });
+    });
+  };
+  /**
+   *  格式化表格数据
+   *  @filterVal  格式头
+   *  @jsonData  用来格式化的表格数据
+   */
+  const formatJson = (filterVal: any, jsonData: any) => {
+    return jsonData.map((v: any) => filterVal.map((j: any) => v[j]));
+  };
   onMounted(async () => {
     // 获取频率
     let frequency = await getEnum({ params: { enumType: 'TimeFlagEnum' } });
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
index 16b6574..5109db2 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
@@ -65,6 +65,13 @@
                 :unCheckedValue="0"
                 @change="(checked) => updateShowed(record)" />
             </template>
+            <template
+              v-if="column.dataIndex === 'device1Area' || column.dataIndex === 'device2Area'">
+              <a-tooltip v-if="text.length > 15" :title="text">
+                {{ text.slice(0, 15) }}...
+              </a-tooltip>
+              <span v-else>{{ text }}</span>
+            </template>
           </template>
           <template #title>
             <div
@@ -171,7 +178,7 @@
   const typeList = ref();
 
   const quyuvalue = ref<string[]>([]);
-  const useFlag = ref<Number>();
+  const useFlag = ref<Number | null>();
   const useFlagList = ref();
   useFlagList.value = [
     {
@@ -218,6 +225,7 @@
   // 重置
   const resetting = () => {
     quyuvalue.value = [];
+    useFlag.value = null;
     areaName.value = '';
   };
   // 修改是否显示状态
@@ -296,6 +304,8 @@
         //   quyuvalue.value = [treeData2.value[0].childList[0].id];
         // }
       });
+
+    queryDeviceInfoListPage();
   };
   onMounted(async () => {
     // 获取环境参数
@@ -360,6 +370,13 @@
       {
         title: '设备一级区域',
         dataIndex: 'device1Area',
+        // width: 300,
+        // ellipsis: true,
+        // textNumber: 15,
+        // textEllipsis: true,
+        // ellipsis: {
+        //   showTitle: false, // 设置为 false 在悬浮时显示 tooltip
+        // },
       },
       {
         title: '设备二级区域',