xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: 企业联调

Browse Source
This commit is contained in:
xuziqiang
2024-06-12 16:41:30 +08:00
parent 8e6abb5c57
commit 680855f310
12 changed files with 1831 additions and 1636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3015
hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
View File

File diff suppressed because it is too large Load Diff

3
hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts
View File

@@ -7,6 +7,7 @@ export const formConfig = (disabled: Boolean) => {
component: 'NsChildForm',
componentProps: {
schemas: [
{ label: '企业名称', field: 'orgName', show: false },
{
label: '部门名称',
field: 'deptName',
@@ -90,6 +91,8 @@ export const formConfig2 = (disabled2: Boolean) => {
component: 'NsChildForm',
componentProps: {
schemas: [
{ label: '部门名称', field: 'deptName', show: false },
{
label: '角色名称',
field: 'zhName',

59
hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue
View File

@@ -7,19 +7,12 @@
<a-row>
<a-col :span="12" class="tree">
<ns-button style="margin: 10px" type="primary" @click="addApartment">新增部门</ns-button>
<ns-button :disabled="disabled" type="primary" @click="addApartmentSon"
>新增子部门</ns-button
>
<ns-button
:disabled="disabled"
style="margin: 10px"
type="primary"
@click="deleteApartment"
>删除</ns-button
>
<ns-button type="primary" @click="addApartmentSon">新增子部门</ns-button>
<ns-button style="margin: 10px" type="primary" @click="deleteApartment">删除</ns-button>
<a-tree
v-if="apartmentTreeData?.length"
:tree-data="apartmentTreeData"
:checkedKeys="['0-0']"
defaultExpandAll
@select="SelectApartmentTree">
<template #title="data">
@@ -52,7 +45,8 @@
</a-tabs>
<div v-show="activeKey === '1'">
<ns-button style="margin: 16px" type="primary" @click="CancelApartment">取消</ns-button>
<ns-button type="primary" :disabled="disabled" @click="ApartmentSure">确定</ns-button>
<ns-button v-show="disabled" type="primary" @click="deptEdit">编辑</ns-button>
<ns-button v-show="!disabled" type="primary" @click="ApartmentSure">确定</ns-button>
</div>
<div v-show="activeKey === '2'">
<ns-button style="margin-left: 16px" type="primary" @click="apartmentPermission"
@@ -104,7 +98,12 @@
</a-tabs>
<div v-show="activeKey2 === '1'">
<ns-button style="margin: 16px" type="primary" @click="CancelUser">取消</ns-button>
<ns-button type="primary" :disabled="disabled2" @click="UserSure"> 确定</ns-button>
<ns-button v-show="disabled2" type="primary" :disabled="disabled2" @click="UserSure">
确定</ns-button
>
<ns-button v-show="!disabled2" type="primary" :disabled="disabled2" @click="UserSure">
确定</ns-button
>
</div>
<div v-show="activeKey2 === '2'">
<ns-button style="margin: 16px" type="primary" @click="rolePermission"> 确定</ns-button>
@@ -143,12 +142,10 @@
const selectRef2 = ref();
const formSchema = formConfig(disabled as any);
const formSchema2 = formConfig2(disabled2 as any);
const orgId = JSON.parse(sessionStorage.getItem('userInfo')).orgId;
const projectId = JSON.parse(sessionStorage.getItem('userInfo')).projectId;
const { orgId, orgName, projectId } = JSON.parse(sessionStorage.getItem('userInfo'));
const userAdminTreeData = ref([]);
const apartmentTreeData = ref([]);
const apartmentAdminTreeData = ref([]);
const userTreeData = ref([]);
const getPermissionTree = (params) => {
return http.post(permission.permissionTree, params).then((res) => {
@@ -157,7 +154,7 @@
});
};
getPermissionTree({ projectId });
getPermissionTree({ projectId, orgId });
watch(ApartcheckedKeys, () => {
console.log('checkedKeys', ApartcheckedKeys.value);
@@ -215,6 +212,7 @@
...params,
orgId,
projectId,
orgName,
});
};
return;
@@ -230,6 +228,7 @@
orgId,
projectId,
pdeptId: selectRef.value.deptInfo.deptId,
deptName: selectRef.value.deptInfo.deptName,
});
};
};
@@ -245,6 +244,7 @@
orgId,
projectId,
deptId: selectRef.value.deptInfo.deptId,
deptName: selectRef.value.deptInfo.deptName,
});
};
};
@@ -261,6 +261,7 @@
projectId,
proleId: selectRef2.value.roleId,
deptId: selectRef.value.deptInfo.deptId,
deptName: selectRef.value.deptInfo.deptName,
});
};
};
@@ -374,17 +375,27 @@
};
};
// 部门编辑
const deptEdit = () => {
disabled.value = false;
apartmentChoose();
};
// 部门选择
const SelectApartmentTree = (selectedKeys: any, info: any) => {
console.log(selectedKeys, info);
const { selected } = info;
disabled.value = !selected;
console.log(info, 'info');
selectKey.value = selectedKeys[0];
// disabled.value = !selected;
if (!selectedKeys?.length) return;
selectKey.value = [info.node.key];
selectRef.value = info.node.dataRef;
formData.value = cloneDeep(info.node.dataRef.deptInfo);
apartmentChoose();
ApartcheckedKeys.value.splice(0);
getDeptPermission();
formData.value = cloneDeep(info.node.dataRef.deptInfo);
// getUserTree({ deptId: selectRef.value.deptInfo.deptId });
};
@@ -434,10 +445,6 @@
};
const ApartmentSure = () => {
// formRef.value?.triggerSubmit().then(() => {});
// disabled.value = !disabled.value;
// console.log(formData.value.name, 'formData');
console.log(opMap.type, 'ApartmentSure');
const opArr = ['addDept', 'editDpet', 'addson'];
if (opArr.includes(opMap.type)) {
@@ -445,6 +452,7 @@
opMap.fuc &&
opMap.fuc(formData.value).then(() => {
getTree();
disabled.value = true;
});
} else if (opMap.type === 'deptDelete') {
opMap.fuc && opMap.fuc({ ...formData.value, selectRef: selectRef.value });
@@ -504,6 +512,7 @@
formRef,
apartmentPermission,
rolePermission,
deptEdit,
};
},
});

2
hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
View File

@@ -390,7 +390,7 @@
confirm: true,
handle: ({ userId }: any) => {
http
.post(origanizemanage.resetPwd, { userId })
.post(origanizemanage.resetPwd, { userId, password: 123456 })
.then(() => NsModal.success({ content: '密码重置成功,初始密码123456' }));
},
},