Browse Source

feat:fix bugs

dev
zhaobing’ 1 year ago
parent
commit
6133906f5d
  1. 36
      web/client/src/sections/install/containers/system.jsx
  2. 1
      web/client/src/sections/projectGroup/containers/bigscreen.jsx

36
web/client/src/sections/install/containers/system.jsx

@ -175,25 +175,37 @@ const Example = (props) => {
return (
<div className='myseparator' key={index} style={{ display: 'flex', alignItems: 'center' }}>
{
row.anxinProject.length >= 3 ? (
// row.anxinProject.length >= 3 ? (
// <Tooltip content={item.name}>
// <div style={{ width: item.name.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.projectState == -1 ? '#F93920' : '' }}>
// {item.name}
// </div>
// </Tooltip>
// ) : row.anxinProject.length == 2 ? (
// <Tooltip content={item.name}>
// <div style={{ width: item.name.length > 12 ? '173.5px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.projectState == -1 ? '#F93920' : '' }}>
// {item.name}
// </div>
// </Tooltip>
// ) : (
// <Tooltip content={item.name}>
// <div style={{ width: item.name.length > 25 ? '358px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.projectState == -1 ? '#F93920' : '' }}>
// {item.name}
// </div>
// </Tooltip>
// )
row.anxinProject.length >= 2 ? (
<Tooltip content={item.name}>
<div style={{ width: item.name.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.projectState == -1 ? '#F93920' : '' }}>
{item.name}
</div>
</Tooltip>
) : row.anxinProject.length == 2 ? (
</Tooltip>):(
<Tooltip content={item.name}>
<div style={{ width: item.name.length > 12 ? '173.5px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.projectState == -1 ? '#F93920' : '' }}>
<div style={{width: item.name.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.projectState == -1 ? '#F93920' : '' }}>
{item.name}
</div>
</Tooltip>
) : (
<Tooltip content={item.name}>
<div style={{ width: item.name.length > 25 ? '358px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.projectState == -1 ? '#F93920' : '' }}>
{item.name}
</div>
</Tooltip>
)
</Tooltip>)
}
<div className='separator' style={{ width: 1, height: 12, border: '1px solid #DCDEE0', margin: '0px 10px', display: index > 1 ? 'none' : '' }}></div>
</div>

1
web/client/src/sections/projectGroup/containers/bigscreen.jsx

@ -313,6 +313,7 @@ const Bigscreen = (props) => {
},
tooltip: {
trigger: 'axis',
position: 'inside',
formatter: function (params) {
//
// console.log(params);

Loading…
Cancel
Save