Compare commits
13 Commits
1790db4595
...
deploy-dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6202151242 | ||
|
|
ad9a43a7c6 | ||
|
|
82b0f4cf96 | ||
|
|
bbed0e3ff3 | ||
|
|
57b55b5f82 | ||
|
|
ca0ebf33f7 | ||
| 0585818abf | |||
|
|
9dfc3173ac | ||
|
|
7690f72636 | ||
|
|
211b013084 | ||
| a94531bd57 | |||
| 7802223799 | |||
|
|
e648da4b6e |
@@ -22,7 +22,7 @@ export const appConfig = {
|
|||||||
projectType: 'web',
|
projectType: 'web',
|
||||||
baseApi: '/api',
|
baseApi: '/api',
|
||||||
projectName: '济阳站_AI智能BAS系统',
|
projectName: '济阳站_AI智能BAS系统',
|
||||||
enablePermissions: false,
|
enablePermissions: true,
|
||||||
// themeColor: '#eee',
|
// themeColor: '#eee',
|
||||||
siderPosition: 'left',
|
siderPosition: 'left',
|
||||||
baseHeader: '/parkingManage',
|
baseHeader: '/parkingManage',
|
||||||
|
|||||||
@@ -103,7 +103,8 @@ export const formSchema = [
|
|||||||
field: 'pointName',
|
field: 'pointName',
|
||||||
component: 'NsInput',
|
component: 'NsInput',
|
||||||
componentProps: {
|
componentProps: {
|
||||||
placeholder: '请输入节点名称(必填)',
|
placeholder: '请输入',
|
||||||
|
maxLength: 32,
|
||||||
},
|
},
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
@@ -117,7 +118,7 @@ export const formSchema = [
|
|||||||
field: 'pointType',
|
field: 'pointType',
|
||||||
component: 'NsSelectApi',
|
component: 'NsSelectApi',
|
||||||
componentProps: {
|
componentProps: {
|
||||||
placeholder: '请选择节点类型(必填)',
|
placeholder: '请选择',
|
||||||
api: () => dict({ params: { dicKey: 'COUNT_POINT' } }),
|
api: () => dict({ params: { dicKey: 'COUNT_POINT' } }),
|
||||||
// params: { dicKey: 'COUNT_POINT' },
|
// params: { dicKey: 'COUNT_POINT' },
|
||||||
immediate: true,
|
immediate: true,
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ export const tableConfig = (orgId) => {
|
|||||||
// labelField: 'deviceName',
|
// labelField: 'deviceName',
|
||||||
// valueField: 'deviceName',
|
// valueField: 'deviceName',
|
||||||
filterOption: (input: string, option: any) => {
|
filterOption: (input: string, option: any) => {
|
||||||
return option.deviceName.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
return option.deviceName?.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
||||||
},
|
},
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
immediate: true,
|
immediate: true,
|
||||||
@@ -231,7 +231,7 @@ export const tableConfig = (orgId) => {
|
|||||||
// labelField: 'manufacturer',
|
// labelField: 'manufacturer',
|
||||||
// valueField: 'manufacturer',
|
// valueField: 'manufacturer',
|
||||||
filterOption: (input: string, option: any) => {
|
filterOption: (input: string, option: any) => {
|
||||||
return option.manufacturer.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
return option.manufacturer?.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
||||||
},
|
},
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
immediate: true,
|
immediate: true,
|
||||||
|
|||||||
@@ -128,7 +128,7 @@
|
|||||||
formLayout="vertical"
|
formLayout="vertical"
|
||||||
class="form" />
|
class="form" />
|
||||||
</a-tab-pane>
|
</a-tab-pane>
|
||||||
<a-tab-pane :key="2" tab="角色权限">
|
<a-tab-pane :key="2" tab="角色权限" :disabled="!selectRoleRef">
|
||||||
<a-tree
|
<a-tree
|
||||||
v-if="rolePermissionTreeData?.length"
|
v-if="rolePermissionTreeData?.length"
|
||||||
:tree-data="rolePermissionTreeData"
|
:tree-data="rolePermissionTreeData"
|
||||||
@@ -501,12 +501,11 @@
|
|||||||
roleFormData.value = {};
|
roleFormData.value = {};
|
||||||
opMap.type = '';
|
opMap.type = '';
|
||||||
opMap.fuc = '';
|
opMap.fuc = '';
|
||||||
selectRoleRef.value = '';
|
|
||||||
roleDisabled.value = true;
|
roleDisabled.value = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
// 部门权限选择
|
// 部门权限选择
|
||||||
const deptCheck = (checked, { halfCheckedKeys }) => {
|
const deptCheck = (checked: any, { halfCheckedKeys }: any) => {
|
||||||
console.log(checked, halfCheckedKeys);
|
console.log(checked, halfCheckedKeys);
|
||||||
|
|
||||||
const result = checked.map((item) => {
|
const result = checked.map((item) => {
|
||||||
@@ -626,11 +625,13 @@
|
|||||||
|
|
||||||
// 部门切换需要调整角色tab
|
// 部门切换需要调整角色tab
|
||||||
roleActiveKey.value = 1;
|
roleActiveKey.value = 1;
|
||||||
|
|
||||||
|
const { selected } = info;
|
||||||
|
if (!selectedKeys?.length) return;
|
||||||
// 需要重置数据
|
// 需要重置数据
|
||||||
clearDeptData();
|
clearDeptData();
|
||||||
clearRoleData();
|
clearRoleData();
|
||||||
const { selected } = info;
|
selectRoleRef.value = '';
|
||||||
if (!selectedKeys?.length) return;
|
|
||||||
|
|
||||||
deptTreeSelectedKeys.value = [info.node.key];
|
deptTreeSelectedKeys.value = [info.node.key];
|
||||||
selectRef.value = info.node.dataRef;
|
selectRef.value = info.node.dataRef;
|
||||||
@@ -679,8 +680,9 @@
|
|||||||
const { selected } = info;
|
const { selected } = info;
|
||||||
// roleDisabled.value = !selected;
|
// roleDisabled.value = !selected;
|
||||||
// 重置原操作逻辑
|
// 重置原操作逻辑
|
||||||
clearRoleData();
|
|
||||||
if (!selectedKeys?.length) return;
|
if (!selectedKeys?.length) return;
|
||||||
|
clearRoleData();
|
||||||
|
|
||||||
roleTreeSelectedKeys.value = [info.node.key];
|
roleTreeSelectedKeys.value = [info.node.key];
|
||||||
selectRoleRef.value = info.node.dataRef;
|
selectRoleRef.value = info.node.dataRef;
|
||||||
formRoleRef.value?.reset();
|
formRoleRef.value?.reset();
|
||||||
@@ -745,7 +747,7 @@
|
|||||||
opMap.fuc(roleFormData.value).then(() => {
|
opMap.fuc(roleFormData.value).then(() => {
|
||||||
getUserTree();
|
getUserTree();
|
||||||
opMap.type !== 'editRole' && clearRoleData();
|
opMap.type !== 'editRole' && clearRoleData();
|
||||||
roleDisabled.value = !roleDisabled.value;
|
roleDisabled.value = true;
|
||||||
NsMessage.success('操作成功');
|
NsMessage.success('操作成功');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user