zhaohy 5 months ago
parent
commit
4dea1ff14d
  1. 4
      hx-ai-intelligent/src/App.vue
  2. 4
      hx-ai-intelligent/src/api/deviceManage.ts
  3. 2
      hx-ai-intelligent/src/config/app.config.ts
  4. 24
      hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
  5. 38
      hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
  6. 193
      hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
  7. 61
      hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.less
  8. 161
      hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
  9. 11
      hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
  10. 1018
      hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
  11. 88
      hx-ai-intelligent/src/view/equipmentControl/lightingManage/treeData.ts
  12. 75
      hx-ai-intelligent/src/view/equipmentManage/group/config.ts
  13. 98
      hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
  14. 27
      hx-ai-intelligent/src/view/equipmentManage/group/index.vue
  15. 2
      hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
  16. 2
      hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts
  17. 4
      hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
  18. 1
      lib/component/drawer/drawer.vue
  19. 2
      lib/saas/config/router.config.ts
  20. 30
      lib/saas/router/guard/permission-guard.ts
  21. 2
      lib/saas/view/service/updatePassWord.vue
  22. 15
      lib/saas/view/system/layout/customHeader.vue
  23. 17
      lib/saas/view/system/layout/header.vue
  24. 9
      lib/saas/view/system/login.vue
  25. 6
      lib/util/http/axios.ts

4
hx-ai-intelligent/src/App.vue

@ -21,12 +21,12 @@
// watch( // watch(
// () => router.currentRoute.value, // () => router.currentRoute.value,
// (e) => { // (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); // // message.warn('!', 1);
// // router.push('/login'); // // router.push('/login');
// // } // // }
// // } else { // // } 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'); // // let url = window.sessionStorage.getItem('url');
// // url === null ? window.sessionStorage.setItem('url', '/doorway/visitor/audit') : ''; // // url === null ? window.sessionStorage.setItem('url', '/doorway/visitor/audit') : '';
// // router.push(url === null ? '/doorway' : url); // // router.push(url === null ? '/doorway' : url);

4
hx-ai-intelligent/src/api/deviceManage.ts

@ -11,4 +11,8 @@ export enum group {
creatOrUpdate = `${BASE_URL}/deviceGroup/creatOrUpdate`, // 左侧树节点新增编辑 creatOrUpdate = `${BASE_URL}/deviceGroup/creatOrUpdate`, // 左侧树节点新增编辑
del = `${BASE_URL}/deviceGroup/del`, del = `${BASE_URL}/deviceGroup/del`,
move = `${BASE_URL}/deviceGroup/move`, 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`, // 分组删除
} }

2
hx-ai-intelligent/src/config/app.config.ts

@ -71,7 +71,7 @@ export const appConfig = {
// 解决初始化登录select无初始值的问题 // 解决初始化登录select无初始值的问题
selectDefaultValue.value = finalId; 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]; const ownOrgInfo = userInfo.linkList?.filter(({ orgId: id }) => id === finalId)[0];
return http.post('/carbon-smart/user/login/logInPermission', ownOrgInfo).then((res) => { return http.post('/carbon-smart/user/login/logInPermission', ownOrgInfo).then((res) => {

24
hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue

@ -493,7 +493,7 @@ import { log } from 'node:console';
isReload: true, isReload: true,
isClearCheck: true, isClearCheck: true,
api: carbonEmissionFactorLibrary.del, api: carbonEmissionFactorLibrary.del,
dynamicParams: { id: 'id[]' }, dynamicParams: { ids: 'id[]' },
}, },
], ],
columns: [ columns: [
@ -573,7 +573,7 @@ import { log } from 'node:console';
{ {
label: '删除', label: '删除',
name: 'userDelete', name: 'userDelete',
dynamicParams: 'id', dynamicParams: { ids: 'id[]' },
confirm: true, confirm: true,
isReload: true, isReload: true,
api: carbonEmissionFactorLibrary.del, api: carbonEmissionFactorLibrary.del,
@ -617,11 +617,27 @@ import { log } from 'node:console';
options: [ options: [
{ {
label: 'CO2', label: 'CO2',
value: 0, value: 'CO2',
}, },
{ {
label: 'CO2e', label: 'CO2e',
value: 1, value: 'CO2e',
},
{
label: 'SF6',
value:'SF6',
},
{
label: 'CH4',
value: 'CH4',
},
{
label: 'PFCs',
value: 'PFCs',
},
{
label: 'HFCs',
value: 'HFCs',
}, },
], ],
}, },

38
hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts

@ -7,64 +7,70 @@ export const tableColumns = [
}, },
{ {
title: '能源种类', title: '能源种类',
dataIndex: 'money', dataIndex: 'energyType',
}, },
{ {
title: '计量单位', title: '计量单位',
className: 'column-money', className: 'unit',
dataIndex: 'money', dataIndex: 'unit',
}, },
{ {
title: '全年', title: '全年',
dataIndex: 'address', dataIndex: 'yearly',
}, },
{ {
title: '1月', title: '1月',
dataIndex: 'address', dataIndex: 'jan',
customRender: ({ text, record }) => ({
children: text,
attrs: {
style: record.janFlag === 1 ? 'color: red' : 'color: blue'
}
})
}, },
{ {
title: '2月', title: '2月',
dataIndex: 'address', dataIndex: 'feb',
}, },
{ {
title: '3月', title: '3月',
dataIndex: 'address', dataIndex: 'mar',
}, },
{ {
title: '4月', title: '4月',
dataIndex: 'address', dataIndex: 'apr',
}, },
{ {
title: '5月', title: '5月',
dataIndex: 'address', dataIndex: 'may',
}, },
{ {
title: '6月', title: '6月',
dataIndex: 'address', dataIndex: 'jun',
}, },
{ {
title: '7月', title: '7月',
dataIndex: 'address', dataIndex: 'jul',
}, },
{ {
title: '8月', title: '8月',
dataIndex: 'address', dataIndex: 'aug',
}, },
{ {
title: '9月', title: '9月',
dataIndex: 'address', dataIndex: 'sep',
}, },
{ {
title: '10月', title: '10月',
dataIndex: 'address', dataIndex: 'oct',
}, },
{ {
title: '11月', title: '11月',
dataIndex: 'address', dataIndex: 'nov',
}, },
{ {
title: '12月', title: '12月',
dataIndex: 'address', dataIndex: 'dec',
}, },
{ {
title: '操作', title: '操作',

193
hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue

@ -16,7 +16,7 @@
</template> </template>
</template> </template>
<template #title> <template #title>
<a-date-picker v-model:value="selectYear" picker="year" /> <a-date-picker v-model:value="selectYear" picker="year" @change="changeYearData" />
<div class="buttonGroup"> <div class="buttonGroup">
<a-button type="primary" @click="addNewData">新增</a-button> <a-button type="primary" @click="addNewData">新增</a-button>
<a-button type="primary">导入</a-button> <a-button type="primary">导入</a-button>
@ -27,11 +27,14 @@
</div> </div>
</template> </template>
</a-table> </a-table>
<a-pagination <a-pagination
:current="current" :current="current"
:page-size="pageSize" :total="total"
:total="0" :page-size="pageSize"
:show-total="(total, range) => `${range[0]}-${range[1]} of ${total} items`" /> style="display: flex;justify-content: center;margin-top: 16px;"
:show-size-changer="true"
:show-quick-jumper="true"
@change="onChange" />
<!-- 新增数据库数据 --> <!-- 新增数据库数据 -->
<a-drawer <a-drawer
:width="500" :width="500"
@ -47,42 +50,80 @@
:label-col="labelCol" :label-col="labelCol"
:wrapper-col="wrapperCol" :wrapper-col="wrapperCol"
> >
<a-form-item ref="name" label="能源种类" name="name"> <a-form-item ref="name" label="能源种类" name="energyType">
<a-input v-model:value="formState.name" /> <a-input v-model:value="formState.energyType" placeholder="请输入能源种类" />
</a-form-item> </a-form-item>
<a-form-item label="计量单位"> <a-form-item label="计量单位" name="unit">
<a-cascader v-model:value="value" :options="options" placeholder="Please select" /> <a-cascader v-model:value="formState.unit" :options="options" />
</a-form-item> </a-form-item>
<a-form-item label="自动采集节点"> <a-form-item label="自动采集节点" name="collectionNode">
<a-tree-select <a-tree-select
v-model:value="treeValue" v-model:value="formState.collectionNode"
style="width: 300px"
placeholder="Please select"
:tree-line="true" :tree-line="true"
:tree-data="treeData" :tree-data="treeData"
tree-node-filter-prop="title" tree-node-filter-prop="title"
> >
<template #title="{ value: val, title }">
<b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
<template v-else>{{ title }}</template>
</template>
</a-tree-select> </a-tree-select>
</a-form-item> </a-form-item>
<a-form-item label="计算碳排" name="resource"> <a-form-item label="计算碳排" name="isComputeCarbon">
<a-radio-group v-model:value="formState.resource"> <a-radio-group v-model:value="formState.isComputeCarbon" @change="changeRadio">
<a-radio value="1"></a-radio> <a-radio value="0"></a-radio>
<a-radio value="2"></a-radio> <a-radio value="1"></a-radio>
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
<a-form-item label="排放类型" name="region"> <a-form-item label="排放类型" name="emissionType">
<a-select v-model:value="formState.region" placeholder="请选择排放类型"> <a-select v-model:value="formState.emissionType" placeholder="请选择排放类型">
<a-select-option value="shanghai">Zone one</a-select-option> <a-select-option value="直接排放">直接排放</a-select-option>
<a-select-option value="beijing">Zone two</a-select-option> <a-select-option value="间接排放">间接排放</a-select-option>
<a-select-option value="其他">其他</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label="1月" name="delivery"> <a-row>
<a-switch v-model:checked="formState.delivery" /> <a-col :span="24" style="display:flex;justify-content: space-around;">
</a-form-item> <a-form-item label="1月" name="janFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.janFlag" />
</a-form-item>
<a-form-item label="2月" name="febFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.febFlag" />
</a-form-item>
<a-form-item label="3月" name="marFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.marFlag" />
</a-form-item>
</a-col>
<a-col :span="24" style="display:flex;justify-content: space-around;">
<a-form-item label="4月" name="aprFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.aprFlag" />
</a-form-item>
<a-form-item label="5月" name="mayFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.mayFlag" />
</a-form-item>
<a-form-item label="6月" name="junFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.junFlag" />
</a-form-item>
</a-col>
<a-col :span="24" style="display:flex;justify-content: space-around;">
<a-form-item label="7月" name="julFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.julFlag" />
</a-form-item>
<a-form-item label="8月" name="augFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.augFlag" />
</a-form-item>
<a-form-item label="9月" name="sepFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.sepFlag" />
</a-form-item>
</a-col>
<a-col :span="24" style="display:flex;justify-content: space-around;">
<a-form-item label="10月" name="octFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.octFlag" />
</a-form-item>
<a-form-item label="11月" name="novFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.novFlag" />
</a-form-item>
<a-form-item label="12月" name="decFlag" :label-col="switchLabelCol" :wrapper-col="switchWrapperCol">
<a-switch v-model:checked="formState.decFlag" />
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
<template #footer> <template #footer>
<a-button style="margin-right: 8px" @click="onClose">取消</a-button> <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
@ -95,13 +136,17 @@
import { ref,reactive, toRaw } from 'vue'; import { ref,reactive, toRaw } from 'vue';
import type { UnwrapRef } from 'vue'; import type { UnwrapRef } from 'vue';
import type { Rule } from 'ant-design-vue/es/form'; import type { Rule } from 'ant-design-vue/es/form';
import { Pagination } from 'ant-design-vue';
import type { CascaderProps,TreeSelectProps } from 'ant-design-vue'; import type { CascaderProps,TreeSelectProps } from 'ant-design-vue';
import type { Dayjs } from 'dayjs'; import type { Dayjs } from 'dayjs';
import { http } from '/nerv-lib/util/http'; import { http } from '/nerv-lib/util/http';
import { tableColumns } from '../config'; import { tableColumns } from '../config';
import { energyConsumption } from '/@/api/carbonEmissionFactorLibrary'; import { energyConsumption } from '/@/api/carbonEmissionFactorLibrary';
defineOptions({ defineOptions({
name: 'EnergyConsumption', // name energyType: 'EnergyConsumption', // name
components: {
'a-pagination': Pagination,
},
}); });
const orgId = JSON.parse(sessionStorage.getItem('userInfo')).orgId; const orgId = JSON.parse(sessionStorage.getItem('userInfo')).orgId;
@ -111,30 +156,61 @@
const selectYear = ref<Dayjs>(); const selectYear = ref<Dayjs>();
const current = ref<number>(1); const current = ref<number>(1);
const pageSize = ref<number>(10); const pageSize = ref<number>(10);
const total = ref<number>()
const queryParams = ref({
pageNum:current.value,
pageSize:pageSize.value,
})
const visible = ref(false); const visible = ref(false);
const value = ref<string[]>([]);
const data = ref([]); const data = ref([]);
interface FormState { interface FormState {
name: string; energyType: string;
region: string | undefined; unit: string;
delivery: boolean; collectionNode: string;
resource: string; emissionType: string | undefined;
isComputeCarbon: string;
janFlag: boolean;
febFlag: boolean;
marFlag: boolean;
aprFlag: boolean;
mayFlag: boolean;
junFlag: boolean;
julFlag: boolean;
augFlag: boolean;
sepFlag: boolean;
octFlag: boolean;
novFlag: boolean;
decFlag: boolean;
} }
const formRef = ref(); const formRef = ref();
const labelCol = { span: 5 }; const labelCol = { span: 5 };
const wrapperCol = { span: 13 }; const wrapperCol = { span: 19 };
const switchLabelCol = { span: 10 };
const switchWrapperCol = { span: 14 };
const formState: UnwrapRef<FormState> = reactive({ const formState: UnwrapRef<FormState> = reactive({
name: '', energyType: '',
region: undefined, unit: '',
delivery: false, collectionNode: '',
resource: '', emissionType: undefined,
isComputeCarbon: '',
janFlag: false,
febFlag: false,
marFlag: false,
aprFlag: false,
mayFlag: false,
junFlag: false,
julFlag: false,
augFlag: false,
sepFlag: false,
octFlag: false,
novFlag: false,
decFlag: false,
}); });
// form // form
const rules: Record<string, Rule[]> = { const rules: Record<string, Rule[]> = {
name: [ energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
{ required: true, message: '请输入能源种类', trigger: 'change' }, isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }],
], emissionType : [{ required: false, message: '请输入选择排放类型', trigger: 'change' }]
resource: [{ required: true, message: 'Please select activity resource', trigger: 'change' }],
}; };
// //
const options: CascaderProps['options'] = [ const options: CascaderProps['options'] = [
@ -172,7 +248,6 @@
}, },
]; ];
// //
const treeValue = ref<string>();
const treeData = ref<TreeSelectProps['treeData']>([ const treeData = ref<TreeSelectProps['treeData']>([
{ {
title: 'parent 1', title: 'parent 1',
@ -199,13 +274,33 @@
], ],
}, },
]); ]);
//
const changeYearData = () => {
queryParams.value.year = selectYear.value.format('YYYY')
getTableList()
}
// //
const getTableList = () => { const getTableList = () => {
fetch(energyConsumption.pageList).then((res) => { fetch(energyConsumption.pageList , queryParams.value).then((res) => {
console.log(res,'aaaaaa'); data.value = res.data.records
total.value = res.data.total
}); });
}; };
getTableList() getTableList()
//
const onChange = (pageNumber: number,size: number) => {
current.value = pageNumber;
pageSize.value = size;
};
//
const changeRadio = (e) => {
if(e.target.value==='0'){
rules.emissionType.required = true
}else{
rules.emissionType.required = false
}
console.log(rules);
};
// //
const onSubmit = () => { const onSubmit = () => {
formRef.value formRef.value
@ -217,9 +312,6 @@
console.log('error', error); console.log('error', error);
}); });
}; };
const resetForm = () => {
formRef.value.resetFields();
};
// //
const addNewData = () => { const addNewData = () => {
visible.value = true visible.value = true
@ -227,6 +319,7 @@
// //
const onClose = () => { const onClose = () => {
visible.value = false; visible.value = false;
formRef.value.resetFields();
}; };
</script> </script>
<style scoped lang="less"> <style scoped lang="less">

61
hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.less

@ -4,24 +4,6 @@
// height: 100%; // height: 100%;
position: relative; position: relative;
// background: linear-gradient(#badaff, #8cabeb, #7095de); // background: linear-gradient(#badaff, #8cabeb, #7095de);
.drawer-box {
width: 30px;
height: 40px;
border-radius: 2px;
position: fixed;
right: 0;
top: 0;
bottom: 0;
margin: auto;
background: rgba(0, 0 ,0 ,0.5);
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
.drawer-icon {
}
}
// 照明设备功能总容器 // 照明设备功能总容器
.lighting-img-box { .lighting-img-box {
position: relative; position: relative;
@ -88,9 +70,9 @@
background: rgba(80, 236, 244, 0.3); background: rgba(80, 236, 244, 0.3);
border: 2px solid rgb(80, 236, 244); border: 2px solid rgb(80, 236, 244);
} }
.area-item:hover { // .area-item:hover {
border:2px solid white; // transform: scale(1.05);
} // }
.area-item { .area-item {
cursor: pointer; cursor: pointer;
transition: all ease 0.2s; transition: all ease 0.2s;
@ -125,20 +107,21 @@
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
} }
} }
.group-shadow { // .group-shadow {
transition: all ease 0.2s; // transition: all ease 0.2s;
} // }
.group-shadow:hover { // .group-shadow:hover {
border: 2px solid white; // transform: scale(1.05);
} // }
} }
} }
} }
} }
// 总容器与抽屉按钮
.ns-content-main { .ns-content-main {
position: relative; position: relative;
// 抽屉伸缩按钮 // 抽屉打开按钮
.drawer-box { .drawer-box-in {
width: 30px; width: 30px;
height: 40px; height: 40px;
border-radius: 2px; border-radius: 2px;
@ -152,8 +135,22 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
.drawer-icon {
}
} }
// 抽屉关闭按钮
.drawer-box-out {
width: 30px;
height: 40px;
border-radius: 2px;
position: fixed;
right: 496px;
top: 0;
bottom: 0;
margin: auto;
background: rgba(0, 0 ,0 ,0.5);
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
}
} }

161
hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue

@ -9,73 +9,156 @@
</div> </div>
<!-- 楼层区域 --> <!-- 楼层区域 -->
<div class="area"> <div class="area">
<div class="area-item area1" :class="{ 'isActive': area === 1 }" @click="getArea(1)"> <div
<div class="light-group"> v-for="(item, index) in treeData"
<div class="group-shadow group-shadow1" @click.stop="getArea(1.1)"></div> :class="computedClass(item.id)"
</div> @click="getArea(item.id)"
<div class="light-group"> :key="index">
<div class="group-shadow group-shadow1" @click.stop="getArea(1.2)"></div> <div v-for="(v, i) in item.children" :key="i" class="light-group">
</div> <div class="group-shadow group-shadow1" :class="computedClass(v.id)" @click.stop="getArea(v.id)"></div>
</div>
<div class="area-item area2" @click="getArea(2)">
<div class="light-group">
<div class="group-shadow group-shadow2" @click.stop="getArea(2.1)"></div>
</div>
<div class="light-group">
<div class="group-shadow group-shadow2" @click.stop="getArea(2.2)"></div>
</div>
</div>
<div class="area-item area3" @click="getArea(3)">
<div class="light-group">
<div class="group-shadow group-shadow3" @click.stop="getArea(3.1)"></div>
</div>
</div>
<div class="area-item area4" @click="getArea(4)">
<div class="light-group">
<div class="group-shadow group-shadow4" @click.stop="getArea(4.1)"></div>
</div> </div>
</div> </div>
</div> </div>
<!-- 照明设备 --> <!-- 照明设备 -->
<div class="lights"> <div class="lights">
<light :styleObject="{left: '190px', bottom: '200px'}" :type="1"></light> <light v-for="(item, index) in bulbs" :key="index" :styleObject="item.styleText" :type="item.type" :visible="item.visible"></light>
<light :styleObject="{left: '245px', bottom: '125px'}" :type="2"></light>
<light :styleObject="{left: '355px', bottom: '160px'}" :type="3"></light>
<light :styleObject="{left: '295px', bottom: '230px'}" :type="3"></light>
<light :styleObject="{left: '460px', bottom: '230px'}" :type="3"></light>
<light :styleObject="{left: '510px', bottom: '190px'}" :type="3"></light>
<light :styleObject="{left: '415px', bottom: '275px'}" :type="1"></light>
</div> </div>
</div> </div>
<!-- 右侧抽屉的触发按钮 --> <!-- 右侧抽屉的触发按钮 -->
<div class="drawer-box" v-if="!visible"> <div class="drawer-box-in" v-if="!visible" @click="toggleDrawer">
<double-left-outlined class="drawer-icon" style="color: rgba(255, 255, 255, 1)" /> <double-left-outlined class="drawer-icon" style="color: white" />
</div> </div>
</div> <!-- 左侧抽屉的关闭按钮 -->
<div class="drawer-box-out" v-if="visible" @click="toggleDrawer">
<double-right-outlined class="drawer-icon" style="color: white;" />
</div>
<!-- 右侧抽屉 -->
<a-drawer
v-model:visible="visible"
class="drawer-item"
width="496"
placement="right"
:body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8 }"
:closable="false"
id="Odrawer"
:maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane key="1" tab="控制面板">
<tabs1 @changeArea="getArea" :treeData="treeData"></tabs1>
</a-tab-pane>
<a-tab-pane key="2" tab="计划列表" force-render>
</a-tab-pane>
<a-tab-pane key="3" tab="日志"></a-tab-pane>
</a-tabs>
</a-drawer>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref } from 'vue'; import { ref } from 'vue';
import { treeData } from './treeData'
import light from './light.vue'; import light from './light.vue';
import tabs1 from './tabs1.vue'
// ICON
import { import {
DoubleLeftOutlined, DoubleLeftOutlined,
DoubleRightOutlined DoubleRightOutlined
} from '@ant-design/icons-vue'; } from '@ant-design/icons-vue';
let area = ref(1) // - -
let visible = ref(false) let area = ref(['1'])
// -
const bulbs = ref([
{
styleText: { left: '190px', bottom: '200px' },
area: 1,
type: 1,
visible: true
},
{
styleText: { left: '245px', bottom: '125px' },
area: 1,
type: 2,
visible: true
},
{
styleText: { left: '355px', bottom: '160px' },
area: 1,
type: 3,
visible: true
},
{
styleText: { left: '295px', bottom: '230px' },
area: 1,
type: 3,
visible: true
},
{
styleText: { left: '425px', bottom: '230px' },
area: 2,
type: 3,
visible: true
},
{
styleText: { left: '470px', bottom: '190px' },
area: 2,
type: 3,
visible: true
},
{
styleText: { left: '380px', bottom: '275px' },
area: 2,
type: 3,
visible: true
},
{
styleText: { left: '700px', bottom: '320px' },
area: 3,
type: 1,
visible: true
},
])
// -
const getArea = (result: any) => {
//
if (Array.isArray(result)) {
area.value = result
//
} else {
area.value.length = 0
area.value[0] = String(result)
}
}
// -
// -
const computedClass = (number: number) => {
if (area.value.indexOf(number) != -1) {
return `isActive area-item area${number}`
} else {
return `area-item area${number}`
}
}
const getArea = (number: any) => { // - tab
alert(number) let activeKey = ref('1');
// -
let visible = ref(false);
// -
const toggleDrawer = () => {
visible.value = !visible.value;
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import "./indexs.less"; @import "./indexs.less";
.isActive { .isActive {
border: 2px solid white !important; border: 3px solid white !important;
}
:deep(.ant-tabs-tab-btn) {
color: white;
} }
</style> </style>

11
hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue

@ -33,7 +33,7 @@
</div> </div>
</div> </div>
</template> </template>
<div class="icon-box" :style="styleObject"> <div class="icon-box" :style="styleObject" v-show="visible">
<img v-if="type == 1" class="icon-item" src="/asset/image/bulbLogo/22394.png" alt=""> <img v-if="type == 1" class="icon-item" src="/asset/image/bulbLogo/22394.png" alt="">
<img v-if="type == 2" class="icon-item" src="/asset/image/bulbLogo/22396.png" alt=""> <img v-if="type == 2" class="icon-item" src="/asset/image/bulbLogo/22396.png" alt="">
<img v-if="type == 3" class="icon-item" src="/asset/image/bulbLogo/22400.png" alt=""> <img v-if="type == 3" class="icon-item" src="/asset/image/bulbLogo/22400.png" alt="">
@ -43,9 +43,14 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref } from 'vue'; import { ref } from 'vue';
defineProps({ defineProps({
styleObject: Object, styleObject: Object,
type: Number type: Number,
visible: {
type: Boolean,
default: false
}
}); });
const result = ref({ const result = ref({

1018
hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue

File diff suppressed because it is too large

88
hx-ai-intelligent/src/view/equipmentControl/lightingManage/treeData.ts

@ -0,0 +1,88 @@
import { ref } from 'vue';
export const treeData = ref([
{
label: '站厅',
id: '1',
// 前端遍历后添加,属前端属性
selected: false,
children: [{
label: '站厅1区',
id: '1-1',
// 前端属性
selected: false,
// 后端属性(表示禁用了一个设备)
stop: false,
// 当前的控制模式
type: 3
},{
label: '站厅2区',
id: '1-2',
selected: false,
stop: false,
type: 1
}]
},
{
label: '站台',
id: '2',
selected: false,
children: [{
label: '站台1区',
id: '2-1',
selected: false,
stop: false,
type: 1
},{
label: '站台2区',
id: '2-2',
selected: false,
stop: false,
type: 2
},{
label: '站台3区',
id: '2-3',
selected: false,
stop: false,
type: 3
},{
label: '站台4区',
id: '2-4',
selected: false,
stop: false,
type: 1
}]
},{
label: '办公室',
id: '3',
selected: false,
children: [{
label: '办公室1区',
id: '3-1',
selected: false,
stop: false,
type: 2
}]
},{
label: '楼道',
id: '4',
selected: false,
children: [{
label: '楼道1区',
id: '4-1',
selected: false,
stop: false,
type: 3
}]
},
]);
export const controlType = ref([{
name: '托管',
type: 1,
},{
name: 'AI',
type: 2,
},{
name: '手动',
type: 3,
}])

75
hx-ai-intelligent/src/view/equipmentManage/group/config.ts

@ -4,10 +4,13 @@ import { http } from '/nerv-lib/util';
import { ref } from 'vue'; import { ref } from 'vue';
import { group } from '/@/api/deviceManage'; import { group } from '/@/api/deviceManage';
import { dict } from '/@/api'; import { dict } from '/@/api';
const tableKeyMap = [ import { origanizemanage } from '/@/api/origanizemanage';
const tableCalKeyMap = [
{ {
title: '来源企业', title: '来源企业',
dataIndex: 'id', dataIndex: 'orgName',
// textEllipsis: true,
// textNumber: 4,
}, },
{ {
title: '设备id', title: '设备id',
@ -32,20 +35,18 @@ const tableKeyMap = [
dataIndex: 'position', dataIndex: 'position',
}, },
]; ];
const tableCalKeyMap = [ const tableKeyMap = [
{ {
title: '来源企业', title: '来源企业',
dataIndex: 'id', dataIndex: 'orgName',
}, },
{ {
title: '节点编号', title: '节点编号',
dataIndex: 'deviceName', dataIndex: 'pointNum',
textNumber: 8,
textEllipsis: true,
}, },
{ {
title: '节点路径', title: '节点路径',
dataIndex: 'position', dataIndex: 'routeName',
}, },
]; ];
const doWnload = (url) => { 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) => { export const treeConfig = (orgId) => {
return { return {
defaultExpandAll: true, defaultExpandAll: true,
@ -133,15 +154,8 @@ export const treeConfig = (orgId) => {
title: '能耗分组', title: '能耗分组',
}, },
params: { orgId }, params: { orgId },
showLine: { showLeafIcon: false },
api: group.queryDeviceGroupTree, api: group.queryDeviceGroupTree,
// api: () => {
// return new Promise((resolve) => {
// setTimeout(() => {
// resolve({ data: [{ title: '全部', key: 'all', children: data.data }] });
// }, 100);
// });
// },
transform: (data) => { transform: (data) => {
return [{ pointName: '全部', id: 'all', selectable: false, children: 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 { return {
title: '点位信息', title: '点位信息',
// api: '/carbon_emission/device/getDeviceList', api: group.queryGroupPage,
value: mockData.value, params: defaultParams.value,
headerActions: [ headerActions: [
{ {
label: '编辑', label: '编辑',
@ -193,7 +206,7 @@ export const tableConfig = (el, elGroup, elFormula) => {
}, },
{ {
label: '批量删除', label: '批量删除',
name: 'groupTemDownload', name: 'groupBatDelete',
type: 'primary', type: 'primary',
dynamicDisabled: (data: any) => { dynamicDisabled: (data: any) => {
return data.list.length === 0; return data.list.length === 0;
@ -244,7 +257,7 @@ export const tableConfig = (el, elGroup, elFormula) => {
{ {
label: '批量分组', label: '批量分组',
name: 'groupTemDownload', name: 'groupBatGroup',
type: 'primary', type: 'primary',
handle: () => { handle: () => {
elGroup.value.toggle(); elGroup.value.toggle();
@ -252,7 +265,7 @@ export const tableConfig = (el, elGroup, elFormula) => {
}, },
{ {
label: '公式编辑', label: '公式编辑',
name: 'groupTemDownload', name: 'groupFormulaEdit',
type: 'primary', type: 'primary',
handle: () => { handle: () => {
elFormula.value.toggle(); elFormula.value.toggle();
@ -265,7 +278,7 @@ export const tableConfig = (el, elGroup, elFormula) => {
actions: [ actions: [
{ {
label: '删除', label: '删除',
name: 'FeedBackDetail', name: 'groupDelete',
dynamicParams: ['uuid', 'appealType'], dynamicParams: ['uuid', 'appealType'],
confirm: true, confirm: true,
handle: () => { 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 { return {
title: '点位信息', title: '点位信息',
// api: '/carbon_emission/device/getDeviceList', // api: '/carbon_emission/device/getDeviceList',
value: mockData.value, value: mockData.value,
params: defaultParams,
headerActions: [ headerActions: [
{ {
@ -413,12 +428,12 @@ export const tableConfigCal = (el, elGroup, elFormula) => {
actions: [ actions: [
{ {
label: '删除', label: '删除',
name: 'FeedBackDetail', name: 'groupDelete',
dynamicParams: ['uuid', 'appealType'], dynamicParams: 'id',
confirm: true, confirm: true,
handle: () => { isReload: true,
mockData.value.splice(0, 1); isClearCheck: true,
}, api: group.delGroupList,
}, },
], ],
}, },

98
hx-ai-intelligent/src/view/equipmentManage/group/edit.vue

@ -1,53 +1,72 @@
<template> <template>
<ns-drawer <ns-drawer
v-model:visible="visible" v-model:visible="visible"
size="large" :width="800"
class="custom-class" class="custom-class"
title="编辑" title=" "
destroyOnClose
:ok="btnClick" :ok="btnClick"
:cancel="() => (visible = false)" :cancel="() => (visible = false)"
placement="right"> placement="right">
<div class="drawerContainer"> <div class="drawerContainer">
<ns-tree-api v-bind="treeConfig" @select="treeSelect" /> <ns-tree-api v-bind="config" @select="treeSelect" />
<a-transfer <a-transfer
v-model:target-keys="targetKeys" v-model:target-keys="targetKeys"
:data-source="mockData" :data-source="dataSource"
style="height: 100%; width: 66%" style="height: 100%; width: 66%"
oneWay
:listStyle="listStyle" :listStyle="listStyle"
show-search show-search
:render="(item) => item.title"
:filter-option="filterOption" :filter-option="filterOption"
:render="(item) => item.title" /> @change="handleChange" />
</div> </div>
</ns-drawer> </ns-drawer>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted, ref } from 'vue'; import { computed, onMounted, ref } from 'vue';
import { NsMessage } from '/nerv-lib/component'; import { NsMessage } from '/nerv-lib/component';
import { treeConfig } from './config'; import { editTreeConfig } from './config';
import { group } from '/@/api/deviceManage';
const visible = ref(false); import { http } from '/nerv-lib/util/http';
const mockData = ref([]); 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 = { const listStyle = {
height: '100%', height: '100%',
width: '100%', width: '100%',
}; };
const targetKeys = ref<string[]>([]); const targetKeys = ref([]);
const currentId = ref('');
const toggle = () => { const toggle = () => {
visible.value = !visible.value; 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(() => { const filterOption = (inputValue: string, option: any) => {
getMock('上海公司'); return option?.title.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
});
const filterOption = (inputValue: string, option: MockData) => {
return option.description.indexOf(inputValue) > -1;
}; };
const btnClick = () => { const btnClick = () => {
visible.value = false; // visible.value = false;
NsMessage.success('编辑成功');
http
.post(group.saveGroupList, {
...props.params,
saveOrgId: currentId.value,
saveGroupIds: targetKeys.value,
})
.then(() => {
NsMessage.success('操作成功');
});
}; };
function treeSelect( function treeSelect(
selectedKeys: never[], selectedKeys: never[],
@ -62,26 +81,27 @@
const { const {
dataRef: { title }, dataRef: { title },
} = e.node; } = e.node;
currentId.value = selectedKeys[0];
getMock(title); getData(currentId.value);
} }
const getMock = (company) => { const getData = (id) => {
const keys = []; http
const mData = []; .post(group.queryEditGroup, {
for (let i = 0; i < 60; i++) { orgId: result,
const data = { queryOrgId: id,
key: i.toString(), ...props.params,
title: `A00${i + 1}总用电量(${company})`, // energyType: props.params.energyType,
description: `description of content${i + 1}`, })
chosen: Math.random() * 2 > 1, .then((res) => {
}; dataSource.value = res.data.groups?.map((item) => {
if (data.chosen) { item['title'] = item.pointName;
keys.push(data.key); item['key'] = item.id.toString();
} return item;
mData.push(data); });
} targetKeys.value = res.data.linkGroups.map((item) => {
mockData.value = mData; return item.id;
targetKeys.value = keys; });
});
}; };
defineExpose({ defineExpose({
toggle, toggle,

27
hx-ai-intelligent/src/view/equipmentManage/group/index.vue

@ -1,5 +1,5 @@
<template> <template>
<editDrawer ref="editDrawerRef" /> <editDrawer ref="editDrawerRef" :params="defaultParams" />
<editGroup ref="editGroupRef" /> <editGroup ref="editGroupRef" />
<editFormula ref="editFormulaRef" /> <editFormula ref="editFormulaRef" />
@ -34,8 +34,8 @@
</template> </template>
</ns-tree-api> </ns-tree-api>
</div> </div>
<ns-view-list-table v-show="defaultType" class="table" v-bind="config" /> <ns-view-list-table v-if="defaultType" class="table" v-bind="config" ref="tableRef" />
<ns-view-list-table v-show="!defaultType" class="table" v-bind="configCal" /> <ns-view-list-table v-else class="table" v-bind="configCal" ref="tableCalRef" />
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -53,14 +53,18 @@
type opType = 'up' | 'down'; type opType = 'up' | 'down';
const { getParams } = useParams(); const { getParams } = useParams();
const modalFormRef = ref(); const modalFormRef = ref();
const tableRef = ref();
const tableCalRef = ref();
const editDrawerRef = ref(); const editDrawerRef = ref();
const editGroupRef = ref(); const editGroupRef = ref();
const editFormulaRef = ref(); const editFormulaRef = ref();
const treeRef = ref(); const treeRef = ref();
const defaultType = ref(true); const defaultType = ref(true);
const result = JSON.parse(sessionStorage.getItem('ORGID')!); const result = JSON.parse(sessionStorage.getItem('ORGID')!);
const config = tableConfig(editDrawerRef, editGroupRef, editFormulaRef); const defaultParams = ref({ orgId: result, energyType: '用电量', id: 19 });
const configCal = tableConfigCal(editDrawerRef, editGroupRef, editFormulaRef);
const config = tableConfig(editDrawerRef, editGroupRef, editFormulaRef, defaultParams);
const configCal = tableConfigCal(editDrawerRef, editGroupRef, editFormulaRef, defaultParams);
const tConfig = treeConfig(result); const tConfig = treeConfig(result);
const nsModalFormConfig = ref({ const nsModalFormConfig = ref({
api: group.creatOrUpdate, api: group.creatOrUpdate,
@ -150,8 +154,17 @@
{ title: '下移', key: 'moveDown', func: (data) => moveNode(data, 'down') }, { title: '下移', key: 'moveDown', func: (data) => moveNode(data, 'down') },
{ title: '删除', key: 'deleteNode', func: (data) => deleteNode(data) }, { title: '删除', key: 'deleteNode', func: (data) => deleteNode(data) },
]; ];
const handleSelect = () => { const handleSelect = (key, record) => {
defaultType.value = !defaultType.value; 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> </script>
<style lang="less" scoped> <style lang="less" scoped>

2
hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue

@ -194,7 +194,7 @@
const selectRoleRef = ref(); const selectRoleRef = ref();
const formSchema = formConfig(disabled as any); const formSchema = formConfig(disabled as any);
const formSchema2 = formConfig2(roleDisabled 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 orgId = JSON.parse(sessionStorage.getItem('ORGID'));
const roleTreeData = ref([]); const roleTreeData = ref([]);
const rolePermissionTreeData = ref([]); const rolePermissionTreeData = ref([]);

2
hx-ai-intelligent/src/view/organizationManage/usermanage/config.ts

@ -89,7 +89,7 @@ export const formConfig = (disabled) => {
label: '组织关系', label: '组织关系',
field: 'orgName', field: 'orgName',
component: 'NsInput', component: 'NsInput',
defaultValue: JSON.parse(sessionStorage.getItem('userInfo')).orgName, defaultValue: JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)).orgName,
componentProps: { componentProps: {
disabled: true, disabled: true,
maxLength: 30, maxLength: 30,

4
hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue

@ -104,7 +104,7 @@
const treeDataDept = ref([]); const treeDataDept = ref([]);
const treeData2 = ref([]); const treeData2 = ref([]);
const userAuthList = 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 orgId = JSON.parse(sessionStorage.getItem('ORGID')!);
const orgTreeConfig = ref({ const orgTreeConfig = ref({
selectedKeys: ['0-0'], selectedKeys: ['0-0'],
@ -291,7 +291,7 @@
setTimeout(() => { setTimeout(() => {
formData.value = { formData.value = {
sex: '男', sex: '男',
orgName: JSON.parse(sessionStorage.getItem('userInfo')).orgName, orgName: JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH)).orgName,
}; };
userAuthList.value.splice(0); userAuthList.value.splice(0);
}); });

1
lib/component/drawer/drawer.vue

@ -32,6 +32,7 @@
getContainer: (triggerNode: any) => triggerNode.parentNode, getContainer: (triggerNode: any) => triggerNode.parentNode,
...attrs, ...attrs,
...props, ...props,
footerStyle: { textAlign: 'right' },
})); }));
return { getBindValue }; return { getBindValue };
}, },

2
lib/saas/config/router.config.ts

@ -4,7 +4,7 @@ export const routerConfig = {
router: router, router: router,
login: 'login', login: 'login',
logout: () => { logout: () => {
Cookies.remove('nervsid'); Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
Cookies.remove('token'); Cookies.remove('token');
sessionStorage.clear(); sessionStorage.clear();
router.push('/login'); router.push('/login');

30
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 { appConfigStore } from '/nerv-base/store/modules/app-config';
import { Cookies } from '/nerv-lib/util/cookie'; import { Cookies } from '/nerv-lib/util/cookie';
import { setRouteChange } from '/nerv-lib/util/routeChange'; import { setRouteChange } from '/nerv-lib/util/routeChange';
console.log(import.meta.env.VITE_PUBLIC_PATH);
export function createPermissionGuard(router: Router, whiteNameList: string[]) { export function createPermissionGuard(router: Router, whiteNameList: string[]) {
const authorizationStore = authorizationService(); const authorizationStore = authorizationService();
const appConfig = appConfigStore(); const appConfig = appConfigStore();
@ -11,23 +14,26 @@ export function createPermissionGuard(router: Router, whiteNameList: string[]) {
if (!appConfig.userCustomRouterGuard) { if (!appConfig.userCustomRouterGuard) {
setRouteChange(to); setRouteChange(to);
if (to?.query?.nervsid) { if (to?.query?.nervsid) {
if (to?.query?.nervsid !== Cookies.get('nervsid')) { if (to?.query?.nervsid !== Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)) {
Cookies.set('nervsid', to?.query?.nervsid); Cookies.set(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`, to?.query?.nervsid);
try { try {
const info = await appConfig.userInfo(); const info = await appConfig.userInfo();
await authorizationStore.initUserResource(); await authorizationStore.initUserResource();
authorizationStore.initMenuResource(); authorizationStore.initMenuResource();
appConfig.setUserInfo(info.data); appConfig.setUserInfo(info.data);
info.success 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) { } catch (err) {
Cookies.remove('nervsid'); Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
} }
} }
} }
if ( if (
!Cookies.get('nervsid') && !Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`) &&
to.fullPath !== '/login' && to.fullPath !== '/login' &&
to.name && to.name &&
!whiteNameList.includes(to.name as string) !whiteNameList.includes(to.name as string)
@ -36,15 +42,19 @@ export function createPermissionGuard(router: Router, whiteNameList: string[]) {
next({ name: 'login' }); next({ name: 'login' });
} else { } else {
// 存储用户信息 // 存储用户信息
if (to.fullPath !== '/login') { if (to.fullPath !== '/login') {
const initUserInfo = window.sessionStorage['userInfo']; const initUserInfo = window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH];
if (!initUserInfo && Cookies.get('nervsid')) { if (!initUserInfo && Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)) {
try { try {
const info = await appConfig.userInfo(); 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) { } catch (err) {
Cookies.remove('nervsid'); Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
} }
} else { } else {
if (initUserInfo) { if (initUserInfo) {

2
lib/saas/view/service/updatePassWord.vue

@ -168,7 +168,7 @@
const res = await http.post(configStore.updatePassWordInfo?.api, data); const res = await http.post(configStore.updatePassWordInfo?.api, data);
if (res.success) { if (res.success) {
NsMessage.success('修改成功,需重新登陆', 1, () => { NsMessage.success('修改成功,需重新登陆', 1, () => {
Cookies.remove('nervsid'); Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
sessionStorage.clear(); sessionStorage.clear();
router.push('/login'); router.push('/login');
authorizationStore.clearAuthorization(); authorizationStore.clearAuthorization();

15
lib/saas/view/system/layout/customHeader.vue

@ -197,7 +197,7 @@
}); });
const toCustomUrl = (val: string) => { 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(() => { const messageCount = computed(() => {
return messagecountStore.getCount; return messagecountStore.getCount;
@ -267,12 +267,15 @@
const { getProjectName: projectName } = storeToRefs(authorizationStore); const { getProjectName: projectName } = storeToRefs(authorizationStore);
const { getEnterpriseName: enterpriseName } = 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')) { if (!authorizationStore.getProjectName && Cookies.get('projectName')) {
authorizationStore.setProjectName(Cookies.get('projectName')); authorizationStore.setProjectName(Cookies.get('projectName'));
} }
if (!authorizationStore.getEnterpriseName && window.sessionStorage['userInfo']) { if (
const userInfo = JSON.parse(window.sessionStorage['userInfo']); !authorizationStore.getEnterpriseName &&
window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH]
) {
const userInfo = JSON.parse(window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH]);
authorizationStore.setEnterpriseName( authorizationStore.setEnterpriseName(
!userInfo.organizationalName ? '' : userInfo.organizationalName, !userInfo.organizationalName ? '' : userInfo.organizationalName,
); );
@ -351,7 +354,7 @@
if (configStore.dropOut) { if (configStore.dropOut) {
configStore.dropOut(Cookies, router, useTags, authorizationStore, http); configStore.dropOut(Cookies, router, useTags, authorizationStore, http);
} else { } else {
Cookies.remove('nervsid'); Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
sessionStorage.clear(); sessionStorage.clear();
router.push('/login'); router.push('/login');
useTags().clearTags(); useTags().clearTags();
@ -392,7 +395,7 @@
]; ];
const backDoor = () => { const backDoor = () => {
let protocol = window.location.protocol; 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) => { http.get('/portalurl.json').then((res) => {
if (nervsid) { if (nervsid) {
window.location.href = `${protocol}//${res.url}report?nervsid=${nervsid}`; window.location.href = `${protocol}//${res.url}report?nervsid=${nervsid}`;

17
lib/saas/view/system/layout/header.vue

@ -187,8 +187,8 @@
// const messageCount = ref(); // const messageCount = ref();
const time = ref(); const time = ref();
const toCustomUrl = (val: string) => { const toCustomUrl = (val: string) => {
window.open(`${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('nervsid')}`; // window.location.href = `${val}?nervsid=${Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)}`;
}; };
const messageCount = computed(() => { const messageCount = computed(() => {
return messagecountStore.getCount; return messagecountStore.getCount;
@ -217,12 +217,15 @@
const userName = ref<string>('-'); const userName = ref<string>('-');
const authorizationStore = authorizationService(); const authorizationStore = authorizationService();
const initUserInfo = window.sessionStorage['userInfo']; const initUserInfo = window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH];
if (!authorizationStore.getProjectName && Cookies.get('projectName')) { if (!authorizationStore.getProjectName && Cookies.get('projectName')) {
authorizationStore.setProjectName(Cookies.get('projectName')); authorizationStore.setProjectName(Cookies.get('projectName'));
} }
if (!authorizationStore.getEnterpriseName && window.sessionStorage['userInfo']) { if (
const userInfo = JSON.parse(window.sessionStorage['userInfo']); !authorizationStore.getEnterpriseName &&
window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH]
) {
const userInfo = JSON.parse(window.sessionStorage[import.meta.env.VITE_PUBLIC_PATH]);
authorizationStore.setEnterpriseName( authorizationStore.setEnterpriseName(
!userInfo.organizationalName ? '' : userInfo.organizationalName, !userInfo.organizationalName ? '' : userInfo.organizationalName,
); );
@ -314,7 +317,7 @@
if (configStore.dropOut) { if (configStore.dropOut) {
configStore.dropOut(Cookies, router, useTags, authorizationStore, http); configStore.dropOut(Cookies, router, useTags, authorizationStore, http);
} else { } else {
Cookies.remove('nervsid'); Cookies.remove(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
sessionStorage.clear(); sessionStorage.clear();
router.push('/login'); router.push('/login');
useTags().clearTags(); useTags().clearTags();
@ -353,7 +356,7 @@
]; ];
const backDoor = () => { const backDoor = () => {
let protocol = window.location.protocol; 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) => { http.get('/portalurl.json').then((res) => {
if (nervsid) { if (nervsid) {
window.location.href = `${protocol}//${res.url}report?nervsid=${nervsid}`; window.location.href = `${protocol}//${res.url}report?nervsid=${nervsid}`;

9
lib/saas/view/system/login.vue

@ -140,11 +140,14 @@
verifyRef.value?.reload(); verifyRef.value?.reload();
if (res.data?.token) { if (res.data?.token) {
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(); const info = await configStore.userInfo();
info.data 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; loading.value = false;
if (configStore.enablePermissions) { if (configStore.enablePermissions) {
@ -264,7 +267,7 @@
}, },
mounted() { mounted() {
// if (Cookies.get('nervsid') !== undefined) { // if (Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`) !== undefined) {
// this.$router.push('/home'); // this.$router.push('/home');
// } // }
}, },

6
lib/util/http/axios.ts

@ -43,14 +43,14 @@ export class NSAxios {
private interceptors(): void { private interceptors(): void {
this.instance.interceptors.request.use((config: AxiosRequestConfig) => { 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; // config.withCredentials = true;
if (!config.headers) { if (!config.headers) {
config.headers = {}; config.headers = {};
} }
if (Cookies.get('nervsid')) { if (Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`)) {
config.headers['token'] = Cookies.get('nervsid'); config.headers['token'] = Cookies.get(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`);
} }
//暂时停用后端自己处理 //暂时停用后端自己处理

Loading…
Cancel
Save