main.js

@@ -316,21 +316,12 @@ app.on('ready', () => {
                 frame: false,
                 backgroundColor: '#00000000',
                 transparent: true,
-                width: config.width,
-                height: config.height,
             })
             child.loadURL(config.url)
             childWindow[config.key] = child
             child.once('ready-to-show', () => {
                 child.show()
-                if (config.key === 'shareScreenWindow') {
-                    const display = screen.getDisplayMatching({ ...child.getBounds() });
-                    const x = Math.round((display.workArea.width - child.getSize()[0]) / 2);
-                    child.setPosition(x, 0);
-                    child.setResizable(false)
-                    child.setMovable(false)
-                    mainWindow.setPosition(-999999, -999999);
-                }
+                child.setSize(config.width, config.height)
             })
         });
     }

src/page/Home/User/index.tsx

@@ -335,7 +335,7 @@ const User: React.FC = () => {
                 }}
               />
             </div> : null}
-            {isCreateUser !== 'batch' ? <div>
+            <div>
               <span>角色：</span>
               <Select
                 placeholder='请选择角色'
@@ -347,7 +347,7 @@ const User: React.FC = () => {
                     RoleId: e
                   });
                 }} />;
-            </div> : null}
+            </div>
             {isCreateUser === 'add' ? <div>
               <span>密码：</span>
               <Input.Password
@@ -414,7 +414,7 @@ const User: React.FC = () => {
               if (!addUserFrom.Account && isCreateUser !== 'batch') {
                 return message.error('请输入账号！')
               }
-              if (!addUserFrom.RoleId && isCreateUser !== 'batch') {
+              if (!addUserFrom.RoleId) {
                 return message.error('请选择角色！')
               }
               if (!addUserFrom.Pwd && isCreateUser === 'add') {
@@ -458,7 +458,8 @@ const User: React.FC = () => {
                   return {
                     id: item,
                     subject: addUserFrom.subject,
-                    year: addUserFrom.year
+                    year: addUserFrom.year,
+                    RoleId: addUserFrom.RoleId,
                   }
                 })
                 await PutUserBth(param).then(res => {

src/page/Meeting/index.tsx

@@ -1022,7 +1022,6 @@ const Meeting: React.FC = () => {
         async onOk() {
           GetApplySpeak(state.channelId).then(res => {
             if (res.code === 200) {
-              setIsClicked(true);
               message.success('申请发言成功')
             }
           })
@@ -1084,6 +1083,7 @@ const Meeting: React.FC = () => {
           } else {
             if (!isClicked) {
               setCurrentRequestSpeakType('audio')
+              setIsClicked(true);
               requestSpeak()
             } else {
               message.error('申请太频繁了，请稍后重试！');
@@ -1101,6 +1101,7 @@ const Meeting: React.FC = () => {
           } else {
             if (!isClicked) {
               setCurrentRequestSpeakType('video')
+              setIsClicked(true);
               requestSpeak()
             } else {
               message.error('申请太频繁了，请稍后重试！');
@@ -1194,6 +1195,7 @@ const Meeting: React.FC = () => {
         break;
       case '申请发言':
         if (!isClicked) {
+          setIsClicked(true);
           requestSpeak()
         } else {
           message.error('申请太频繁了，请稍后重试！');

src/page/ShareScreenWindow/index.module.scss

@@ -1,45 +1,7 @@
 .shareScreenWindow {
-  background-color: #07090B;
-  color: white;
+  background-color: red;
+  color: black;
   height: 100%;
   width: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .shareScreenWindowTitle {
-    font-size: 12px;
-    flex-shrink: 0;
-    padding: 4px;
-    box-sizing: border-box;
-    background-color: lighten(#07090B, 4%);
-  }
-
-  .shareScreenWindowContent {
-    flex-grow: 1;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .shareScreenWindowContentList {
-      display: flex;
-      flex-grow: 1;
-      justify-content: space-between;
-      padding: 0 20px;
-
-      >div {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        cursor: pointer;
-
-        >img {
-          height: 24px;
-        }
-
-        >span {
-          font-size: 12px;
-        }
-      }
-    }
-  }
+  font-size: 30px;
 }

src/page/ShareScreenWindow/index.tsx

@@ -1,88 +1,20 @@
 import styles from '@/page/ShareScreenWindow/index.module.scss'
-import ImageUrl from '@/utils/package/imageUrl';
-import { Button } from 'antd';
-import { useEffect, useState } from "react";
-// window.electron.createChildWindow({
-//   url: location.origin + `/#/shareScreenWindow`,
-//   width: 500,
-//   height: 70,
-//   key: 'shareScreenWindow',
-// })
+import { useEffect } from "react";
 const ShareScreenWindow: React.FC = () => {
-  const [footerList, setFooterList] = useState<any>([
-    {
-      title: '静音',
-      icon: ImageUrl.icon22,
-      iconActive: ImageUrl.icon22Active,
-      active: false,
-      select: false,
-    },
-    {
-      title: '关闭视频',
-      icon: ImageUrl.icon23,
-      iconActive: ImageUrl.icon23Active,
-      active: false,
-      select: false,
-    },
-    {
-      title: '成员列表',
-      icon: ImageUrl.icon30,
-      iconSelect: ImageUrl.icon30Select,
-      active: false,
-      select: false,
-    },
-    {
-      title: '聊天',
-      icon: ImageUrl.icon31,
-      iconSelect: ImageUrl.icon31Select,
-      active: false,
-      select: false,
-    },
-    {
-      title: '设置',
-      icon: ImageUrl.icon28,
-      iconSelect: ImageUrl.icon28Select,
-      active: false,
-      select: false,
-    },
-    {
-      title: '录制',
-      icon: ImageUrl.icon27,
-      iconSelect: ImageUrl.icon27Select,
-      iconActive: ImageUrl.icon27Active,
-      active: false,
-      select: false,
-    },
-  ])
+
   useEffect(() => {
 
   }, []);
-
+  // window.electron.createChildWindow({
+  //   url: location.origin + `/#/shareScreenWindow`,
+  //   width: 600,
+  //   height: 40,
+  //   key: 'shareScreenWindow',
+  // })
   return (
     <>
-      <div className={`${styles.shareScreenWindow} drag`}>
-        <div className={styles.shareScreenWindowTitle}>02：38 共享中</div>
-        <div className={styles.shareScreenWindowContent}>
-          <div className={styles.shareScreenWindowContentList}>
-            {footerList.map((item: any, index: number) => {
-              return (
-                <div
-                  onClick={() => {
-                    console.log(item, index)
-                  }}
-                  key={index}>
-                  {item.select ? <img src={item.iconSelect} alt="" /> : <img src={item.active ? item.iconActive : item.icon} alt="" />}
-                  <span>{item.title}</span>
-                </div>
-              )
-            })}
-          </div>
-          <Button type="primary" style={{ backgroundColor: '#FF5219', marginRight: '14px' }} onClick={() => {
-
-          }}>
-            结束会议
-          </Button>
-        </div>
+      <div className={styles.shareScreenWindow}>
+        2222
       </div>
     </>
   )

src/utils/styles/main.css

@@ -29,6 +29,7 @@ input {
   padding: 0;
   font-size: 16px;
   overflow: hidden;
+  border-radius: 10px;
   -webkit-app-region: drag;
 }