diff --git a/main.js b/main.js
index 96aee97..248a337 100644
--- a/main.js
+++ b/main.js
@@ -266,7 +266,7 @@ app.on('ready', () => {
const newWindow = new BrowserWindow({
width: 1200,
height: 800,
- maxWidth: 1200,
+ minWidth: 1200,
minHeight: 800,
webPreferences: {
contextIsolation: false,
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 6161a01..e648fa4 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -368,6 +368,31 @@ const Meeting: React.FC = () => {
}
})
break;
+ // 申请发言哦
+ case '申请发言哦':
+ api.open({
+ message: '',
+ description:
+
哈哈哈
+
+
+
+
+
,
+ duration: 3,
+ placement: 'bottomRight',
+ showProgress: true,
+ pauseOnHover: false,
+ });
+ break;
}
})
return () => {
@@ -767,9 +792,9 @@ const Meeting: React.FC = () => {
setFooterList(footerListTemplate)
break;
case '会议监控':
- // window.electron.oepnWindow({
- // url: location.origin + '/#/userVideo'
- // })
+ window.electron.oepnWindow({
+ url: location.origin + '/#/userVideo'
+ })
break;
}
}
diff --git a/src/page/UserVideo/index.module.scss b/src/page/UserVideo/index.module.scss
index 1aa0448..693dabb 100644
--- a/src/page/UserVideo/index.module.scss
+++ b/src/page/UserVideo/index.module.scss
@@ -1,5 +1,22 @@
.userVideo {
width: 100%;
height: 100%;
- background-color: #1F2022;
+ background-color: rgb(7, 9, 11);
+ padding: 20px;
+ box-sizing: border-box;
+
+ .userVideoTitle {
+ text-align: center;
+ color: white;
+ font-size: 20px;
+ position: relative;
+
+ >span {
+ cursor: pointer;
+ position: absolute;
+ right: 20px;
+ top: 50%;
+ transform: translate(0, -50%);
+ }
+ }
}
\ No newline at end of file
diff --git a/src/page/UserVideo/index.tsx b/src/page/UserVideo/index.tsx
index 63c862a..311053a 100644
--- a/src/page/UserVideo/index.tsx
+++ b/src/page/UserVideo/index.tsx
@@ -1,5 +1,7 @@
import styles from '@/page/UserVideo/index.module.scss'
+import ImageUrl from '@/utils/package/ImageUrl';
+import { CloseOutlined } from '@ant-design/icons';
import { useEffect } from "react";
const UserVideo: React.FC = () => {
@@ -9,7 +11,10 @@ const UserVideo: React.FC = () => {
return (
<>
>
)