yangjie #39

Merged
yangqiang merged 3 commits from yangjie into master 2024-12-03 13:56:25 +08:00
6 changed files with 63 additions and 11 deletions
Showing only changes of commit 3c0faea343 - Show all commits

View File

@ -44,7 +44,7 @@ class AppWindow extends BrowserWindow {
}; };
const finalConfig = { ...basicConfig, ...config }; const finalConfig = { ...basicConfig, ...config };
super(finalConfig); super(finalConfig);
if (envStr === 'development') { if (env === 'development') {
// 开发 // 开发
this.loadURL('http://localhost:3000'); this.loadURL('http://localhost:3000');
} else { } else {

View File

@ -46,6 +46,11 @@ export const GetAgoraConf = () =>
url: `/home/agora-conf`, url: `/home/agora-conf`,
method: 'get', method: 'get',
}) })
export const GetQrcode = (roomNum: string, env: string) =>
request({
url: `/home/r-qrcode?roomNum=${roomNum}&env=${env}`,
method: 'get',
})
export const GetRecord = (beginTimestamp: number, endTimestamp: number, roomNum: string) => export const GetRecord = (beginTimestamp: number, endTimestamp: number, roomNum: string) =>
request({ request({

BIN
src/assets/icon55.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@ -108,12 +108,26 @@
>div:nth-child(1) { >div:nth-child(1) {
display: flex; display: flex;
align-items: center; align-items: center;
cursor: pointer;
>span { >div:nth-child(1) {
color: #767676; margin-right: 6px;
margin-right: 4px; display: flex;
font-size: 14px; align-items: center;
cursor: pointer;
>span {
color: #767676;
margin-right: 6px;
font-size: 14px;
}
}
>div:nth-child(2) {
cursor: pointer;
>img {
width: 16px;
}
} }
} }

View File

@ -2,7 +2,7 @@ import styles from '@/page/Home/Index/index.module.scss'
import { useEffect, useState, useRef } from "react"; import { useEffect, useState, useRef } from "react";
import Operation from '@/components/Operation'; import Operation from '@/components/Operation';
import { Button, Input, Modal, Pagination, Empty, message, Popover, Popconfirm, DatePicker, Select } from "antd"; import { Button, Input, Modal, Pagination, Empty, message, Popover, Popconfirm, DatePicker, Select } from "antd";
import { GetRoom, PostRoom, GetCheckoutRoomNum, GetRoomRtcToken, DeleteRoom, GetRecord, PostRoomInfo } from '@/api/Home/Index'; import { GetRoom, PostRoom, GetCheckoutRoomNum, GetRoomRtcToken, DeleteRoom, GetRecord, PostRoomInfo, GetQrcode } from '@/api/Home/Index';
import ImageUrl from '@/utils/package/imageUrl' import ImageUrl from '@/utils/package/imageUrl'
import { ExclamationCircleFilled, ReloadOutlined } from '@ant-design/icons'; import { ExclamationCircleFilled, ReloadOutlined } from '@ant-design/icons';
import JoinSetting from '@/components/JoinSetting'; import JoinSetting from '@/components/JoinSetting';
@ -41,6 +41,7 @@ const Index: React.FC = () => {
const [subjectList, setSubjectList] = useState<any>([]); const [subjectList, setSubjectList] = useState<any>([]);
const [timeData, setTimeData] = useState<any>([]); const [timeData, setTimeData] = useState<any>([]);
const [isCreateRoom, setIsCreateRoom] = useState<boolean>(false); const [isCreateRoom, setIsCreateRoom] = useState<boolean>(false);
const [baseImage, setBaseImage] = useState('');
const userInfo = JSON.parse(storage.getItem('user') as string) const userInfo = JSON.parse(storage.getItem('user') as string)
useEffect(() => { useEffect(() => {
setUser(userInfo) setUser(userInfo)
@ -231,9 +232,37 @@ const Index: React.FC = () => {
</div> </div>
</div> </div>
<div> <div>
<div onClick={() => copyRoomNum(item.roomNum)} title='复制房间号'> <div>
<span>{item.roomNum}</span> <div onClick={() => copyRoomNum(item.roomNum)} title='复制房间号'>
<img src={ImageUrl.icon10} alt="" /> <span>{item.roomNum}</span>
<img src={ImageUrl.icon10} alt="" />
</div>
<Popover
placement="bottom"
onOpenChange={(e: boolean) => {
if (e) {
GetQrcode(item.roomNum, import.meta.env.VITE_ENV === 'development' ? 'trial' : 'release').then(res => {
if (res.code === 200) {
setBaseImage(res.data)
}
})
}
}}
content={
<div>
<img style={{ width: '200px' }} src={`data:image/png;base64,${baseImage}`} alt="" />
<div style={{ color: 'white', textAlign: 'center', fontSize: '14px', marginTop: '10px' }}>
<span></span><br />
<span></span>
</div>
</div>
}
>
<div title='小程序'>
<img src={ImageUrl.icon55} alt="" />
</div>
</Popover>
</div> </div>
<div> <div>
{role.ID.includes(userInfo.roleId) ? <Popover {role.ID.includes(userInfo.roleId) ? <Popover

View File

@ -82,6 +82,8 @@ import virtualBackground6 from '@/assets/virtualBackground/6.png'
import icon52 from '@/assets/icon52.png' import icon52 from '@/assets/icon52.png'
import icon52Select from '@/assets/icon52-select.png' import icon52Select from '@/assets/icon52-select.png'
import icon53 from '@/assets/icon53.png' import icon53 from '@/assets/icon53.png'
import icon54 from '@/assets/icon54.png'
import icon55 from '@/assets/icon55.png'
export default { export default {
loading, loading,
icon, icon,
@ -166,5 +168,7 @@ export default {
virtualBackground6, virtualBackground6,
icon52, icon52,
icon52Select, icon52Select,
icon53 icon53,
icon54,
icon55
} }