marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

Merge pull request 'yangjie' (#34) from yangjie into master 

Reviewed-on: #34
This commit is contained in:
yangqiang 2024-11-07 16:05:54 +08:00
parent 5199f0b764 63ce58bb96
commit 11072711b1
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/EquipmentManagement/index.module.scss
View File

@ -11,6 +11,7 @@
color: #EEEEEE;
font-size: 16px;
margin-right: 10px;
white-space: nowrap;
}
}
}

7
src/page/Meeting/index.module.scss
View File

@ -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;
}
}

2
src/page/Meeting/index.tsx
View File

@ -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', {