diff --git a/hx-ai-intelligent/src/App.vue b/hx-ai-intelligent/src/App.vue
index 1b31526..9d71885 100644
--- a/hx-ai-intelligent/src/App.vue
+++ b/hx-ai-intelligent/src/App.vue
@@ -48,11 +48,18 @@
       height: 100%;
     }
   }
+  // 树组件
   :deep(.ant-tree-node-content-wrapper) {
     overflow: hidden;
     text-overflow: ellipsis;
     text-wrap: nowrap;
   }
+
+  :deep(.ant-tree-node-selected) {
+    color: @primary-color !important;
+  }
+
+  // ns-view-list-table 搜索区域
   :deep(.ns-table-search) {
     .ns-flexv2-form {
       .ns-operate {
diff --git a/hx-ai-intelligent/src/router/alarmManagement.ts b/hx-ai-intelligent/src/router/alarmManagement.ts
index f9d7428..02aee50 100644
--- a/hx-ai-intelligent/src/router/alarmManagement.ts
+++ b/hx-ai-intelligent/src/router/alarmManagement.ts
@@ -18,7 +18,7 @@ const alarmManagement = {
           component: () => import('/@/view/alarmManagement/alarmOverview/index.vue'),
           meta: {
             title: '告警总览',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
@@ -37,7 +37,7 @@ const alarmManagement = {
           component: () => import('/@/view/alarmManagement/equipmentAlarm/index.vue'),
           meta: {
             title: '设备告警',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
@@ -56,7 +56,7 @@ const alarmManagement = {
           component: () => import('/@/view/alarmManagement/alarmSettings/index.vue'),
           meta: {
             title: '告警设置',
-            keepAlive: true,
+            keepAlive: false,
             operates: [
               { title: '设备告警新增', code: 'equipmentAlarmAdd' },
               { title: '设备告警导入', code: 'equipmentAlarmImport' },
diff --git a/hx-ai-intelligent/src/router/carbonEmissionManage.ts b/hx-ai-intelligent/src/router/carbonEmissionManage.ts
index c945868..1ce91af 100644
--- a/hx-ai-intelligent/src/router/carbonEmissionManage.ts
+++ b/hx-ai-intelligent/src/router/carbonEmissionManage.ts
@@ -19,7 +19,7 @@ const equipment = {
           component: () => import('/@/view/carbonEmissionManage/carbonEmissionStatistics/index.vue'),
           meta: {
             title: '碳排统计',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
@@ -39,7 +39,7 @@ const equipment = {
           component: () => import('/@/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue'),
           meta: {
             title: '碳排因子库',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
@@ -59,7 +59,7 @@ const equipment = {
           component: () => import('/@/view/carbonEmissionManage/carbonInventoryCheck/index.vue'),
           meta: {
             title: '碳盘查',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts
index 3ed5421..e682e9a 100644
--- a/hx-ai-intelligent/src/router/equipmentControl.ts
+++ b/hx-ai-intelligent/src/router/equipmentControl.ts
@@ -18,7 +18,7 @@ const equipmentControl = {
           component: () => import('/@/view/equipmentControl/lightingManage/indexs.vue'),
           meta: {
             title: '智能照明',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
diff --git a/hx-ai-intelligent/src/router/equipmentManage.ts b/hx-ai-intelligent/src/router/equipmentManage.ts
index 576e048..5cb2769 100644
--- a/hx-ai-intelligent/src/router/equipmentManage.ts
+++ b/hx-ai-intelligent/src/router/equipmentManage.ts
@@ -19,7 +19,7 @@ const equipment = {
           component: () => import('/@/view/equipmentManage/ledger/index.vue'),
           meta: {
             title: '设备台账',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
@@ -38,7 +38,7 @@ const equipment = {
           component: () => import('/@/view/equipmentManage/group/index.vue'),
           meta: {
             title: '分组管理',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
@@ -57,7 +57,7 @@ const equipment = {
     //       component: () => import('/@/view/equipmentManage/energyMapping/index.vue'),
     //       meta: {
     //         title: '能耗映射',
-    //         keepAlive: true,
+    //         keepAlive: false,
     //         // backApi: [],
     //       },
     //     },
diff --git a/hx-ai-intelligent/src/router/home.ts b/hx-ai-intelligent/src/router/home.ts
index 4ef3db5..965c0e4 100644
--- a/hx-ai-intelligent/src/router/home.ts
+++ b/hx-ai-intelligent/src/router/home.ts
@@ -17,7 +17,7 @@ const home = {
       //     name: 'homeIndex',
       //     meta: {
       //       title: '首页',
-      //       keepAlive: true,
+      //       keepAlive: false,
       //       // backApi: [],
       //     },
       //   },
diff --git a/hx-ai-intelligent/src/router/monitor.ts b/hx-ai-intelligent/src/router/monitor.ts
index 8a21dde..e2ee039 100644
--- a/hx-ai-intelligent/src/router/monitor.ts
+++ b/hx-ai-intelligent/src/router/monitor.ts
@@ -18,7 +18,7 @@ const equipment = {
           component: () => import('/@/view/monitor/environmentMonitor/index.vue'),
           meta: {
             title: '环境监测',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
@@ -37,7 +37,7 @@ const equipment = {
           component: () => import('/@/view/monitor/deviceMonitor/index.vue'),
           meta: {
             title: '设备监测',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
@@ -56,7 +56,7 @@ const equipment = {
           component: () => import('/@/view/monitor/energyMonitor/index.vue'),
           meta: {
             title: '能耗监测',
-            keepAlive: true,
+            keepAlive: false,
             // backApi: [],
           },
         },
@@ -75,7 +75,7 @@ const equipment = {
     //       component: () => import('/@/view/monitor/group/index.vue'),
     //       meta: {
     //         title: '分组管理',
-    //         keepAlive: true,
+    //         keepAlive: false,
     //         // backApi: [],
     //       },
     //     },
diff --git a/hx-ai-intelligent/src/router/organizationManage.ts b/hx-ai-intelligent/src/router/organizationManage.ts
index 6b5a52e..1984cd3 100644
--- a/hx-ai-intelligent/src/router/organizationManage.ts
+++ b/hx-ai-intelligent/src/router/organizationManage.ts
@@ -18,7 +18,7 @@ const organizationManage = {
           component: () => import('/@/view/organizationManage/usermanage/index.vue'),
           meta: {
             title: '用户管理',
-            keepAlive: true,
+            keepAlive: false,
             operates: [
               { title: '新增', code: 'userAdd' },
               { title: '导入', code: 'userImport' },
@@ -48,7 +48,7 @@ const organizationManage = {
           component: () => import('/@/view/organizationManage/departmentManage/index.vue'),
           meta: {
             title: '部门/权限',
-            keepAlive: true,
+            keepAlive: false,
             operates: [
               { title: '新增部门', code: 'authorityDeptAdd' },
               { title: '新增子部门', code: 'authorityDeptSonAdd' },
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 9298666..d792f11 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -83,7 +83,7 @@
     },
     {
       title: '计量单位',
-      dataIndex: 'unit',
+      dataIndex: 'unitName',
     },
     {
       title: '加权平均',
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
index 33312db..c4a1582 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -214,7 +214,9 @@
   const wrapperCol = { span: 19 };
   const switchLabelCol = { span: 10 };
   const switchWrapperCol = { span: 14 };
-  const formState = ref({})
+  const formState = ref({
+    orgId: orgId.value,
+  })
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
@@ -289,8 +291,8 @@
       },
       {
         title: '计量单位',
-        className: 'unit',
-        dataIndex: 'unit',
+        className: 'unitName',
+        dataIndex: 'unitName',
       },
       {
         title: '全年',
@@ -361,9 +363,9 @@
             getDictList()
             visible.value = true
             fetch(energyConsumption.findById , {id : record.id }).then((res) => {
-              if(res.data.unit){
-                res.data.unit = res.data.unit.split(',')
-              }
+              // if(res.data.unit){
+              //   res.data.unit = res.data.unit.split(',')
+              // }
               formState.value = res.data
             });
           },
@@ -423,12 +425,14 @@
       .then(() => {
         console.log('values', formState, toRaw(formState));
         if(formState.value.unit){
-          formState.value.unit = formState.value.unit.join(',')
+          formState.value.unit = formState.value.unit.join(',').split(',')[1]
         }
         if(formState.value.id){
           fetch(energyConsumption.update , formState.value).then((res) => {
             visible.value = false
-            formState.value = {}
+            formState.value = {
+              orgId: orgId.value,
+            }
             message.success('操作成功！');
             mainRef.value?.nsTableRef.reload();
           });
@@ -439,7 +443,9 @@
               NsMessage.warning(res.data);
             }else{
               visible.value = false
-              formState.value = {}
+              formState.value = {
+                orgId: orgId.value,
+              }
               message.success('操作成功！');
               mainRef.value?.nsTableRef.reload();
             }
@@ -491,8 +497,8 @@
     getDictList()
     visible.value = true
     fetch(energyConsumption.findById , {id : record.id }).then((res) => {
-      if(res.data.unit){
-        res.data.unit = res.data.unit.split(',')
+      if(res.data.unitName){
+        res.data.unitName = res.data.unitName.split(',')
       }
       formState.value = res.data
     });
@@ -519,7 +525,9 @@
   // 关闭新增抽屉
   const onClose = () => {
     visible.value = false;
-    formState.value = {}
+    formState.value = {
+      orgId: orgId.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 6f1a5d3..602471f 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -319,11 +319,11 @@
           label: '编辑',
           name: 'userEdit',
           handle: (record: any) => {
-            selectedRowKeys.value = [record.carbonId];
+            selectedRowKeys.value = [record.factorId];
             formState.value.id = record.id
             formState.value.emissionFactors = record.emissionFactors
             formState.value.dateRange = [record.startTime, record.endTime];
-            formState.value.carbonId = record.carbonId
+            formState.value.factorId = record.factorId
             visible.value = true
             getNewTable()
           },
@@ -375,7 +375,7 @@
   const onSelectionChange = (selectedKeys, selectedRows) => {
     selectedRowKeys.value = selectedKeys;
     formState.value.emissionFactors = selectedRows[0].emissionFactors
-    formState.value.carbonId = selectedRows[0].id
+    formState.value.factorId = selectedRows[0].id
   };
   const queryData = ref({
     orgId: orgId.value,
@@ -390,11 +390,11 @@
   };
   // 点击编辑按钮
   const editData = (record) =>{
-    selectedRowKeys.value = [record.carbonId];
+    selectedRowKeys.value = [record.factorId];
     formState.value.id = record.id
     formState.value.emissionFactors = record.emissionFactors
     formState.value.dateRange = [record.startTime, record.endTime];
-    formState.value.carbonId = record.carbonId
+    formState.value.factorId = record.factorId
     visible.value = true
     getNewTable()
   };
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
new file mode 100644
index 0000000..eb62cd7
--- /dev/null
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -0,0 +1,10 @@
+<template>
+  
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style lang="less" scoped>
+
+</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 d1a1a77..89ff479 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -1,8 +1,55 @@
 <template>
-  <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" />
+  <!-- 首页 -->
+  <div v-if="isMainPage">
+    <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" />
+  </div>
+  <!-- 填报页 -->
+  <div v-if="fillInPage">
+
+  </div>
+  <!-- 新增报告弹窗 -->
+  <a-drawer
+    :width="500"
+    :visible="visible"
+    :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-input v-model:value="formState.energyType" placeholder="请输入报告名称" />
+      </a-form-item>
+      <a-form-item ref="name" label="报告年度" name="energyType">
+        <a-date-picker v-model:value="value5" picker="year" />
+      </a-form-item>
+      <a-form-item ref="name" label="适用标准" name="energyType">
+        <a-input v-model:value="formState.energyType" placeholder="请输入适用标准" />
+      </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-item ref="name" label="适用标准" name="energyType">
+        <a-range-picker v-model:value="value4" picker="month" />
+      </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>
+<script lang="ts" setup>
   import { ref } from 'vue';
   import { http } from '/nerv-lib/util/http';
   import { carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
@@ -13,6 +60,27 @@
   const fetch = (api, params = { orgId }) => {
     return http.post(api, params);
   };
+  // 判断展示哪个页面
+  const isMainPage = ref(false);
+  const fillInPage = ref(true);
+  // 新增相关数据
+  const visible = ref(false);
+  const formState = ref({})
+  const formRef = ref();
+  const labelCol = { span: 5 };
+  const wrapperCol = { span: 19 };
+  // 定义form表单的必填
+  const rules: Record<string, Rule[]> = {
+    energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
+    isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }]
+  };
+  // 关闭新增抽屉
+  const onClose = () => {
+    visible.value = false;
+    formState.value = {}
+    formRef.value.resetFields();
+  };
+  // 表格相关数据
   const tableConfig = ref({
     title: '数据库',
     api: carbonEmissionFactorLibrary.getTableList,
@@ -25,6 +93,7 @@
         name: 'userAdd',
         type: 'primary',
         handle: () => {
+          visible.value = true
         },
       },
     ],
@@ -67,12 +136,15 @@
           label: '编辑',
           name: 'userEdit',
           handle: (record: any) => {
+            visible.value = true
           },
         },
         {
           label: '填报',
           name: 'fillIn',
           handle: (record: any) => {
+            isMainPage.value = false
+            fillInPage.value = true
           },
         },
         {
@@ -91,7 +163,6 @@
         },
       ],
     },
-
     formConfig: {
       schemas: [
         {
@@ -103,11 +174,22 @@
             maxLength: 30,
           },
         },
+        {
+          field: 'createTime1',
+          label: '采购日期',
+          component: 'NsRangePicker',
+          fieldMap: ['purchaseBeginDate', 'purchaseEndDate'],
+          componentProps: {
+            valueFormat: 'YYYY-MM-DD',
+            placeholder: ['报告年度', '报告年度'],
+          },
+        },
       ],
       params: {},
     },
     rowKey: 'id',
   });
+  // 填报页
 </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 0ee490a..597d1cf 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
@@ -237,4 +237,11 @@
       .common-style;
     }
   }
+
+  .tree,
+  :deep(.ns-table-search),
+  // :deep(.ns-list-table),
+  :deep(.ns-table-main) {
+    box-shadow: @ns-content-box-shadow;
+  }
 </style>
diff --git a/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue b/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue
index 4a35850..2cd33ec 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue
@@ -13,4 +13,10 @@
     name: 'LedgerIndex', // 与页面路由name一致缓存才可生效
   });
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  :deep(.ns-table-search),
+  :deep(.ns-part-tree),
+  :deep(.ns-table-main) {
+    box-shadow: @ns-content-box-shadow;
+  }
+</style>
diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
index e7be87b..a49011b 100644
--- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
@@ -816,7 +816,7 @@
     padding: @ns-gap;
     background-color: @white;
     border-radius: @ns-border-radius;
-    // box-shadow: @ns-content-box-shadow;
+    box-shadow: @ns-content-box-shadow;
   }
 
   .tree {
diff --git a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
index 9528e9e..79613a5 100644
--- a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
@@ -652,4 +652,10 @@
       }
     }
   }
+
+  .top,
+  :deep(.ns-table-search),
+  :deep(.ns-table-main) {
+    box-shadow: @ns-content-box-shadow;
+  }
 </style>
diff --git a/hx-op/src/router/home.ts b/hx-op/src/router/home.ts
index b8ea9f4..171c853 100644
--- a/hx-op/src/router/home.ts
+++ b/hx-op/src/router/home.ts
@@ -11,7 +11,7 @@ const home = {
       component: () => import('/@/view/developing.vue'),
       meta: {
         title: '首页',
-        keepAlive: true,
+        keepAlive: false,
         // backApi: [],
       },
     },
diff --git a/hx-op/src/router/organizationManage.ts b/hx-op/src/router/organizationManage.ts
index f4ecc42..e0b11ad 100644
--- a/hx-op/src/router/organizationManage.ts
+++ b/hx-op/src/router/organizationManage.ts
@@ -11,7 +11,7 @@ const organizationManage = {
       component: () => import('/@/view/organizationManage/enterpriseManage/index.vue'),
       meta: {
         title: '企业管理',
-        keepAlive: true,
+        keepAlive: false,
         // backApi: [],
       },
     },
diff --git a/lib/saas/view/system/application.vue b/lib/saas/view/system/application.vue
index 3b432cf..76a7517 100644
--- a/lib/saas/view/system/application.vue
+++ b/lib/saas/view/system/application.vue
@@ -337,7 +337,7 @@
       height: 100%;
       background-color: @white;
       border-radius: @ns-border-radius;
-      overflow-y: auto;
+      // overflow-y: auto;
       // overflow-x: hidden;
       // margin: 0 16px 16px 16px;
     }