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

Compare commits

base: marking:11072711b1701f33e976b5e02cebb4df78ebe1d6
Branches Tags
marking:master
marking:yangjie
marking:视频监控
marking:master-襄阳四中
marking:0.8.0
marking:0.7.1
marking:0.7.0
marking:0.6.4
..
compare: marking:5199f0b764a55bcfec68597ac83768dfa8c7502b
Branches Tags
marking:yangjie
marking:视频监控
marking:master
marking:master-襄阳四中
marking:0.8.0
marking:0.7.1
marking:0.7.0
marking:0.6.4

No commits in common. "11072711b1701f33e976b5e02cebb4df78ebe1d6" and "5199f0b764a55bcfec68597ac83768dfa8c7502b" have entirely different histories.
11072711b1 ... 5199f0b764

3 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

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

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

@ -420,13 +420,12 @@
.meetingContentSwiperCardShare { .meetingContentSwiperCardShare {
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 6%; top: 50%;
z-index: 2; z-index: 2;
transform: translate(-50%, 0%); transform: translate(-50%, -50%);
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
color: white; color: white;
font-size: 12px; padding: 10px 20px;
padding: 4px 10px;
white-space: nowrap; white-space: nowrap;
} }
} }

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

@ -787,7 +787,7 @@ const Meeting: React.FC = () => {
label: row.deviceName label: row.deviceName
} }
}), }),
playBackDeviceId: res[1].playBackList.find((row: any) => row.deviceId === setting.playBackDeviceId) ? setting.playBackDeviceId : res[1].playBackList.length ? res[1].playBackList[0].deviceId : null, playBackDeviceId: res[1].ecordingList.find((row: any) => row.deviceId === setting.playBackDeviceId) ? setting.playBackDeviceId : res[1].playBackList.length ? res[1].playBackList[0].deviceId : null,
ecordingVolume: res[1].ecordingVolume ecordingVolume: res[1].ecordingVolume
} }
window.electron.onInvoke('sendDrivers', { window.electron.onInvoke('sendDrivers', {