Skip to content

S
szse
Commit fbb9ccaf by zhaochengxiang
Options

资源浏览统计隐藏

parent 37eb875f
Showing with 57 additions and 60 deletions
src/view/Manage/AssetManage/Component/AssetDirectory.jsx
...@@ -178,7 +178,7 @@ const AssetDirectory = (props) => { ...@@ -178,7 +178,7 @@ const AssetDirectory = (props) => {
</Tooltip> </Tooltip>
</Paragraph> </Paragraph>
</div> </div>
<div className={(reference===AssetManageReference || reference===ResourceBrowseReference)?'mb-common':''}> <div className={(reference===AssetManageReference)?'mb-common':''}>
<Paragraph> <Paragraph>
<Tooltip title={dir?.desc||''}> <Tooltip title={dir?.desc||''}>
<Text className='title-color' ellipsis={true}> <Text className='title-color' ellipsis={true}>
...@@ -189,50 +189,46 @@ const AssetDirectory = (props) => { ...@@ -189,50 +189,46 @@ const AssetDirectory = (props) => {
</Paragraph> </Paragraph>
</div> </div>
{ {
(reference===AssetManageReference || reference===ResourceBrowseReference) && <div className='flex'> (reference===AssetManageReference) && <div className='flex'>
{ <Paragraph style={{ flex: 1, overflow: 'hidden' }}>
(reference === AssetManageReference) && <React.Fragment> <Tooltip title={dir?.remarks||''}>
<Paragraph style={{ flex: 1, overflow: 'hidden' }}> <Text className='title-color' ellipsis={true}>
<Tooltip title={dir?.remarks||''}> 备注：
<Text className='title-color' ellipsis={true}> <Text className='text-color'>{dir?.remarks||''}</Text>
备注： </Text>
<Text className='text-color'>{dir?.remarks||''}</Text> </Tooltip>
</Text> </Paragraph>
</Tooltip> <Separate width={10} background='#fff' />
</Paragraph> {
<Separate width={10} background='#fff' /> resourceState && <React.Fragment>
</React.Fragment> <Paragraph style={{ flex: 1, overflow: 'hidden' }}>
} <Tooltip title={resourceState?.relatedAsset}>
{ <Text className='title-color' ellipsis={true}>
(reference===ResourceBrowseReference || resourceState) && <React.Fragment> 资产化数量：
<Paragraph style={{ flex: 1, overflow: 'hidden' }}> <Text className='text-color'>{resourceState?.relatedAsset}</Text>
<Tooltip title={resourceState?.relatedAsset}> </Text>
<Text className='title-color' ellipsis={true}> </Tooltip>
资产化数量： </Paragraph>
<Text className='text-color'>{resourceState?.relatedAsset}</Text> <Separate width={10} background='#fff' />
</Text> <Paragraph style={{ flex: 1, overflow: 'hidden' }}>
</Tooltip> <Tooltip title={resourceState?.notRelatedAsset}>
</Paragraph> <Text className='title-color' ellipsis={true}>
<Separate width={10} background='#fff' /> 非资产数量：
<Paragraph style={{ flex: 1, overflow: 'hidden' }}> <Text className='text-color'>{resourceState?.notRelatedAsset}</Text>
<Tooltip title={resourceState?.notRelatedAsset}> </Text>
<Text className='title-color' ellipsis={true}> </Tooltip>
非资产数量： </Paragraph>
<Text className='text-color'>{resourceState?.notRelatedAsset}</Text> <Separate width={10} background='#fff' />
</Text> <Paragraph style={{ flex: 1, overflow: 'hidden' }}>
</Tooltip> <Tooltip title={resourceState?.uncombed}>
</Paragraph> <Text className='title-color' ellipsis={true}>
<Separate width={10} background='#fff' /> 未梳理数量：
<Paragraph style={{ flex: 1, overflow: 'hidden' }}> <Text className='text-color'>{resourceState?.uncombed}</Text>
<Tooltip title={resourceState?.uncombed}> </Text>
<Text className='title-color' ellipsis={true}> </Tooltip>
未梳理数量： </Paragraph>
<Text className='text-color'>{resourceState?.uncombed}</Text> </React.Fragment>
</Text> }
</Tooltip>
</Paragraph>
</React.Fragment>
}
</div> </div>
} }
</div> </div>
......
src/view/Manage/AssetManage/Component/AssetDirectory.less
...@@ -2,20 +2,20 @@ ...@@ -2,20 +2,20 @@
.asset-directory { .asset-directory {
// .more-container { .more-container {
// cursor: pointer; cursor: pointer;
// color: @icon-normal-color; color: @icon-normal-color;
// .icon { .icon {
// fill: @icon-normal-color !important; fill: @icon-normal-color !important;
// } }
// &:hover { &:hover {
// color: @icon-hover-color; color: @icon-hover-color;
// .icon { .icon {
// fill: @icon-hover-color !important; fill: @icon-hover-color !important;
// } }
// } }
// } }
} }
\ No newline at end of file
src/view/Manage/AssetManage/Component/AssetTable.jsx
...@@ -644,9 +644,9 @@ const AssetTable = (props) => { ...@@ -644,9 +644,9 @@ const AssetTable = (props) => {
if ((assets||[]).length>0) { if ((assets||[]).length>0) {
if (fullScreen) { if (fullScreen) {
scrollY = 'calc(100vh - 209px - 72px)'; scrollY = 'calc(100vh - 209px - 72px)';
} else if (reference===AssetManageReference||reference===ResourceBrowseReference) { } else if (reference===AssetManageReference) {
scrollY = 'calc(100vh - 209px - 123px - 15px - 72px)'; scrollY = 'calc(100vh - 209px - 123px - 15px - 72px)';
} else if (reference===AssetBrowseReference) { } else if (reference===AssetBrowseReference ||reference===ResourceBrowseReference) {
scrollY = 'calc(100vh - 209px - 94px - 15px - 72px)'; scrollY = 'calc(100vh - 209px - 94px - 15px - 72px)';
} else if (reference===AssetRecycleReference) { } else if (reference===AssetRecycleReference) {
scrollY = 'calc(100vh - 209px - 72px)'; scrollY = 'calc(100vh - 209px - 72px)';
......
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