diff --git a/src/components/EquipmentManagement/index.module.scss b/src/components/EquipmentManagement/index.module.scss index 845d5ec..579164a 100644 --- a/src/components/EquipmentManagement/index.module.scss +++ b/src/components/EquipmentManagement/index.module.scss @@ -11,6 +11,7 @@ color: #EEEEEE; font-size: 16px; margin-right: 10px; + white-space: nowrap; } } } diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index 565833e..4342a23 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -420,12 +420,13 @@ .meetingContentSwiperCardShare { position: absolute; left: 50%; - top: 50%; + top: 6%; z-index: 2; - transform: translate(-50%, -50%); + transform: translate(-50%, 0%); background-color: rgba(0, 0, 0, 0.5); color: white; - padding: 10px 20px; + font-size: 12px; + padding: 4px 10px; white-space: nowrap; } } diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 5d79b88..fc33cfb 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -787,7 +787,7 @@ const Meeting: React.FC = () => { label: row.deviceName } }), - playBackDeviceId: res[1].ecordingList.find((row: any) => row.deviceId === setting.playBackDeviceId) ? setting.playBackDeviceId : res[1].playBackList.length ? res[1].playBackList[0].deviceId : null, + playBackDeviceId: res[1].playBackList.find((row: any) => row.deviceId === setting.playBackDeviceId) ? setting.playBackDeviceId : res[1].playBackList.length ? res[1].playBackList[0].deviceId : null, ecordingVolume: res[1].ecordingVolume } window.electron.onInvoke('sendDrivers', {