From 16e3213f210328076cdba29a54362ce5cadbff3f Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Mon, 22 Jul 2024 15:25:41 +0800
Subject: [PATCH 1/4] tackid:099 remark:'commit'

---
 .../carbonEmissionFactorLibrary/index.vue          |  12 +-
 .../carbonEmissions/index copy.vue                 |   4 +-
 .../carbonEmissions/index.vue                      |  20 +-
 .../energyConsumption/index.vue                    |   4 +-
 .../quickCalculation/index.vue                     |   4 +-
 .../carbonInventoryCheck/config.ts                 | 374 ++------
 .../carbonInventoryCheck/fillInPage/index.vue      | 996 ++++++++++++++++++---
 .../carbonInventoryCheck/index.vue                 |   4 +-
 8 files changed, 1005 insertions(+), 413 deletions(-)

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({})

From 7c679f7fa5ee60ee3f4d66b5df7a1208012fabcf Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Mon, 22 Jul 2024 15:51:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95icon=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/App.vue | 59 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/hx-ai-intelligent/src/App.vue b/hx-ai-intelligent/src/App.vue
index af9b91f..3333c55 100644
--- a/hx-ai-intelligent/src/App.vue
+++ b/hx-ai-intelligent/src/App.vue
@@ -79,24 +79,53 @@
   // 区域阴影
   // .ns-list-table {
 
-  // :deep(.ant-tabs) {
-  //   // overflow: visible;
-  //   box-shadow: @ns-content-box-shadow;
-  //   border-radius: @ns-border-radius;
-  //   .ns-table-search {
-  //     box-shadow: none;
-  //     border-top-left-radius: 0px !important;
-  //     border-top-right-radius: 0px !important;
-  //   }
-  //   .ns-table-main {
-  //   }
-  //   .ant-tabs-tabpane-active > div {
-  //     height: 100%;
-  //   }
-  // }
+  :deep(.ant-tabs) {
+    //   // overflow: visible;
+    //   box-shadow: @ns-content-box-shadow;
+    //   border-radius: @ns-border-radius;
+    .ns-table-search {
+      border-top-left-radius: 0px !important;
+      border-top-right-radius: 0px !important;
+    }
+    .ns-table-main {
+      border-bottom-left-radius: 0px !important;
+      border-bottom-right-radius: 0px !important;
+    }
+    //   .ant-tabs-tabpane-active > div {
+    //     height: 100%;
+    //   }
+  }
   // .ant-tabs .ns-table-main {
   //   border-bottom-left-radius: 0px !important;
   //   border-bottom-right-radius: 0px !important;
   // }
   // }
+
+  // 菜单icon(仅仅处理特殊需求：未选中时icon与文字不同色)
+  :deep(.anticon) {
+    color: #8d96a3 !important;
+  }
+
+  :deep(.ant-menu-item-selected .ant-menu-item-only-child),
+  :deep(.ant-menu-submenu-selected .ant-menu-item-only-child),
+  :deep(.firstMenuItem-selected) {
+    .router-link-active > .anticon {
+      color: @white !important;
+    }
+  }
+
+  :deep(.ant-menu-item-active) {
+    .anticon {
+      color: @primary-color !important;
+    }
+  }
+  :deep(.ant-menu-submenu-active),
+  :deep(.ant-menu-submenu-open),
+  :deep(.ant-menu-item-selected) {
+    .ant-menu-submenu-title {
+      .anticon {
+        color: @primary-color !important;
+      }
+    }
+  }
 </style>

From 159698ffbe378f85a012f83209d63b946d609e28 Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Mon, 22 Jul 2024 18:02:12 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/App.vue | 50 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/hx-ai-intelligent/src/App.vue b/hx-ai-intelligent/src/App.vue
index 3333c55..72c7ea0 100644
--- a/hx-ai-intelligent/src/App.vue
+++ b/hx-ai-intelligent/src/App.vue
@@ -128,4 +128,54 @@
       }
     }
   }
+
+  @min-padding: 5px;
+  :deep(.ns-left-menu-space):not(.ns-left-menu-space-collapsed) {
+    .firstMenuItem-selected {
+      background-color: transparent !important;
+    }
+    .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
+      background-color: transparent;
+      &::before {
+        background-color: @primary-color;
+        opacity: 1;
+        height: calc(100% - @min-padding*2);
+        top: @min-padding;
+        border-radius: @ns-border-radius;
+      }
+    }
+    .ant-menu-item-active:not(.ant-menu-item-selected) {
+      background-color: transparent !important;
+      position: relative;
+      &::before {
+        content: '';
+        position: absolute;
+        width: 100%;
+        background-color: rgb(@primary-color, 0.1);
+        height: calc(100% - @min-padding*2);
+        top: @min-padding;
+        left: 0;
+        border-radius: @ns-border-radius;
+        z-index: 0;
+      }
+    }
+
+    // .ant-menu-inline .ant-menu-item-selected::after {
+    //   content: '';
+    //   position: absolute;
+    //   top: 50%;
+    //   right: -20px;
+    //   transform: translateY(-50%);
+    //   width: 3px !important;
+    //   border-radius: 2px;
+    //   background-color: red;
+    //   height: 30px;
+    //   z-index: 2;
+    //   border: none;
+    // }
+
+    .ant-menu-title-content {
+      z-index: 1;
+    }
+  }
 </style>

From 975d5fe4f03e9eab78da3d85f88093c5d360e41e Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Mon, 22 Jul 2024 18:11:03 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/App.vue          | 10 ++++++++++
 lib/component/tree/tree-api.vue        | 10 +++++-----
 lib/saas/view/system/layout/header.vue |  8 ++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/hx-ai-intelligent/src/App.vue b/hx-ai-intelligent/src/App.vue
index 72c7ea0..d862cbb 100644
--- a/hx-ai-intelligent/src/App.vue
+++ b/hx-ai-intelligent/src/App.vue
@@ -178,4 +178,14 @@
       z-index: 1;
     }
   }
+
+  :deep(.nsHeader_action) {
+    .action {
+      font-size: 18px;
+      font-weight: bold;
+      letter-spacing: 0px;
+      line-height: 24px;
+      color: rgba(51, 51, 51, 1);
+    }
+  }
 </style>
diff --git a/lib/component/tree/tree-api.vue b/lib/component/tree/tree-api.vue
index 3bb3574..510a152 100644
--- a/lib/component/tree/tree-api.vue
+++ b/lib/component/tree/tree-api.vue
@@ -3,8 +3,8 @@
     <div class="ns-tree-container">
       <div class="ns-tree-form">
         <div v-if="header" class="ns-tree-title">
-          <ns-icon :name="header.icon" size="14" />
-          <span>{{ header.title }}</span>
+          <!-- <ns-icon :name="header.icon" size="14" /> -->
+          <span class="ns-title-extra-box">{{ header.title }}</span>
         </div>
         <div v-if="!formConfig?.schema">
           <ns-form ref="formElRef" v-bind="formConfig" :model="formModel" @finish="formFinish" />
@@ -155,9 +155,9 @@
     // padding-bottom: 10px;
     // border-bottom: 1px solid #e9e9e9;
 
-    > span {
-      padding-left: 6px;
-    }
+    // > span {
+    //   padding-left: 6px;
+    // }
     & ~ div {
       padding: 0 @gap !important;
       width: 100%;
diff --git a/lib/saas/view/system/layout/header.vue b/lib/saas/view/system/layout/header.vue
index 24f59e6..e755452 100644
--- a/lib/saas/view/system/layout/header.vue
+++ b/lib/saas/view/system/layout/header.vue
@@ -93,7 +93,7 @@
             "
             >{{ userName }}</span
           >
-          <ns-icon class="downArrow" name="downArrow" size="20" />
+          <!-- <ns-icon class="downArrow" name="downArrow" size="20" /> -->
         </div>
 
         <template #overlay>
@@ -536,9 +536,9 @@
     .action {
       cursor: pointer;
 
-      &:hover {
-        background-color: @layout-header-hover;
-      }
+      // &:hover {
+      //   background-color: @layout-header-hover;
+      // }
     }
 
     .projectName {