Compare commits
No commits in common. "727e2469fc1a91193412ec0f6a4aae0593b2409d" and "7c4787670f36f2beac1ad5ed510a82048de9f2b1" have entirely different histories.
727e2469fc
...
7c4787670f
|
|
@ -34,7 +34,6 @@ const Index: React.FC = () => {
|
||||||
const stupWizardRef = useRef<any>();
|
const stupWizardRef = useRef<any>();
|
||||||
const [user, setUser] = useState<any>({});
|
const [user, setUser] = useState<any>({});
|
||||||
const [currentRoomInfo, setCurrentRoomInfo] = useState<any>({});
|
const [currentRoomInfo, setCurrentRoomInfo] = useState<any>({});
|
||||||
const [timeData, setTimeData] = useState<any>([]);
|
|
||||||
const userInfo = JSON.parse(storage.getItem('user') as string)
|
const userInfo = JSON.parse(storage.getItem('user') as string)
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setUser(userInfo)
|
setUser(userInfo)
|
||||||
|
|
@ -387,23 +386,15 @@ const Index: React.FC = () => {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Modal>
|
</Modal>
|
||||||
<Modal title="选择时间段" destroyOnClose={true} open={timeSelectModal} footer={null} onCancel={() => setTimeSelectModal(false)} centered maskClosable={false} width={'400px'}>
|
<Modal title="选择时间段" destroyOnClose={true} open={timeSelectModal} footer={null} onCancel={() => setTimeSelectModal(false)} centered width={'400px'}>
|
||||||
<div>
|
<div>
|
||||||
<RangePicker
|
<RangePicker
|
||||||
showTime={{ format: 'YYYY-MM-DD HH:mm:ss' }}
|
showTime={{ format: 'YYYY-MM-DD HH:mm:ss' }}
|
||||||
format="YYYY-MM-DD HH:mm:ss"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
onChange={(_value, dateString) => {
|
onChange={(_value, dateString) => {
|
||||||
setTimeData(dateString)
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<div style={{ display: 'flex', justifyContent: 'center', marginTop: '10px' }}>
|
|
||||||
<Button type="primary"
|
|
||||||
style={{ backgroundColor: '#31353A', marginRight: '10px' }}
|
|
||||||
onClick={() => setTimeSelectModal(false)}>取消</Button>
|
|
||||||
<Button type="primary" className='m-ant-btn' onClick={async () => {
|
|
||||||
const setting = JSON.parse(storage.getItem('setting') as string)
|
const setting = JSON.parse(storage.getItem('setting') as string)
|
||||||
if (timeData.length === 2) {
|
if (dateString.length === 2) {
|
||||||
GetRecord(dayjs(timeData[0]).unix(), dayjs(timeData[1]).unix(), currentRoomInfo.roomNum).then(res => {
|
GetRecord(dayjs(dateString[0]).unix(), dayjs(dateString[1]).unix(), currentRoomInfo.roomNum).then(res => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
const fileName = res.data.split('/').pop().split('?')[0];
|
const fileName = res.data.split('/').pop().split('?')[0];
|
||||||
fileUpLoad({
|
fileUpLoad({
|
||||||
|
|
@ -415,8 +406,8 @@ const Index: React.FC = () => {
|
||||||
setTimeSelectModal(false)
|
setTimeSelectModal(false)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}}>导出</Button>
|
}}
|
||||||
</div>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</Modal>
|
</Modal>
|
||||||
<JoinSetting ref={joinSettingRef} />
|
<JoinSetting ref={joinSettingRef} />
|
||||||
|
|
|
||||||
|
|
@ -1207,11 +1207,8 @@ const Meeting: React.FC = () => {
|
||||||
// 退出房间
|
// 退出房间
|
||||||
const leaveChannel = async (bool: boolean = true): Promise<void> => {
|
const leaveChannel = async (bool: boolean = true): Promise<void> => {
|
||||||
await stopRecorderMedia()
|
await stopRecorderMedia()
|
||||||
try {
|
if (bool) {
|
||||||
if (bool) {
|
await getLeave()
|
||||||
await getLeave()
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
}
|
}
|
||||||
await agora.leaveChannel()
|
await agora.leaveChannel()
|
||||||
if (user.isAnonymous) {
|
if (user.isAnonymous) {
|
||||||
|
|
|
||||||
|
|
@ -22,12 +22,15 @@ export const startSignalr = async () => {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export const onStart = async () => {
|
export const onStart = async (callBack?: Function) => {
|
||||||
if (connection) {
|
if (connection.state !== signalR.HubConnectionState.Connected) {
|
||||||
if (connection.state !== signalR.HubConnectionState.Connected) {
|
try {
|
||||||
connection.start();
|
await connection.start();
|
||||||
} else {
|
if (callBack) {
|
||||||
setTimeout(onStart, 3000);
|
callBack()
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
setTimeout(onStart, 5000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -381,11 +381,7 @@ $pagination-hover-background-color: #5575F2;
|
||||||
.ant-message {
|
.ant-message {
|
||||||
-webkit-app-region: no-drag;
|
-webkit-app-region: no-drag;
|
||||||
}
|
}
|
||||||
// ant-spin-fullscreen
|
|
||||||
.ant-spin-fullscreen {
|
.ant-spin-fullscreen {
|
||||||
z-index: 10000;
|
z-index: 10000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ant-picker-dropdown {
|
|
||||||
-webkit-app-region: no-drag;
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue