diff --git a/src/assets/icon49.png b/src/assets/icon49.png new file mode 100644 index 0000000..2b80162 Binary files /dev/null and b/src/assets/icon49.png differ diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index 95b6b5f..51ef62f 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -29,9 +29,28 @@ } } - >img { + >label { + height: 18px; width: 18px; - margin-right: 4px; + position: relative; + + >img { + width: 100%; + height: 100%; + margin-right: 4px; + } + + >div { + position: absolute; + left: 0; + bottom: 0; + height: 0%; + width: 100%; + overflow: hidden; + background-repeat: no-repeat; + background-position: bottom center; + background-size: cover; + } } >span { @@ -397,25 +416,6 @@ padding: 10px 20px; white-space: nowrap; } - - .meetingContentSwiperCardBorder { - position: absolute; - height: 3px; - width: calc(100% - 20px); - background-color: #2C2C2C; - overflow: hidden; - left: 10px; - z-index: 1; - bottom: 9px; - - >div { - background-color: #5575F2; - position: absolute; - height: 3px; - left: 0; - top: 0; - } - } } .meetingContentBodyRight { @@ -742,6 +742,31 @@ right: -10px; } + >label { + height: 50px; + height: 50px; + cursor: pointer; + position: relative; + + >img { + width: 100%; + height: 100%; + margin-right: 4px; + } + + >div { + position: absolute; + left: 0; + bottom: 0; + height: 0%; + width: 100%; + overflow: hidden; + background-repeat: no-repeat; + background-position: bottom center; + background-size: cover; + } + } + &:hover { background-color: #161A29; } diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index c9a0a40..18ff1dd 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -637,10 +637,15 @@ const Meeting: React.FC = () => { }, onAudioVolumeIndication: async (speakers: any) => { speakers.forEach((item: any) => { + let domMe = document.getElementById(`micr-item-${userInfo.uid}`); let dom = document.getElementById(`micr-${item.uid ? item.uid : userInfo.uid}`); if (dom) { const percentage = (item.volume / 255) * 100 - dom.style.width = `${percentage}%` + dom.style.height = `${percentage}%` + } + if (domMe && !item.uid) { + const percentage = (item.volume / 255) * 100 + domMe.style.height = `${percentage}%` } }); } @@ -1598,9 +1603,6 @@ const Meeting: React.FC = () => { }} /> : null} -
- {item.enableMicr ?
: null} -
: null) } )} @@ -2095,6 +2097,22 @@ const Meeting: React.FC = () => { }} >{noViewChatList} : null} + case '静音': + case '解除静音': + return
changeStatusList(row, itemIndex, rowIndex)} + onMouseDown={() => changeFooterListSelect(row, itemIndex, rowIndex, true)} + onMouseUp={() => changeFooterListSelect(row, itemIndex, rowIndex, false)} + onMouseLeave={() => changeFooterListSelect(row, itemIndex, rowIndex, false)} + key={rowIndex}> + + {row.title} +
default: return
{
: null} - {!item.enableMicr ? : ''} + {item.userName} {item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''} diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts index 79b85b4..0eaccc4 100644 --- a/src/utils/package/imageUrl.ts +++ b/src/utils/package/imageUrl.ts @@ -70,6 +70,7 @@ import icon47 from '@/assets/icon47.png' import icon47Active from '@/assets/icon47-active.png' import icon48 from '@/assets/icon48.png' import icon48Select from '@/assets/icon48-select.png' +import icon49 from '@/assets/icon49.png' export default { loading, icon, @@ -142,5 +143,6 @@ export default { icon47, icon47Active, icon48, - icon48Select + icon48Select, + icon49, } \ No newline at end of file