diff --git a/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts b/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts
index b3f80fd..3be9a50 100644
--- a/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts
+++ b/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts
@@ -1,4 +1,5 @@
 export enum equipmentAlarmApi {
   getTableList = '/carbon-smart/api/AlarmEquipmentLog/selectAlarmEquipmentLog', //设备告警 列表
   getCodeList = '/carbon-smart/api/AlarmEquipmentLog/selectErrorCodeList', //设备告警 列表
+  getSelectAlarmEquipmentLogStatusProcess = '/carbon-smart/api/AlarmEquipmentLogStatusProcess/selectAlarmEquipmentLogStatusProcess', //设备告警 状态 没有创建工单log接口
 }
diff --git a/hx-ai-intelligent/src/api/index.ts b/hx-ai-intelligent/src/api/index.ts
index 9f32029..fa25e6e 100644
--- a/hx-ai-intelligent/src/api/index.ts
+++ b/hx-ai-intelligent/src/api/index.ts
@@ -45,19 +45,9 @@ export const dict = async ({
 export const getAllEnum = async ({
   api = `${BASE_URL}/operation/enum/getAllEnum`,
   params = {},
-  keyField = 'dicKey',
-  transform = (res: any) => res,
 }: dictHttpConfig) => {
-  const dictMap = JSON.parse(sessionStorage.getItem('dictMap') || '{}') as Object;
-  const key = get(params, keyField) as keyof typeof dictMap;
-
-  if (!dictMap.hasOwnProperty(key)) {
-    const res = await http.post(api, params);
-    const options = get(transform(res), `data.${key}`);
-    dictMap[key] = options;
-    sessionStorage.setItem('dictMap', JSON.stringify(dictMap));
-  }
-  return Promise.resolve({ data: { data: get(dictMap, key) } });
+  const res = await http.post(api, params);
+  return Promise.resolve(res);
 };
 
 
@@ -67,17 +57,7 @@ export const getAllEnum = async ({
 export const getEnum = async ({
   api = `${BASE_URL}/operation/enum/getEnum`,
   params = {},
-  keyField = 'dicKey',
-  transform = (res: any) => res,
 }: dictHttpConfig) => {
-  const dictMap = JSON.parse(sessionStorage.getItem('dictMap') || '{}') as Object;
-  const key = get(params, keyField) as keyof typeof dictMap;
-
-  if (!dictMap.hasOwnProperty(key)) {
-    const res = await http.post(api, params);
-    const options = get(transform(res), `data.${key}`);
-    dictMap[key] = options;
-    sessionStorage.setItem('dictMap', JSON.stringify(dictMap));
-  }
-  return Promise.resolve({ data: { data: get(dictMap, key) } });
+  const res = await http.post(api, params);
+  return Promise.resolve(res);
 };
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/components/ns-steps.vue b/hx-ai-intelligent/src/components/ns-steps.vue
index 9903135..d164d0c 100644
--- a/hx-ai-intelligent/src/components/ns-steps.vue
+++ b/hx-ai-intelligent/src/components/ns-steps.vue
@@ -8,12 +8,12 @@
         <template #description>
           <div class="card">
             <div class="card-title">
-              <a-tag class="card-title-tag" :color="item.color">{{ item.statusName }}</a-tag>
-              <div class="name">{{ item.name }}</div>
-              <div class="time">{{ item.time }}</div>
+              <a-tag class="card-title-tag" :color="item.color">{{ item.stateName }}</a-tag>
+              <div class="name">{{ item.createName }}</div>
+              <div class="time">{{ item.createTime }}</div>
             </div>
             <div style="width: 100%; color: #3a3a3a; height: 25px; overflow: auto">
-              {{ item.desc }}</div
+              {{ item.remarks }}</div
             >
           </div>
         </template>
diff --git a/hx-ai-intelligent/src/icon/status-1.svg b/hx-ai-intelligent/src/icon/state-1.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-1.svg
rename to hx-ai-intelligent/src/icon/state-1.svg
diff --git a/hx-ai-intelligent/src/icon/status-2.svg b/hx-ai-intelligent/src/icon/state-2.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-2.svg
rename to hx-ai-intelligent/src/icon/state-2.svg
diff --git a/hx-ai-intelligent/src/icon/status-3.svg b/hx-ai-intelligent/src/icon/state-3.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-3.svg
rename to hx-ai-intelligent/src/icon/state-3.svg
diff --git a/hx-ai-intelligent/src/icon/status-4.svg b/hx-ai-intelligent/src/icon/state-4.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-4.svg
rename to hx-ai-intelligent/src/icon/state-4.svg
diff --git a/hx-ai-intelligent/src/icon/status-5.svg b/hx-ai-intelligent/src/icon/state-5.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-5.svg
rename to hx-ai-intelligent/src/icon/state-5.svg
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
index 9ecbbd8..b2c1e72 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -12,6 +12,20 @@
       <a-form-item name="alarmTitle" label="告警标题">
         <ns-input allowClear v-model:value="infoObject.alarmTitle" placeholder="请输入告警标题" />
       </a-form-item>
+      <a-form-item name="monitorTime" label="监测时长">
+        <ns-input-number
+          allowClear
+          v-model:value="infoObject.monitorTime"
+          placeholder="请输入监测时长" />
+      </a-form-item>
+      <a-form-item label="监测时长单位" name="monitorTimeUnit">
+        <a-select
+          v-model:value="infoObject.monitorTimeUnit"
+          placeholder="请选择监测时长单位"
+          style="width: 100%"
+          allowClear
+          :options="monitorTimeUnitData" />
+      </a-form-item>
       <a-form-item label="告警频率" name="alarmFrequency">
         <a-select
           v-model:value="infoObject.alarmFrequency"
@@ -35,20 +49,6 @@
           allowClear
           :options="intervalDurationUnitData" />
       </a-form-item>
-      <a-form-item name="monitorTime" label="监测时长">
-        <ns-input-number
-          allowClear
-          v-model:value="infoObject.monitorTime"
-          placeholder="请输入监测时长" />
-      </a-form-item>
-      <a-form-item label="监测时长单位" name="monitorTimeUnit">
-        <a-select
-          v-model:value="infoObject.monitorTimeUnit"
-          placeholder="请选择监测时长单位"
-          style="width: 100%"
-          allowClear
-          :options="monitorTimeUnitData" />
-      </a-form-item>
       <a-form-item label="优先级" name="priority">
         <a-select
           v-model:value="infoObject.priority"
@@ -92,6 +92,9 @@
     monitorTimeUnit: null,
     priority: null,
     createWorkOrder: null,
+    intervalDurationUnit: null,
+    repetitions: null,
+    intervalDuration: null,
     enableRules: 0,
   });
   const formRef = ref();
@@ -159,7 +162,15 @@
     } else {
       infoObject.value = {
         id: null,
-        accountNo: null,
+        alarmTitle: null,
+        alarmFrequency: null,
+        monitorTime: null,
+        monitorTimeUnit: null,
+        priority: null,
+        createWorkOrder: null,
+        intervalDurationUnit: null,
+        repetitions: null,
+        intervalDuration: null,
         enableRules: 0,
       };
     }
@@ -185,10 +196,9 @@
     monitorTime: [
       {
         required: true,
-        message: '请输入正确的监测时长',
         trigger: 'change',
         validator: (rules: any, monitorTime: any, cbfn: any) => {
-          if (monitorTime && monitorTime > 0) {
+          if (Number.isInteger(monitorTime) && monitorTime > 0) {
             cbfn();
           } else {
             cbfn('请输入正确的监测时长');
@@ -199,10 +209,9 @@
     intervalDuration: [
       {
         required: true,
-        message: '请输入正确的间隔时长',
         trigger: 'change',
-        validator: (rules: any, monitorTime: any, cbfn: any) => {
-          if (monitorTime && monitorTime > 0) {
+        validator: (rules: any, intervalDuration: any, cbfn: any) => {
+          if (Number.isInteger(intervalDuration) && intervalDuration > 0) {
             cbfn();
           } else {
             cbfn('请输入正确的间隔时长');
@@ -213,10 +222,9 @@
     repetitions: [
       {
         required: true,
-        message: '请输入正确的重复次数',
         trigger: 'change',
         validator: (rules: any, repetitions: any, cbfn: any) => {
-          if (repetitions && repetitions > 0) {
+          if (Number.isInteger(repetitions) && repetitions > 0) {
             cbfn();
           } else {
             cbfn('请输入正确的重复次数');
@@ -242,6 +250,50 @@
   const btnClick = () => {
     //表单校验
     formRef.value.validate().then(() => {
+      // 告警频率重复时 都换成分钟  比较 监测时长 和 间隔时长  重复次数 * 间隔 <= 监测
+      if (infoObject.value.alarmFrequency === 2) {
+        // 监测时长
+        let monitorTime = 0;
+        switch (infoObject.value.monitorTimeUnit) {
+          case 1:
+            monitorTime = Number(infoObject.value.monitorTime) * 1;
+            break;
+          case 2:
+            monitorTime = Number(infoObject.value.monitorTime) * 60;
+            break;
+          case 3:
+            monitorTime = Number(infoObject.value.monitorTime) * 60 * 24;
+            break;
+        }
+        // 间隔时长
+        let intervalTime = 0;
+        switch (infoObject.value.intervalDurationUnit) {
+          case 1:
+            intervalTime =
+              Number(infoObject.value.intervalDuration) * 1 * Number(infoObject.value.repetitions);
+            break;
+          case 2:
+            intervalTime =
+              Number(infoObject.value.intervalDuration) * 60 * Number(infoObject.value.repetitions);
+            break;
+          case 3:
+            intervalTime =
+              Number(infoObject.value.intervalDuration) *
+              60 *
+              24 *
+              Number(infoObject.value.repetitions);
+            break;
+        }
+        if (intervalTime > monitorTime) {
+          NsMessage.error(
+            '间隔时长超过了告警监测周期的最大值。请设置1分钟到' +
+              infoObject.value.monitorTime +
+              ['分', '小时', '天'][infoObject.value.monitorTimeUnit - 1] +
+              '之间的间隔时长',
+          );
+          return;
+        }
+      }
       //调用接口
       let data = { ...infoObject.value };
       data.createWorkOrder = Number(data.createWorkOrder);
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
index 2cce3b9..ba6760b 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
@@ -59,14 +59,14 @@
             </template>
             <template v-if="column.dataIndex === 'repetitions'">
               {{
-                record.repetitions && record.alarmFrequency.value === 2 ? record.repetitions : ''
+                record.repetitions && record.alarmFrequency.value === 2 ? record.repetitions : '-'
               }}
             </template>
             <template v-if="column.dataIndex === 'interval'">
               {{
                 record.intervalDuration && record.alarmFrequency.value === 2
                   ? record.intervalDuration + '' + record.intervalDurationUnit.label
-                  : ''
+                  : '-'
               }}
             </template>
           </template>
@@ -112,14 +112,14 @@
             </template>
             <template v-if="column.dataIndex === 'repetitions'">
               {{
-                record.repetitions && record.alarmFrequency.value === 2 ? record.repetitions : ''
+                record.repetitions && record.alarmFrequency.value === 2 ? record.repetitions : '-'
               }}
             </template>
             <template v-if="column.dataIndex === 'interval'">
               {{
                 record.intervalDuration && record.alarmFrequency.value === 2
                   ? record.intervalDuration + '' + record.intervalDurationUnit.label
-                  : ''
+                  : '-'
               }}
             </template>
           </template>
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
index 5c4755a..53c6a15 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -12,22 +12,22 @@
       <a-tab-pane key="1" tab="更新状态">
         <div style="width: 100%; padding: 24px">
           <a-form ref="formRef" :model="infoObject" :rules="rules">
-            <a-form-item ref="status" label="当前状态" name="status">
+            <a-form-item ref="state" label="当前状态" createName="state">
               <a-select
-                v-model:value="infoObject.status"
+                v-model:value="infoObject.state"
                 show-search
                 placeholder="请选择设备点位"
                 style="width: 85%"
-                :options="statusOptions"
+                :options="stateOptions"
                 :disabled="showEdit"
                 :filter-option="filterDevicePoint" />
               <ns-icon
                 size="20"
-                @click="() => (showEdit = !showEdit)"
+                @click="changeShowEdit"
                 style="margin-left: 20px"
-                :name="showEdit ? 'bianji' : 'baocun'" />
+                :createName="showEdit ? 'bianji' : 'baocun'" />
             </a-form-item>
-            <a-form-item label="备注" name="desc">
+            <a-form-item label="备注" createName="desc">
               <a-textarea
                 v-model:value="infoObject.desc"
                 placeholder="请输入异常描述"
@@ -55,6 +55,8 @@
   import { ref } from 'vue';
   import NsSteps from '/@/components/ns-steps.vue';
   import { NsMessage } from '/nerv-lib/component';
+  import { http } from '/nerv-lib/util';
+  import { equipmentAlarmApi } from '/@/api/alarmManagement/equipmentAlarm';
 
   export default defineComponent({
     components: { NsSteps },
@@ -64,33 +66,46 @@
       const showEdit = ref(true);
       const infoObject = ref({});
       const equipmentAlarm = ref({});
-      const statusOptions = ref();
+      const stateOptions = ref();
       const logList = ref([
-        { name: '李四', status: 3, time: '2024-03-10 10:00:00', desc: '完成' },
-        { name: '王五', status: 5, time: '2024-03-10 10:00:00' },
-        { name: '王五', status: 4, time: '2024-03-10 10:00:00' },
-        { name: '王五', status: 2, time: '2024-03-10 10:00:00', desc: '创建工单' },
-        { name: '赵六', status: 1, time: '2024-03-10 10:00:00' },
+        { createName: '李四', state: 3, createTime: '2024-03-10 10:00:00', desc: '完成' },
+        { createName: '王五', state: 5, createTime: '2024-03-10 10:00:00' },
+        { createName: '王五', state: 4, createTime: '2024-03-10 10:00:00' },
+        { createName: '王五', state: 2, createTime: '2024-03-10 10:00:00', desc: '创建工单' },
+        { createName: '赵六', state: 1, createTime: '2024-03-10 10:00:00' },
       ]);
       const config = ref({
         size: logList.value.length,
         dataSource: logList.value,
       });
       const handleClose = () => {
+        equipmentAlarm.value = P;
         visible.value = false;
       };
       const btnClick = () => {
         NsMessage.success('操作成功');
-        delete infoObject.value.time;
+        delete infoObject.value.createTime;
         console.log(infoObject.value, equipmentAlarm.value, '操作');
         console.log('btnClick');
       };
-      const toggle = (data) => {
-        console.log(data, '数据');
-        equipmentAlarm.value = data;
+      //修改状态
+      const changeShowEdit = () => {
+        if (equipmentAlarm.value.createWorkOrder === 1) {
+          showEdit.value = !showEdit.value;
+        }
+      };
+      const toggle = async (data) => {
+        equipmentAlarm.value = { ...data };
         infoObject.value = { ...logList.value[0] };
+        await http
+          .post(equipmentAlarmApi.getSelectAlarmEquipmentLogStatusProcess, {
+            id: data.id,
+          })
+          .then((res) => {
+            console.log(res);
+          });
         if (equipmentAlarm.value.createWorkOrder === 1) {
-          statusOptions.value = [
+          stateOptions.value = [
             { value: 1, label: '待处理' },
             { value: 2, label: '处理中' },
             { value: 3, label: '已完成' },
@@ -98,7 +113,7 @@
             { value: 5, label: '已关闭' },
           ];
         } else {
-          statusOptions.value = [
+          stateOptions.value = [
             { value: 1, label: '待处理' },
             { value: 2, label: '处理中' },
             { value: 3, label: '已完成' },
@@ -120,17 +135,18 @@
           5: '#a6a6a6',
         };
         logList.value.forEach((item) => {
-          item.statusName = statusMap[item.status];
-          item.color = colorMap[item.status];
-          item.src = 'status-' + item.status;
+          item.stateName = statusMap[item.state];
+          item.color = colorMap[item.state];
+          item.src = 'state-' + item.state;
         });
         visible.value = true;
       };
       return {
         infoObject,
+        changeShowEdit,
         showEdit,
         equipmentAlarm,
-        statusOptions,
+        stateOptions,
         btnClick,
         visible,
         logList,
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
index 35cfd8a..27ced80 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
@@ -8,6 +8,7 @@ const tableKeyMap = [
   {
     title: '序号',
     dataIndex: 'address',
+    width: 80,
     customRender: (text: any) => {
       return text.index + 1;
     },
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 8925bca..874ac97 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -739,27 +739,27 @@
             options: [
               {
                 label: 'CO2',
-                value: 'CO2',
+                value: '1',
               },
               {
                 label: 'CO2e',
-                value: 'CO2e',
+                value: '2',
               },
               {
                 label: 'SF6',
-                value:'SF6',
+                value:'3',
               },
               {
                 label: 'CH4',
-                value: 'CH4',
+                value: '4',
               },
               {
                 label: 'PFCs',
-                value: 'PFCs',
+                value: '5',
               },
               {
                 label: 'HFCs',
-                value: 'HFCs',
+                value: '6',
               },
             ],
           },
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue
index 62c8b54..8283309 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue	
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue	
@@ -291,10 +291,10 @@
   // };
 </script>
 <style scoped lang="less">
-  ::v-deep .ant-table-title{
+  :deep(.ant-table-title){
     display: flex;
   }
-  ::v-deep .ant-table-container{
+  :deep(.ant-table-container){
     padding: 0px 16px;
   }
 </style>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
index d792f11..412aae7 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -10,14 +10,14 @@
         <a-date-picker v-model:value="selectYear" picker="year" @change="changeYearData" valueFormat="YYYY" />
       </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" />
+    <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>
 </template>
 <script lang="ts" setup>
@@ -177,10 +177,10 @@
   };
 </script>
 <style scoped lang="less">
-  ::v-deep .ant-table-title{
+  :deep(.ant-table-title){
     display: flex;
   }
-  ::v-deep .ant-table-container{
+  :deep(.ant-table-container){
     padding: 0px 16px;
   }
 </style>
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 4978f78..256c5cb 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -576,10 +576,10 @@
   };
 </script>
 <style scoped lang="less">
-  ::v-deep .ant-table-title{
+  :deep(.ant-table-title) {
     display: flex;
   }
-  ::v-deep .ant-table-container{
+  :deep(.ant-table-container) {
     padding: 0px 16px;
   }
   .buttonGroup{
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 a43aa27..08059aa 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -490,7 +490,7 @@
     height: 100%;
     background: #ffffff;
   }
-  ::v-deep .ant-table-container{
+  :deep(.ant-table-container) {
     padding: 0px 16px;
   }
   :deep(.ns-table-main) {
@@ -527,7 +527,7 @@
     border-radius: 1px;
     background-color: #2778FF;
   }
-  ::v-deep .ant-table-title{
+  :deep(.ant-table-title) {
     display: flex;
     height: 100%;
     align-items: center;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts
index 6c3642a..94ed611 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts
@@ -1,283 +1,97 @@
-import { ref } from 'vue';
-import { http } from '/nerv-lib/util';
-import { origanizemanage } from '/@/api/origanizemanage';
-import { carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
-export const formConfig = (disabled) => {
-  return ref([
-    {
-      field: 'fields',
-      component: 'NsChildForm',
-      componentProps: {
-        schemas: [
-          {
-            label: '排放源',
-            field: 'emissionSources',
-            component: 'NsInput',
-            componentProps: {
-              placeholder: '请输入排放源',
-              maxLength: 20,
-            },
-            rules: [
-              {
-                required: true,
-                message: '请输入排放源',
-              },
-            ],
-          },
-          {
-            field: 'emissionType',
-            label: '排放分类',
-            component: 'NsCascader',
-            fieldMap: ['emissionType'],
-            componentProps: {
-              placeholder: '请选择排放分类',
-              api: carbonEmissionFactorLibrary.getCarbonFactorTree,
-              fieldNames: { label: 'emissionName', value: 'id' },
-              showSearch: true,
-            },
-            rules: [
-              {
-                required: true,
-                message: '请选择排放分类',
-              },
-            ],
-          },
-          {
-            field: 'emissionGas',
-            label: '排放气体',
-            component: 'NsSelect',
-            componentProps: {
-              allowClear: true,
-              placeholder: '请选择排放气体',
-              options: [
-                {
-                  label: 'CO2',
-                  value: 'CO2',
-                },
-                {
-                  label: 'CO2e',
-                  value: 'CO2e',
-                },
-                {
-                  label: 'SF6',
-                  value:'SF6',
-                },
-                {
-                  label: 'CH4',
-                  value: 'CH4',
-                },
-                {
-                  label: 'PFCs',
-                  value: 'PFCs',
-                },
-                {
-                  label: 'HFCs',
-                  value: 'HFCs',
-                },
-              ],
-            },
-            rules: [
-              {
-                required: true,
-                message: '请选择排放气体',
-              },
-            ],
-          },
-          // {
-          //   field: 'emissionProcess',
-          //   label: '排放环节',
-          //   component: 'NsSelectApi',
-          //   componentProps: {
-          //     api: carbonEmissionFactorLibrary.getEmissionProcess,
-          //     params: {
-          //       emissionType: sessionStorage.getItem('checkedTreeNode'),
-          //     },
-          //     resultField: 'data',
-          //     labelField: 'emissionProcess',
-          //     valueField: 'emissionProcess',
-          //     immediate: true,
-          //     autoSelectFirst: false,
-          //     filterOption:false,
-          //     showSearch:true,
-          //     autoClearSearchValue:false
-          //   },
-          // },
-          {
-            label: '排放环节',
-            field: 'emissionProcess',
-            component: 'NsInput',
-            componentProps: {
-              placeholder: '请输入排放环节',
-              maxLength: 20,
-            },
-            rules: [
-              {
-                required: true,
-                message: '请输入排放环节',
-              },
-            ],
-          },
-          {
-            label: '排放因子',
-            field: 'emissionFactors',
-            component: 'NsInputNumber',
-            componentProps: {
-              placeholder: '请输入排放因子值',
-              maxLength: 20,
-            },
-            rules: [
-              {
-                required: true,
-                message: '请输入排放因子值',
-                trigger: 'change',
-              },
-            ],
-          },
-          {
-            field: 'carbonEmissionPrefix',
-            label: '碳排前缀',
-            component: 'NsSelect',
-            componentProps: {
-              disabled: true,
-              allowClear: true,
-              defaultValue: 't',
-              placeholder: '请选择碳排前缀',
-              options: [
-                {
-                  label: 'g',
-                  value: 'g',
-                },
-                {
-                  label: 'kg',
-                  value: 'kg',
-                },
-                {
-                  label: 't',
-                  value: 't',
-                },
-              ],
-            },
-            rules: [
-              {
-                required: true,
-                message: '请选择碳排前缀',
-              },
-            ],
-          },
-          {
-            label: '碳排后缀',
-            field: 'carbonEmissionSuffix',
-            component: 'NsInput',
-            componentProps: {
-              placeholder: '请输入碳排后缀',
-              maxLength: 20,
-            },
-            rules: [
-              {
-                required: true,
-                message: '请输入碳排后缀',
-              },
-            ],
-          },
-          {
-            label: '已引用数',
-            field: 'numberOfReferences',
-            component: 'NsInput',
-            componentProps: {
-              defaultValue: 10,
-              disabled: true,
-              maxLength: 20,
-            },
-          },
-          {
-            label: '参考文献',
-            field: 'reference',
-            component: 'NsTextarea',
-            componentProps: {
-              placeholder: '请输入参考文献',
-              maxLength: 20,
-            },
-          },
-        ],
+// 填报页表头
+export const columns = [
+  {
+    title: '日期',
+    dataIndex: 'name',
+    key: 'name',
+    width: 100,
+    fixed: 'left',
+  },
+  {
+    title: '消耗量',
+    children: [
+      {
+        title: '数据来源',
+        dataIndex: 'companyAddress',
+        key: 'companyAddress',
+        width: 200,
       },
-    },
-  ]);
-};
-const options = ref([]);
-
-const getUserPerList = (transform, params = {}) => {
-  return http.post(origanizemanage.queryUserPerList, { ...params }).then((res) => {
-    return res.data?.map((item) => {
-      item = { ...item, ...transform(item) };
-      return item;
-    });
-  });
-};
-export const formConfig2 = (casData: any) => {
-  return ref([
-    {
-      field: 'information',
-      component: 'NsCascader',
-      componentProps: {
-        placeholder: '请选择',
-        displayRender: ({ labels, selectedOptions }: any) => {
-          console.log(labels, selectedOptions);
-
-          casData.value = selectedOptions.map(({ label, value }) => {
-            return { label, value };
-          });
-          return labels.join('/');
-        },
-        loadData: (selectedOptions, options) => {
-          console.log(selectedOptions, options, 'selectedOptions, options');
-
-          const targetOption = selectedOptions[selectedOptions.length - 1];
-          let transForm, params;
-          // load options lazily
-          if (!selectedOptions.length) {
-            transForm = (data) => {
-              data['label'] = data.orgName;
-              data['value'] = data.orgId;
-              data['isLeaf'] = false;
-              data['level'] = 1;
-              return data;
-            };
-            getUserPerList(transForm).then((res) => {
-              options.value = [...res];
-            });
-          }
-          const id = targetOption?.value;
-          const level = targetOption?.level;
-          if (targetOption) {
-            targetOption.loading = true;
-          }
-
-          if (level === 1) {
-            transForm = (data) => {
-              data['label'] = data.deptName;
-              data['value'] = data.deptId;
-              data['isLeaf'] = false;
-              data['level'] = 2;
-              return data;
-            };
-            params = { orgId: id };
-          } else if (level === 2) {
-            transForm = (data) => {
-              data['label'] = data.roleName;
-              data['value'] = data.roleId;
-              data['level'] = 3;
-              return data;
-            };
-            params = { deptId: id };
-          }
-          if (targetOption) {
-            getUserPerList(transForm, { ...params }).then((res) => {
-              targetOption.loading = false;
-              targetOption.children = [...res];
-            });
-          }
-        },
+      {
+        title: '数值',
+        dataIndex: 'companyName',
+        key: 'companyName',
+      },
+    ],
+  },
+  {
+    title: '碳排因子',
+    children: [
+      {
+        title: '数据来源',
+        dataIndex: 'companyAddress',
+        key: 'companyAddress',
+        width: 200,
+      },
+      {
+        title: '数值',
+        dataIndex: 'companyName',
+        key: 'companyName',
       },
+    ],
+  },
+  {
+    title: '排放量',
+    dataIndex: 'gender',
+    key: 'gender',
+    width: 80,
+    fixed: 'right',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    key: 'action',
+    width: 80,
+    fixed: 'right',
+  },
+];
+// 凭证弹窗表头
+export const voucherColumns = [
+  {
+    title: '序号',
+    customRender: (text: any) => {
+      return text.index + 1;
     },
-  ]);
-};
+  },
+  {
+    title: '日期',
+    dataIndex: 'age',
+    key: 'age',
+  },
+  {
+    title: '文件名称',
+    dataIndex: 'address',
+    key: 'address 1',
+    ellipsis: true,
+  },
+];
+// 编辑页中表头
+export const drawerColumns = [
+  {
+    title: '名称',
+    dataIndex: 'emissionSources',
+  },
+  {
+    title: '因子值',
+    dataIndex: 'emissionFactors',
+  },
+  {
+    title: '排放环节',
+    className: 'emissionProcess',
+    dataIndex: 'emissionProcess',
+  },
+  {
+    title: '数据来源',
+    className: 'dataSources',
+    dataIndex: 'dataSources',
+  },
+];
\ No newline at end of file
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 33f731f..f0d78a1 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -3,7 +3,13 @@
     <div class="left">
       <div class="top">
         <a-form style="width: 100%;margin: 0 auto;">
-          <div class="ns-form-title"><div class="title">2024年济阳站碳盘查报告</div></div>
+            <div class="ns-form-title">
+              <div class="title">2024年济阳站碳盘查报告</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;">
@@ -35,33 +41,331 @@
         <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="changePage">排放统计</div>
-            <div class="changePage">碳排流向</div>
+            <div :class="{ 'pftj': isClickedPftj }" @click="showPftj">排放统计</div>
+            <div :class="{ 'tplx': isClickedTplx }" @click="showTplx">碳排流向</div>
           </div>
         </a-form>
       </div>
     </div>
     <div class="right">
-      <div class="ns-table-title ns-title-extra-box">排放源</div>
-      <div class="mainLeft"></div>
-      <div class="mainRight">
-        <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1500}" />
+      <div style="display:flex;">
+        <div class="ns-table-title ns-title-extra-box">排放源</div>
+        <a-button type="primary" style="margin-left: 12px;">返回</a-button>
+      </div>
+      <div style="display: flex;" v-if="fillInPage">
+        <div class="mainLeft">
+          <a-tree
+            v-model:expandedKeys="expandedKeysR"
+            v-model:selectedKeys="selectedKeys"
+            v-model:checkedKeys="checkedKeys"
+            :tree-data="treeData"
+            block-node
+          >
+            <template #title="data">
+              <div class="treeRow">
+                <div>
+                  <span>{{ data.title }}</span>
+                </div>
+                <div class="actionMore">
+                  <EditOutlined v-if="!data.parentId" @click="editGroup(data)" />
+                  <EditOutlined v-else @click="editUnit(data)" />
+                  <MinusCircleOutlined style="margin-left: 6px;" @click="delUnit(data)" />
+                  <PlusCircleOutlined v-if="!data.parentId" style="margin-left: 6px;" @click="addUnit(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: 480 }"
+          >
+            <template #title>
+              <a-button type="primary" @click="downLoadVoucher">凭证</a-button>
+            </template>
+            <template #bodyCell="{ column, text, record }">
+              <template v-if="column.key === 'action'">
+                <span>
+                  <a @click="edit(record)">编辑</a>
+                </span>
+              </template>
+            </template>
+          </a-table>
+        </div>
+      </div>
+      <div v-if="isClickedPftj">
+        <a-table 
+          :columns="pftjColumn" 
+          :data-source="pftjData" 
+          bordered
+          :pagination="false"
+          :scroll="{ x: 2000 }">
+        </a-table>
+      </div>
+      <div v-if="isClickedTplx">
+        <div ref="tplxChart" style="width: 100%; height: 68vh"></div>
       </div>
     </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"
+          :tree-data="categoryTreeData"
+          v-if="categoryTreeData && categoryTreeData.length > 0"
+          class="draggable-tree"
+          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="closeUnitManag">确定</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="energyType">
+          <a-select
+            ref="select"
+            v-model:value="formState.unit"
+          >
+            <a-select-option value="jack">Jack</a-select-option>
+            <a-select-option value="lucy">Lucy</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item ref="name" label="计量单位" name="energyType">
+          <a-select
+            ref="select"
+            v-model:value="formState.unit"
+          >
+            <a-select-option value="jack">Jack</a-select-option>
+            <a-select-option value="lucy">Lucy</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item ref="name" label="温室气体" name="energyType">
+          <a-select
+            ref="select"
+            v-model:value="formState.unit"
+          >
+            <a-select-option value="jack">Jack</a-select-option>
+            <a-select-option value="lucy">Lucy</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item ref="name" label="碳排单位" name="energyType">
+          <a-select
+            ref="select"
+            v-model:value="formState.unit"
+          >
+            <a-select-option value="jack">Jack</a-select-option>
+            <a-select-option value="lucy">Lucy</a-select-option>
+          </a-select>
+        </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 }"
+        :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="700"
+      :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="12">
+          <a-form-item ref="name" label="数据来源" name="dateRange">
+            <a-select
+              ref="select"
+              v-model:value="editFormState.dateRange"
+              @change="handleChange"
+            >
+              <a-select-option value="jack">Jack</a-select-option>
+              <a-select-option value="lucy">Lucy</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="name" label="消耗量" name="emissionFactors">
+            <ns-input v-model:value="editFormState.emissionFactors" disabled />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="12">
+          <a-form-item ref="name" label="采集节点" name="dateRange">
+            <a-select
+              ref="select"
+              v-model:value="editFormState.dateRange"
+              @change="handleChange"
+            >
+              <a-select-option value="jack">Jack</a-select-option>
+              <a-select-option value="lucy">Lucy</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="12">
+          <a-form-item ref="name" label="因子值" name="emissionFactors">
+            <ns-input v-model:value="editFormState.emissionFactors" disabled />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item ref="name" label="关键字" name="emissionFactors">
+            <a-input-search v-model:value="editFormState.emissionFactors" placeholder="请输入关键字" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      </a-form>
+      <a-table 
+        :columns="drawerColumns" 
+        :data-source="newTableData" 
+        bordered
+        rowKey="id"
+        :scroll="{ y: 400 }"
+        style="margin-bottom: 10px;"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectionChange, type: 'radio' }"
+        :pagination="false">
+      </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" />
+      <a-upload
+        v-model:file-list="fileList"
+        name="file"
+        action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+        :headers="headers"
+        @change="handleChange"
+      >
+        <a-button>
+          <upload-outlined></upload-outlined>
+          点击上传凭证
+        </a-button>
+      </a-upload>
+      <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 } from 'vue';
-  import type { TreeProps } from 'ant-design-vue';
-  import { energyConsumption } from '/@/api/carbonEmissionFactorLibrary';
+  import { http } from '/nerv-lib/util/http';
+  import { Pagination } from 'ant-design-vue';
+  import type { TreeProps,TableColumnsType,UploadChangeParam  } from 'ant-design-vue';
+  import { EditOutlined,PlusCircleOutlined,MinusCircleOutlined,UploadOutlined  } from '@ant-design/icons-vue';
+  import * as echarts from 'echarts';
+  import { columns,voucherColumns,drawerColumns } from '../config';
+  import { energyConsumption,carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
+  defineOptions({
+    energyType: 'fillInPage', // 与页面路由name一致缓存才可生效
+    components: {
+      'a-pagination': Pagination,
+    },
+  });
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   orgId.value = result;
   const fetch = (api, params = { orgId } ) => {
     return http.post(api, params);
   };
-  // 树结构
+  // 左侧树结构
   const x = 3;
   const y = 2;
   const z = 1;
@@ -144,159 +448,580 @@
     autoExpandParent.value = true;
   });
   // 填报表格数据
+  const data = [...Array(12)].map((_, i) => ({
+    key: i,
+    name: 'John Brown',
+    age: i + 1,
+    street: 'Lake Park',
+    building: 'C',
+    number: 2035,
+    companyAddress: 'Lake Street 42',
+    companyName: 'SoftLake Co',
+    gender: 'M',
+  }));
+  // 右侧树数据
+  const treeData: TreeProps['treeData'] = [
+    {
+      title: 'parent 1',
+      key: '0-0',
+      children: [
+        {
+          title: 'parent 1-0',
+          key: '0-0-0',
+          children: [
+            { title: 'leaf', key: '0-0-0-0'},
+            { title: 'leaf', key: '0-0-0-1' },
+          ],
+        },
+        {
+          title: 'parent 1-1',
+          key: '0-0-1',
+          children: [{ key: '0-0-1-0', title: 'sss' }],
+        },
+      ],
+    },
+  ];
+
+  const expandedKeysR = ref<string[]>(['0-0-0', '0-0-1']);
+  const selectedKeys = ref<string[]>(['0-0-0', '0-0-1']);
+  const checkedKeys = ref<string[]>(['0-0-0', '0-0-1']);
+  watch(expandedKeysR, () => {
+    console.log('expandedKeysR', expandedKeysR);
+  });
+  watch(selectedKeys, () => {
+    console.log('selectedKeys', selectedKeys);
+  });
+  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 getUnitTree = () => {
+    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement).then((res) => {
+      categoryTreeData.value = res.data
+    });
+  }
+  getUnitTree()
+  const openCategoryConfig = () => {
+    categoryConfig.value = true;
+  };
+  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,
+  })
+  // 定义form表单的必填
+  const rules: Record<string, Rule[]> = {
+    energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
+    isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }]
+  };
+  const addTreeNodeData = () => {
+    addTreeNodeVisible.value = true;
+  };
+  const onClose = () => {
+    addTreeNodeVisible.value = false;
+    formState.value = {
+      orgId: orgId.value,
+    }
+    formRef.value.resetFields();
+  };
+  // 点击凭证弹出框
+  const openVoucher = ref(false);
+  const downLoadVoucher = () => {
+    openVoucher.value = true;
+  };
+  const selectedRowKeys = ref([]);
+  const onSelectionChange = (selectedKeys, selectedRows) => {
+    selectedRowKeys.value = selectedKeys;
+  };
+
+  const voucherData = [
+    {
+      key: '1',
+      name: 'John Brown',
+      age: 32,
+      address: 'New York No. 1 Lake Park, New York No. 1 Lake Park',
+      tags: ['nice', 'developer'],
+    },
+    {
+      key: '2',
+      name: 'Jim Green',
+      age: 42,
+      address: 'London No. 2 Lake Park, London No. 2 Lake Park',
+      tags: ['loser'],
+    },
+    {
+      key: '3',
+      name: 'Joe Black',
+      age: 32,
+      address: 'Sidney No. 1 Lake Park, Sidney No. 1 Lake Park',
+      tags: ['cool', 'teacher'],
+    },
+  ];
+  const onCloseVoucher = () => {
+    openVoucher.value = false;
+  };
+  // 点击编辑弹出框
+  const editData = ref(false);
+  const editFormRef = ref();
+  const editFormState = ref({
+    orgId: orgId.value,
+  })
+  const newTableData = ref([])
+  const total = ref<number>()
   const queryParams = ref({
     pageNum: 1,
     pageSize: 10,
+    orgId: orgId.value
+  })
+  const queryData = ref({
     orgId: orgId.value,
+    pageNum: 1,
+    pageSize: 999
   })
-  const tableConfig = ref({
-    title: '能耗统计',
-    api: energyConsumption.pageList,
-    params: queryParams.value,
-    headerActions: [
+  const edit = () => {
+    getNewTable()
+    editData.value = true
+  };
+  const getNewTable = () => {
+    fetch(carbonEmissionFactorLibrary.getTableList,queryData.value).then((res) => {
+      newTableData.value = res.data.records
+      total.value = res.data.total
+    });
+  };
+  const handleChange = (info: UploadChangeParam) => {
+    if (info.file.status !== 'uploading') {
+      console.log(info.file, info.fileList);
+    }
+    if (info.file.status === 'done') {
+      message.success(`${info.file.name} file uploaded successfully`);
+    } else if (info.file.status === 'error') {
+      message.error(`${info.file.name} file upload failed.`);
+    }
+  };
+
+  const fileList = ref([]);
+  const headers = {
+    authorization: 'authorization-text',
+  };
+  const onCloseEditData = () => {
+    editData.value = false
+  };
+  // 分页器
+  const onChange = (pageNumber: number,size: number) => {
+    queryParams.value.pageNum = pageNumber;
+    queryParams.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
+  };
+  const showTplx = () => {
+    fillInPage.value = false
+    isClickedPftj.value = false
+    isClickedTplx.value = true
+    drawEcharts();
+  };
+  // 排放统计表头
+  const pftjColumn = [
+    {
+      title: '排放分类',
+      dataIndex: 'cnValue',
+      customCell: (record, rowIndex) => {
+        if (rowIndex == undefined) {
+          return {
+            rowSpan: 0,
+            colSpan: 0,
+          };
+        }
+        const rowSpan = getRowSpan('cnValue', record, pftjData.value);
+        if (rowIndex != 0 && pftjData.value[rowIndex - 1].name == record.name) {
+          return {
+            rowSpan: 0,
+            colSpan: 0,
+          };
+        }
+        return {
+          rowSpan: rowSpan,
+        };
+      },
+    },
+    {
+      title: '运行边界',
+      dataIndex: 'cnValue',
+      customCell: (record, rowIndex) => {
+        if (rowIndex == undefined) {
+          return {
+            rowSpan: 0,
+            colSpan: 0,
+          };
+        }
+        const rowSpan = getRowSpan('cnValue', record, pftjData.value);
+        if (rowIndex != 0 && pftjData.value[rowIndex - 1].name == record.name) {
+          return {
+            rowSpan: 0,
+            colSpan: 0,
+          };
+        }
+        return {
+          rowSpan: rowSpan,
+        };
+      },
+    },
+    {
+      title: '排放类别',
+      dataIndex: 'energyType',
+    },
+    {
+      title: '排放源',
+      dataIndex: 'unitName',
+    },
+    {
+      title: '温室气体',
+      dataIndex: 'averageFactorValue',
+    },
+  ];
+  // 合并单元格
+  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 datalist = [
       {
-        label: '新增',
-        name: 'userAdd',
-        type: 'primary',
-        handle: () => {
-          getDictList()
-          visible.value = true
-        },
+        name: "公共平台",
       },
       {
-        label: '导入',
-        type: 'primary',
-        name: 'userImport',
-        handle: () => {},
+        name: "系统0000",
       },
       {
-        label: '导出',
-        type: 'primary',
-        name: 'userExports',
+        name: "系统0011",
       },
       {
-        label: '模板下载',
-        type: 'primary',
-        name: 'userExports',
+        name: "系统0022",
       },
       {
-        label: '上传凭证',
-        type: 'primary',
-        handle: () => {
-          openUpload.value = true;
-        },
+        name: "系统0033",
       },
       {
-        label: '凭证下载',
-        type: 'primary',
-        name: 'userExports',
+        name: "系统0044",
       },
-    ],
-    columns: [
       {
-        title: '序号',
-        customRender: (text: any) => {
-          return text.index + 1;
-        },
+        name: "系统0055",
       },
       {
-        title: '能源种类',
-        dataIndex: 'energyType',
+        name: "系统11",
       },
       {
-        title: '计量单位',
-        className: 'unitName',
-        dataIndex: 'unitName',
+        name: "系统22",
       },
       {
-        title: '全年',
-        dataIndex: 'yearly',
+        name: "系统33",
       },
       {
-        title: '1月',
-        dataIndex: 'jan',
+        name: "系统44",
       },
       {
-        title: '2月',
-        dataIndex: 'feb',
+        name: "系统55",
       },
       {
-        title: '3月',
-        dataIndex: 'mar',
+        name: "系统66",
       },
       {
-        title: '4月',
-        dataIndex: 'apr',
+        name: "系统77",
       },
       {
-        title: '5月',
-        dataIndex: 'may',
+        name: "系统88",
       },
       {
-        title: '6月',
-        dataIndex: 'jun',
+        name: "系统99",
       },
+    ];
+    let linksData = [
       {
-        title: '7月',
-        dataIndex: 'jul',
+        source: "公共平台",
+        target: "系统0000",
+        value: 1044305,
       },
       {
-        title: '8月',
-        dataIndex: 'aug',
+        source: "公共平台",
+        target: "系统0011",
+        value: 651527,
       },
       {
-        title: '9月',
-        dataIndex: 'sep',
+        source: "公共平台",
+        target: "系统0022",
+        value: 651527,
       },
       {
-        title: '10月',
-        dataIndex: 'oct',
+        source: "公共平台",
+        target: "系统0033",
+        value: 486710,
       },
       {
-        title: '11月',
-        dataIndex: 'nov',
+        source: "公共平台",
+        target: "系统0044",
+        value: 212670,
       },
       {
-        title: '12月',
-        dataIndex: 'dec',
+        source: "公共平台",
+        target: "系统0055",
+        value: 210400,
       },
-    ],
-    columnActions: {
-      title: '操作',
-      actions: [
-        {
-          label: '编辑',
-          name: 'userEdit',
-          handle: (record: any) => {
+      {
+        source: "系统0011",
+        target: "系统11",
+        value: 645246,
+      },
+      {
+        source: "系统0022",
+        target: "系统22",
+        value: 513275,
+      },
+      {
+        source: "系统0011",
+        target: "系统33",
+        value: 282986,
+      },
+      {
+        source: "系统0011",
+        target: "系统44",
+        value: 118655,
+      },
+      {
+        source: "系统0022",
+        target: "系统55",
+        value: 105989,
+      },
+      {
+        source: "系统0022",
+        target: "系统66",
+        value: 95100,
+      },
+      {
+        source: "系统0033",
+        target: "系统77",
+        value: 87796,
+      },
+      {
+        source: "系统0044",
+        target: "系统88",
+        value: 47658,
+      },
+      {
+        source: "系统0055",
+        target: "系统99",
+        value: 243660,
+      },
+    ];
+    let Color = [
+      "#61FEFF",
+      "#937FE6",
+      "#2B56D3",
+      "#87E7AA",
+      "#937FE6",
+      "#FF9B97",
+      "#8f23f5",
+      "#0576ea",
+      "#2cb8cf",
+      "#8A7EE0",
+      "#2cb8cf",
+      "#4e70f0",
+      "#1fa3de",
+      "#bbc951",
+      "#FFC14B",
+      "#b785a6",
+    ];
+    let Color1 = [
+      "#04E0F3",
+      "#682EFC",
+      "#35A7FE",
+      "#0DC09F",
+      "#682EFC",
+      "#ED6663",
+      "#8f23f5",
+      "#0576ea",
+      "#2cb8cf",
+      "#8A7EE0",
+      "#2cb8cf",
+      "#4e70f0",
+      "#1fa3de",
+      "#bbc951",
+      "#FFC14B",
+      "#b785a6",
+    ];
+    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 < datalist.length; i++) {
+      datalist[i].label = {
+        normal: {
+          position: sourceLabel[i],
+        },
+      };
+      labelSource.push(sourceLabel[i]);
+    }
+    for (let d = 0; d < datalist.length; d++) {
+      datalist[d].itemStyle = {
+        normal: {
+          // color: Color[d]
+          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
           },
         },
-        {
-          label: '删除',
-          name: 'userDelete',
-          dynamicParams: { id: 'id' },
-          confirm: true,
-          isReload: true,
-          api: energyConsumption.del,
+      };
+      itemStyleColor.push(datalist[d]);
+    }
+    option = {
+      backgroundColor: "#031d7a",
+      tooltip: {
+        trigger: "item",
+        triggerOn: "mousemove",
+        formatter: function (params) {
+          if (params.name == "公共平台") {
+            return " 公共平台 ";
+          } else {
+            let value = params.data.value;
+            if (!value && value !== 0) return 0;
+            let str = value.toString();
+            let reg =
+              str.indexOf(".") > -1
+                ? /(\d)(?=(\d{3})+\.)/g
+                : /(\d)(?=(?:\d{3})+$)/g;
+            if (params.data.source == "公共平台") {
+              return params.data.target + " : " + str.replace(reg, "$1,");
+            } else {
+              return params.data.source + " : " + str.replace(reg, "$1,");
+            }
+          }
         },
-      ],
-    },
-
-    formConfig: {
-      schemas: [
+      },
+      series: [
         {
-          field: 'year',
-          label: '年份',
-          component: 'NsDatePicker',
-          componentProps: {
-            picker: 'year',
-            valueFormat: 'YYYY',
+          type: "sankey",
+          layout: "none",
+          top: "4%",
+          bottom: "12%",
+          left: "20",
+          right: "20",
+          nodeGap: 15,
+          nodeWidth: 25,
+          focusNodeAdjacency: "allEdges",
+          data: itemStyleColor,
+          links: linksData,
+          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",
+            },
           },
         },
       ],
-      params: {},
-    },
-    rowKey: 'id',
-  });
+    };
+    chartInstance = echarts.init(tplxChart.value);
+    chartInstance.setOption(option);
+  };
 </script>
 
 <style lang="less" scoped>
@@ -319,6 +1044,7 @@
     .top{
       position: relative;
       height: 80%;
+      margin-bottom: 20px;
       .ns-form-title{
         font-weight: bold;
         user-select: text;
@@ -379,11 +1105,17 @@
         border-radius: 1px;
         background-color: #2778FF;
       }
-      .changePage{
+      .button>div{
         height: 3vh;
         display: flex;
         align-items: center;
       }
+      .pftj{
+        background: #c9e4ff;
+      }
+      .tplx{
+        background: #c9e4ff;
+      }
     }
   }
   .right {
@@ -399,8 +1131,54 @@
       font-size: 16px;
       font-weight: bold;
       user-select: text;
-      width: 100%;
+      width: 92%;
       margin-bottom: @ns-gap;
     }
+    .mainLeft{
+      width: 19%;
+      margin-right: 1%;
+      border-right: 1px solid #f2f2f2;
+      position: relative;
+      .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;
+    justify-content: space-evenly;
+  }
+  .treePart{
+    width: 70%;
+    height: 100%;
+    display: flex;
+    border: 1px solid #bfbfbf;
+    margin-left: 10%;
+    flex-direction: column;
   }
 </style>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index 807cb39..468051b 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -61,8 +61,8 @@
     return http.post(api, params);
   };
   // 判断展示哪个页面
-  const isMainPage = ref(true);
-  const fillInPage = ref(false);
+  const isMainPage = ref(false);
+  const fillInPage = ref(true);
   // 新增相关数据
   const visible = ref(false);
   const formState = ref({})
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index 4101051..cf3de9a 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -49,7 +49,12 @@
         :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">
             <a-tabs v-model:activeKey="activeKey">
                 <a-tab-pane key="1" tab="控制面板">
-                    <tabs1 @changeArea="changeArea" @reset="reset" :treeData="treeData" :nowArea="nowArea"></tabs1>
+                    <tabs1 
+                    @changeArea="changeArea" 
+                    @reset="reset" 
+                    :treeData="treeData" 
+                    :nowArea="nowArea"
+                    ></tabs1>
                 </a-tab-pane>
                 <a-tab-pane key="2" tab="计划列表" force-render>
                     <tabs2></tabs2>
@@ -83,6 +88,7 @@ import {
 // 初始化 =======================================================
 
 onMounted(() => {
+    // 获得分区与线路的结构
     http.get(lightingManage.getArea, { projectId: 'HLlmTZp8' }).then(res => {
         const data = res.data
         floorData.value = data
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
index 3882694..c0fb56b 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -81,9 +81,10 @@
       </div>
       <!-- 控制模式按钮部分 -->
       <div class="control-mode-btn-area" v-show="showControlMode">
-        <button v-for="(button3, index) in controlType" :key="index"
-          :class="{ btn: true, selected: button3.type == thisButton.type }" @click="selectButton3(button3)">
-          {{ button3.name }}
+        <button v-for="(button3, index) in controlMode" :key="index"
+        class="btn"
+        :class="{ selected: thisButton.mode.value == button3.value }" @click="selectButton3(button3)">
+          {{ button3.label }}
         </button>
       </div>
     </div>
@@ -212,7 +213,6 @@
 
 <script setup lang="ts">
 import { ref, computed, onMounted, watch } from 'vue';
-import { controlType } from './treeData'
 import {
   DownOutlined,
   UpOutlined,
@@ -222,11 +222,15 @@ import { message } from 'ant-design-vue';
 // 请求
 import { http } from '/nerv-lib/util/http';
 import { lightingManage } from '/@/api/IlluminationInfo';
+import { getAllEnum } from '/@/api/index'
 
 // 初始化  =========================================================================
 
 onMounted(() => {
+  // 设置分区
   setArea()
+  // 获得枚举
+  getEnum(['IlluminationMode', 'IlluminationScene'])
 })
 // 父组件点击俯视图切换分区时，子组件切换线路
 const setArea = () => {
@@ -402,8 +406,13 @@ const toggleSelection = (button: any) => {
   } else {
     // 未发生选中 或 多选被取消
     showControlMode.value = false
-    thisButton.value = { type: '0' }
+    thisButton.value = {
+      mode: {
+        value: '0'
+      }
+    }
   }
+  console.log(thisButton,'button')
 };
 
 // 照明回路所有按钮
@@ -417,16 +426,31 @@ const limitedButtons2 = computed(() => buttons2.value.slice(0, 8));
 
 // 决定该区域是否显示
 const showControlMode = ref(false);
-const thisButton = ref({ type: 0 })
+const thisButton = ref({
+  mode: {
+    value: '0'
+  }
+})
 // 控制模式 - 按钮切换
 const selectButton3 = (button3) => {
-  thisButton.value.type = button3.type
-  showControlScene.value = button3.name === '手动';
+  let checked = thisButton.value.mode.value
+  console.log(button3.value,'---', checked)
+  // 如果点击了相同的按钮，未作出修改
+  if (checked === button3.value) {
+    return
+  }
+  checked = button3.value
+  // 如果当前选项是手动模式
+  showControlScene.value = button3.label === '手动模式';
   selectedButton4.value = null; // 清空选中的控制场景按钮
 };
 
 // 控制场景业务 =====================================================================
 
+// 控制模式枚举
+const controlMode = ref([])
+// 场景枚举
+const controlScene = ref([])
 // 决定该区域是否显示
 const showControlScene = ref(false);
 // 控制场景 - 所有按钮
@@ -458,6 +482,8 @@ const handleRowClick = (index: any) => {
 
 // 内侧弹窗 ========================================================================
 
+// 需要向后端提交的修改内容
+const submitArray = ref([])
 const cxList = ref([
   {
     id: '1',
@@ -498,7 +524,7 @@ const cxList = ref([
 ]);
 //撤销
 const delBtn = (id: any) => {
-  cxList.value.pop(id);
+  cxList.value.pop();
   console.log(cxList.value.length);
 
   if (cxList.value.length === 0) {
@@ -514,14 +540,6 @@ const isLoading = ref(false)
 const initMenu = (tier: number) => {
   // 1 = 照明区域 - 切换时，重置以下所有菜单
   if (tier == 1) {
-    // 切换前，清除照明回路的选中状态
-    // buttons2.value.forEach(item => {
-    //   item.selected = false
-    // })
-    // // 切换后，清空所有选中状态
-    // props.treeData.forEach(item => {
-    //   item.selected = false
-    // })
     emit('reset')
     // 控制模式 隐藏
     showControlMode.value = false;
@@ -568,6 +586,15 @@ const changeConfirm = () => {
 const changeCancel = () => {
 
 }
+// 获得枚举，初始化
+const getEnum = (arr: any) => {
+    getAllEnum({ params: arr }).then(res => {
+        const data = res.data
+        controlMode.value = data.IlluminationMode
+        controlScene.value = data.IlluminationScene
+    })
+    console.log(controlMode, controlScene, '001')
+} 
 
 </script>
 <style lang="less" scoped>
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
index 6c73017..f118df6 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
@@ -41,7 +41,14 @@
         </td>
         <td>
           <div class="tabReboot" @click="restartPlan(row.id)">重启</div>
-          <div class="tabDelete" @click="deletePlan(row.id)">删除</div>
+          <a-popconfirm
+          title="此操作将永久删除该条数据"
+          ok-text="确定"
+          cancel-text="取消"
+          @confirm="deletePlan(row.id)"
+          >
+            <div class="tabDelete">删除</div>
+          </a-popconfirm>
         </td>
       </tr>
     </tbody>
@@ -121,6 +128,7 @@ const addModal = () => {
   addVisible.value = true;
 };
 
+
 // 穿梭框部分 =======================================================
 
 // 穿梭框数据