Commit 21a9c15c by zhaochengxiang

bug fix

parent 93c63eb8
...@@ -200,7 +200,8 @@ const AssetDirectory = (props) => { ...@@ -200,7 +200,8 @@ const AssetDirectory = (props) => {
资产属性管理 资产属性管理
</div> </div>
</PermissionMenuItem> </PermissionMenuItem>
<PermissionMenuItem {
(reference === ResourceManageReference) && <PermissionMenuItem
key='attributeRelate' key='attributeRelate'
permissionKey='attributeRelate' permissionKey='attributeRelate'
permissions={permissions} permissions={permissions}
...@@ -209,6 +210,7 @@ const AssetDirectory = (props) => { ...@@ -209,6 +210,7 @@ const AssetDirectory = (props) => {
资产属性关联 资产属性关联
</div> </div>
</PermissionMenuItem> </PermissionMenuItem>
}
<PermissionMenuItem <PermissionMenuItem
defaultPermission='true' defaultPermission='true'
key='elementValueChangeManage' key='elementValueChangeManage'
......
...@@ -9,7 +9,7 @@ import LocalStorage from 'local-storage' ...@@ -9,7 +9,7 @@ import LocalStorage from 'local-storage'
import { defaultPage, usePage } from '../../../util/hooks/page' import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table' import Table from '../../../util/Component/Table'
import { dispatch } from '../../../model' import { dispatch } from '../../../model'
import { getAssetRange, getAssetType, getQueryParam, IsArr, isSzseEnv, showMessage, showNotifaction } from '../../../util' import { checkMenuAdmit, getAssetRange, getAssetType, getQueryParam, IsArr, isSzseEnv, showMessage, showNotifaction } from '../../../util'
import { AssetManageReference, ResourceManageReference } from '../../../util/constant' import { AssetManageReference, ResourceManageReference } from '../../../util/constant'
import PermissionButton from '../../../util/Component/PermissionButton' import PermissionButton from '../../../util/Component/PermissionButton'
import PermissionMenuItem from '../../../util/Component/PermissionMenuItem' import PermissionMenuItem from '../../../util/Component/PermissionMenuItem'
...@@ -336,7 +336,9 @@ const FC = (props) => { ...@@ -336,7 +336,9 @@ const FC = (props) => {
ellipsis: true, ellipsis: true,
width: 120, width: 120,
render: (_, record) => <a onClick={() => { render: (_, record) => <a onClick={() => {
if (checkMenuAdmit('task-manage')) {
window.open(`/center-home/menu/task-manage?id=${record.resourceExtraAttribute?.taskNO}`) window.open(`/center-home/menu/task-manage?id=${record.resourceExtraAttribute?.taskNO}`)
}
}}> }}>
{record.resourceExtraAttribute?.taskNO} {record.resourceExtraAttribute?.taskNO}
</a> </a>
......
...@@ -7,7 +7,7 @@ import Table from '../../../util/Component/Table' ...@@ -7,7 +7,7 @@ import Table from '../../../util/Component/Table'
import { dispatch } from '../../../model' import { dispatch } from '../../../model'
import './index.less' import './index.less'
import { getQueryParam } from '../../../util' import { checkMenuAdmit, getQueryParam } from '../../../util'
const FC = (props) => { const FC = (props) => {
const id = getQueryParam('id', props?.location?.search) const id = getQueryParam('id', props?.location?.search)
...@@ -83,7 +83,9 @@ const FC = (props) => { ...@@ -83,7 +83,9 @@ const FC = (props) => {
title: '任务编号', title: '任务编号',
dataIndex: 'taskNO', dataIndex: 'taskNO',
render: (_, record) => <a onClick={() => { render: (_, record) => <a onClick={() => {
if (checkMenuAdmit('asset-resource-manage')) {
window.open(`/center-home/menu/asset-resource-manage?taskId=${record.taskNO}`) window.open(`/center-home/menu/asset-resource-manage?taskId=${record.taskNO}`)
}
}}> }}>
{record.taskNO} {record.taskNO}
</a> </a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment