From 31f90e250dec95afe97ddbe4939750f5711b60ad Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 13 Nov 2024 15:12:41 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Home/User/index.ts           |  28 ++++-
 src/page/Home/User/index.module.scss |  15 +++
 src/page/Home/User/index.tsx         | 182 +++++++++++++++++++++++++--
 src/utils/styles/App.scss            |  14 +++
 4 files changed, 225 insertions(+), 14 deletions(-)

diff --git a/src/api/Home/User/index.ts b/src/api/Home/User/index.ts
index 0a3b33c..579ed76 100644
--- a/src/api/Home/User/index.ts
+++ b/src/api/Home/User/index.ts
@@ -57,4 +57,30 @@ export const PostUserImport = (data: any) =>
     url: `/user/import`,
     method: 'post',
     data
-  })
\ No newline at end of file
+  })
+
+export const GetSigninList = () =>
+  request({
+    url: `/user/signin-list`,
+    method: 'get',
+  })
+
+export const PostUserImportSigninList = (data: any) =>
+  request({
+    url: `/user/import/signin-list`,
+    method: 'post',
+    data
+  })
+
+export const GetSigns = (uid: string) =>
+  request({
+    url: `/user/signs?uid=${uid}`,
+    method: 'get',
+  })
+
+export const PutSigns = (uid: string, data: any) =>
+  request({
+    url: `/user/signs?uid=${uid}`,
+    method: 'put',
+    data,
+  })
diff --git a/src/page/Home/User/index.module.scss b/src/page/Home/User/index.module.scss
index e0d7e8a..68a02b2 100644
--- a/src/page/Home/User/index.module.scss
+++ b/src/page/Home/User/index.module.scss
@@ -98,4 +98,19 @@
       text-align: right;
     }
   }
+}
+
+.signInUserModal {
+  max-height: 60vh;
+  display: flex;
+  flex-direction: column;
+
+  >div:nth-child(1) {
+    flex-grow: 1;
+    overflow-y: auto;
+  }
+
+  >div:nth-child(2) {
+    flex-shrink: 0;
+  }
 }
\ No newline at end of file
diff --git a/src/page/Home/User/index.tsx b/src/page/Home/User/index.tsx
index 4a1ad55..34812c9 100644
--- a/src/page/Home/User/index.tsx
+++ b/src/page/Home/User/index.tsx
@@ -3,7 +3,7 @@ import { useEffect, useState, useRef } from "react";
 import Operation from '@/components/Operation';
 import { Button, Input, Table, Pagination, Modal, message, Select } from "antd";
 import { ExclamationCircleFilled, SearchOutlined } from '@ant-design/icons';
-import { GetUserList, PostUser, PutUser, DeleteUser, PutUserPwd, GetRoleDpList, PostUserImport, GetSubDpList, PutUserBth } from '@/api/Home/User';
+import { GetUserList, PostUser, PutUser, DeleteUser, PutUserPwd, GetRoleDpList, PostUserImport, GetSubDpList, PutUserBth, GetSigninList, PostUserImportSigninList, GetSigns, PutSigns } from '@/api/Home/User';
 import * as CryptoJS from 'crypto-js';
 import ImageUrl from '@/utils/package/imageUrl';
 import { storage } from '@/utils';
@@ -35,8 +35,14 @@ const User: React.FC = () => {
     year: '0',
   })
   const [changeUserPawModal, setChangeUserPawModal] = useState(false)
+  const [signInModal, setSignInModal] = useState(false)
+  const [signInUserModal, setSignInUserModal] = useState(false)
+  const [signInUserForm, setSignInUserForm] = useState({
+    currentUserList: [],
+    uid: ''
+  })
   const [changeImportModal, setChangeImportModal] = useState(false)
-  const [changeUserPawFrom, setChangeUserPawFrom] = useState({
+  const [changeUserPawForm, setChangeUserPawForm] = useState({
     Pwd: "",
     newPwd: '',
   })
@@ -94,6 +100,7 @@ const User: React.FC = () => {
       const buffer = Buffer.from(arrayBuffer);
       await fs.writeFile(`${setting.shareFilesPath}\\${data.fileName}`, buffer, {});
       setChangeImportModal(false)
+      setSignInModal(false)
       confirm({
         title: '提示',
         icon: <ExclamationCircleFilled />,
@@ -207,6 +214,13 @@ const User: React.FC = () => {
             >
               删除用户
             </Button>
+            <Button type="primary"
+              onClick={() => {
+                setSignInModal(true)
+              }}
+              className='m-ant-btn'>
+              签到绑定
+            </Button>
           </div>
           <div className={`${styles.userBtnsRight} drag`}>
             <Input
@@ -260,7 +274,7 @@ const User: React.FC = () => {
                 <div>{subjectList.find((subject: any) => subject.value === item.subject)?.label}</div>
               </>
             )} />
-            <Column title="操作" width={200} render={(item) => (
+            <Column title="操作" width={300} render={(item) => (
               <>
                 <Button
                   type="primary"
@@ -288,7 +302,7 @@ const User: React.FC = () => {
                   style={{ backgroundColor: '#715AFF40', marginRight: '14px' }}
                   size={'small'}
                   onClick={() => {
-                    setChangeUserPawFrom({
+                    setChangeUserPawForm({
                       Pwd: "",
                       newPwd: '',
                     })
@@ -301,6 +315,25 @@ const User: React.FC = () => {
                     })
                     setChangeUserPawModal(true)
                   }}>更改密码</Button>
+                <Button
+                  type="primary"
+                  style={{ backgroundColor: '#0085FF30', marginRight: '14px' }}
+                  size={'small'}
+                  onClick={() => {
+                    setSignInUserForm({
+                      currentUserList: [],
+                      uid: item.id,
+                    })
+                    GetSigns(item.id).then(res => {
+                      if (res.code === 200) {
+                        setSignInUserForm({
+                          uid: item.id,
+                          currentUserList: res.data,
+                        })
+                        setSignInUserModal(true)
+                      }
+                    })
+                  }}>签到绑定</Button>
               </>
             )} />
           </Table>
@@ -478,10 +511,10 @@ const User: React.FC = () => {
               <Input.Password
                 placeholder="请输入新密码"
                 style={{ flexGrow: 1 }}
-                value={changeUserPawFrom.Pwd}
+                value={changeUserPawForm.Pwd}
                 onChange={(e) => {
-                  setChangeUserPawFrom({
-                    ...changeUserPawFrom,
+                  setChangeUserPawForm({
+                    ...changeUserPawForm,
                     Pwd: e.target.value,
                   });
                 }}
@@ -492,10 +525,10 @@ const User: React.FC = () => {
               <Input.Password
                 placeholder="再次输入密码"
                 style={{ flexGrow: 1 }}
-                value={changeUserPawFrom.newPwd}
+                value={changeUserPawForm.newPwd}
                 onChange={(e) => {
-                  setChangeUserPawFrom({
-                    ...changeUserPawFrom,
+                  setChangeUserPawForm({
+                    ...changeUserPawForm,
                     newPwd: e.target.value,
                   });
                 }}
@@ -507,14 +540,14 @@ const User: React.FC = () => {
           }}>
             <Button type="primary" style={{ backgroundColor: '#31353A', marginRight: '14px' }} onClick={() => setChangeUserPawModal(false)}>取消</Button>
             <Button type="primary" className='m-ant-btn' onClick={async () => {
-              if (!changeUserPawFrom.Pwd || !changeUserPawFrom.newPwd) {
+              if (!changeUserPawForm.Pwd || !changeUserPawForm.newPwd) {
                 return message.error('请输入密码！')
               }
-              if (changeUserPawFrom.Pwd !== changeUserPawFrom.newPwd) {
+              if (changeUserPawForm.Pwd !== changeUserPawForm.newPwd) {
                 return message.error('新密码与确认密码不一致！')
               }
 
-              await PutUserPwd({ id: addUserFrom.Id, pwd: CryptoJS.MD5(changeUserPawFrom.Pwd).toString(CryptoJS.enc.Hex) }).then(res => {
+              await PutUserPwd({ id: addUserFrom.Id, pwd: CryptoJS.MD5(changeUserPawForm.Pwd).toString(CryptoJS.enc.Hex) }).then(res => {
                 if (res.code === 200) {
                   setChangeUserPawModal(false)
                   message.success('修改成功')
@@ -609,6 +642,129 @@ const User: React.FC = () => {
           </div>
         </div>
       </Modal>
+      <Modal title='签到绑定' open={signInModal} onCancel={() => setSignInModal(false)} footer={null} centered width={'300px'}>
+        <div>
+          <div>
+            <Button type="primary" className='m-ant-btn' style={{ width: '100%', marginBottom: '10px' }}
+              onClick={async () => {
+                const setting = await JSON.parse(storage.getItem('setting') as string)
+                await GetSigninList().then(res => {
+                  if (res.code === 200) {
+                    const fileName = res.data.split('/').pop().split('?')[0];
+                    fileUpLoad({
+                      url: res.data,
+                      content: `下载签到模板成功！文件已保存至:${setting.shareFilesPath}`,
+                      fileName: fileName,
+                    })
+                  }
+                })
+              }}
+            >
+              下载签到模版
+            </Button>
+          </div>
+          <div>
+            <Button type="primary" className='m-ant-btn' style={{ width: '100%' }}
+              onClick={() => {
+                const file = document.createElement("input") as any;
+                file.type = "file";
+                // file.accept = ".xls,.xlsx";
+                file.onchange = async () => {
+                  const setting = await JSON.parse(storage.getItem('setting') as string)
+                  const fileInfo = file.files[0];
+                  const formData = new FormData();
+                  formData.append("file", fileInfo);
+                  await PostUserImportSigninList(formData).then(res => {
+                    if (res.code === 200) {
+                      if (res.data.item1) {
+                        message.success(res.data.item3)
+                      } else {
+                        if (res.data.item2) {
+                          const fileName = res.data.item2.split('/').pop().split('?')[0];
+                          fileUpLoad({
+                            url: res.data.item2,
+                            content: `导入模板失败！失败文件已保存至:${setting.shareFilesPath}`,
+                            fileName
+                          })
+                        }
+                        message.error(res.data.item3)
+                      }
+                    }
+                  })
+                  setSignInModal(false)
+                };
+                file.click();
+              }}
+            >
+              选择导入文件
+            </Button>
+          </div>
+        </div>
+      </Modal>
+      <Modal title='签到绑定' open={signInUserModal} destroyOnClose={true} onCancel={() => setSignInUserModal(false)} footer={null} centered width={'300px'}>
+        <div className={styles.signInUserModal}>
+          <div>
+            {signInUserForm.currentUserList.map((item: any, index: number) => {
+              return (
+                <div style={{ display: 'flex', alignItems: 'center', marginBottom: '10px' }} key={index}>
+                  <Input
+                    placeholder="请输入用户名称"
+                    value={item.signInName}
+                    onChange={(e) => {
+                      let currentUserListTemp: any = [...signInUserForm.currentUserList]
+                      currentUserListTemp[index].signInName = e.target.value
+                      setSignInUserForm({
+                        ...signInUserForm,
+                        currentUserList: currentUserListTemp,
+                      })
+                    }}
+                  />
+                  <img src={ImageUrl.icon21} alt="" style={{ cursor: 'pointer', marginLeft: '10px' }} onClick={() => {
+                    let currentUserListTemp: any = [...signInUserForm.currentUserList]
+                    currentUserListTemp.splice(index, 1)
+                    setSignInUserForm({
+                      ...signInUserForm,
+                      currentUserList: currentUserListTemp,
+                    })
+                  }} />
+                </div>
+              )
+            })
+            }
+            <Button type="primary"
+              onClick={() => {
+                let currentUserListTemp: any = [...signInUserForm.currentUserList, {
+                  id: 0,
+                  uId: signInUserForm.uid,
+                  signInName: '',
+                }]
+                setSignInUserForm({
+                  ...signInUserForm,
+                  currentUserList: currentUserListTemp,
+                })
+              }}
+              style={{ width: '100%', marginBottom: '20px' }}
+              icon={<img src={ImageUrl.icon8} alt="" />}
+              className='m-ant-btn'>
+              添加签到人
+            </Button>
+          </div>
+          <div style={{
+            display: 'flex', justifyContent: 'center'
+          }}>
+            <Button type="primary" style={{ backgroundColor: '#31353A', marginRight: '14px' }}
+              onClick={() => setSignInUserModal(false)}>取消</Button>
+            <Button type="primary" className='m-ant-btn' onClick={() => {
+              PutSigns(signInUserForm.uid, signInUserForm.currentUserList).then(res => {
+                if (res.code === 200) {
+                  message.success('签到绑定成功')
+                  setSignInUserModal(false)
+                }
+              })
+            }}>确定</Button>
+          </div>
+        </div>
+      </Modal>
       <StupWizard ref={stupWizardRef} />
     </>
   )
diff --git a/src/utils/styles/App.scss b/src/utils/styles/App.scss
index ab2bc9a..e82a365 100644
--- a/src/utils/styles/App.scss
+++ b/src/utils/styles/App.scss
@@ -26,6 +26,20 @@ $pagination-hover-background-color: #5575F2;
   .ant-select-suffix {
     color: white !important;
   }
+
+  .ant-select-selection-overflow-item {
+    .ant-select-selection-item {
+      background-color: rgba(0, 0, 0, 0.6);
+    }
+
+    .ant-select-selection-item-remove {
+      color: white !important;
+    }
+  }
+
+  .ant-select-selection-search-input {
+    color: white !important;
+  }
 }
 
 // input
-- 
2.40.1


From 2362fabee5042379bbd35126d3565456b947fd65 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 13 Nov 2024 16:25:39 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=86=85=E7=AD=BE?=
 =?UTF-8?q?=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Meeting/index.ts                |  13 ++++
 src/assets/icon52-select.png            | Bin 0 -> 3923 bytes
 src/assets/icon52.png                   | Bin 0 -> 2915 bytes
 src/components/SingIn/index.module.scss |  32 ++++++++++
 src/components/SingIn/index.tsx         |  77 ++++++++++++++++++++++++
 src/page/Meeting/index.tsx              |  39 +++++++++++-
 src/utils/package/imageUrl.ts           |   4 ++
 7 files changed, 163 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/icon52-select.png
 create mode 100644 src/assets/icon52.png
 create mode 100644 src/components/SingIn/index.module.scss
 create mode 100644 src/components/SingIn/index.tsx

diff --git a/src/api/Meeting/index.ts b/src/api/Meeting/index.ts
index 1c2ba98..3733fae 100644
--- a/src/api/Meeting/index.ts
+++ b/src/api/Meeting/index.ts
@@ -134,4 +134,17 @@ export const GetPolling = (roomNum: string, count: string) =>
   request({
     url: `/room/polling?roomNum=${roomNum}&count=${count}`,
     method: 'get'
+  })
+
+export const GetRoomSingnIn = () =>
+  request({
+    url: `/room/sign-in`,
+    method: 'get'
+  })
+
+export const PostRoomSingnIn = (data: any) =>
+  request({
+    url: `/room/sign-in`,
+    method: 'post',
+    data
   })
\ No newline at end of file
diff --git a/src/assets/icon52-select.png b/src/assets/icon52-select.png
new file mode 100644
index 0000000000000000000000000000000000000000..38f3e0c5d8eb184f14909dbdb90cd0a626c2b387
GIT binary patch
literal 3923
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

literal 0
HcmV?d00001

diff --git a/src/assets/icon52.png b/src/assets/icon52.png
new file mode 100644
index 0000000000000000000000000000000000000000..49a4752cbf84eece8aaa7cf57fc4e1ee4a969507
GIT binary patch
literal 2915
zcmb7G`9Bkm8+UHS5V_LalPkB})5fr6A6H_F<(4Z%b4JN+k>+DDx9~}bB)PA0ml+W;
zS0vXQITOD6eE)&(_j$dZ=l$Hz^TYGQlW1XP!oeoQ#=yY9fkGmzPO<k7p8=f8#4di;
zQ#k97#0D}jTsHl~jKxq=>8X=3(8|Ps;ne_m>C|Ak4gU+y!0`GB`){Yy3buU|0&X3`
zxJFCHU)1CQZnV;Ij4f=wIQTr9!43Za)&jZI8&Rcf5L>Ylre3~;QdkRHT`A0r^*oxP
z@38^ux1eM2!;^KWo{pJw()IwSGJ)%1!v9S#EKTy;6MGsrs;6=fU#<Q4@dC)#EhY<L
z?SRxM*5nPXyj(M2E-|m1HaNsN7&0ipu*yi)vv8_7pp&xC4X#%>$GoU{gg=wLo*%7(
z1jV*xhyglz-5$*;5C$WSKp7$k!$Dtbk32)WzB*dG2CJp)?4ztAc1o6;hbB*BG-CII
zpTAFlB#6IS0?*nVsM+Bd$_=FZoe`ki4XHOMw-}-8)F^@HhixF7J(WdJ(^-ZSzYLT{
zDyFZwU8}FoFf%@=x18xW`!>RA_e^V($pm9zNdZl*OgT;Osg{2;$C}{wB)&&Rz=JoM
z#hfP3ks6%;Y`Y+*X6(qTrIC+mUd?$giE*oe^Y!6~eaRi2w4%*!=|RPNL-W`knP3mZ
z8#oUWqRjUCU`vU(MWhikdDT}1hW>cn_HEcFHy%Jj{jyqLD>YRekm(Gzkq6n9u^(=S
zmz7LaG<&UVxZL=L0SuBYEduk^(@<7l9OGuoNfVJq_AEObz|=Z0hS}|rXqjkyVcy#O
zAO*q9Ch)l)w5VU>+3+GTvP-d<5)E>Z%|@+W-zVsjwnPlGP~Y1^zNt})o8k-f)z(mR
zG`#ErNC-?Rra0(eUcn+`TC4127jGJe38V{NmTGireb{B*muyJlS&U51{h-oswKe?s
zYgCu%T+UC+t&4YdLr}kb=~AuXgCVG6UlL%3Hw6XOUC=OMeHm^>Ja+a?H5dJAvT~b=
zN6jjJfAzWDq3tjI=>W7P*LrE1ZXjpP&OvWD9ipvDd`D^K{nk?Z0f+IOU!xba?1jed
zT_rW)hA(*NLFh#p{Z=3)i}43ORlMI4V~Ls;S_z`;y@zO5*;>Xe0yxrAU+@I2E!yyX
z^?0Zj;=qqhTI<}$u3k=lP+K}b92F-S`lg4)xFZiQw@Y%y#F6gbsPrE6hfE9m10;!i
z<DV2jsN6-FU*p=9-ZDgKLWVvl4b$G|$s|cs%D<hz1u+-ss*#X%bC<9K;z{d#oFi3T
z&~8_ql{F~kX`a4cW*hP=ha02a`iEY<clcM)h&kFZZ|yJtC=8cs#e*)Z^*}&)aSOZJ
zlv*##uA-9+P1}?Ma{@G!&AM5M3)W1Y3Qx_r#hZY2<+PKM*AZUD`b{mq>R*5&%dfxl
z<VPjZy?7McPC6{e*&aE6+2iXc0jRh}%aqGj1Z|%qkcr-Ho|Q(b?Yw0ed0$kS-&cfv
z%%-6RLjT@gxF~jTwl?6etRI#Gdyl;}Bcm(MW^aHYq==)-1hUNojlSN4TY+QCGco;Q
zPeY93+!|_IO!ZOiwsIELcdn52O}KQ=Yt3FsyH|yeZwg2b&b1R$>Zdr-a06Z5sTrgj
z!)@x)!t3)QZ4`F!h<hftu2wtRDqsF@z_501d-?qFPg{Ov*CVvFKqcJyVBt80Y3P0x
z>y}KwR9F~S|KoiT&JYfset3BAa+;aos?&<<`<RbkFaQ(~I7XA(2TRft%|X-GnO)<m
zuT5DSM`aeRzHixqX&2d-1^*;4G9j?~)b$zI&&4_}II~oZY|wh7r~gOpV59jiwpe9k
zAEhF!@VuPiaC@0MNoi~{oto#z{gu_(KbxcJj>nTOb$rzic7Q|h(S0T-^6!7v4!QTJ
z!r*9@eJ-~2sCVg1F6Hgi0+m(YbeuMlGn9k)-D^kE`9SQ8k?oLouxYD(8A$mhTH<7K
z-P`9IPyadrPJB9nCIS|^OPA1NBUdW{D_O^)5md@#<&~VNX*<zNHL;vQVOld+kYQt=
zSm>$Pn@=iN8g}s0Z<SZti}j1IHkw=(UQypQ8ql_v?N>?Da>6F}Rm;Nr1RDas$!^gz
zhKhs8Q+tX{_dnH?#_sUM4q^S3ZUO1g)uuPu)e3jtctUI3FMI{XzT-6jkuD}?C73&T
zGwDLJH-sRg!TIOGNHr6WFyudgZr=9-EIMOA!h%<ah?z37FuK8hR^qd7I-pznv3a~`
z`;e3Q(n(I+z{%|CU7)0>B0*+*<3Kq#uC<#um)~4cjf30Soe|8TOm^&Avj>Td3!Ktr
zebmvRoEsFD%nq)jY}@MTrRLF#xJJPmc?#V5NXjo_wwx8Y1g}pYSBxSSl#M*Y`1*7P
zrcSnxx@IZb{_<0Y>Fn2<=4a$y<TAl2ENCEAeMlv>OO@WNWro7;es}b8#R)I04pTEX
z^x4OL_3J-S$SSg0=Ec{CN=7eZilQr6!J8tGQJi8k=2riuQCf=1kByGoW>{A?JBMZk
zNT4vp(<pC8;5c;nXUyM5I-i${K`%99Icv-Pe8xwrek`-E(tP%z!MBgrV9fLPjx<%>
zxSs)~M$SRB>FBhbc;6*OT{tb5qN5BI(8sok@4<=gL`6rx=81)!&>qE0We!C{{=jgl
zU3m@LexW_ELyP;9iMKhXUVC3|qg^U5tbT$*VfMC0sYQ(UQ#?7z@a=l!c{ovZk#DOf
zsLjIH<OQOEc}naF>#}HCd9BK_qq!|wqzUXKGs2QMv@|nAmv*^lHIrZD<24by0#erq
zq%an~?1RX;o>#z`!CW?{RvtzacL{@)U@mu;pfGEECL-3SP@a_nH(VZ0IiQaSL2gz@
zFaS3V1E3fO+l9DsPm(Nf^L>4}6wEq3(^cwIYu}FlV~w(sthZM9R2iGbq-E|#EL3i&
z;{YN`o#A$8u79Bbv)+LdyQFobI!3&-;_rdyeBmP+WUVDR8cqLEz=b)z181@}r{WE}
z{e0>a?$hatqIFlhfypJm2K7Hj8u$mo3o)Cj)aM=7MlV$W&gS)q(xaalhH#F|bB}oQ
zRf^O+A=oe>u4JNY42-D@^<4QlYh3TwqF!`0ksenba%bJto3W5Q0Ff7e{?THQzl0Q~
zZqfTS22PBDWj?3lgt(~BpPse`5nb0NpYm%IPQ<#Wa8&>jyu#4cig-z_3tM>uH#yIB
ziecYqbQ99VpL<Cw&>z9KK=QZD$>pwhI#hbug(^cL*crDNw*>&b@<J6MJ05k!w`Zg0
z`8aHv$d&)*$P1N+Tygj_cq{H6wWjL#v-ENSWn^tCQ}OqRCURCy9eWBY$ilO;e`j1=
zN*NhsJ-#(9QtsNE2(OO6MmpJbeCQMVUsdDH?_CRU-Fm?zj&<_Q$Z#1zZ!Xv`<e&6%
z?{n#ex?c#Q@A7l*qMc#)t((Hs8%~o!Jd#U_5lMHK+pmpI2||orC;60YsyW-D8lQ6e
zg>+xzPd4q5=`MiwX?=vL8_&*V_ibRl7vE(USVG6W`CH3aLg<};!9a17n}=|M-e6;>
z2ba}=By-Fpm7qbRnF_813Kf1qWhQ+AA#zbuNdod%Yhds7%{g&|wLtR<A*a|s-|Pxc
z*1rLz*QFt^iAH$SsA|7XZ$Ke`3?V|IF)QkYRQ1HxbojZq$Xa=h6~|U)%QA?*kG=1i
zlx|)`_K5B|#cAQpbD%K(YXW3|(UXv6UQItSiT{<hR?I)*)%Z5=r~G-48Bj)Mh*t)V
GkNyJ?ZDk$+

literal 0
HcmV?d00001

diff --git a/src/components/SingIn/index.module.scss b/src/components/SingIn/index.module.scss
new file mode 100644
index 0000000..451317b
--- /dev/null
+++ b/src/components/SingIn/index.module.scss
@@ -0,0 +1,32 @@
+.singInModal {
+  max-height: 80vh;
+
+  .singInModalContent {
+    flex-grow: 1;
+    overflow-y: auto;
+    margin: 10px 0;
+
+    >div {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 1px #363636 solid;
+      padding-bottom: 10px;
+
+      >span {
+        flex-grow: 1;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        font-size: 16px;
+        color: white;
+      }
+    }
+  }
+
+  .singInModalFooter {
+    flex-shrink: 0;
+    display: flex;
+    justify-content: center;
+  }
+}
\ No newline at end of file
diff --git a/src/components/SingIn/index.tsx b/src/components/SingIn/index.tsx
new file mode 100644
index 0000000..d37dbf7
--- /dev/null
+++ b/src/components/SingIn/index.tsx
@@ -0,0 +1,77 @@
+import { GetRoomSingnIn, PostRoomSingnIn } from '@/api/Meeting';
+import styles from '@/components/SingIn/index.module.scss'
+import { storage } from '@/utils';
+import { Button, message, Modal } from 'antd';
+import { useState, useImperativeHandle, forwardRef } from "react";
+const SingIn = forwardRef((props: any, ref: any) => {
+  useImperativeHandle(ref, () => ({
+    changeModal: () => {
+      setSingInModal(true)
+      getRoomSingnIn()
+    },
+    getModal: () => {
+      return new Promise((resolve, reject) => {
+        setSingInModal(bool => {
+          resolve(bool)
+          return bool
+        })
+      })
+    },
+  }))
+  const [singInModal, setSingInModal] = useState(false);
+  const [singInList, setSingInList] = useState([]);
+  const getRoomSingnIn = async (): Promise<void> => {
+    await GetRoomSingnIn().then(res => {
+      if (res.code === 200) {
+        setSingInList(res.data.map((item: any) => {
+          return {
+            ...item,
+            active: true
+          }
+        }))
+      }
+    })
+  }
+  return (
+    <>
+      <Modal
+        title="会议签到"
+        open={singInModal}
+        footer={null}
+        destroyOnClose={true}
+        onCancel={() => setSingInModal(false)}
+        centered
+        width={'300px'}
+      >
+        <div className={styles.singInModal}>
+          <div className={styles.singInModalContent}>
+            {singInList.map((item: any, index: number) => {
+              return <div key={index}>
+                <span>{item.signInName}</span>
+                {item.active ?
+                  <Button type="primary" className='m-ant-btn' onClick={async () => {
+                    const stateInfo = await JSON.parse(storage.getItem('stateInfo') as string);
+                    const singInListTemp: any = [...singInList]
+                    singInListTemp[index].active = false;
+                    PostRoomSingnIn([{ signInName: item.signInName, roomNum: stateInfo.channelId }]).then(res => {
+                      if (res.code === 200) {
+                        message.success('签到成功')
+                        setSingInList(singInListTemp)
+                      }
+                    })
+                  }}>签到</Button>
+                  : <Button type="primary" style={{ backgroundColor: 'rgb(57,66,99)', marginLeft: '10px' }}>已签到</Button>}
+              </div>
+            })}
+          </div>
+          <div className={styles.singInModalFooter}>
+            <Button type="primary" style={{ backgroundColor: 'rgb(16,20,24)', width: '100%' }}
+              onClick={() => setSingInModal(false)}>关闭</Button>
+          </div>
+        </div>
+      </Modal>
+    </>
+  )
+})
+
+export default SingIn
\ No newline at end of file
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 862083d..993ec24 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -23,6 +23,7 @@ import { role } from '@/config/role';
 import { fixWebmDuration } from "webm-duration-fix-buffer";
 import { getKeyOpenChildWindow, setKeyOpenChildWindow } from '@/utils/package/public';
 import MeetingDisconnected from '@/components/MeetingDisconnected';
+import SingIn from '@/components/SingIn';
 const { confirm } = Modal;
 const { exec } = require('child_process');
 const fs = require('fs').promises;
@@ -36,6 +37,7 @@ const Meeting: React.FC = () => {
   const stupWizardRef = useRef<any>();
   const equipmentManagementRef = useRef<any>();
   const meetingDisconnectedRef = useRef<any>();
+  const singInRef = useRef<any>();
   const [isClicked, setIsClicked] = useState(false);
   const [statusList, setStatusList] = useState({
     userList: false,
@@ -102,6 +104,13 @@ const Meeting: React.FC = () => {
         active: false,
         select: false,
       },
+      {
+        title: '签到',
+        icon: ImageUrl.icon52,
+        iconSelect: ImageUrl.icon52Select,
+        active: false,
+        select: false,
+      },
       {
         title: '设置',
         icon: ImageUrl.icon28,
@@ -432,8 +441,18 @@ const Meeting: React.FC = () => {
                     } else {
                       message.error('当前不在会议室！')
                     }
+                    singInRef.current.getModal().then((res: boolean) => {
+                      if (!res) {
+                        singInRef.current.changeModal()
+                      }
+                    })
                   },
                   onCancel() {
+                    singInRef.current.getModal().then((res: boolean) => {
+                      if (!res) {
+                        singInRef.current.changeModal()
+                      }
+                    })
                   }
                 })
               }
@@ -1455,7 +1474,6 @@ const Meeting: React.FC = () => {
         await getUserRoomInfo().then(async (res) => {
           stupWizardRef.current.changeModal(0, res)
         })
-
         break;
       case '邀请人员':
         await getUserRoomInfo().then(async (res) => {
@@ -1559,6 +1577,9 @@ const Meeting: React.FC = () => {
         storage.setItem('noViewChatList', 0)
         setNoViewChatList(0)
         break;
+      case '签到':
+        singInRef.current.changeModal()
+        break;
     }
   }
   // 停止录制
@@ -2705,10 +2726,23 @@ const Meeting: React.FC = () => {
                             <span>{row.title}</span>
                           </div>
                         </Popover>
+                      case '签到':
+                        if (!role.ID.includes(user.roleId)) {
+                          return <div className='drag'
+                            onClick={() => changeStatusList(row, itemIndex, rowIndex)}
+                            onMouseDown={() => changeFooterListSelect(row, itemIndex, rowIndex, true)}
+                            onMouseUp={() => changeFooterListSelect(row, itemIndex, rowIndex, false)}
+                            onMouseLeave={() => changeFooterListSelect(row, itemIndex, rowIndex, false)}
+                            key={rowIndex}>
+                            {row.select ? <img src={row.iconSelect} alt="" /> : <img src={row.icon} alt="" />}
+                            <span>{row.title}</span>
+                          </div>
+                        }
+                        return null
                       case '申请发言':
                         // if (!role.ID.includes(user.roleId)) {
                         //   return <div className='drag' onClick={() => changeStatusList(row, itemIndex, rowIndex)} key={rowIndex}>
-                        //     <img src={row.active ? row.iconActive : row.icon} alt="" />
+                        //     {row.select ? <img src={row.iconSelect} alt="" /> : <img src={row.active ? row.iconActive : row.icon} alt="" />}
                         //     <span>{row.title}</span>
                         //   </div>
                         // }
@@ -2917,6 +2951,7 @@ const Meeting: React.FC = () => {
       <StupWizard ref={stupWizardRef} />
       <EquipmentManagement ref={equipmentManagementRef} />
       <MeetingDisconnected ref={meetingDisconnectedRef} />
+      <SingIn ref={singInRef} />
     </>
   )
 }
diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts
index 2722e37..3b8e6dc 100644
--- a/src/utils/package/imageUrl.ts
+++ b/src/utils/package/imageUrl.ts
@@ -79,6 +79,8 @@ import virtualBackground3 from '@/assets/virtualBackground/3.png'
 import virtualBackground4 from '@/assets/virtualBackground/4.png'
 import virtualBackground5 from '@/assets/virtualBackground/5.png'
 import virtualBackground6 from '@/assets/virtualBackground/6.png'
+import icon52 from '@/assets/icon52.png'
+import icon52Select from '@/assets/icon52-select.png'
 export default {
   loading,
   icon,
@@ -161,4 +163,6 @@ export default {
   virtualBackground4,
   virtualBackground5,
   virtualBackground6,
+  icon52,
+  icon52Select
 }
\ No newline at end of file
-- 
2.40.1


From be6de54c0d7f2a1975b41dbfd58e972d0b652926 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 13 Nov 2024 16:28:54 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Home/User/index.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/page/Home/User/index.tsx b/src/page/Home/User/index.tsx
index 34812c9..a380fc5 100644
--- a/src/page/Home/User/index.tsx
+++ b/src/page/Home/User/index.tsx
@@ -703,7 +703,7 @@ const User: React.FC = () => {
       </Modal>
       <Modal title='签到绑定' open={signInUserModal} destroyOnClose={true} onCancel={() => setSignInUserModal(false)} footer={null} centered width={'300px'}>
         <div className={styles.signInUserModal}>
-          <div>
+          <div id='signInView'>
             {signInUserForm.currentUserList.map((item: any, index: number) => {
               return (
                 <div style={{ display: 'flex', alignItems: 'center', marginBottom: '10px' }} key={index}>
@@ -742,6 +742,12 @@ const User: React.FC = () => {
                   ...signInUserForm,
                   currentUserList: currentUserListTemp,
                 })
+                setTimeout(() => {
+                  const signInView = document.getElementById('signInView') as HTMLElement;
+                  if (signInView) {
+                    signInView.scrollTop = signInView.scrollHeight;
+                  }
+                }, 0);
               }}
               style={{ width: '100%', marginBottom: '20px' }}
               icon={<img src={ImageUrl.icon8} alt="" />}
-- 
2.40.1


From 35ff92c99ac5005bf871b985bf1507c8403621b5 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 13 Nov 2024 17:25:46 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=B0=88=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.tsx | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 993ec24..25d4e1b 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -441,18 +441,22 @@ const Meeting: React.FC = () => {
                     } else {
                       message.error('当前不在会议室！')
                     }
-                    singInRef.current.getModal().then((res: boolean) => {
-                      if (!res) {
-                        singInRef.current.changeModal()
-                      }
-                    })
+                    if (!role.ID.includes(userInfo.roleId)) {
+                      singInRef.current.getModal().then((res: boolean) => {
+                        if (!res) {
+                          singInRef.current.changeModal()
+                        }
+                      })
+                    }
                   },
                   onCancel() {
-                    singInRef.current.getModal().then((res: boolean) => {
-                      if (!res) {
-                        singInRef.current.changeModal()
-                      }
-                    })
+                    if (!role.ID.includes(userInfo.roleId)) {
+                      singInRef.current.getModal().then((res: boolean) => {
+                        if (!res) {
+                          singInRef.current.changeModal()
+                        }
+                      })
+                    }
                   }
                 })
               }
-- 
2.40.1


From abfad93e599959e397fe51c2550d917761b10868 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 13 Nov 2024 17:32:26 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SingIn/index.tsx |  4 +++-
 src/page/Meeting/index.tsx      | 27 +++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/SingIn/index.tsx b/src/components/SingIn/index.tsx
index d37dbf7..58d64e9 100644
--- a/src/components/SingIn/index.tsx
+++ b/src/components/SingIn/index.tsx
@@ -6,7 +6,6 @@ import { useState, useImperativeHandle, forwardRef } from "react";
 const SingIn = forwardRef((props: any, ref: any) => {
   useImperativeHandle(ref, () => ({
     changeModal: () => {
-      setSingInModal(true)
       getRoomSingnIn()
     },
     getModal: () => {
@@ -23,6 +22,9 @@ const SingIn = forwardRef((props: any, ref: any) => {
   const getRoomSingnIn = async (): Promise<void> => {
     await GetRoomSingnIn().then(res => {
       if (res.code === 200) {
+        if (res.data.length) {
+          setSingInModal(true)
+        }
         setSingInList(res.data.map((item: any) => {
           return {
             ...item,
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 25d4e1b..67ef2e8 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -418,6 +418,15 @@ const Meeting: React.FC = () => {
     firstFooterList[0][1].title = state.enableCamera ? '关闭视频' : '开启视频'
     firstFooterList[0][1].active = !state.enableCamera
     setFooterList(firstFooterList)
+    function showSingIn() {
+      if (!role.ID.includes(userInfo.roleId)) {
+        singInRef.current.getModal().then((res: boolean) => {
+          if (!res) {
+            singInRef.current.changeModal()
+          }
+        })
+      }
+    }
     setTimeout(async () => {
       const setting = await JSON.parse(storage.getItem('setting') as string);
       const stateInfo = await JSON.parse(storage.getItem('stateInfo') as string);
@@ -441,22 +450,10 @@ const Meeting: React.FC = () => {
                     } else {
                       message.error('当前不在会议室！')
                     }
-                    if (!role.ID.includes(userInfo.roleId)) {
-                      singInRef.current.getModal().then((res: boolean) => {
-                        if (!res) {
-                          singInRef.current.changeModal()
-                        }
-                      })
-                    }
+                    showSingIn()
                   },
                   onCancel() {
-                    if (!role.ID.includes(userInfo.roleId)) {
-                      singInRef.current.getModal().then((res: boolean) => {
-                        if (!res) {
-                          singInRef.current.changeModal()
-                        }
-                      })
-                    }
+                    showSingIn()
                   }
                 })
               }
@@ -465,6 +462,8 @@ const Meeting: React.FC = () => {
           }
           return data
         })
+      } else {
+        showSingIn()
       }
     }, 10000);
     return () => {
-- 
2.40.1


From a0795768e9aecb0113e7564a0624f24fd91b3ace Mon Sep 17 00:00:00 2001
From: youngq <yq5537@outlook.com>
Date: Wed, 13 Nov 2024 17:43:27 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Home/User/index.tsx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/page/Home/User/index.tsx b/src/page/Home/User/index.tsx
index a380fc5..b83d7d7 100644
--- a/src/page/Home/User/index.tsx
+++ b/src/page/Home/User/index.tsx
@@ -167,14 +167,14 @@ const User: React.FC = () => {
               }}
               icon={<img src={ImageUrl.icon8} alt="" />}
               className='m-ant-btn'>
-              添加用户
+              添加
             </Button>
             <Button type="primary"
               onClick={() => {
                 setChangeImportModal(true)
               }}
               className='m-ant-btn'>
-              批量导入用户
+              批量添加
             </Button>
             <Button type="primary"
               onClick={() => {
@@ -199,7 +199,14 @@ const User: React.FC = () => {
                 }
               }}
               className='m-ant-btn'>
-              批量修改用户信息
+              批量修改
+            </Button>
+            <Button type="primary"
+              onClick={() => {
+                setSignInModal(true)
+              }}
+              className='m-ant-btn'>
+              批量签到绑定
             </Button>
             <Button type="primary"
               icon={<img src={ImageUrl.icon21} alt="" />}
@@ -214,13 +221,7 @@ const User: React.FC = () => {
             >
               删除用户
             </Button>
-            <Button type="primary"
-              onClick={() => {
-                setSignInModal(true)
-              }}
-              className='m-ant-btn'>
-              签到绑定
-            </Button>
+            
           </div>
           <div className={`${styles.userBtnsRight} drag`}>
             <Input
-- 
2.40.1


From 9f8fc16de3ad0c40a2d2a65148c4db11238721b3 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 13 Nov 2024 17:59:09 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 67ef2e8..bf368ba 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -463,7 +463,12 @@ const Meeting: React.FC = () => {
           return data
         })
       } else {
-        showSingIn()
+        setIsScreenCapture(bool => {
+          if (!bool) {
+            showSingIn()
+          }
+          return bool
+        })
       }
     }, 10000);
     return () => {
-- 
2.40.1