From 7a09fb7ea7f958f0217c3e729ce741edf298739f Mon Sep 17 00:00:00 2001 From: cxc Date: Mon, 13 Jun 2022 17:33:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E4=BA=BA=E5=8F=82=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.ico | Bin 4286 -> 2966 bytes public/index.html | 17 +++++++++++------ src/api/meeting.js | 10 ++++++++++ src/router/index.js | 28 +++++++++++++++++++++++++--- 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index df36fcfb72584e00488330b560ebcf34a41c64c2..31f3c04d8eae6755cfe6d168a5dfc1d405b2c6a9 100644 GIT binary patch literal 2966 zcmcImeNc{B6n__Eu?%9G!R%IMY&$!4QM;j*Vo4t)DwJxh+ND^uv!u*yWfH4q8v9Qe zWH#%YC}M@a>#es``jkEpW_+yG78AYq{`Q>vc!u?lmfh2wr{~^#o^yWZ^S%bdd-P{* zY2c?J_5*`~UJaiRTN95b=6ywUHsS?q8wLYjA+s5fQroDil8B0uaCaA&Hci0GOJM6( zi5oXG0U-e9|B8BgG);AN5>8G6mX-pG7Yl6PE|HQVv3awEo14JUp#pw>0{8E0I2iN0 zlCC2)Rl;Bp%GTq@61lk&2?-J#Hb^8VOK?osuD`#;`~3xqiryWAZaXbaqHkXT_Mi2R z9xY&HC9r6bz{-^ZbLR?-94TODCvfkc#KD7_{FN&&^YONEXlaocJXoN-Tw?cbEe3}V zYkIjJ^qSxt#l~vql@trki?y}D^XHmnUGCrF@bM8?zh3iu&>(?p*Ivf8r$>^0jm>7> zmpFDzVBkQ3yLSbgoz2*^Nh?H_l?0-<%s6k})O_H&o;Xop&mPV8vuBzYtV<^$7>Bl6 zyH=>$C@BFvJTzP^%FJ@F60cd0poY=0>E}ClO7*?TBr$fZfZhjuZl>a>s=A8uib@m~ zmY}q>9BpkkQCw_7MTHSLIVH%+%}0r`9FHD7hRIYxXQim5Z%pNt>OK2n4&}8Hd3l9O zS8++1+OMsx$1`$r#R`eYNU8khUT4xVu>Gd%&0tw$sR>O@&A4@|9r*>tXlQ6cX_<+7 zq!5jbO}KOCE-qirQ&_KGZy`)&IGvHDFc%dWQD5JvbQz5%T&<}?ZCwMpx}KQQk@PBz2a+f4U#59ZC|p=egK&1@EGZt1hG=S4H~n&$}<@9FieHt3;aXl<41 zw}!TU&wQ!v*^F6Y9>gu+T7X+ot79*Q4w0?SHO!p83?0 ziWqi5fkb?~Kya|Yf(06us3<}Ao}d}TJtFb+sg^IJQR|uB+IwA2xBKuRaOjX!KJ#xb z7Z(9XM=cf;CI}20CgAI<`TDw!cUg1q#l;DPh6=>Q2%I>f^&{ia?>yGeabad+%*-4+ f=C`HpZi&Q1f$VI)C*Q1vZS_X(&6+^<{{PV5%JEY? literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S diff --git a/public/index.html b/public/index.html index 80c1f2e..d0947a7 100644 --- a/public/index.html +++ b/public/index.html @@ -1,17 +1,22 @@ - - - - + + + + - <%= htmlWebpackPlugin.options.title %> + + 楚桓会议客户端
diff --git a/src/api/meeting.js b/src/api/meeting.js index 86370a3..0600174 100644 --- a/src/api/meeting.js +++ b/src/api/meeting.js @@ -97,3 +97,13 @@ export function getMeetingSetting() { method: "get", }); } + +// 监管参会 +export function superviseJoinMeeting(params) { + return request({ + url: `/app/superviseJoinMeeting`, + method: "post", + // headers: { "Content-Type": "application/json" }, + params, + }); +} diff --git a/src/router/index.js b/src/router/index.js index 4ba87cc..1c08677 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,6 +8,7 @@ import { registerJoinUser, visitorJoinUser, panelistJoinMeeting, + superviseJoinMeeting, } from "@/api/meeting"; const router = createRouter({ history: createWebHistory(), @@ -47,6 +48,11 @@ const router = createRouter({ name: "Host", component: () => import("@/views/meeting.vue"), }, + { + path: "/supervisor/:meetingId/:username", + name: "Supervisor", + component: () => import("@/views/meeting.vue"), + }, { path: "/:pathMatch(.*)*", name: "NotFound", @@ -77,7 +83,7 @@ router.beforeEach(async (to) => { return true; } // 如果要前往参会页面 - if (to.name === "Meeting") { + else if (to.name === "Meeting") { // 如果要去的页面会议号于 vuex中的不一样，则清除数据 if (to.params.meetingId !== store.state.joinUser.meetingId) { store.commit("setJoinUser", {}); @@ -145,8 +151,7 @@ router.beforeEach(async (to) => { return true; } } - } - if (to.name === "Panelist") { + } else if (to.name === "Panelist") { // 如果要去的页面会议号于 vuex中的不一样，则清除数据 if (to.params.meetingId !== store.state.joinUser.meetingId) { store.commit("setJoinUser", {}); @@ -173,6 +178,23 @@ router.beforeEach(async (to) => { store.commit("setJoinUser", {}); return `/panelist-verify/${to.params.meetingId}`; } + } else if (to.name === "Supervisor") { + // 监管参会 + if (to.params.meetingId !== store.state.joinUser.meetingId) { + store.commit("setMessagesList", []); + } + const { email, meetingPassword } = await superviseJoinMeeting({ + icCard: to.params.username, + meetingId: to.params.meetingId, + }); + store.commit("setJoinUser", { + meetingId: to.params.meetingId, + icCard: to.params.username, + email: email.email, + token: email.token, + }); + store.commit("setPassword", meetingPassword); + return true; } });