From 029d665c0ff8f5863f35d65264f15499e9f15441 Mon Sep 17 00:00:00 2001
From: duyufeng <dyf911216@126.com>
Date: Wed, 28 Aug 2024 08:57:32 +0800
Subject: [PATCH 1/4] =?UTF-8?q?op=E7=AB=AF=E4=BC=81=E4=B8=9A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=9C=8D=E5=8A=A1=E6=9D=83=E9=99=90=E6=A0=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizationManage/enterpriseManage/index.vue  | 68 ++++++++++++++++++++--
 .../systemManage/systemMenu/editSystemMenu.vue     |  3 -
 2 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/hx-op/src/view/organizationManage/enterpriseManage/index.vue b/hx-op/src/view/organizationManage/enterpriseManage/index.vue
index ec375bb..68de6e3 100644
--- a/hx-op/src/view/organizationManage/enterpriseManage/index.vue
+++ b/hx-op/src/view/organizationManage/enterpriseManage/index.vue
@@ -32,7 +32,7 @@
       v-model:value="searchValue"
       style="margin-bottom: 8px"
       @search="onSearch" /> -->
-    <a-tree v-if="treeData?.length" v-model:checkedKeys="checkedKeys" v-bind="serverTree" />
+    <a-tree v-if="treeData?.length" v-model:checkedKeys="checkedKeys" v-bind="serverTree"/>
   </ns-drawer>
 
   <TreeAdd ref="treeAdd" @ok="handleOk" :info="currentBoundaryRecord" />
@@ -82,9 +82,10 @@
   const comApi = computed(() => {
     return calMap[opType.value as keyof typeof calMap];
   });
-
   // 公共请求方法，包含tablereload，drawerclose
   const fetch = (params, isReload = true) => {
+    console.log(params)
+    console.log(comApi.value)
     http.post(comApi.value, params).then(() => {
       NsMessage.success('操作成功');
       onClose();
@@ -197,10 +198,61 @@
   // 获取服务权限树
   const getTree = (params) => {
     return http.post(enterPrise.permissionTree, params).then((res) => {
-      treeData.value = res.data?.data;
+      // treeData.value = res.data?.data;
+      let dataTreeList = res.data?.data;
+      let getDataTreeList = dataTreeListReply(dataTreeList)
+      treeData.value = filterTreeData(getDataTreeList);
     });
   };
-  getTree({});
+  // 递归处理权限树数据（将子级为空的节点增加“hidden"标识）
+  const dataTreeListReply =(data:any)=>{
+    return data.map(item => {
+      if (item.menus && item.menus.length > 0) {
+        return {
+          ...item,
+          menus: dataTreeListReply(item.menus),
+        };
+      }
+      if (item.menus && item.menus.length == 0) {
+        item.hidden = true;
+      }
+      return item;
+    });
+  }
+  //递归处理服务权限树数据（将子级menus为空的节点隐藏）
+  const filterTreeData = (data:any) => {
+    return data.map(item => {
+      //方法一：给子节点menus为空的当前节点增加样式控制显示隐藏
+      if (item.menus && item.menus.length > 0) {
+        item.menus.map(itemchild=>{
+          if(itemchild.menus && itemchild.menus.length==0){
+            item.class = 'parentNodeArrowHide';
+          }
+        })
+        return {
+          ...item,
+          menus: filterTreeData(item.menus),
+        };
+      }else{
+        if(item.hidden){
+          item.class = 'leafNodeHide';
+        }
+      }
+      return item;
+    })
+    //方法二：递归过滤掉滤掉hidden的节点
+    // return data.filter(item => !item.hidden).map(item => {
+    //   if (item.menus) {
+    //     return {
+    //       ...item,
+    //       menus: filterTreeData(item.menus),
+    //     };
+    //   }
+    //   return item;
+    // });
+  }
+
+  getTree({})
 
   // 获取当前企业拥有的权限数据
   const getPermissionData = (params) => {
@@ -354,3 +406,11 @@
     }
   }
 </style>
+<style>
+ .leafNodeHide{
+    display:none!important;
+  }
+  .parentNodeArrowHide .ant-tree-switcher{
+    visibility: hidden;
+  }
+</style>
diff --git a/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue b/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue
index 839ea88..d1b5bb2 100644
--- a/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue
+++ b/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue
@@ -164,7 +164,6 @@
   };
   //菜单类型按钮切换
   const chanageMenuType = (e:any,typeMenu:any)=>{
-    console.log(e)
     let currentType = null;
     if(e && e.target){
       currentType = e.target.value;
@@ -246,8 +245,6 @@
         if(menuRadioType.value==1){
           params.pid = currentLineData.value?currentLineData.value.pid:"root";//一级菜单pid,传'root'
         }
-        console.log("1234567777")
-        console.log(menuRadioType.value)
         if(addOrEditType.value==1){//新增
           http.post(menuS.queryMenuPageAdd, params).then(() => {
             NsMessage.success('操作成功');

From ef6f59a1c6bc10d5a05919902fba06abecc02122 Mon Sep 17 00:00:00 2001
From: duyufeng <dyf911216@126.com>
Date: Wed, 28 Aug 2024 17:04:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?op=E7=AB=AF=E6=9C=8D=E5=8A=A1=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=9D=83=E9=99=90=E6=A0=91=E4=B8=8D=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=97=B6=E4=BC=A0=E5=80=BC=E5=85=A8=E9=83=A8=E5=8F=98=E6=88=90?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BCbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/api/index.ts                 |  2 +-
 .../organizationManage/enterpriseManage/index.vue  | 30 +++++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/hx-ai-intelligent/src/api/index.ts b/hx-ai-intelligent/src/api/index.ts
index 0349a92..ff85a4e 100644
--- a/hx-ai-intelligent/src/api/index.ts
+++ b/hx-ai-intelligent/src/api/index.ts
@@ -59,4 +59,4 @@ export const getEnum = async ({
 }: dictHttpConfig) => {
   const res = await http.get(api, params);
   return Promise.resolve(res);
-};
+};
\ No newline at end of file
diff --git a/hx-op/src/view/organizationManage/enterpriseManage/index.vue b/hx-op/src/view/organizationManage/enterpriseManage/index.vue
index 68de6e3..8c5e4bf 100644
--- a/hx-op/src/view/organizationManage/enterpriseManage/index.vue
+++ b/hx-op/src/view/organizationManage/enterpriseManage/index.vue
@@ -50,6 +50,7 @@
   // import { mockData, treeData } from './mock';
   import { enterPrise } from '/@/api/origanizemanage';
   import { tableConfig as insertConfig } from './config';
+import { string } from 'vue-types';
   defineOptions({
     name: 'EnterpriseManageIndex',
   });
@@ -84,8 +85,6 @@
   });
   // 公共请求方法，包含tablereload，drawerclose
   const fetch = (params, isReload = true) => {
-    console.log(params)
-    console.log(comApi.value)
     http.post(comApi.value, params).then(() => {
       NsMessage.success('操作成功');
       onClose();
@@ -153,14 +152,20 @@
     });
   };
 
-  // 服务操作逻辑区域
+  // 服务操作逻辑区域checkedKeys
   const serverOK = () => {
-    const params = {
-      orgId: currentServerRecord.value?.orgId,
-      orgName: currentServerRecord.value?.orgName,
-      permissionVoList: totalCheckedKeys.value,
-    };
-    fetch(params, false);
+    let getPermissionSelected = totalCheckedKeys.value;
+    if(getPermissionSelected.length==0){
+      NsMessage.success('请选择相应的权限菜单分配！');
+      return false;
+    }else{
+      const params = {
+        orgId: currentServerRecord.value?.orgId,
+        orgName: currentServerRecord.value?.orgName,
+        permissionVoList: getPermissionSelected,
+      };
+      fetch(params, false);
+    }
   };
 
   const ServiceSelect = (selectedKeys: any, info: any) => {
@@ -262,6 +267,13 @@
         .map((item) => {
           return item.permissionId;
         });
+      const finalResult = res.data.map((items) => {
+        return {
+          halfCheck: items.halfCheck,
+          permissionId: items.permissionId,
+        };
+      })
+      totalCheckedKeys.value = finalResult;
     });
   };
 

From 6ba03df551438f856794b2ca5d74982927e4a30b Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Thu, 29 Aug 2024 17:27:01 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/asset/file/emissionSource.xlsx          | Bin 9245 -> 9496 bytes
 .../public/asset/file/energyConsumption.xlsx       | Bin 10613 -> 9229 bytes
 .../carbonAssets/carbonAssetsDetail/index.vue      |   5 +-
 .../carbonEmissions/index.vue                      |   3 +
 .../carbonEmissionStatistics/config.ts             |  10 ++-
 .../energyConsumption/index.vue                    |   4 +-
 .../quickCalculation/index.vue                     |  80 ++++++++++++++++-----
 .../carbonInventoryCheck/fillInPage/index.vue      |  16 +++--
 .../carbonInventoryCheck/index.vue                 |  37 +++++-----
 .../carbonPlanning/category/categoryDeatil.vue     |  12 ++--
 .../carbonPlanning/category/index.vue              |   2 +-
 lib/util/xlsx-util.ts                              |   4 +-
 12 files changed, 115 insertions(+), 58 deletions(-)

diff --git a/hx-ai-intelligent/public/asset/file/emissionSource.xlsx b/hx-ai-intelligent/public/asset/file/emissionSource.xlsx
index 306414bfd33a03d62aad1f0a182d82e6f8278432..57d82b06095d8eac4d6dabd336eec6a46697cdb3 100644
GIT binary patch
delta 4998
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
A5C8xG

delta 4770
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
W0Og;+$MwI-i{M*~92kG!0sId-4C!<L

diff --git a/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx b/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx
index a9eae6eccd48016ea7b6a3353844f687e88c991f..5edee96705a85c0703d12810dbab5912a767c63f 100644
GIT binary patch
delta 8012
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
Dk9DI1

literal 10613
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

diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
index fcc3dab..fe7571b 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
@@ -48,7 +48,7 @@
       </a-form>
     </a-card>
   </div>
-  <div style="display: flex; margin-top: 20px; height: calc(84% - 20px)">
+  <div style="display: flex; margin-top: 20px; height: calc(85% - 20px)">
     <div class="detailTable">
       <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1280 }">
         <template #bodyCell="{ column, text, record }">
@@ -523,6 +523,7 @@
       {
         title: '更新时间',
         width: 150,
+        ellipsis: true,
         dataIndex: 'updateTime',
       },
     ],
@@ -826,7 +827,7 @@
     padding: 16px;
   }
   .search {
-    height: 16%;
+    height: 15%;
   }
   .detailTable {
     width: 70%;
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 4022831..db760ae 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -13,6 +13,9 @@
           <a-button type="primary" ghost style="margin-left: 6px" @click="reset">重置</a-button>
         </span>
       </template>
+      <template #bodyCell="{ column, text }">
+          <span>{{ text || '-' }}</span>
+        </template>
     </a-table>
     <!-- <a-pagination
       :current="queryParams.pageNum"
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index 2a1c2de..aa287fb 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -146,7 +146,7 @@ export const drawerColumns = [
     dataIndex: 'dataSources',
   },
 ];
-export const setFactorConfig = (orgId) => {
+export const setFactorConfig = (orgId, treeId, tableId) => {
   return ref({
     api: carbonEmissionFactorLibrary.getTableList,
     params: { orgId, pageNum: 1, pageSize: 9999, emissionList: [0] },
@@ -155,7 +155,8 @@ export const setFactorConfig = (orgId) => {
         icon: 'deviceType',
         title: '排放分类',
       },
-      params: { orgId},
+      selectedKeys: treeId,
+      params: { orgId },
       dynamicParams: { emissionList: 'id[]' },
       defaultExpandAll: true,
       // checkable:true,
@@ -175,7 +176,10 @@ export const setFactorConfig = (orgId) => {
         ],
       },
     },
-    rowSelection: { type: 'radio' },
+    rowSelection: {
+      type: 'radio',
+      selectedRowKeys: tableId,
+    },
     columns: [
       {
         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 c0e84dd..6e5f3ae 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -297,9 +297,7 @@
           indexName: '能源种类', // 匹配类型字段
           message: [
             { label: '1、若必填项未填写，则不能进行导入操作' },
-            { label: `2、当重复时，则更新数据。` },
-            { label: '3、数据将从模版的第五行进行导入。' },
-            { label: '4、文件导入勿超过5MB。' },
+            { label: '2、文件导入勿超过5MB。' },
           ],
         },
       },
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 b80d476..e5525e9 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -21,20 +21,22 @@
           :auto-expand-parent="autoExpandParent"
           :selectedKeys="selectedKeys"
           :tree-data="gData"
+          :show-line="{ showLeafIcon: false }"
           show-line
           @expand="onExpand"
           @select="onSelect"
           style="padding: 0 16px !important">
           <template #title="data">
-            <span
+            <!-- <span
               v-if="data.energyType && searchValue && data.energyType.indexOf(searchValue) > -1">
               {{ data.energyType.substring(0, data.energyType.indexOf(searchValue)) }}
               <span style="color: #f50">{{ searchValue }}</span>
               {{
                 data.energyType.substring(data.energyType.indexOf(searchValue) + searchValue.length)
               }}
-            </span>
-            <span v-else>{{ data.energyType }}</span>
+            </span> -->
+            <span v-if="data.code">{{ truncatedName(data.energyType + data.code) }}</span>
+            <span v-else>{{ truncatedName(data.energyType) }}</span>
           </template>
         </a-tree>
       </div>
@@ -130,8 +132,8 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, watch, toRaw, defineExpose } from 'vue';
-  import type { TreeProps } from 'ant-design-vue';
+  import { ref, watch, toRaw, defineExpose, nextTick } from 'vue';
+  import { message, TreeProps } from 'ant-design-vue';
   import { Pagination, Modal } from 'ant-design-vue';
   import { columns, drawerColumns } from '../config';
   import { http } from '/nerv-lib/util/http';
@@ -225,6 +227,12 @@
     expandedKeys.value = keys;
     autoExpandParent.value = false;
   };
+  const truncatedName = (name) => {
+    if (name.length > 8) {
+      return name.substring(0, 8) + '...';
+    }
+    return name;
+  };
   // 被选中的树节点
   const energyType = ref();
   const onSelect = (selectedKey: string[], info: any) => {
@@ -245,16 +253,22 @@
         return null;
       })
       .filter((item, i, self) => item && self.indexOf(item) === i);
-    expandedKeys.value = expanded;
+    // expandedKeys.value = expanded;
     searchValue.value = value;
     autoExpandParent.value = true;
   });
   // 查询因子分类树数据
-  const onSearchTreeData = () => {};
+  const getTreeQuery = ref({
+    orgId: orgId.value,
+  });
+  const onSearchTreeData = () => {
+    getTreeQuery.value.energyType = searchValue.value;
+    getTreeData();
+  };
   const statsId = ref();
   // 获取因子分类树数据
   const getTreeData = () => {
-    fetch(quickCalculation.carbonQuickTree, { orgId: orgId.value }).then((res) => {
+    fetch(quickCalculation.carbonQuickTree, getTreeQuery.value).then((res) => {
       gData.value = res.data;
       energyType.value = gData.value[0].children[0].id;
       statsId.value = gData.value[0].children[0].id;
@@ -271,9 +285,12 @@
   });
   const tableData = ref([]);
   const emissionSources = ref();
+  const treeId = ref([]);
+  const tableId = ref([]);
   const tableConfig = ref({
     title: '排放因子库',
     api: quickCalculation.queryCarbonEmissionPage,
+    rowSelection: null,
     params: {
       orgId,
       energyType,
@@ -307,12 +324,6 @@
         dataIndex: 'carbonEmissionSuffix',
       },
       {
-        title: '更新时间',
-        className: 'updateTime',
-        dataIndex: 'updateTime',
-        ellipsis: true,
-      },
-      {
         title: '启用时间',
         className: 'startTime',
         dataIndex: 'startTime',
@@ -327,6 +338,12 @@
         className: 'dataSources',
         dataIndex: 'dataSources',
       },
+      {
+        title: '更新时间',
+        className: 'updateTime',
+        dataIndex: 'updateTime',
+        ellipsis: true,
+      },
     ],
     columnActions: {
       title: '操作',
@@ -342,8 +359,10 @@
             formState.value.factorId = record.factorId;
             text.value = '编辑';
             visible.value = true;
-            emissionSources.value = record.factorId; //todo
-            queryData.value.factorId = emissionSources.value; //todo
+            emissionSources.value = record.factorId;
+            queryData.value.factorId = emissionSources.value;
+            treeId.value = [record.treeId];
+            tableId.value = [record.factorId];
             getNewTable();
           },
         },
@@ -450,6 +469,7 @@
             selectedRowKeys.value = [];
             formState.value = {};
             formRef.value.resetFields();
+            message.success('操作成功！');
             mainRef.value?.nsTableRef.reload();
           });
         } else {
@@ -458,6 +478,7 @@
             selectedRowKeys.value = [];
             formState.value = {};
             formRef.value.resetFields();
+            message.success('操作成功！');
             mainRef.value?.nsTableRef.reload();
           });
         }
@@ -487,9 +508,15 @@
   };
   const openVisible = ref(false);
   const setFactorRef = ref();
-  const config = setFactorConfig(orgId.value);
+  const config = setFactorConfig(orgId.value, treeId.value, tableId.value);
   const selectFactor = () => {
     openVisible.value = true;
+    nextTick(() => {
+      setFactorRef.value.nsTableRef.params.emissionList = treeId.value;
+      setFactorRef.value.nsTableRef.treeElRef.selectedKeys = treeId.value;
+      setFactorRef.value.nsTableRef.rowSelection.selectedRowKeys = tableId.value;
+      setFactorRef.value.nsTableRef.reload();
+    });
   };
   const btnClick = () => {
     let selectRowKeys = setFactorRef.value?.nsTableRef.tableState.selectedRowKeys;
@@ -624,6 +651,25 @@
   :deep(.ant-modal-footer) {
     border-top: 10px solid #f0f0f0 !important;
   }
+  :deep(.ns-table-container) {
+    background: white;
+  }
+  :deep(.ns-part-tree) {
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
+  }
+  :deep(.ns-table-search) {
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
+  }
+  :deep(.ns-table-main) {
+    margin-top: 20px !important;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
+  }
 </style>
 <style scoped>
   th.column-money,
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 7e19474..e630eee 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -1193,11 +1193,11 @@
     return regex.test(filename);
   };
   const beforeUpload: UploadProps['beforeUpload'] = (file) => {
-    const filename = file.name;
-    if (!isValidFileName(filename)) {
-      message.error('文件名不符合规则');
-      return Upload.LIST_IGNORE; // 阻止文件上传
-    }
+    // const filename = file.name;
+    // if (!isValidFileName(filename)) {
+    //   message.error('文件名不符合规则');
+    //   return Upload.LIST_IGNORE; // 阻止文件上传
+    // }
     return false;
   };
   const handleChange = (info: UploadChangeParam) => {
@@ -1284,14 +1284,16 @@
       NsMessage.warn('请选择因子');
       return;
     } else {
-      if (newTableData.value.emissionFactorUnits === carbonEmission.value) {
+      if (newTableData.value[0].emissionFactorUnits === carbonEmission.value) {
         newTableData.value = setFactorRef.value?.nsTableRef.tableState.selectedRows;
         selectedRowKeysEdit.value = setFactorRef.value?.nsTableRef.tableState.selectedRowKeys;
         editFormState.value.emissionFactors = newTableData.value[0].emissionFactors;
         editFormState.value.factorId = selectedRowKeysEdit.value[0];
         openVisible.value = false;
       } else {
-        NsMessage.warn('因子值单位不统一，请重新选择！');
+        NsMessage.warn(
+          '因子值单位与当前因子值单位（' + carbonEmission.value + '）不统一，请重新选择！',
+        );
       }
     }
   };
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index 0c6b25d..c9c99b8 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -39,11 +39,7 @@
             placeholder="请输入报告名称" />
         </a-form-item>
         <a-form-item ref="name" label="报告年度" name="reportYear">
-          <a-date-picker
-            v-model:value="formState.reportYear"
-            @openChange="openChange"
-            picker="year"
-            valueFormat="YYYY" />
+          <a-date-picker v-model:value="formState.reportYear" picker="year" valueFormat="YYYY" />
         </a-form-item>
         <a-form-item ref="name" label="适用标准" name="genericStandard">
           <a-input
@@ -64,7 +60,6 @@
         <a-form-item ref="name" label="报告范围" name="reportScope">
           <a-range-picker
             v-model:value="formState.reportScope"
-            :defaultPickerValue="defaultPickerValue"
             picker="month"
             :disabledDate="disabledDate"
             valueFormat="YYYY-MM" />
@@ -111,20 +106,22 @@
   const selectChange = (value) => {
     formState.value.reportScope = '';
   };
-  const defaultPickerValue = ref([
-    dayjs('2020'), // 默认开始日期
-    dayjs('2020'), // 默认结束日期
-  ]);
-  const openChange = (status) => {
-    if (status === false) {
-      if (formState.value.reportYear) {
-        defaultPickerValue.value = [
-          dayjs(formState.value.reportYear),
-          dayjs(formState.value.reportYear),
-        ];
-      }
-    }
-  };
+  // const defaultPickerValue = ref([]);
+  // const open = ref(false);
+  // const openChange = (status) => {
+  //   debugger;
+  //   open.value = status;
+  //   if (formState.value.reportYear) {
+  //     defaultPickerValue.value = [
+  //       dayjs(formState.value.reportYear),
+  //       dayjs(formState.value.reportYear),
+  //     ];
+  //     open.value = false;
+  //     nextTick(() => {
+  //       open.value = status; // 重新打开日期选择框
+  //     });
+  //   }
+  // };
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     reportName: [{ required: true, message: '请输入报告名称', trigger: 'change' }],
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
index 38be751..dd9641c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
@@ -417,7 +417,6 @@
   const editData = (record) => {
     open.value = true;
     if (record.isLastYear !== undefined) {
-      formState.value.ids = [record.id];
       if (record.lastYear === '是') {
         formState.value.isLastYear = 1;
         disabled.value = false;
@@ -425,10 +424,12 @@
         formState.value.isLastYear = 0;
         disabled.value = true;
       }
-      formState.value.conversionRate = record.conversionRate;
-      formState.value.lastYearList = [record.lastYearActualUsage];
-      formState.value.budget = record.budget;
     }
+    formState.value.ids = [record.id];
+    formState.value.conversionRate = record.conversionRate;
+    formState.value.lastYearList = [record.lastYearActualUsage];
+    formState.value.ids = [record.id];
+    formState.value.budget = record.budget;
   };
   const disabled = ref(true);
   const selectChange = (value) => {
@@ -995,6 +996,9 @@
   :deep(.ant-card-bordered) {
     border: unset;
   }
+  :deep(.ant-input-number-handler-wrap){
+    display: none;
+  }
 </style>
 <style scoped>
   .editable-row-operations a {
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
index c81e634..b11b030 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
@@ -674,7 +674,7 @@
   }
   .contant {
     width: 100%;
-    height: calc(94% - 5vh);
+    height: calc(94% - 5vh - 24px);
     overflow-y: auto;
     padding: 12px;
     .chartsPart {
diff --git a/lib/util/xlsx-util.ts b/lib/util/xlsx-util.ts
index 1c2086b..e9366e9 100644
--- a/lib/util/xlsx-util.ts
+++ b/lib/util/xlsx-util.ts
@@ -129,11 +129,13 @@ export const importFile = (
       headers: { token: Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`) },
     })
     .then((res) => {
-      if (res) {
+      if (res.data.data) {
         NsMessage.success('导入成功', 1, () => {
           reload && reload();
           successBack && successBack(res);
         });
+      } else {
+        NsMessage.error(res.data.msg || '导入失败');
       }
     })
     .catch((err) => {

From 699754c90264ee62e47229af4cc63b01d82bfdbb Mon Sep 17 00:00:00 2001
From: duyufeng <dyf911216@126.com>
Date: Fri, 30 Aug 2024 10:25:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=8F=8A=E5=A4=B4=E9=83=A8=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/config/app.config.ts         | 85 +++++++++++++------
 hx-ai-intelligent/src/router/dynamicRoute.ts       | 44 ++++++++++
 hx-ai-intelligent/src/util/dynamicRoutes.ts        | 98 ++++++++++++++++++++++
 .../systemManage/systemMenu/editSystemMenu.vue     |  9 +-
 lib/paas/store/index.ts                            |  2 +
 lib/saas/store/modules/route.ts                    |  2 +
 lib/saas/view/system/layout/tags.vue               | 22 ++---
 lib/saas/view/system/login.vue                     | 15 +++-
 lib/util/dynamicRoutesss.ts                        | 25 ++++++
 package.json                                       |  1 +
 10 files changed, 262 insertions(+), 41 deletions(-)
 create mode 100644 hx-ai-intelligent/src/router/dynamicRoute.ts
 create mode 100644 hx-ai-intelligent/src/util/dynamicRoutes.ts
 create mode 100644 lib/util/dynamicRoutesss.ts

diff --git a/hx-ai-intelligent/src/config/app.config.ts b/hx-ai-intelligent/src/config/app.config.ts
index 2a80768..41bd1f6 100644
--- a/hx-ai-intelligent/src/config/app.config.ts
+++ b/hx-ai-intelligent/src/config/app.config.ts
@@ -3,14 +3,19 @@ import { permission } from '/@/api/origanizemanage';
 import { appConfigStore } from '/nerv-lib/saas/store/modules/app-config';
 import { authorizationService } from '/nerv-base/store/modules/authorization-service';
 import { get } from 'lodash-es';
-import { computed, ref, toRef } from 'vue';
+import { computed, ref, toRef} from 'vue';
 
-const ORGID = sessionStorage.getItem('ORGID') ? Number(sessionStorage.getItem('ORGID')) : '';
-const isAdmin = sessionStorage.getItem('ISADMIN')
-  ? Boolean(sessionStorage.getItem('ISADMIN'))
-  : false;
-const selectDefaultValue = ref(ORGID);
-const selectDefaultDisabled = ref(isAdmin);
+import { router } from '/nerv-lib/saas/router';
+import { replyRoutesButton } from '/@/util/dynamicRoutes';
+import { replyDynamRoutesPath } from '/nerv-lib/util/dynamicRoutesss';
+import { useTags } from '/nerv-base/store/modules/tags';
+
+const ROLEID = sessionStorage.getItem('ROLEID') ? Number(sessionStorage.getItem('ROLEID')) : '';
+// const isAdmin = sessionStorage.getItem('ISADMIN')
+//   ? Boolean(sessionStorage.getItem('ISADMIN'))
+//   : false;
+const selectDefaultValue = ref(ROLEID);
+// const selectDefaultDisabled = ref(isAdmin);
 const transform = (data, map) => {
   return Object.keys(map).reduce((pre, cur) => {
     pre[cur] = data[map[cur]];
@@ -46,22 +51,25 @@ export const appConfig = {
       api: '/carbon-smart/user/login/logInInfo',
       size: 'large',
       defaultValue: selectDefaultValue,
-      disabled: selectDefaultDisabled,
+      disabled:false,
+      // disabled: selectDefaultDisabled,
       // autoSelectFirst: true,
       placeholder: '请选择',
-      onSelect: async (cur, record) => {
-        console.log(cur, record);
+      onSelect: async (cur:any, record:any) => {
         const configStore = appConfigStore();
         const useAuthorization = authorizationService();
         sessionStorage.setItem('ORGID', record.orgId);
+        sessionStorage.setItem('ROLEID', record.roleId);
         const res = await configStore.userResource({ data: record });
         useAuthorization.updateUserResource(res.data);
-        window.location.reload();
+        setTimeout(() => {
+          window.location.reload();
+        }, 200);
         // value.value = cur;
       },
-      resultField: 'data.linkList',
+      resultField: 'data.userRoles',
       labelField: 'orgName',
-      valueField: 'orgId',
+      valueField: 'roleId',
       immediate: true,
       dropdownReload: true,
     },
@@ -71,15 +79,33 @@ export const appConfig = {
     return http.post('/carbon-smart/user/login', { ...params });
   },
   userResourceApi: (params) => {
-    const { orgId } = get(params, 'data') || { orgId: '' };
-    const finalId = orgId || ORGID;
+    const { roleId } = get(params, 'data') || { roleId: '' };
+    const finalId = roleId || ROLEID;
     // 解决初始化登录select无初始值的问题
     selectDefaultValue.value = finalId;
 
-    const userInfo = JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)!);
-    const ownOrgInfo = userInfo.linkList?.filter(({ orgId: id }) => id === finalId)[0];
-
-    return http.post('/carbon-smart/user/login/logInPermission', ownOrgInfo).then((res) => {
+    // const userInfo = JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)!);
+    // const ownOrgInfo = userInfo.userRoles?.filter(({ roleId: id }) => id === finalId)[0];
+    // return http.post('/carbon-smart/user/login/logInPermission', ownOrgInfo).then((res) => {
+    //   return res;
+    // });
+    // 切换角色时获取新的权限菜单
+    return http.post('/carbon-smart/user/login/role/permission/'+finalId).then((res) => {
+      //切换后重新处理动态菜单数据
+      let resetDynamicRouteList = replyRoutesButton(res.data);
+      sessionStorage.setItem("dynamicRouteList",JSON.stringify(resetDynamicRouteList));
+      if(resetDynamicRouteList && resetDynamicRouteList.length>0){
+        let addDynamicRoutes = replyDynamRoutesPath(resetDynamicRouteList);
+        addDynamicRoutes.forEach(item => {
+          if (item.children && !item.component) {
+            item.component = () => import('/nerv-lib/saas/view/system/application.vue');//hx-ai-intelligent项目下的首页
+          }
+          router.addRoute(item);
+        })
+      }
+      //删除所有已经打开的tag标签
+      useTags().clearTags();
+      router.replace({ name: 'home' });
       return res;
     });
   },
@@ -96,16 +122,25 @@ export const appConfig = {
         linkList: 'linkList',
         permissionVos: 'permissionVos',
         adminFlag: 'adminFlag',
+        userRoles:'userRoles',
       });
       sessionStorage.setItem('ORGID', info.orgId);
       sessionStorage.setItem('LINKLIST', JSON.stringify(info.linkList));
-      sessionStorage.setItem('ISADMIN', trD?.adminFlag === '1');
-      selectDefaultDisabled.value = info?.adminFlag === '1';
-      selectDefaultValue.value = info.orgId;
-      return { data: { ...trD } };
-    });
+      // 头部“企业角色”切换暂不需要以下屏蔽的两个参数
+      // sessionStorage.setItem('ISADMIN', trD?.adminFlag === '1');
+      // selectDefaultDisabled.value = info?.adminFlag === '1';
+      if(info.userRoles && info.userRoles.length>0){
+        sessionStorage.setItem('ROLEID', info.userRoles[0].roleId);
+        sessionStorage.setItem('USERROLES', JSON.stringify(info.userRoles));
+        selectDefaultValue.value = info.userRoles[0].roleId;
+        //路由接口数据暂时组装
+        let getRoutesList = replyRoutesButton(info.userRoles[0].routes);
+        sessionStorage.setItem("dynamicRouteList",JSON.stringify(getRoutesList))
+        sessionStorage.setItem("isRefrech",'1')
+      }
+        return { data: { ...trD } };
+      });
   },
-
   useHistoryTag: false,
   // 修改密码配置
   updatePassWordInfo: {
diff --git a/hx-ai-intelligent/src/router/dynamicRoute.ts b/hx-ai-intelligent/src/router/dynamicRoute.ts
new file mode 100644
index 0000000..99f34a3
--- /dev/null
+++ b/hx-ai-intelligent/src/router/dynamicRoute.ts
@@ -0,0 +1,44 @@
+const sessionStoreRoute = sessionStorage.getItem("dynamicRouteList");
+let getDynamicRouteList = sessionStoreRoute?JSON.parse(sessionStoreRoute):[];
+let dynamicRoute:any = [];
+// getDynamicRouteList.map(itemRouter => {
+//     if(itemRouter.children && itemRouter.children.length > 0){
+//       itemRouter.children.map(childRoute => {
+//         let modulePath0 = childRoute.component;
+//         childRoute.component = () => new Function(`return import('/nerv-lib/saas/view/${modulePath0}')`)();///nerv-lib/saas/view/
+//         if(childRoute.children && childRoute.children.length > 0){
+//           childRoute.children.map(child2=>{
+//             let modulePath = child2.component;
+//             child2.component = () => new Function(`return import('/@/view/${modulePath}')`)();///@/view/
+//           })
+//         }else{//如没有下一级菜单代表是一级，重新处理一级菜单路由
+//             childRoute.component = () => new Function(`return import('/@/view/${modulePath0}')`)();
+//         }
+//       })
+//     }
+//     dynamicRoute.push(itemRouter)
+// })
+getDynamicRouteList.forEach(itemRouter => {
+  if (itemRouter.children && itemRouter.children.length > 0) {
+      itemRouter.children.forEach(childRoute => {
+        const modulePath0 = childRoute.component;
+        // 修改 component 属性
+        // childRoute.component = () => import(`/nerv-lib/saas/view/${modulePath0}`).then(mod => mod.default);
+        childRoute.component = () => new Function(`return import('/nerv-lib/saas/view/${modulePath0}')`)();
+
+        if (childRoute.children && childRoute.children.length > 0) {
+            childRoute.children.forEach(child2 => {
+                const modulePath = child2.component;
+                // 修改 component 属性
+                // child2.component = /* @vite-ignore */ () => import(`/@/view/${modulePath}`).then(mod => mod.default);
+                child2.component = () => new Function(`return import('/@/view/${modulePath}')`)();
+            });
+        } else { // 如果没有下一级菜单代表是一级，重新处理一级菜单路由
+            // childRoute.component = /* @vite-ignore */ () => import(`/@/view/${modulePath0}`).then(mod => mod.default);
+            childRoute.component = () => new Function(`return import('/@/view/${modulePath0}')`)();
+        }
+      });
+  }
+  dynamicRoute.push(itemRouter);
+});
+export default dynamicRoute;
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/util/dynamicRoutes.ts b/hx-ai-intelligent/src/util/dynamicRoutes.ts
new file mode 100644
index 0000000..fea4dbb
--- /dev/null
+++ b/hx-ai-intelligent/src/util/dynamicRoutes.ts
@@ -0,0 +1,98 @@
+/***公共方法==>处理动态路由数据 将“按钮”部分的数据追加到meta中*/
+//处理路由按钮，存放在meta中
+export const replyRoutesButton = (data:any) => {
+    if(!data) return;
+    return data.map(item => {
+      if(item.children && item.children.length > 0){
+        item.meta.operates = [];
+        item.children.map(itemChild => {
+            if(itemChild.type=="3"){
+                let operateObj = {title:'',code:''};
+                operateObj.title = itemChild.meta.title;
+                operateObj.code = itemChild.name;
+                item.meta.operates.push(operateObj);
+                item.children = item.children.filter(its => its.name != itemChild.name);
+            }    
+        })
+        if(item.meta.operates.length == 0){
+            delete item.meta.operates;
+        }
+        return {
+          ...item,
+          children: replyRoutesButton(item.children),
+        };
+      }
+      
+      return item;
+    });
+};
+// //处理路由compontent路径
+// export const replyRoutesPath = (itemRouter:any) => {
+//   if (itemRouter.children && itemRouter.children.length > 0) {
+//     itemRouter.children.forEach(childRoute => {
+//       const modulePath0 = childRoute.component;
+//       // 修改 component 属性
+//       // childRoute.component = () => import(`/nerv-lib/saas/view/${modulePath0}`).then(mod => mod.default);
+//       childRoute.component = () => new Function(`return import('/nerv-lib/saas/view/${modulePath0}')`)();
+
+//       if (childRoute.children && childRoute.children.length > 0) {
+//           childRoute.children.forEach(child2 => {
+//               const modulePath = child2.component;
+//               // 修改 component 属性
+//               // child2.component = /* @vite-ignore */ () => import(`/@/view/${modulePath}`).then(mod => mod.default);
+//               child2.component = () => new Function(`return import('/@/view/${modulePath}')`)();
+//           });
+//       } else { // 如果没有下一级菜单代表是一级，重新处理一级菜单路由
+//           // childRoute.component = /* @vite-ignore */ () => import(`/@/view/${modulePath0}`).then(mod => mod.default);
+//           childRoute.component = () => new Function(`return import('/@/view/${modulePath0}')`)();
+//       }
+//     });
+//   }
+//   return itemRouter;
+// }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue b/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue
index d1b5bb2..bf2f96e 100644
--- a/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue
+++ b/hx-op/src/view/systemManage/systemMenu/editSystemMenu.vue
@@ -106,7 +106,7 @@
   const componentIsshow = ref(false);//前端组件是否显示
   const redirectIsshow = ref(true);//重定向路由是否显示
   const keepAliveIsshow = ref(false);//缓存是否显示
-  const hideChildrenIsshow = ref(false);//是否隐藏子级是否显示
+  const hideChildrenIsshow = ref(true);//是否隐藏子级是否显示
   interface FormState {
     menuName: string;
     previousMenu:string;
@@ -183,7 +183,7 @@
       componentIsshow.value = false;
       redirectIsshow.value = true;
       keepAliveIsshow.value = false;
-      hideChildrenIsshow.value = false;
+      hideChildrenIsshow.value = true;
     }else if(currentType==2){//二级菜单
       menuNameIsshow.value = true;
       preMenuIsshow.value = true;
@@ -244,6 +244,7 @@
         }
         if(menuRadioType.value==1){
           params.pid = currentLineData.value?currentLineData.value.pid:"root";//一级菜单pid,传'root'
+          params.hideChildren = formState.value.hideChildren;//是否隐藏子级
         }
         if(addOrEditType.value==1){//新增
           http.post(menuS.queryMenuPageAdd, params).then(() => {
@@ -312,7 +313,9 @@
         menuCode:'',
         type:'',
         menuJumpUrl:'',
-        menuRedirect:''
+        menuRedirect:'',
+        keepAlive:false,
+        hideChildren:false
       };
       }else if(type==2){//编辑
         drawerTitele.value = '编辑菜单';
diff --git a/lib/paas/store/index.ts b/lib/paas/store/index.ts
index ddefcf4..7c19ce2 100644
--- a/lib/paas/store/index.ts
+++ b/lib/paas/store/index.ts
@@ -1,6 +1,8 @@
 import type { App } from 'vue';
 import { createPinia } from 'pinia';
 const store = createPinia();
+// import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
+// store.use(piniaPluginPersistedstate)
 
 export function setupStore(app: App<Element>) {
   app.use(store);
diff --git a/lib/saas/store/modules/route.ts b/lib/saas/store/modules/route.ts
index 753d410..6da2daf 100644
--- a/lib/saas/store/modules/route.ts
+++ b/lib/saas/store/modules/route.ts
@@ -135,4 +135,6 @@ export const useRouteStore = defineStore({
         });
     },
   },
+  // //开启数据缓存
+  // persist:true,
 });
diff --git a/lib/saas/view/system/layout/tags.vue b/lib/saas/view/system/layout/tags.vue
index cb0283f..de6976c 100644
--- a/lib/saas/view/system/layout/tags.vue
+++ b/lib/saas/view/system/layout/tags.vue
@@ -266,18 +266,18 @@
       resizeButtom() {
         this.$nextTick(() => {
           if (this.$refs.tags !== undefined) {
-            const clientWidth = (this.$refs.tags as HTMLElement).clientWidth;
-            if (this.currentPage === 0) {
-              this.isdisabledl = this.tagList.length * 100 > clientWidth;
-            } else {
-              this.isdisabledl =
-                (this.tagList.length - this.number * this.currentPage) * 100 > clientWidth;
-              if (this.tagList.length * 100 < clientWidth) {
-                (this.$refs.tags as HTMLElement).style.cssText = `transform: translateX(${0}px)`;
-                this.isdisabledr = false;
-                this.currentPage = 0;
+              const clientWidth = (this.$refs.tags as HTMLElement).clientWidth;
+              if (this.currentPage === 0) {
+                this.isdisabledl = this.tagList.length * 100 > clientWidth;
+              } else {
+                this.isdisabledl =
+                  (this.tagList.length - this.number * this.currentPage) * 100 > clientWidth;
+                if (this.tagList.length * 100 < clientWidth) {
+                  (this.$refs.tags as HTMLElement).style.cssText = `transform: translateX(${0}px)`;
+                  this.isdisabledr = false;
+                  this.currentPage = 0;
+                }
               }
-            }
           }
         });
       },
diff --git a/lib/saas/view/system/login.vue b/lib/saas/view/system/login.vue
index 5c64d1e..e654921 100644
--- a/lib/saas/view/system/login.vue
+++ b/lib/saas/view/system/login.vue
@@ -79,6 +79,7 @@
   import { Cookies } from '/nerv-lib/util/cookie';
   import { storeToRefs } from 'pinia';
   import { NsMessage } from '/nerv-lib/component';
+  import { replyDynamRoutesPath } from '/nerv-lib/util/dynamicRoutesss';
 
   export default defineComponent({
     name: 'UserLogin',
@@ -194,12 +195,22 @@
                       name: initRouterList.length === 0 ? 'error403' : res.data[0]['code'],
                     });
                   } else {
-                    router.replace({ name: 'root' });
+                    const sessionStoreRoute = sessionStorage.getItem("dynamicRouteList");
+                    let getDynamicRouteList = sessionStoreRoute?JSON.parse(sessionStoreRoute):[];
+                    if(getDynamicRouteList && getDynamicRouteList.lenght>0){
+                      let addDynamicRoutes = replyDynamRoutesPath(getDynamicRouteList);
+                      addDynamicRoutes.forEach(item => {
+                        if (item.children && !item.component) {
+                          item.component = () => import('/nerv-lib/saas/view/system/application.vue');//hx-ai-intelligent项目下的首页
+                        }
+                        router.addRoute(item);
+                      });
+                    }
+                    router.replace({ name: 'home' });
                   }
                 }
               } catch (err) {
                 console.log(err);
-
                 loading.value = false;
               }
             }
diff --git a/lib/util/dynamicRoutesss.ts b/lib/util/dynamicRoutesss.ts
new file mode 100644
index 0000000..462073c
--- /dev/null
+++ b/lib/util/dynamicRoutesss.ts
@@ -0,0 +1,25 @@
+//处理路由compontent路径
+export const replyDynamRoutesPath = (data:any) => {
+  return data.map(item => {
+    if(item.children && item.children.length > 0){
+      item.children.map(itemChild => {
+        if(itemChild.component){
+          const modulePath0 = itemChild.component;
+          itemChild.component = () => new Function(`return import('/nerv-lib/saas/view/${modulePath0}')`)();
+          if(itemChild.children && itemChild.children.length > 0){
+            itemChild.children.map(itemChildChild => {
+              if(itemChildChild.component){
+                const modulePath1 = itemChildChild.component;
+                itemChildChild.component = () => new Function(`return import('/@/view/${modulePath1}')`)();
+              }
+            })
+          }else{
+            itemChild.component = () => new Function(`return import('/@/view/${modulePath0}')`)();
+          }
+        }
+      })
+    }
+    return item;
+  })
+}
+  
\ No newline at end of file
diff --git a/package.json b/package.json
index 076c3fd..26689e3 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
     "nanoid": "^4.0.2",
     "path-to-regexp": "^6.2.1",
     "pinia": "^2.0.14",
+    "pinia-plugin-persistedstate": "^3.2.1",
     "pnpm": "^8.7.6",
     "qrcode.vue": "^3.3.3",
     "recorder-core": "^1.3.23122400",