From c4c280606d4476c5de1bb0289c8ef277175b7dce Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 21 Aug 2024 17:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=9B=91=E6=8E=A7=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                              |  2 +-
 src/page/Meeting/index.tsx           | 31 +++++++++++++++++++++++++---
 src/page/UserVideo/index.module.scss | 19 ++++++++++++++++-
 src/page/UserVideo/index.tsx         |  7 ++++++-
 4 files changed, 53 insertions(+), 6 deletions(-)

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: <div>
+              <span style={{ fontSize: '16px' }}>哈哈哈</span>
+              <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+                <Button
+                  type="primary"
+                  className='m-ant-btn'
+                  onClick={() => { }}
+                >接受</Button>
+                <Button
+                  type="primary"
+                  onClick={() => { }}
+                  style={{ backgroundColor: '#EC3C3C', marginLeft: '14px' }}
+                >拒绝</Button>
+              </div>
+            </div>,
+            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 (
     <>
       <div className={styles.userVideo}>
-
+        <div className={styles.userVideoTitle}>
+          会议监控
+          <CloseOutlined className='drag'/>
+        </div>
       </div>
     </>
   )