From 6137aaa4b63194bd8e3eb5a2151defa3cd64e00e Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Thu, 11 Jul 2024 15:53:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=90=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=99=BB=E5=BD=95=E4=BF=A1=E6=81=AF=E6=B1=A1=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/App.vue                      |  4 +-
 hx-ai-intelligent/src/api/deviceManage.ts          |  4 +
 hx-ai-intelligent/src/config/app.config.ts         |  2 +-
 .../carbonEmissionFactorLibrary/index.vue          |  2 +-
 .../energyConsumption/index.vue                    |  2 +-
 .../src/view/equipmentManage/group/config.ts       | 75 ++++++++++-------
 .../src/view/equipmentManage/group/edit.vue        | 98 +++++++++++++---------
 .../src/view/equipmentManage/group/index.vue       | 27 ++++--
 .../organizationManage/departmentManage/index.vue  |  2 +-
 .../view/organizationManage/usermanage/config.ts   |  2 +-
 .../view/organizationManage/usermanage/index.vue   |  4 +-
 lib/component/drawer/drawer.vue                    |  1 +
 lib/saas/config/router.config.ts                   |  2 +-
 lib/saas/router/guard/permission-guard.ts          | 30 ++++---
 lib/saas/view/service/updatePassWord.vue           |  2 +-
 lib/saas/view/system/layout/customHeader.vue       | 15 ++--
 lib/saas/view/system/layout/header.vue             | 17 ++--
 lib/saas/view/system/login.vue                     |  9 +-
 lib/util/http/axios.ts                             |  6 +-
 19 files changed, 188 insertions(+), 116 deletions(-)

diff --git a/hx-ai-intelligent/src/App.vue b/hx-ai-intelligent/src/App.vue
index 35a2db5..9c90247 100644
--- a/hx-ai-intelligent/src/App.vue
+++ b/hx-ai-intelligent/src/App.vue
@@ -21,12 +21,12 @@
       // watch(
       //   () => router.currentRoute.value,
       //   (e) => {
-      //     // if (Cookies.get('nervsid') === undefined && e.fullPath !== '/login') {
+      //     // if (Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`) === undefined && e.fullPath !== '/login') {
       //     //   message.warn('登陆信息已过期，请重新登录!', 1);
       //     //   router.push('/login');
       //     // }
       //     // } else {
-      //     //   if (Cookies.get('nervsid') !== undefined && e === '/login') {
+      //     //   if (Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`) !== undefined && e === '/login') {
       //     //     let url = window.sessionStorage.getItem('url');
       //     //     url === null ? window.sessionStorage.setItem('url', '/doorway/visitor/audit') : '';
       //     //     router.push(url === null ? '/doorway' : url);
diff --git a/hx-ai-intelligent/src/api/deviceManage.ts b/hx-ai-intelligent/src/api/deviceManage.ts
index f598951..7ae63d2 100644
--- a/hx-ai-intelligent/src/api/deviceManage.ts
+++ b/hx-ai-intelligent/src/api/deviceManage.ts
@@ -11,4 +11,8 @@ export enum group {
   creatOrUpdate = `${BASE_URL}/deviceGroup/creatOrUpdate`, // 左侧树节点新增编辑
   del = `${BASE_URL}/deviceGroup/del`,
   move = `${BASE_URL}/deviceGroup/move`,
+  queryEditGroup = `${BASE_URL}/deviceGroup/queryEditGroup`, // 分组树
+  queryGroupPage = `${BASE_URL}/deviceGroup/queryGroupPage`, // 分组列表
+  saveGroupList = `${BASE_URL}/deviceGroup/saveGroupList`, // 分组保存
+  delGroupList = `${BASE_URL}/deviceGroup/delGroupList`, // 分组删除
 }
diff --git a/hx-ai-intelligent/src/config/app.config.ts b/hx-ai-intelligent/src/config/app.config.ts
index 5215705..a0db2b8 100644
--- a/hx-ai-intelligent/src/config/app.config.ts
+++ b/hx-ai-intelligent/src/config/app.config.ts
@@ -71,7 +71,7 @@ export const appConfig = {
     // 解决初始化登录select无初始值的问题
     selectDefaultValue.value = finalId;
 
-    const userInfo = JSON.parse(sessionStorage.getItem('userInfo')!);
+    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) => {
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 3c651cf..f2397f7 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -135,7 +135,7 @@ import { log } from 'node:console';
   const casData = ref([]);
   const treeData = ref([]);
   const userAuthList = ref([]);
-  const orgId = JSON.parse(sessionStorage.getItem('userInfo')).orgId;
+  const orgId = JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)).orgId;
   const dynamicDisabled = computed(() => {
     return formRef.value?.validateResult && userAuthList.value?.length;
   });
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 3100688..f13ffe3 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -104,7 +104,7 @@
     name: 'EnergyConsumption', // 与页面路由name一致缓存才可生效
   });
   
-  const orgId = JSON.parse(sessionStorage.getItem('userInfo')).orgId;
+  const orgId = JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)).orgId;
   const fetch = (api, params = { orgId }) => {
     return http.post(api, params);
   };
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
index 082faf5..4a51f89 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
@@ -4,10 +4,13 @@ import { http } from '/nerv-lib/util';
 import { ref } from 'vue';
 import { group } from '/@/api/deviceManage';
 import { dict } from '/@/api';
-const tableKeyMap = [
+import { origanizemanage } from '/@/api/origanizemanage';
+const tableCalKeyMap = [
   {
     title: '来源企业',
-    dataIndex: 'id',
+    dataIndex: 'orgName',
+    // textEllipsis: true,
+    // textNumber: 4,
   },
   {
     title: '设备id',
@@ -32,20 +35,18 @@ const tableKeyMap = [
     dataIndex: 'position',
   },
 ];
-const tableCalKeyMap = [
+const tableKeyMap = [
   {
     title: '来源企业',
-    dataIndex: 'id',
+    dataIndex: 'orgName',
   },
   {
     title: '节点编号',
-    dataIndex: 'deviceName',
-    textNumber: 8,
-    textEllipsis: true,
+    dataIndex: 'pointNum',
   },
   {
     title: '节点路径',
-    dataIndex: 'position',
+    dataIndex: 'routeName',
   },
 ];
 const doWnload = (url) => {
@@ -125,6 +126,26 @@ export const formSchema = [
     ],
   },
 ];
+export const editTreeConfig = (orgId) => ({
+  selectedKeys: ['0-0'],
+  defaultExpandAll: true,
+  api: group.queryEditGroup,
+  params: { orgId },
+  resultField: 'data.orgInfos',
+  fieldNames: { title: 'orgName', key: 'orgId' },
+  formConfig: {
+    schemas: [
+      {
+        field: 'orgName',
+        component: 'NsInput',
+        autoSubmit: true,
+        componentProps: {
+          placeholder: '请输入企业名称',
+        },
+      },
+    ],
+  },
+});
 export const treeConfig = (orgId) => {
   return {
     defaultExpandAll: true,
@@ -133,15 +154,8 @@ export const treeConfig = (orgId) => {
       title: '能耗分组',
     },
     params: { orgId },
-    showLine: { showLeafIcon: false },
+
     api: group.queryDeviceGroupTree,
-    // api: () => {
-    //   return new Promise((resolve) => {
-    //     setTimeout(() => {
-    //       resolve({ data: [{ title: '全部', key: 'all', children: data.data }] });
-    //     }, 100);
-    //   });
-    // },
     transform: (data) => {
       return [{ pointName: '全部', id: 'all', selectable: false, children: data }];
     },
@@ -176,12 +190,11 @@ export const treeConfig = (orgId) => {
     },
   };
 };
-export const tableConfig = (el, elGroup, elFormula) => {
+export const tableConfig = (el, elGroup, elFormula, defaultParams) => {
   return {
     title: '点位信息',
-    // api: '/carbon_emission/device/getDeviceList',
-    value: mockData.value,
-
+    api: group.queryGroupPage,
+    params: defaultParams.value,
     headerActions: [
       {
         label: '编辑',
@@ -193,7 +206,7 @@ export const tableConfig = (el, elGroup, elFormula) => {
       },
       {
         label: '批量删除',
-        name: 'groupTemDownload',
+        name: 'groupBatDelete',
         type: 'primary',
         dynamicDisabled: (data: any) => {
           return data.list.length === 0;
@@ -244,7 +257,7 @@ export const tableConfig = (el, elGroup, elFormula) => {
 
       {
         label: '批量分组',
-        name: 'groupTemDownload',
+        name: 'groupBatGroup',
         type: 'primary',
         handle: () => {
           elGroup.value.toggle();
@@ -252,7 +265,7 @@ export const tableConfig = (el, elGroup, elFormula) => {
       },
       {
         label: '公式编辑',
-        name: 'groupTemDownload',
+        name: 'groupFormulaEdit',
         type: 'primary',
         handle: () => {
           elFormula.value.toggle();
@@ -265,7 +278,7 @@ export const tableConfig = (el, elGroup, elFormula) => {
       actions: [
         {
           label: '删除',
-          name: 'FeedBackDetail',
+          name: 'groupDelete',
           dynamicParams: ['uuid', 'appealType'],
           confirm: true,
           handle: () => {
@@ -341,11 +354,13 @@ export const tableConfig = (el, elGroup, elFormula) => {
   };
 };
 
-export const tableConfigCal = (el, elGroup, elFormula) => {
+export const tableConfigCal = (el, elGroup, elFormula, defaultParams) => {
+  // 分组节点
   return {
     title: '点位信息',
     // api: '/carbon_emission/device/getDeviceList',
     value: mockData.value,
+    params: defaultParams,
 
     headerActions: [
       {
@@ -413,12 +428,12 @@ export const tableConfigCal = (el, elGroup, elFormula) => {
       actions: [
         {
           label: '删除',
-          name: 'FeedBackDetail',
-          dynamicParams: ['uuid', 'appealType'],
+          name: 'groupDelete',
+          dynamicParams: 'id',
           confirm: true,
-          handle: () => {
-            mockData.value.splice(0, 1);
-          },
+          isReload: true,
+          isClearCheck: true,
+          api: group.delGroupList,
         },
       ],
     },
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
index 669dc6b..d43c189 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
@@ -1,53 +1,72 @@
 <template>
   <ns-drawer
     v-model:visible="visible"
-    size="large"
+    :width="800"
     class="custom-class"
-    title="编辑"
+    title=" "
+    destroyOnClose
     :ok="btnClick"
     :cancel="() => (visible = false)"
     placement="right">
     <div class="drawerContainer">
-      <ns-tree-api v-bind="treeConfig" @select="treeSelect" />
+      <ns-tree-api v-bind="config" @select="treeSelect" />
       <a-transfer
         v-model:target-keys="targetKeys"
-        :data-source="mockData"
+        :data-source="dataSource"
         style="height: 100%; width: 66%"
+        oneWay
         :listStyle="listStyle"
         show-search
+        :render="(item) => item.title"
         :filter-option="filterOption"
-        :render="(item) => item.title" />
+        @change="handleChange" />
     </div>
   </ns-drawer>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref } from 'vue';
+  import { computed, onMounted, ref } from 'vue';
   import { NsMessage } from '/nerv-lib/component';
-  import { treeConfig } from './config';
-
-  const visible = ref(false);
-  const mockData = ref([]);
-
+  import { editTreeConfig } from './config';
+  import { group } from '/@/api/deviceManage';
+  import { http } from '/nerv-lib/util/http';
+  const props = defineProps({ params: Object });
+  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+  const config = computed(() => {
+    return editTreeConfig(result);
+  });
+  const visible = ref(true);
+  const dataSource = ref([]);
   const listStyle = {
     height: '100%',
     width: '100%',
   };
-  const targetKeys = ref<string[]>([]);
+  const targetKeys = ref([]);
+  const currentId = ref('');
   const toggle = () => {
     visible.value = !visible.value;
   };
+  const handleChange = (nextTargetKeys: string[], direction: string, moveKeys: string[]) => {
+    console.log('targetKeys: ', nextTargetKeys);
+    console.log('direction: ', direction);
+    console.log('moveKeys: ', moveKeys);
+  };
 
-  onMounted(() => {
-    getMock('上海公司');
-  });
-
-  const filterOption = (inputValue: string, option: MockData) => {
-    return option.description.indexOf(inputValue) > -1;
+  const filterOption = (inputValue: string, option: any) => {
+    return option?.title.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
   };
 
   const btnClick = () => {
-    visible.value = false;
-    NsMessage.success('编辑成功');
+    // visible.value = false;
+
+    http
+      .post(group.saveGroupList, {
+        ...props.params,
+        saveOrgId: currentId.value,
+        saveGroupIds: targetKeys.value,
+      })
+      .then(() => {
+        NsMessage.success('操作成功');
+      });
   };
   function treeSelect(
     selectedKeys: never[],
@@ -62,26 +81,27 @@
     const {
       dataRef: { title },
     } = e.node;
-
-    getMock(title);
+    currentId.value = selectedKeys[0];
+    getData(currentId.value);
   }
-  const getMock = (company) => {
-    const keys = [];
-    const mData = [];
-    for (let i = 0; i < 60; i++) {
-      const data = {
-        key: i.toString(),
-        title: `A00${i + 1}总用电量(${company})`,
-        description: `description of content${i + 1}`,
-        chosen: Math.random() * 2 > 1,
-      };
-      if (data.chosen) {
-        keys.push(data.key);
-      }
-      mData.push(data);
-    }
-    mockData.value = mData;
-    targetKeys.value = keys;
+  const getData = (id) => {
+    http
+      .post(group.queryEditGroup, {
+        orgId: result,
+        queryOrgId: id,
+        ...props.params,
+        // energyType: props.params.energyType,
+      })
+      .then((res) => {
+        dataSource.value = res.data.groups?.map((item) => {
+          item['title'] = item.pointName;
+          item['key'] = item.id.toString();
+          return item;
+        });
+        targetKeys.value = res.data.linkGroups.map((item) => {
+          return item.id;
+        });
+      });
   };
   defineExpose({
     toggle,
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
index f4322fd..79bdc0f 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <editDrawer ref="editDrawerRef" />
+  <editDrawer ref="editDrawerRef" :params="defaultParams" />
   <editGroup ref="editGroupRef" />
   <editFormula ref="editFormulaRef" />
 
@@ -34,8 +34,8 @@
         </template>
       </ns-tree-api>
     </div>
-    <ns-view-list-table v-show="defaultType" class="table" v-bind="config" />
-    <ns-view-list-table v-show="!defaultType" class="table" v-bind="configCal" />
+    <ns-view-list-table v-if="defaultType" class="table" v-bind="config" ref="tableRef" />
+    <ns-view-list-table v-else class="table" v-bind="configCal" ref="tableCalRef" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -53,14 +53,18 @@
   type opType = 'up' | 'down';
   const { getParams } = useParams();
   const modalFormRef = ref();
+  const tableRef = ref();
+  const tableCalRef = ref();
   const editDrawerRef = ref();
   const editGroupRef = ref();
   const editFormulaRef = ref();
   const treeRef = ref();
   const defaultType = ref(true);
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
-  const config = tableConfig(editDrawerRef, editGroupRef, editFormulaRef);
-  const configCal = tableConfigCal(editDrawerRef, editGroupRef, editFormulaRef);
+  const defaultParams = ref({ orgId: result, energyType: '用电量', id: 19 });
+
+  const config = tableConfig(editDrawerRef, editGroupRef, editFormulaRef, defaultParams);
+  const configCal = tableConfigCal(editDrawerRef, editGroupRef, editFormulaRef, defaultParams);
   const tConfig = treeConfig(result);
   const nsModalFormConfig = ref({
     api: group.creatOrUpdate,
@@ -150,8 +154,17 @@
     { title: '下移', key: 'moveDown', func: (data) => moveNode(data, 'down') },
     { title: '删除', key: 'deleteNode', func: (data) => deleteNode(data) },
   ];
-  const handleSelect = () => {
-    defaultType.value = !defaultType.value;
+  const handleSelect = (key, record) => {
+    console.log(record);
+    const {
+      node: { pointType, id, energyType },
+    } = record;
+    defaultParams.value.energyType = energyType;
+    defaultParams.value.id = id;
+    defaultType.value = pointType === '分组节点';
+    defaultType.value
+      ? tableRef.value?.nsTableRef.reload()
+      : tableCalRef.value?.nsTableRef.reload();
   };
 </script>
 <style lang="less" scoped>
diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
index 9fe67c1..f4d24fa 100644
--- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
@@ -194,7 +194,7 @@
   const selectRoleRef = ref();
   const formSchema = formConfig(disabled as any);
   const formSchema2 = formConfig2(roleDisabled as any);
-  const { orgName, projectId, orgId } = JSON.parse(sessionStorage.getItem('userInfo'));
+  const { orgName, projectId, orgId } = JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH));
   // const orgId = JSON.parse(sessionStorage.getItem('ORGID'));
   const roleTreeData = ref([]);
   const rolePermissionTreeData = ref([]);
diff --git a/hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts b/hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts
index 3b7e580..6b5e24c 100644
--- a/hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts
+++ b/hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts
@@ -89,7 +89,7 @@ export const formConfig = (disabled) => {
             label: '组织关系',
             field: 'orgName',
             component: 'NsInput',
-            defaultValue: JSON.parse(sessionStorage.getItem('userInfo')).orgName,
+            defaultValue: JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)).orgName,
             componentProps: {
               disabled: true,
               maxLength: 30,
diff --git a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
index e8d257a..02ee2db 100644
--- a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
@@ -104,7 +104,7 @@
   const treeDataDept = ref([]);
   const treeData2 = ref([]);
   const userAuthList = ref([]);
-  // const orgId = JSON.parse(sessionStorage.getItem('userInfo')).orgId;
+  // const orgId = JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)).orgId;
   const orgId = JSON.parse(sessionStorage.getItem('ORGID')!);
   const orgTreeConfig = ref({
     selectedKeys: ['0-0'],
@@ -291,7 +291,7 @@
           setTimeout(() => {
             formData.value = {
               sex: '男',
-              orgName: JSON.parse(sessionStorage.getItem('userInfo')).orgName,
+              orgName: JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)).orgName,
             };
             userAuthList.value.splice(0);
           });
diff --git a/lib/component/drawer/drawer.vue b/lib/component/drawer/drawer.vue
index a01a731..b7d8726 100644
--- a/lib/component/drawer/drawer.vue
+++ b/lib/component/drawer/drawer.vue
@@ -32,6 +32,7 @@
         getContainer: (triggerNode: any) => triggerNode.parentNode,
         ...attrs,
         ...props,
+        footerStyle: { textAlign: 'right' },
       }));
       return { getBindValue };
     },
diff --git a/lib/saas/config/router.config.ts b/lib/saas/config/router.config.ts
index 2a36049..46c1c4c 100644
--- a/lib/saas/config/router.config.ts
+++ b/lib/saas/config/router.config.ts
@@ -4,7 +4,7 @@ export const routerConfig = {
   router: router,
   login: 'login',
   logout: () => {
-    Cookies.remove('nervsid');
+    Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
     Cookies.remove('token');
     sessionStorage.clear();
     router.push('/login');
diff --git a/lib/saas/router/guard/permission-guard.ts b/lib/saas/router/guard/permission-guard.ts
index 5105adf..cb8c885 100644
--- a/lib/saas/router/guard/permission-guard.ts
+++ b/lib/saas/router/guard/permission-guard.ts
@@ -4,6 +4,9 @@ import { authorizationService } from '/nerv-base/store/modules/authorization-ser
 import { appConfigStore } from '/nerv-base/store/modules/app-config';
 import { Cookies } from '/nerv-lib/util/cookie';
 import { setRouteChange } from '/nerv-lib/util/routeChange';
+
+console.log(import.meta.env.VITE_PUBLIC_PATH);
+
 export function createPermissionGuard(router: Router, whiteNameList: string[]) {
   const authorizationStore = authorizationService();
   const appConfig = appConfigStore();
@@ -11,23 +14,26 @@ export function createPermissionGuard(router: Router, whiteNameList: string[]) {
     if (!appConfig.userCustomRouterGuard) {
       setRouteChange(to);
       if (to?.query?.nervsid) {
-        if (to?.query?.nervsid !== Cookies.get('nervsid')) {
-          Cookies.set('nervsid', to?.query?.nervsid);
+        if (to?.query?.nervsid !== Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)) {
+          Cookies.set(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`, to?.query?.nervsid);
           try {
             const info = await appConfig.userInfo();
             await authorizationStore.initUserResource();
             authorizationStore.initMenuResource();
             appConfig.setUserInfo(info.data);
             info.success
-              ? window.sessionStorage.setItem('userInfo', JSON.stringify(info.data))
+              ? window.sessionStorage.setItem(
+                  import.meta.env.VITE_PUBLIC_PATH,
+                  JSON.stringify(info.data),
+                )
               : '';
           } catch (err) {
-            Cookies.remove('nervsid');
+            Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
           }
         }
       }
       if (
-        !Cookies.get('nervsid') &&
+        !Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`) &&
         to.fullPath !== '/login' &&
         to.name &&
         !whiteNameList.includes(to.name as string)
@@ -36,15 +42,19 @@ export function createPermissionGuard(router: Router, whiteNameList: string[]) {
         next({ name: 'login' });
       } else {
         //  存储用户信息
-
         if (to.fullPath !== '/login') {
-          const initUserInfo = window.sessionStorage['userInfo'];
-          if (!initUserInfo && Cookies.get('nervsid')) {
+          const initUserInfo = window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH];
+          if (!initUserInfo && Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)) {
             try {
               const info = await appConfig.userInfo();
-              info.data ? window.sessionStorage.setItem('userInfo', JSON.stringify(info.data)) : '';
+              info.data
+                ? window.sessionStorage.setItem(
+                    import.meta.env.VITE_PUBLIC_PATH,
+                    JSON.stringify(info.data),
+                  )
+                : '';
             } catch (err) {
-              Cookies.remove('nervsid');
+              Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
             }
           } else {
             if (initUserInfo) {
diff --git a/lib/saas/view/service/updatePassWord.vue b/lib/saas/view/service/updatePassWord.vue
index 3315d99..e75810f 100644
--- a/lib/saas/view/service/updatePassWord.vue
+++ b/lib/saas/view/service/updatePassWord.vue
@@ -168,7 +168,7 @@
               const res = await http.post(configStore.updatePassWordInfo?.api, data);
               if (res.success) {
                 NsMessage.success('修改成功，需重新登陆', 1, () => {
-                  Cookies.remove('nervsid');
+                  Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
                   sessionStorage.clear();
                   router.push('/login');
                   authorizationStore.clearAuthorization();
diff --git a/lib/saas/view/system/layout/customHeader.vue b/lib/saas/view/system/layout/customHeader.vue
index e82d4e2..eccad61 100644
--- a/lib/saas/view/system/layout/customHeader.vue
+++ b/lib/saas/view/system/layout/customHeader.vue
@@ -197,7 +197,7 @@
       });
 
       const toCustomUrl = (val: string) => {
-        window.open(`${val}?nervsid=${Cookies.get('nervsid')}`);
+        window.open(`${val}?nervsid=${Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)}`);
       };
       const messageCount = computed(() => {
         return messagecountStore.getCount;
@@ -267,12 +267,15 @@
       const { getProjectName: projectName } = storeToRefs(authorizationStore);
       const { getEnterpriseName: enterpriseName } = storeToRefs(authorizationStore);
 
-      const initUserInfo = window.sessionStorage['userInfo'];
+      const initUserInfo = window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH];
       if (!authorizationStore.getProjectName && Cookies.get('projectName')) {
         authorizationStore.setProjectName(Cookies.get('projectName'));
       }
-      if (!authorizationStore.getEnterpriseName && window.sessionStorage['userInfo']) {
-        const userInfo = JSON.parse(window.sessionStorage['userInfo']);
+      if (
+        !authorizationStore.getEnterpriseName &&
+        window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH]
+      ) {
+        const userInfo = JSON.parse(window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH]);
         authorizationStore.setEnterpriseName(
           !userInfo.organizationalName ? '' : userInfo.organizationalName,
         );
@@ -351,7 +354,7 @@
         if (configStore.dropOut) {
           configStore.dropOut(Cookies, router, useTags, authorizationStore, http);
         } else {
-          Cookies.remove('nervsid');
+          Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
           sessionStorage.clear();
           router.push('/login');
           useTags().clearTags();
@@ -392,7 +395,7 @@
       ];
       const backDoor = () => {
         let protocol = window.location.protocol;
-        const nervsid = Cookies.get('nervsid');
+        const nervsid = Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
         http.get('/portalurl.json').then((res) => {
           if (nervsid) {
             window.location.href = `${protocol}//${res.url}report?nervsid=${nervsid}`;
diff --git a/lib/saas/view/system/layout/header.vue b/lib/saas/view/system/layout/header.vue
index 4752241..24f59e6 100644
--- a/lib/saas/view/system/layout/header.vue
+++ b/lib/saas/view/system/layout/header.vue
@@ -187,8 +187,8 @@
       // const messageCount = ref();
       const time = ref();
       const toCustomUrl = (val: string) => {
-        window.open(`${val}?nervsid=${Cookies.get('nervsid')}`);
-        // window.location.href = `${val}?nervsid=${Cookies.get('nervsid')}`;
+        window.open(`${val}?nervsid=${Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)}`);
+        // window.location.href = `${val}?nervsid=${Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)}`;
       };
       const messageCount = computed(() => {
         return messagecountStore.getCount;
@@ -217,12 +217,15 @@
       const userName = ref<string>('-');
       const authorizationStore = authorizationService();
 
-      const initUserInfo = window.sessionStorage['userInfo'];
+      const initUserInfo = window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH];
       if (!authorizationStore.getProjectName && Cookies.get('projectName')) {
         authorizationStore.setProjectName(Cookies.get('projectName'));
       }
-      if (!authorizationStore.getEnterpriseName && window.sessionStorage['userInfo']) {
-        const userInfo = JSON.parse(window.sessionStorage['userInfo']);
+      if (
+        !authorizationStore.getEnterpriseName &&
+        window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH]
+      ) {
+        const userInfo = JSON.parse(window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH]);
         authorizationStore.setEnterpriseName(
           !userInfo.organizationalName ? '' : userInfo.organizationalName,
         );
@@ -314,7 +317,7 @@
         if (configStore.dropOut) {
           configStore.dropOut(Cookies, router, useTags, authorizationStore, http);
         } else {
-          Cookies.remove('nervsid');
+          Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
           sessionStorage.clear();
           router.push('/login');
           useTags().clearTags();
@@ -353,7 +356,7 @@
       ];
       const backDoor = () => {
         let protocol = window.location.protocol;
-        const nervsid = Cookies.get('nervsid');
+        const nervsid = Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
         http.get('/portalurl.json').then((res) => {
           if (nervsid) {
             window.location.href = `${protocol}//${res.url}report?nervsid=${nervsid}`;
diff --git a/lib/saas/view/system/login.vue b/lib/saas/view/system/login.vue
index bab205b..8c59eab 100644
--- a/lib/saas/view/system/login.vue
+++ b/lib/saas/view/system/login.vue
@@ -140,11 +140,14 @@
                 verifyRef.value?.reload();
                 if (res.data?.token) {
                   if (res.data?.token) {
-                    Cookies.set('nervsid', res.data?.token);
+                    Cookies.set(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`, res.data?.token);
                   }
                   const info = await configStore.userInfo();
                   info.data
-                    ? window.sessionStorage.setItem('userInfo', JSON.stringify(info.data))
+                    ? window.sessionStorage.setItem(
+                        import.meta.env.VITE_PUBLIC_PATH,
+                        JSON.stringify(info.data),
+                      )
                     : '';
                   loading.value = false;
                   if (configStore.enablePermissions) {
@@ -264,7 +267,7 @@
     },
 
     mounted() {
-      // if (Cookies.get('nervsid') !== undefined) {
+      // if (Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`) !== undefined) {
       //   this.$router.push('/home');
       // }
     },
diff --git a/lib/util/http/axios.ts b/lib/util/http/axios.ts
index 5b314c6..6199de4 100644
--- a/lib/util/http/axios.ts
+++ b/lib/util/http/axios.ts
@@ -43,14 +43,14 @@ export class NSAxios {
 
   private interceptors(): void {
     this.instance.interceptors.request.use((config: AxiosRequestConfig) => {
-      // config.headers.token = Cookies.get('nervsid');
+      // config.headers.token = Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
       // config.withCredentials = true;
       if (!config.headers) {
         config.headers = {};
       }
 
-      if (Cookies.get('nervsid')) {
-        config.headers['token'] = Cookies.get('nervsid');
+      if (Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)) {
+        config.headers['token'] = Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
       }
 
       //暂时停用后端自己处理